From 28c156a68c1a15c2b0a10c095c6a36ae4abc63d6 Mon Sep 17 00:00:00 2001
From: Nathaniel Sherry <nathaniel.sherry@gmail.com>
Date: Sun, 1 Sep 2024 17:49:21 -0400
Subject: [PATCH] Check if FileDrop URLs need to be URL-encoded first, add more
 logging

---
 .../framework/stratus/api/hookins/FileDrop.java     | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/Framework/Stratus/src/main/java/org/peakaboo/framework/stratus/api/hookins/FileDrop.java b/Framework/Stratus/src/main/java/org/peakaboo/framework/stratus/api/hookins/FileDrop.java
index 17bc4846..127fa910 100644
--- a/Framework/Stratus/src/main/java/org/peakaboo/framework/stratus/api/hookins/FileDrop.java
+++ b/Framework/Stratus/src/main/java/org/peakaboo/framework/stratus/api/hookins/FileDrop.java
@@ -17,6 +17,7 @@
 import java.net.HttpURLConnection;
 import java.net.URI;
 import java.net.URL;
+import java.net.URLEncoder;
 import java.nio.ByteBuffer;
 import java.nio.channels.Channels;
 import java.nio.channels.ReadableByteChannel;
@@ -337,8 +338,16 @@ private static File[] createFileArray(BufferedReader bReader) {
 					if (ZERO_CHAR_STRING.equals(line))
 						continue;
 
+					// Clean up this line and check if it needs to be URL encoded before being read as a URL
+					line = line.strip();
+					if (line.contains(" ") && !line.contains("%")) {
+						line = URLEncoder.encode(line, "UTF-8");
+					}
+
+					// Turn it into a File and add it to the list
 					File file = new File(new URI(line));
 					list.add(file);
+					
 				} catch (Exception ex) {
 					log("Error with " + line + ": " + ex.getMessage());
 				}
@@ -412,21 +421,25 @@ private DropType isDragOk(final java.awt.dnd.DropTargetDragEvent evt) {
 			
 			// If it's a file list flavour, accept it
 			if (curFlavor.equals(DataFlavor.javaFileListFlavor)) {
+				log("FileDrop: Found a DropType of " + DropType.DROP_FILELIST.toString());
 				return DropType.DROP_FILELIST;
 			}
 
 			// if the mime-type is a uri-list, accept it
 			if (curFlavor.getSubType().equals("uri-list") && curFlavor.isRepresentationClassReader()) {
+				log("FileDrop: Found a DropType of " + DropType.DROP_LINUX.toString());
 				return DropType.DROP_LINUX;
 			}
 
 			// if the String payload is a URL, accept it
 			if (isDragUrl(evt)) {
+				log("FileDrop: Found a DropType of " + DropType.DROP_URL.toString());
 				return DropType.DROP_URL;
 			}
 
 		}
 
+		log("FileDrop: Found a DropType of " + DropType.DROP_FAIL.toString());
 		return DropType.DROP_FAIL;