Cleanup

JARAM2024 · Apr 16, 2024 · ea30e19 · ea30e19
1 parent 33cae0a
commit ea30e19
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 20 deletions.
diff --git a/.entries.json b/.entries.json
@@ -2,7 +2,7 @@
   {
     "name": "test",
     "address": "127.0.0.1",
-    "port": 8000,
+    "port": 4123,
     "is_ssl": false,
     "headers": []
   },

diff --git a/src/main.rs b/src/main.rs
@@ -84,26 +84,28 @@ impl ProxyHttp for MyGateWay {
                 Err(_) => return not_found,
             },
             None => {
-                let mut server_and_path = std::str::from_utf8(session.req_header().raw_path())
-                    .unwrap()
-                    .splitn(3, "/");
-
-                server_and_path.next().unwrap();
-
-                let server = match server_and_path.next() {
-                    Some(server) => server,
+                let mut server_and_path =
+                    std::str::from_utf8(&(session.req_header().raw_path()[1..]))
+                        .unwrap()
+                        .splitn(3, "/");
+
+                match server_and_path.next() {
+                    Some(server) => {
+                        if server.len() == 0 {
+                            "haksul-proxy"
+                        } else {
+                            ctx.new_uri = match server_and_path.next() {
+                                Some(path) => match ("/".to_string() + path).parse() {
+                                    Ok(uri) => Some(uri),
+                                    Err(_) => None,
+                                },
+                                None => Some(Uri::from_static("/")),
+                            };
+                            server
+                        }
+                    }
                     None => "haksul-proxy",
-                };
-
-                ctx.new_uri = match server_and_path.next() {
-                    Some(path) => match ("/".to_string() + path).parse() {
-                        Ok(uri) => Some(uri),
-                        Err(_) => None,
-                    },
-                    None => Some(Uri::from_static("/")),
-                };
-
-                server
+                }
             }
         };