web(arcane-nebula): xff

cybermouflons · Apr 29, 2024 · e61aaff · e61aaff
1 parent 2b4fb2a
commit e61aaff
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 15 deletions.
diff --git a/web/arcane-nebula/setup/app/index.ts b/web/arcane-nebula/setup/app/index.ts
@@ -14,19 +14,14 @@ const server = Bun.serve({
       return new Response(Bun.file(import.meta.dir + index));
     }
 
-    if (url.pathname.endsWith("/ip-test-091827")) {
-      const ip1 = server.requestIP(req)?.address;
-      const xff = req.headers.get("x-forwarded-for");
-
-      const ss = `
-server.requestIP(req) -> ${ip1}
-xff -> ${xff}
-`;
-      return new Response(ss);
-    }
-
     if (url.pathname.endsWith("/spell")) {
-      const reqIP = server.requestIP(req);
+      const xff = req.headers
+        .get("x-forwarded-for")
+        ?.split(",")
+        .map((x) => x.trim());
+
+      const reqIP = xff ? xff[xff?.length - 1] : server.requestIP(req)?.address;
+
       const allowed = [
         "103.21.244.0/22",
         "103.22.200.0/22",
@@ -48,7 +43,7 @@ xff -> ${xff}
       ].map((s) => new Netmask(s));
 
       try {
-        if (allowed.some((a) => a.contains(reqIP?.address ?? ""))) {
+        if (allowed.some((a) => a.contains(reqIP ?? ""))) {
           const spell = "/views/spell.html";
           return new Response(Bun.file(import.meta.dir + spell));
         }

diff --git a/web/arcane-nebula/setup/app/views/denied.html b/web/arcane-nebula/setup/app/views/denied.html
@@ -33,13 +33,21 @@
     }
 
     if (url.pathname.endsWith("/spell")) {
-      const reqIP = server.requestIP(req);
+      const xff = req.headers
+        .get("x-forwarded-for")
+        ?.split(",")
+        .map((x) => x.trim());
+
+      const reqIP = xff ? xff[xff?.length - 1] : server.requestIP(req)?.address;
+
       const allowed = [
         "103.21.244.0/22",
         "103.22.200.0/22",
         "103.31.4.0/22",
+        "104.16.0.0/12",
         "104.16.0.0/13",
         "104.24.0.0/14",
+        "104.28.0.0/14",
         "108.162.192.0/18",
         "131.0.72.0/22",
         "141.101.64.0/18",
@@ -53,7 +61,7 @@
       ].map((s) => new Netmask(s));
 
       try {
-        if (allowed.some((a) => a.contains(reqIP?.address ?? ""))) {
+        if (allowed.some((a) => a.contains(reqIP ?? ""))) {
           const spell = "/views/spell.html";
           return new Response(Bun.file(import.meta.dir + spell));
         }