Merge pull request #108 from AikidoSec/rename-to-aikido-block

Rename AIKIDO_BLOCKING to AIKIDO_BLOCK
AikidoSec · Jan 28, 2025 · 1a90bd8 · 1a90bd8
2 parents 16ad60b + ba5ad50
commit 1a90bd8
Show file tree

Hide file tree

Showing 29 changed files with 101 additions and 101 deletions.
diff --git a/agent_api/src/main/java/dev/aikido/agent_api/helpers/env/BlockingEnv.java b/agent_api/src/main/java/dev/aikido/agent_api/helpers/env/BlockingEnv.java
@@ -1,7 +1,7 @@
 package dev.aikido.agent_api.helpers.env;
 
 public class BlockingEnv extends BooleanEnv {
-    private static final String environmentName = "AIKIDO_BLOCKING";
+    private static final String environmentName = "AIKIDO_BLOCK";
     private static final boolean defaultValue = false;
 
     public BlockingEnv() {

diff --git a/agent_api/src/test/java/collectors/FileCollectorTest.java b/agent_api/src/test/java/collectors/FileCollectorTest.java
@@ -30,7 +30,7 @@ public void setup() {
     }
 
     @SetEnvironmentVariable(key = "AIKIDO_TOKEN", value = "invalid-token")
-    @SetEnvironmentVariable(key = "AIKIDO_BLOCKING", value = "true")
+    @SetEnvironmentVariable(key = "AIKIDO_BLOCK", value = "true")
     @Test
     public void testStrings() {
         isPathTraversalAttack("/etc/home/../../test.txt.js");
@@ -42,7 +42,7 @@ public void testStrings() {
     }
 
     @SetEnvironmentVariable(key = "AIKIDO_TOKEN", value = "invalid-token")
-    @SetEnvironmentVariable(key = "AIKIDO_BLOCKING", value = "true")
+    @SetEnvironmentVariable(key = "AIKIDO_BLOCK", value = "true")
     @Test
     public void testPaths() {
         isPathTraversalAttack(filePath1);
@@ -53,7 +53,7 @@ public void testPaths() {
     }
 
     @SetEnvironmentVariable(key = "AIKIDO_TOKEN", value = "invalid-token")
-    @SetEnvironmentVariable(key = "AIKIDO_BLOCKING", value = "true")
+    @SetEnvironmentVariable(key = "AIKIDO_BLOCK", value = "true")
     @Test
     public void testStringArrays() {
         isPathTraversalAttack(new String[]{"/etc/home/../../test.txt.js"});
@@ -65,7 +65,7 @@ public void testStringArrays() {
     }
 
     @SetEnvironmentVariable(key = "AIKIDO_TOKEN", value = "invalid-token")
-    @SetEnvironmentVariable(key = "AIKIDO_BLOCKING", value = "true")
+    @SetEnvironmentVariable(key = "AIKIDO_BLOCK", value = "true")
     @Test
     public void testFileURIs() throws URISyntaxException {
         isPathTraversalAttack(new URI("file:///etc/home/../../test.txt.js"));
@@ -79,7 +79,7 @@ public void testFileURIs() throws URISyntaxException {
     }
 
     @SetEnvironmentVariable(key = "AIKIDO_TOKEN", value = "invalid-token")
-    @SetEnvironmentVariable(key = "AIKIDO_BLOCKING", value = "true")
+    @SetEnvironmentVariable(key = "AIKIDO_BLOCK", value = "true")
     @Test
     public void testNotRecognizedObjects() throws MalformedURLException {
         isNotPathTraversalAttack(true);
@@ -104,7 +104,7 @@ public void isNotPathTraversalAttack(Object filePath) {
     }
 
     @SetEnvironmentVariable(key = "AIKIDO_TOKEN", value = "invalid-token")
-    @SetEnvironmentVariable(key = "AIKIDO_BLOCKING", value = "true")
+    @SetEnvironmentVariable(key = "AIKIDO_BLOCK", value = "true")
     @Test
     public void testMaxRecursion() {
         isPathTraversalAttack(new Object[]{new Object[]{"/etc/home/../../test.txt.js"}}); // Depth of 1

diff --git a/agent_api/src/test/java/collectors/HostnameCollectorTest.java b/agent_api/src/test/java/collectors/HostnameCollectorTest.java
@@ -89,7 +89,7 @@ public SampleContextObject() {
     }
 
     @SetEnvironmentVariable(key = "AIKIDO_TOKEN", value = "invalid-token")
-    @SetEnvironmentVariable(key = "AIKIDO_BLOCKING", value = "1")
+    @SetEnvironmentVariable(key = "AIKIDO_BLOCK", value = "1")
     @Test
     public void testHostnameSameWithContextAsAttack() {
         ThreadCacheObject myThreadCache = mock(ThreadCacheObject.class);

diff --git a/agent_api/src/test/java/collectors/URLCollectorTest.java b/agent_api/src/test/java/collectors/URLCollectorTest.java
@@ -33,7 +33,7 @@ private void setContextAndLifecycle(String url) {
     }
 
     @SetEnvironmentVariable(key = "AIKIDO_TOKEN", value = "invalid-token")
-    @SetEnvironmentVariable(key = "AIKIDO_BLOCKING", value = "true")
+    @SetEnvironmentVariable(key = "AIKIDO_BLOCK", value = "true")
     @Test
     public void testNewUrlConnectionWithPort() throws IOException {
         setContextAndLifecycle("");
@@ -46,7 +46,7 @@ public void testNewUrlConnectionWithPort() throws IOException {
     }
 
     @SetEnvironmentVariable(key = "AIKIDO_TOKEN", value = "invalid-token")
-    @SetEnvironmentVariable(key = "AIKIDO_BLOCKING", value = "true")
+    @SetEnvironmentVariable(key = "AIKIDO_BLOCK", value = "true")
     @Test
     public void testNewUrlConnectionWithHttp() throws IOException {
         setContextAndLifecycle("");
@@ -58,7 +58,7 @@ public void testNewUrlConnectionWithHttp() throws IOException {
     }
 
     @SetEnvironmentVariable(key = "AIKIDO_TOKEN", value = "invalid-token")
-    @SetEnvironmentVariable(key = "AIKIDO_BLOCKING", value = "true")
+    @SetEnvironmentVariable(key = "AIKIDO_BLOCK", value = "true")
     @Test
     public void testNewUrlConnectionHttps() throws IOException {
         setContextAndLifecycle("");
@@ -70,7 +70,7 @@ public void testNewUrlConnectionHttps() throws IOException {
     }
 
     @SetEnvironmentVariable(key = "AIKIDO_TOKEN", value = "invalid-token")
-    @SetEnvironmentVariable(key = "AIKIDO_BLOCKING", value = "true")
+    @SetEnvironmentVariable(key = "AIKIDO_BLOCK", value = "true")
     @Test
     public void testNewUrlConnectionFaultyProtocol() throws IOException {
         setContextAndLifecycle("");

diff --git a/agent_api/src/test/java/helpers/ShouldBlockHelperTest.java b/agent_api/src/test/java/helpers/ShouldBlockHelperTest.java
@@ -11,14 +11,14 @@ public class ShouldBlockHelperTest {
 
     @Test
     @SetEnvironmentVariable(key = "AIKIDO_TOKEN", value = "")
-    @SetEnvironmentVariable(key = "AIKIDO_BLOCKING", value = "true")
+    @SetEnvironmentVariable(key = "AIKIDO_BLOCK", value = "true")
     public void testWithInvalidAikidoTokenTrue() {
         assertTrue(ShouldBlockHelper.shouldBlock());
     }
 
     @Test
     @SetEnvironmentVariable(key = "AIKIDO_TOKEN", value = "")
-    @SetEnvironmentVariable(key = "AIKIDO_BLOCKING", value = "false")
+    @SetEnvironmentVariable(key = "AIKIDO_BLOCK", value = "false")
     public void testWithInvalidAikidoTokenFalse() {
         assertFalse(ShouldBlockHelper.shouldBlock());
     }

diff --git a/agent_api/src/test/java/vulnerabilities/ScannerTest.java b/agent_api/src/test/java/vulnerabilities/ScannerTest.java
@@ -81,7 +81,7 @@ void testScanForGivenVulnerability_ContextIsNull() {
 
     // Disable IPC :
     @SetEnvironmentVariable(key = "AIKIDO_TOKEN", value = "improper-access-token")
-    @SetEnvironmentVariable(key = "AIKIDO_BLOCKING", value = "true")
+    @SetEnvironmentVariable(key = "AIKIDO_BLOCK", value = "true")
     @Test
     void testScanSafeSQLCode() {
         // Safe :
@@ -98,7 +98,7 @@ void testScanSafeSQLCode() {
 
     // Disable IPC :
     @SetEnvironmentVariable(key = "AIKIDO_TOKEN", value = "improper-access-token")
-    @SetEnvironmentVariable(key = "AIKIDO_BLOCKING", value = "true")
+    @SetEnvironmentVariable(key = "AIKIDO_BLOCK", value = "true")
     @Test
     void testBypassedIPs() {
         // Thread cache does not force any protection off :
@@ -131,7 +131,7 @@ void testBypassedIPs() {
 
     // Disable IPC :
     @SetEnvironmentVariable(key = "AIKIDO_TOKEN", value = "improper-access-token")
-    @SetEnvironmentVariable(key = "AIKIDO_BLOCKING", value = "true")
+    @SetEnvironmentVariable(key = "AIKIDO_BLOCK", value = "true")
     @Test
     void testForceProtectionOff() {
         // Thread cache does not force any protection off :
@@ -156,7 +156,7 @@ void testForceProtectionOff() {
     }
 
     @SetEnvironmentVariable(key = "AIKIDO_TOKEN", value = "improper-access-token")
-    @SetEnvironmentVariable(key = "AIKIDO_BLOCKING", value = "true")
+    @SetEnvironmentVariable(key = "AIKIDO_BLOCK", value = "true")
     @Test
     void testDoesNotRunWithContextNull() {
         Context.set(null);
@@ -166,7 +166,7 @@ void testDoesNotRunWithContextNull() {
     }
 
     @SetEnvironmentVariable(key = "AIKIDO_TOKEN", value = "improper-access-token")
-    @SetEnvironmentVariable(key = "AIKIDO_BLOCKING", value = "true")
+    @SetEnvironmentVariable(key = "AIKIDO_BLOCK", value = "true")
     @Test
     void TestStillThrowsWithThreadCacheUndefined() {
         ThreadCache.set(null);

diff --git a/agent_api/src/test/java/wrappers/ApacheHttpClientTest.java b/agent_api/src/test/java/wrappers/ApacheHttpClientTest.java
@@ -39,7 +39,7 @@ private void setContextAndLifecycle(String url) {
     }
 
     @SetEnvironmentVariable(key = "AIKIDO_TOKEN", value = "invalid-token-2")
-    @SetEnvironmentVariable(key = "AIKIDO_BLOCKING", value = "true")
+    @SetEnvironmentVariable(key = "AIKIDO_BLOCK", value = "true")
     @Test
     public void testSSRFLocalhostValid() throws Exception {
         setContextAndLifecycle("http://localhost:5000");
@@ -67,7 +67,7 @@ public void testSSRFLocalhostValid() throws Exception {
     }
 
     @SetEnvironmentVariable(key = "AIKIDO_TOKEN", value = "invalid-token-2")
-    @SetEnvironmentVariable(key = "AIKIDO_BLOCKING", value = "true")
+    @SetEnvironmentVariable(key = "AIKIDO_BLOCK", value = "true")
     @Test
     public void testSSRFWithoutPort() throws Exception {
         setContextAndLifecycle("http://localhost:80");
@@ -78,7 +78,7 @@ public void testSSRFWithoutPort() throws Exception {
     }
 
     @SetEnvironmentVariable(key = "AIKIDO_TOKEN", value = "invalid-token-2")
-    @SetEnvironmentVariable(key = "AIKIDO_BLOCKING", value = "true")
+    @SetEnvironmentVariable(key = "AIKIDO_BLOCK", value = "true")
     @Test
     public void testSSRFWithoutPortAndWithoutContext() throws Exception {
         setContextAndLifecycle("http://localhost:80");
@@ -89,7 +89,7 @@ public void testSSRFWithoutPortAndWithoutContext() throws Exception {
     }
 
     @SetEnvironmentVariable(key = "AIKIDO_TOKEN", value = "invalid-token-2")
-    @SetEnvironmentVariable(key = "AIKIDO_BLOCKING", value = "true")
+    @SetEnvironmentVariable(key = "AIKIDO_BLOCK", value = "true")
     @Test
     public void testSSRFWithoutPortAndWithoutThreadCache() throws Exception {
         setContextAndLifecycle("http://localhost:80");

diff --git a/agent_api/src/test/java/wrappers/FileReaderWriterTest.java b/agent_api/src/test/java/wrappers/FileReaderWriterTest.java
@@ -34,7 +34,7 @@ private void setContextAndLifecycle(String url) {
     }
 
     @SetEnvironmentVariable(key = "AIKIDO_TOKEN", value = "invalid-token-2")
-    @SetEnvironmentVariable(key = "AIKIDO_BLOCKING", value = "true")
+    @SetEnvironmentVariable(key = "AIKIDO_BLOCK", value = "true")
     @Test
     public void testFileReader() throws Exception {
         setContextAndLifecycle("../file.txt");
@@ -57,7 +57,7 @@ public void testFileReader() throws Exception {
     }
 
     @SetEnvironmentVariable(key = "AIKIDO_TOKEN", value = "invalid-token-2")
-    @SetEnvironmentVariable(key = "AIKIDO_BLOCKING", value = "true")
+    @SetEnvironmentVariable(key = "AIKIDO_BLOCK", value = "true")
     @Test
     public void testFileWriter() throws Exception {
         setContextAndLifecycle("../file.txt");

diff --git a/agent_api/src/test/java/wrappers/FileWrapperTest.java b/agent_api/src/test/java/wrappers/FileWrapperTest.java
@@ -33,7 +33,7 @@ private void setContextAndLifecycle(String url) {
     }
 
     @SetEnvironmentVariable(key = "AIKIDO_TOKEN", value = "invalid-token-2")
-    @SetEnvironmentVariable(key = "AIKIDO_BLOCKING", value = "true")
+    @SetEnvironmentVariable(key = "AIKIDO_BLOCK", value = "true")
     @Test
     public void testPathTraversalString() throws Exception {
         setContextAndLifecycle("../file.txt");

diff --git a/agent_api/src/test/java/wrappers/HttpURLConnectionRedirectTest.java b/agent_api/src/test/java/wrappers/HttpURLConnectionRedirectTest.java
@@ -40,7 +40,7 @@ private void setContextAndLifecycle(String url) {
     }
 
     @SetEnvironmentVariable(key = "AIKIDO_TOKEN", value = "invalid-token")
-    @SetEnvironmentVariable(key = "AIKIDO_BLOCKING", value = "true")
+    @SetEnvironmentVariable(key = "AIKIDO_BLOCK", value = "true")
     @Test
     public void testSrrfTest() {
         setContextAndLifecycle(SSRF_TEST);
@@ -60,7 +60,7 @@ public void testSrrfTest() {
     }
 
     @SetEnvironmentVariable(key = "AIKIDO_TOKEN", value = "invalid-token")
-    @SetEnvironmentVariable(key = "AIKIDO_BLOCKING", value = "true")
+    @SetEnvironmentVariable(key = "AIKIDO_BLOCK", value = "true")
     @Test
     public void testSrrfTestTwice() {
         setContextAndLifecycle(SSRF_TEST_TWICE);
@@ -79,7 +79,7 @@ public void testSrrfTestTwice() {
     }
 
     @SetEnvironmentVariable(key = "AIKIDO_TOKEN", value = "invalid-token")
-    @SetEnvironmentVariable(key = "AIKIDO_BLOCKING", value = "true")
+    @SetEnvironmentVariable(key = "AIKIDO_BLOCK", value = "true")
     @Test
     public void testSrrfTestDomain() {
         setContextAndLifecycle(SSRF_TEST_DOMAIN);
@@ -98,7 +98,7 @@ public void testSrrfTestDomain() {
     }
 
     @SetEnvironmentVariable(key = "AIKIDO_TOKEN", value = "invalid-token")
-    @SetEnvironmentVariable(key = "AIKIDO_BLOCKING", value = "true")
+    @SetEnvironmentVariable(key = "AIKIDO_BLOCK", value = "true")
     @Test
     public void testSrrfTestDomainTwice() {
         setContextAndLifecycle(SSRF_TEST_DOMAIN_TWICE);
@@ -117,7 +117,7 @@ public void testSrrfTestDomainTwice() {
     }
 
     @SetEnvironmentVariable(key = "AIKIDO_TOKEN", value = "invalid-token")
-    @SetEnvironmentVariable(key = "AIKIDO_BLOCKING", value = "true")
+    @SetEnvironmentVariable(key = "AIKIDO_BLOCK", value = "true")
     @Test
     public void testSsrfCrossDomain() {
         setContextAndLifecycle(CROSS_DOMAIN_TEST);
@@ -136,7 +136,7 @@ public void testSsrfCrossDomain() {
     }
 
     @SetEnvironmentVariable(key = "AIKIDO_TOKEN", value = "invalid-token")
-    @SetEnvironmentVariable(key = "AIKIDO_BLOCKING", value = "true")
+    @SetEnvironmentVariable(key = "AIKIDO_BLOCK", value = "true")
     @Test
     public void testSsrfCrossDomainTwice() {
         setContextAndLifecycle(CROSS_DOMAIN_TEST_DOMAIN_TWICE);

diff --git a/agent_api/src/test/java/wrappers/InetAddressTest.java b/agent_api/src/test/java/wrappers/InetAddressTest.java
@@ -37,7 +37,7 @@ private void setContextAndLifecycle(String url) {
     }
 
     @SetEnvironmentVariable(key = "AIKIDO_TOKEN", value = "invalid-token-2")
-    @SetEnvironmentVariable(key = "AIKIDO_BLOCKING", value = "true")
+    @SetEnvironmentVariable(key = "AIKIDO_BLOCK", value = "true")
     @Test
     public void testSSRFLocalhostValid() throws Exception {
         setContextAndLifecycle("http://localhost:5000");
@@ -67,7 +67,7 @@ public void testSSRFLocalhostValid() throws Exception {
     }
 
     @SetEnvironmentVariable(key = "AIKIDO_TOKEN", value = "invalid-token-2")
-    @SetEnvironmentVariable(key = "AIKIDO_BLOCKING", value = "true")
+    @SetEnvironmentVariable(key = "AIKIDO_BLOCK", value = "true")
     @Test
     public void testSSRFWithoutPort() throws Exception {
         setContextAndLifecycle("http://localhost:80");
@@ -78,7 +78,7 @@ public void testSSRFWithoutPort() throws Exception {
     }
 
     @SetEnvironmentVariable(key = "AIKIDO_TOKEN", value = "invalid-token-2")
-    @SetEnvironmentVariable(key = "AIKIDO_BLOCKING", value = "true")
+    @SetEnvironmentVariable(key = "AIKIDO_BLOCK", value = "true")
     @Test
     public void testSSRFWithoutPortAndWithoutContext() throws Exception {
         setContextAndLifecycle("http://localhost:80");
@@ -89,7 +89,7 @@ public void testSSRFWithoutPortAndWithoutContext() throws Exception {
     }
 
     @SetEnvironmentVariable(key = "AIKIDO_TOKEN", value = "invalid-token-2")
-    @SetEnvironmentVariable(key = "AIKIDO_BLOCKING", value = "true")
+    @SetEnvironmentVariable(key = "AIKIDO_BLOCK", value = "true")
     @Test
     public void testSSRFWithoutPortAndWithoutThreadCache() throws Exception {
         setContextAndLifecycle("http://localhost:80");
@@ -100,7 +100,7 @@ public void testSSRFWithoutPortAndWithoutThreadCache() throws Exception {
     }
 
     @SetEnvironmentVariable(key = "AIKIDO_TOKEN", value = "invalid-token-2")
-    @SetEnvironmentVariable(key = "AIKIDO_BLOCKING", value = "true")
+    @SetEnvironmentVariable(key = "AIKIDO_BLOCK", value = "true")
     @Test
     public void testSSRFWithHttpClient() {
         setContextAndLifecycle("http://localhost:5000/");