Skip to content

Commit ba17528

Browse files
authored
Merge pull request #543 from AikidoSec/env-vars
Support AIKIDO_ENDPOINT and AIKIDO_REALTIME_ENDPOINT
2 parents dd165a7 + c0053f9 commit ba17528

File tree

7 files changed

+15
-15
lines changed

7 files changed

+15
-15
lines changed

end2end/tests/express-mongodb.ssrf.test.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ t.test("it blocks in blocking mode", (t) => {
5757
AIKIDO_DEBUG: "true",
5858
AIKIDO_BLOCKING: "true",
5959
AIKIDO_TOKEN: token,
60-
AIKIDO_URL: testServerUrl,
60+
AIKIDO_ENDPOINT: testServerUrl,
6161
},
6262
});
6363

@@ -155,7 +155,7 @@ t.test("it does not block in dry mode", (t) => {
155155
...process.env,
156156
AIKIDO_DEBUG: "true",
157157
AIKIDO_TOKEN: token,
158-
AIKIDO_URL: testServerUrl,
158+
AIKIDO_ENDPOINT: testServerUrl,
159159
},
160160
});
161161

@@ -213,7 +213,7 @@ t.test("it blocks request to base URL if proxy is not trusted", (t) => {
213213
AIKIDO_DEBUG: "true",
214214
AIKIDO_BLOCKING: "true",
215215
AIKIDO_TOKEN: token,
216-
AIKIDO_URL: testServerUrl,
216+
AIKIDO_ENDPOINT: testServerUrl,
217217
AIKIDO_TRUST_PROXY: "false",
218218
},
219219
});

end2end/tests/hono-xml-allowlists.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ t.test("it blocks non-allowed IP addresses", (t) => {
5959
AIKIDO_DEBUG: "true",
6060
AIKIDO_BLOCK: "true",
6161
AIKIDO_TOKEN: token,
62-
AIKIDO_URL: testServerUrl,
62+
AIKIDO_ENDPOINT: testServerUrl,
6363
},
6464
});
6565

end2end/tests/hono-xml-blocklists.test.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ t.test("it blocks geo restricted IPs", (t) => {
5858
AIKIDO_DEBUG: "true",
5959
AIKIDO_BLOCKING: "true",
6060
AIKIDO_TOKEN: token,
61-
AIKIDO_URL: testServerUrl,
61+
AIKIDO_ENDPOINT: testServerUrl,
6262
},
6363
});
6464

@@ -158,7 +158,7 @@ t.test("it blocks bots", (t) => {
158158
AIKIDO_DEBUG: "true",
159159
AIKIDO_BLOCKING: "true",
160160
AIKIDO_TOKEN: token,
161-
AIKIDO_URL: testServerUrl,
161+
AIKIDO_ENDPOINT: testServerUrl,
162162
},
163163
});
164164

@@ -252,7 +252,7 @@ t.test("it does not block bypass IP if in blocklist", (t) => {
252252
AIKIDO_DEBUG: "true",
253253
AIKIDO_BLOCKING: "true",
254254
AIKIDO_TOKEN: token,
255-
AIKIDO_URL: testServerUrl,
255+
AIKIDO_ENDPOINT: testServerUrl,
256256
},
257257
});
258258

end2end/tests/hono-xml-rate-limiting.test.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ t.test("it rate limits requests", (t) => {
4949
AIKIDO_DEBUG: "true",
5050
AIKIDO_BLOCKING: "true",
5151
AIKIDO_TOKEN: token,
52-
AIKIDO_URL: testServerUrl,
52+
AIKIDO_ENDPOINT: testServerUrl,
5353
},
5454
});
5555

@@ -109,7 +109,7 @@ t.test("user rate limiting works", (t) => {
109109
AIKIDO_DEBUG: "true",
110110
AIKIDO_BLOCKING: "true",
111111
AIKIDO_TOKEN: token,
112-
AIKIDO_URL: testServerUrl,
112+
AIKIDO_ENDPOINT: testServerUrl,
113113
},
114114
});
115115

end2end/tests/nestjs-fastify-rate-limiting.test.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ t.test("it rate limits requests", (t) => {
6060
AIKIDO_DEBUG: "true",
6161
AIKIDO_BLOCKING: "true",
6262
AIKIDO_TOKEN: token,
63-
AIKIDO_URL: testServerUrl,
63+
AIKIDO_ENDPOINT: testServerUrl,
6464
PORT: "4002",
6565
},
6666
});
@@ -122,7 +122,7 @@ t.test("user rate limiting works", (t) => {
122122
AIKIDO_DEBUG: "true",
123123
AIKIDO_BLOCKING: "true",
124124
AIKIDO_TOKEN: token,
125-
AIKIDO_URL: testServerUrl,
125+
AIKIDO_ENDPOINT: testServerUrl,
126126
PORT: "4003",
127127
},
128128
});

library/agent/getAPIURL.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
export function getAPIURL() {
2-
if (process.env.AIKIDO_URL) {
3-
return new URL(process.env.AIKIDO_URL);
2+
if (process.env.AIKIDO_ENDPOINT) {
3+
return new URL(process.env.AIKIDO_ENDPOINT);
44
}
55

66
return new URL("https://guard.aikido.dev");

library/agent/realtime/getRealtimeURL.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
export function getRealtimeURL() {
2-
if (process.env.AIKIDO_REALTIME_URL) {
3-
return new URL(process.env.AIKIDO_REALTIME_URL);
2+
if (process.env.AIKIDO_REALTIME_ENDPOINT) {
3+
return new URL(process.env.AIKIDO_REALTIME_ENDPOINT);
44
}
55

66
return new URL("https://runtime.aikido.dev");

0 commit comments

Comments
 (0)