Merge pull request #540 from wiiitek/issue-382

Issue 382: Build Fails on path with space

Author: xeno6696

src/main/java/org/owasp/esapi/reference/DefaultSecurityConfiguration.java

@@ -20,6 +20,7 @@
 import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.InputStream;
+import java.net.URISyntaxException;
 import java.net.URL;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -581,13 +582,17 @@ public File getResourceFile(String filename) {
         }
 
 		if (fileUrl != null) {
-			String fileLocation = fileUrl.getFile();
-			f = new File(fileLocation);
-			if (f.exists()) {
-				logSpecial("Found in SystemResource Directory/resourceDirectory: " + f.getAbsolutePath());
-				return f;
-			} else {
-				logSpecial("Not found in SystemResource Directory/resourceDirectory (this should never happen): " + f.getAbsolutePath());
+			try {
+				String fileLocation = fileUrl.toURI().getPath();
+				f = new File(fileLocation);
+				if (f.exists()) {
+					logSpecial("Found in SystemResource Directory/resourceDirectory: " + f.getAbsolutePath());
+					return f;
+				} else {
+					logSpecial("Not found in SystemResource Directory/resourceDirectory (this should never happen): " + f.getAbsolutePath());
+				}
+			} catch (URISyntaxException e) {
+				logSpecial("Error while converting URL " + fileUrl + " to file path: " + e.getMessage());
 			}
 		} else {
 			logSpecial("Not found in SystemResource Directory/resourceDirectory: " + resourceDirectory + File.separator + filename);

src/test/java/org/owasp/esapi/crypto/CryptoTokenTest.java

@@ -391,7 +391,9 @@ public final void testAddandGetAttributes() {
     private static void nap(int n) {
         try {
             System.out.println("Sleeping " + n + " seconds...");
-            Thread.sleep( n * 1000 );
+            // adds additional time to make sure we sleep more than n seconds
+            int additionalTimeToSleep = 100;
+            Thread.sleep( n * 1000 + additionalTimeToSleep );
         } catch (InterruptedException e) {
             ;   // Ignore
         }

src/test/java/org/owasp/esapi/reference/ExtensiveEncoderURITest.java

@@ -2,10 +2,11 @@
 
 import static org.junit.Assert.assertEquals;
 
-import java.io.File;
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStreamReader;
 import java.net.URL;
 import java.nio.charset.StandardCharsets;
-import java.nio.file.Files;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
@@ -20,7 +21,7 @@
 
 @RunWith(Parameterized.class)
 public class ExtensiveEncoderURITest {
-	static List<String> inputs = new ArrayList<String>();
+	static List<String> inputs = new ArrayList<>();
 	Validator v = ESAPI.validator();
 	String uri;
 	boolean expected;
@@ -34,16 +35,24 @@ public ExtensiveEncoderURITest(String uri){
 	@Parameters
 	public static Collection<String> getMyUris() throws Exception{
 		URL url = ExtensiveEncoderURITest.class.getResource("/urisForTest.txt");
-		String fileName = url.getFile();
-		File urisForText = new File(fileName);
-		
-		inputs = Files.readAllLines(urisForText.toPath(), StandardCharsets.UTF_8);
-		
+
+		try( BufferedReader br = new BufferedReader(new InputStreamReader(url.openStream(), StandardCharsets.UTF_8)) ) {
+			inputs = readAllLines(br);
+		}
 		return inputs;
 	}
-	
+
+	private static List<String> readAllLines(BufferedReader br) throws IOException {
+		List<String> lines = new ArrayList<>();
+		String line;
+		while ((line = br.readLine()) != null) {
+			lines.add(line);
+		}
+		return lines;
+	}
+
 	@Test
-	public void testUrlsFromFile() throws Exception{
+	public void testUrlsFromFile() {
 		assertEquals(this.expected, v.isValidURI("URL", uri, false));
 	}