From 111ebd2f19e969dd56e24c42f7d0e9409bdf4437 Mon Sep 17 00:00:00 2001
From: Gravit <gravit.min@ya.ru>
Date: Tue, 2 Oct 2018 19:20:57 +0700
Subject: [PATCH] FileServerHandler update

---
 .../fileserver/FileServerHandler.java         | 68 ++++++++++---------
 1 file changed, 35 insertions(+), 33 deletions(-)
diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/fileserver/FileServerHandler.java b/LaunchServer/src/main/java/ru/gravit/launchserver/fileserver/FileServerHandler.java
index f12ab61c..94dc6e62 100644
--- a/LaunchServer/src/main/java/ru/gravit/launchserver/fileserver/FileServerHandler.java
+++ b/LaunchServer/src/main/java/ru/gravit/launchserver/fileserver/FileServerHandler.java
@@ -31,6 +31,7 @@
 import java.io.RandomAccessFile;
 import java.io.UnsupportedEncodingException;
 import java.net.URLDecoder;
+import java.nio.file.Path;
 import java.text.SimpleDateFormat;
 import java.util.Calendar;
 import java.util.Date;
@@ -47,15 +48,16 @@ public class FileServerHandler extends SimpleChannelInboundHandler<FullHttpReque
 
     public static final String HTTP_DATE_FORMAT = "EEE, dd MMM yyyy HH:mm:ss zzz";
     public static final String HTTP_DATE_GMT_TIMEZONE = "GMT";
+    public static final String READ = "r";
     public static final int HTTP_CACHE_SECONDS = 60;
-	private final File base;
-	private final boolean fullOut;
+    private final Path base;
+    private final boolean fullOut;
+
+    public FileServerHandler(Path base, boolean fullOut) {
+        this.base = base;
+        this.fullOut = fullOut;
+    }
 
-	public FileServerHandler(File base, boolean fullOut) {
-		this.base = base;
-		this.fullOut = fullOut;
-	}
-	
     @Override
     public void channelRead0(ChannelHandlerContext ctx, FullHttpRequest request) throws Exception {
         if (!request.decoderResult().isSuccess()) {
@@ -75,20 +77,20 @@ public void channelRead0(ChannelHandlerContext ctx, FullHttpRequest request) thr
             return;
         }
 
-        File file = new File(base, path);
+        File file = base.resolve(path).toFile();
         if (file.isHidden() || !file.exists()) {
             sendError(ctx, NOT_FOUND);
             return;
         }
 
         if (file.isDirectory()) {
-        	if (fullOut) {
-        		if (uri.endsWith("/")) {
-                	sendListing(ctx, file, uri);
-            	} else {
-                	sendRedirect(ctx, uri + '/');
-            	}
-        	} else sendError(ctx, FORBIDDEN);
+            if (fullOut) {
+                if (uri.endsWith("/")) {
+                    sendListing(ctx, file, uri);
+                } else {
+                    sendRedirect(ctx, uri + '/');
+                }
+            } else sendError(ctx, FORBIDDEN);
             return;
         }
 
@@ -115,7 +117,7 @@ public void channelRead0(ChannelHandlerContext ctx, FullHttpRequest request) thr
 
         RandomAccessFile raf;
         try {
-            raf = new RandomAccessFile(file, "r");
+            raf = new RandomAccessFile(file, READ);
         } catch (FileNotFoundException ignore) {
             sendError(ctx, NOT_FOUND);
             return;
@@ -200,9 +202,9 @@ private static String sanitizeUri(String uri) {
         // Simplistic dumb security check.
         // You will have to do something serious in the production environment.
         if (uri.contains(File.separator + '.') ||
-            uri.contains('.' + File.separator) ||
-            uri.charAt(0) == '.' || uri.charAt(uri.length() - 1) == '.' ||
-            INSECURE_URI.matcher(uri).matches()) {
+                uri.contains('.' + File.separator) ||
+                uri.charAt(0) == '.' || uri.charAt(uri.length() - 1) == '.' ||
+                INSECURE_URI.matcher(uri).matches()) {
             return null;
         }
 
@@ -217,18 +219,18 @@ private static void sendListing(ChannelHandlerContext ctx, File dir, String dirP
         response.headers().set(HttpHeaderNames.CONTENT_TYPE, "text/html; charset=UTF-8");
 
         StringBuilder buf = new StringBuilder()
-            .append("<!DOCTYPE html>\r\n")
-            .append("<html><head><meta charset='utf-8' /><title>")
-            .append("Listing of: ")
-            .append(dirPath)
-            .append("</title></head><body>\r\n")
+                .append("<!DOCTYPE html>\r\n")
+                .append("<html><head><meta charset='utf-8' /><title>")
+                .append("Listing of: ")
+                .append(dirPath)
+                .append("</title></head><body>\r\n")
 
-            .append("<h3>Listing of: ")
-            .append(dirPath)
-            .append("</h3>\r\n")
+                .append("<h3>Listing of: ")
+                .append(dirPath)
+                .append("</h3>\r\n")
 
-            .append("<ul>")
-            .append("<li><a href=\"../\">..</a></li>\r\n");
+                .append("<ul>")
+                .append("<li><a href=\"../\">..</a></li>\r\n");
 
         for (File f: dir.listFiles()) {
             if (f.isHidden() || !f.canRead()) {
@@ -241,10 +243,10 @@ private static void sendListing(ChannelHandlerContext ctx, File dir, String dirP
             }
 
             buf.append("<li><a href=\"")
-               .append(name)
-               .append("\">")
-               .append(name)
-               .append("</a></li>\r\n");
+                    .append(name)
+                    .append("\">")
+                    .append(name)
+                    .append("</a></li>\r\n");
         }
 
         buf.append("</ul></body></html>\r\n");
