代码优化 (#74)

scx567888 · Sep 29, 2024 · 2996f4d · 2996f4d
1 parent 170800f
commit 2996f4d
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 3 deletions.
diff --git a/scx-core/src/main/java/cool/scx/core/ScxHttpRouter.java b/scx-core/src/main/java/cool/scx/core/ScxHttpRouter.java
@@ -30,7 +30,7 @@ public ScxHttpRouter(Scx scx) {
         //设置基本的 handler
         this.corsHandler = initCorsHandler(scx.scxOptions().allowedOrigin());
         //注册路由
-        this.corsHandlerRoute = this.route().handler(corsHandler);
+        this.corsHandlerRoute = this.route(-10000).handler(corsHandler);
     }
 
     private static CorsHandler initCorsHandler(String allowedOriginPattern) {

diff --git a/scx-ext/src/test/resources/c1/index.html b/scx-ext/src/test/resources/c1/index.html
@@ -7,7 +7,7 @@
 <body>
 <div>
     <h1>当指向单文件时 所有请求都会被转发给单文件</h1>
-    <a href="/c2">目录形式</a>
+    <a href="/c2/">目录形式</a>
     <h1 id="h11"></h1>
 
 </div>

diff --git a/scx-http/src/main/java/cool/scx/http/routing/Router.java b/scx-http/src/main/java/cool/scx/http/routing/Router.java
@@ -24,4 +24,10 @@ default RouteWritable route() {
         return route;
     }
 
+    default RouteWritable route(int order) {
+        var route = Route.of().order(order);
+        addRoute(route);
+        return route;
+    }
+
 }
diff --git a/scx-http/src/main/java/cool/scx/http/routing/handler/StaticHandler.java b/scx-http/src/main/java/cool/scx/http/routing/handler/StaticHandler.java
@@ -1,5 +1,6 @@
 package cool.scx.http.routing.handler;
 
+import cool.scx.http.exception.NotFoundException;
 import cool.scx.http.routing.RoutingContext;
 
 import java.nio.file.Files;
@@ -46,7 +47,11 @@ public Path getFilePath(String p) {
         if (regularFile) {
             return root;
         }
-        var path = root.resolve(p);
+        var path = root.resolve(p).normalize();
+        // 1, 重要!!! , 防止访问到上级文件的情况
+        if (!path.startsWith(root)) {
+            throw new NotFoundException();
+        }
         if (Files.isDirectory(path)) {
             return path.resolve("index.html");
         } else {