Better check for bad local files

Author: TalLevAmi

cloudinary-http42/src/main/java/com/cloudinary/http42/UploaderStrategy.java

@@ -84,8 +84,12 @@ public Map callApi(String action, Map<String, Object> params, Map options, Objec
             }
         }
 
-        if (file instanceof String && !((String) file).matches("(?s)ftp:.*|https?:.*|s3:.*|data:[^;]*;base64,([a-zA-Z0-9/+\n=]+)")) {
-            file = new File((String) file);
+        if (file instanceof String && !((String) file).matches("ftp:.*|https?:.*|s3:.*|data:[^;]*;base64,([a-zA-Z0-9/+\n=]+)")) {
+            File _file = new File((String) file);
+            if (!_file.isFile() && !_file.canRead()) {
+                throw new IOException("File not found or unreadable: " + file);
+            }
+            file = _file;
         }
         String filename = (String) options.get("filename");
         if (file instanceof File) {
@@ -98,7 +102,7 @@ public Map callApi(String action, Map<String, Object> params, Map options, Objec
         } else if (file == null) {
             // no-problem
         } else {
-            throw new IOException("Uprecognized file parameter " + file);
+            throw new IOException("Unrecognized file parameter " + file);
         }
         postMethod.setEntity(multipart);
 

cloudinary-http43/src/main/java/com/cloudinary/http43/UploaderStrategy.java

@@ -97,8 +97,12 @@ public Map callApi(String action, Map<String, Object> params, Map options, Objec
             }
         }
 
-        if (file instanceof String && !((String) file).matches("(?s)ftp:.*|https?:.*|s3:.*|data:[^;]*;base64,([a-zA-Z0-9/+\n=]+)")) {
-            file = new File((String) file);
+        if (file instanceof String && !((String) file).matches("ftp:.*|https?:.*|s3:.*|data:[^;]*;base64,([a-zA-Z0-9/+\n=]+)")) {
+            File _file = new File((String) file);
+            if (!_file.isFile() && !_file.canRead()) {
+                throw new IOException("File not found or unreadable: " + file);
+            }
+            file = _file;
         }
         String filename = (String) options.get("filename");
         if (file instanceof File) {

cloudinary-http44/src/main/java/com/cloudinary/http44/UploaderStrategy.java

@@ -99,8 +99,12 @@ public Map callApi(String action, Map<String, Object> params, Map options, Objec
             }
         }
 
-        if (file instanceof String && !((String) file).matches("(?s)ftp:.*|https?:.*|s3:.*|data:[^;]*;base64,([a-zA-Z0-9/+\n=]+)")) {
-            file = new File((String) file);
+        if (file instanceof String && !((String) file).matches("ftp:.*|https?:.*|s3:.*|data:[^;]*;base64,([a-zA-Z0-9/+\n=]+)")) {
+            File _file = new File((String) file);
+            if (!_file.isFile() && !_file.canRead()) {
+                throw new IOException("File not found or unreadable: " + file);
+            }
+            file = _file;
         }
         String filename = (String) options.get("filename");
         if (file instanceof File) {

cloudinary-test-common/src/main/java/com/cloudinary/test/AbstractUploaderTest.java

@@ -500,11 +500,13 @@ public void testDownloadArchive() throws Exception {
         assertEquals(2, files);
     }
 
-    @Test
-    public void testUploadInvalidUrl() throws IOException {
-        Map result = cloudinary.uploader().upload(REMOTE_TEST_IMAGE + "\n", ObjectUtils.asMap("return_error", true));
-        Map error = (Map) result.get("error");
-        assertEquals(error.get("http_code"), 404);
+    public void testUploadInvalidUrl() {
+        try {
+            cloudinary.uploader().upload(REMOTE_TEST_IMAGE + "\n", ObjectUtils.asMap("return_error", true));
+            fail("Expected exception was not thrown");
+        } catch(IOException e) {
+            assertEquals(e.getMessage(), "File not found or unreadable: " + REMOTE_TEST_IMAGE + "\n");
+        }
     }
 
 }