Still also allow AIKIDO_BLOCKING

AikidoSec · Jan 28, 2025 · 477ac81 · 477ac81
1 parent cd0ae35
commit 477ac81
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/aikido_zen/helpers/check_env_for_blocking.py b/aikido_zen/helpers/check_env_for_blocking.py
@@ -11,6 +11,8 @@ def check_env_for_blocking():
     """
     # Set log level
     aikido_blocking_env = os.getenv("AIKIDO_BLOCK")
+    if aikido_blocking_env is None:
+        aikido_blocking_env = os.getenv("AIKIDO_BLOCKING") # Fallback to AIKIDO_BLOCKING.
     if aikido_blocking_env is not None:
         return aikido_blocking_env.lower() in ["true", "1"]
     return False
diff --git a/aikido_zen/sinks/tests/urrlib3_test.py b/aikido_zen/sinks/tests/urrlib3_test.py
@@ -76,6 +76,12 @@ def test_srrf_test_domain(monkeypatch):
     with pytest.raises(AikidoSSRF):
         http.request("GET", SSRF_TEST_DOMAIN)
 
+def test_srrf_test_domain_with_aikido_blocking(monkeypatch):
+    http = urllib3.PoolManager()
+    set_context_and_lifecycle(SSRF_TEST_DOMAIN)
+    monkeypatch.setenv("AIKIDO_BLOCKING", "1")
+    with pytest.raises(AikidoSSRF):
+        http.request("GET", SSRF_TEST_DOMAIN)
 
 def test_srrf_test_domain_twice(monkeypatch):
     http = urllib3.PoolManager()