Changeset 881

Timestamp:

02/12/14 12:37:37 (10 years ago)

Author:

jts21

Message:

Fix bug in ImageServer which caused exceptions to be thrown when an unknown image was requested from the server (was non-fatal, so the bug fix is really just tidying up the console output). Also fix more serious bug in ImageSaver where existing images would be overwritten if a client tried to upload a file with the same name (could not occur through an existing codepath in Expeditee, but was exploitable by using external software to send custom data). Now the new file is ignored (not entirely ideal since it's probably a good idea to let the client know if their copy of an image differs from the server's copy... maybe have them send checksums of the files to compare and print a warning message if the files are different?)

Location:

trunk/src/org/expeditee/network

Files:

• ImageSaver.java (modified) (1 diff)
• ImageServer.java (modified) (1 diff)

trunk/src/org/expeditee/network/ImageSaver.java

@@ -21 +21 @@
         // if the above reads failed, fileLen will be -1
         if(fileLen <= 0) {
+                return false;
+        }
+        if(file.exists()) {
+                System.out.println("Ignoring " + file.getName() + " (already exists on filesystem)");
+                is.skip(fileLen);
                 return false;
         }

trunk/src/org/expeditee/network/ImageServer.java

@@ -14 +14 @@
         
         public static void sendImage(File file, Socket socket) throws IOException {
+                if(!file.isFile()) {
+                        System.out.println("Could not find " + file.getName());
+                        return;
+                }
                 OutputStream os = socket.getOutputStream();
         // send the file over the socket