From f9fd10016f2e4bd1df4d4e3bd2d5217690db8566 Mon Sep 17 00:00:00 2001
From: Obique PSWG <obique.pswg@gmail.com>
Date: Wed, 23 Sep 2015 22:22:45 -0500
Subject: [PATCH] Now converts file path to windows separators before file
 exists check

---
 src/services/admin/WebserverHandler.java | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/services/admin/WebserverHandler.java b/src/services/admin/WebserverHandler.java
index 8c9aba743..46c143425 100644
--- a/src/services/admin/WebserverHandler.java
+++ b/src/services/admin/WebserverHandler.java
@@ -176,20 +176,20 @@ class WebserverHandler {
 		if (file.isDirectory())
 			file = new File(file, "index.html");
 		String type = getFileType(filepath);
-		if (!verifyPath(file)) {
-			Log.e("WebserverHandler", "Cannot access %s - not a valid path", file);
-			return null;
-		}
 		if (file.toString().equals("res/webserver/index.html")) {
 			if (session.isAuthenticated()) {
 				file = new File("res/webserver/authenticated.html");
 			}
 		} else if (!session.isAuthenticated() && !type.equals("text/css") && !type.equals("text/js") && !type.startsWith("image"))
 			return null;
-		if (type.equalsIgnoreCase("text/html"))
-			return parseHtmlFile(file, getVariables).getBytes(ASCII);
 		if (File.separatorChar != '/')
 			file = new File(file.getAbsolutePath().replace('/', File.separatorChar));
+		if (!verifyPath(file)) {
+			Log.e("WebserverHandler", "Cannot access %s - not a valid path", file);
+			return null;
+		}
+		if (type.equalsIgnoreCase("text/html"))
+			return parseHtmlFile(file, getVariables).getBytes(ASCII);
 		try (InputStream is = new FileInputStream(file)) {
 			ByteArrayOutputStream baos = new ByteArrayOutputStream(is.available());
 			byte [] buffer = new byte[Math.min(1024, is.available())];
@@ -205,7 +205,8 @@ class WebserverHandler {
 	
 	private boolean verifyPath(File file) {
 		File parent = new File("res/webserver");
-		if (!file.getAbsolutePath().startsWith(parent.getAbsolutePath()))
+		String requiredPrefix = parent.getAbsolutePath().replace('/', File.separatorChar);
+		if (!file.getAbsolutePath().startsWith(requiredPrefix))
 			return false;
 		if (!file.isFile())
 			return false;