Update mock server

AikidoSec · Feb 7, 2025 · c6814e7 · c6814e7
1 parent d66f58d
commit c6814e7
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 22 deletions.
diff --git a/end2end/server/src/handlers/lists.js b/end2end/server/src/handlers/lists.js
@@ -24,6 +24,8 @@ module.exports = function lists(req, res) {
             },
           ]
         : [],
-    blockedUserAgents: blockedUserAgents,
+    blockedUserAgentsV2: Array.isArray(blockedUserAgents)
+      ? blockedUserAgents
+      : [],
   });
 };
diff --git a/end2end/server/src/handlers/updateLists.js b/end2end/server/src/handlers/updateLists.js
@@ -32,10 +32,10 @@ module.exports = function updateIPLists(req, res) {
   updateBlockedIPAddresses(req.app, req.body.blockedIPAddresses);
 
   if (
-    req.body.blockedUserAgents &&
-    typeof req.body.blockedUserAgents === "string"
+    req.body.blockedUserAgentsV2 &&
+    typeof req.body.blockedUserAgentsV2 === "string"
   ) {
-    updateBlockedUserAgents(req.app, req.body.blockedUserAgents);
+    updateBlockedUserAgents(req.app, req.body.blockedUserAgentsV2);
   }
 
   res.json({ success: true });

diff --git a/library/agent/Agent.test.ts b/library/agent/Agent.test.ts
@@ -18,6 +18,7 @@ import { Wrapper } from "./Wrapper";
 import { Context } from "./Context";
 import { createTestAgent } from "../helpers/createTestAgent";
 import { setTimeout } from "node:timers/promises";
+import type { Response } from "./api/fetchBlockedLists";
 
 wrap(fetch, "fetch", function mock() {
   return async function mock() {
@@ -42,7 +43,7 @@ wrap(fetch, "fetch", function mock() {
             pattern: "Bytespider",
           },
         ],
-      }),
+      } satisfies Response),
     };
   };
 });

diff --git a/library/agent/ServiceConfig.ts b/library/agent/ServiceConfig.ts
@@ -2,7 +2,7 @@ import { IPMatcher } from "../helpers/ip-matcher/IPMatcher";
 import { LimitedContext, matchEndpoints } from "../helpers/matchEndpoints";
 import { Endpoint } from "./Config";
 import {
-  Blocklist as BlocklistType,
+  IPBlocklist as BlocklistType,
   AgentBlockList,
 } from "./api/fetchBlockedLists";
 

diff --git a/library/agent/api/fetchBlockedLists.ts b/library/agent/api/fetchBlockedLists.ts
@@ -2,7 +2,7 @@ import { fetch } from "../../helpers/fetch";
 import { getAPIURL } from "../getAPIURL";
 import { Token } from "./Token";
 
-export type Blocklist = {
+export type IPBlocklist = {
   key: string;
   source: string;
   description: string;
@@ -14,8 +14,13 @@ export type AgentBlockList = {
   pattern: string; // e.g. "Googlebot|Bingbot"
 };
 
+export type Response = {
+  blockedIPAddresses: IPBlocklist[];
+  blockedUserAgentsV2: AgentBlockList[];
+};
+
 export async function fetchBlockedLists(token: Token): Promise<{
-  blockedIPAddresses: Blocklist[];
+  blockedIPAddresses: IPBlocklist[];
   blockedUserAgents: AgentBlockList[];
 }> {
   const baseUrl = getAPIURL();
@@ -34,10 +39,7 @@ export async function fetchBlockedLists(token: Token): Promise<{
     throw new Error(`Failed to fetch blocked lists: ${statusCode}`);
   }
 
-  const result: {
-    blockedIPAddresses: Blocklist[];
-    blockedUserAgentsV2: string;
-  } = JSON.parse(body);
+  const result: Response = JSON.parse(body);
 
   return {
     blockedIPAddresses:

diff --git a/library/sources/HTTPServer.test.ts b/library/sources/HTTPServer.test.ts
@@ -8,7 +8,7 @@ import { wrap } from "../helpers/wrap";
 import { HTTPServer } from "./HTTPServer";
 import { join } from "path";
 import { createTestAgent } from "../helpers/createTestAgent";
-import type { Blocklist, AgentBlockList } from "../agent/api/fetchBlockedLists";
+import type { Response } from "../agent/api/fetchBlockedLists";
 import * as fetchBlockedLists from "../agent/api/fetchBlockedLists";
 import { mkdtemp, writeFile, unlink } from "fs/promises";
 import { exec } from "child_process";
@@ -51,10 +51,7 @@ const agent = createTestAgent({
 agent.start([new HTTPServer()]);
 
 wrap(fetchBlockedLists, "fetchBlockedLists", function fetchBlockedLists() {
-  return async function fetchBlockedLists(): Promise<{
-    blockedIPAddresses: Blocklist[];
-    blockedUserAgentsV2: AgentBlockList[];
-  }> {
+  return async function fetchBlockedLists(): Promise<Response> {
     return {
       blockedIPAddresses: [
         {

diff --git a/library/sources/Hono.test.ts b/library/sources/Hono.test.ts
@@ -1,6 +1,6 @@
 /* eslint-disable prefer-rest-params */
 import * as t from "tap";
-import type { Blocklist, AgentBlockList } from "../agent/api/fetchBlockedLists";
+import type { Response } from "../agent/api/fetchBlockedLists";
 import { ReportingAPIForTesting } from "../agent/api/ReportingAPIForTesting";
 import { Token } from "../agent/api/Token";
 import { setUser } from "../agent/context/user";
@@ -38,10 +38,7 @@ wrap(fetch, "fetch", function mock(original) {
               pattern: "hacker|attacker",
             },
           ],
-        } satisfies {
-          blockedIPAddresses: Blocklist[];
-          blockedUserAgentsV2: AgentBlockList[];
-        }),
+        } satisfies Response),
       };
     }