Merge pull request #79 from AikidoSec/whitelist-php-streams

Whitelist php streams from fopen hooks
AikidoSec · Nov 8, 2024 · 36f02ba · 36f02ba
2 parents 855e775 + d73e3e9
commit 36f02ba
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 4 deletions.
diff --git a/lib/agent/globals/constants.go b/lib/agent/globals/constants.go
@@ -1,7 +1,7 @@
 package globals
 
 const (
-	Version                            = "1.0.93"
+	Version                            = "1.0.94"
 	ConfigUpdatedAtMethod              = "GET"
 	ConfigUpdatedAtAPI                 = "/config"
 	ConfigAPIMethod                    = "GET"

diff --git a/lib/php-extension/HandlePathAccess.cpp b/lib/php-extension/HandlePathAccess.cpp
@@ -2,6 +2,11 @@
 
 /* Helper for handle pre file path access */
 void helper_handle_pre_file_path_access(char *filename, EVENT_ID &eventId) {
+    if (strncmp(filename, "php://", 6) == 0) {
+        // Whitelist php:// streams as they are often used by PHP frameworks a lot
+        return;
+    }
+
     // if filename starts with http:// or https://, it's a URL so we treat it as an outgoing request
     if (strncmp(filename, "http://", 7) == 0 ||
         strncmp(filename, "https://", 8) == 0) {

diff --git a/lib/php-extension/include/php_aikido.h b/lib/php-extension/include/php_aikido.h
@@ -3,7 +3,7 @@
 extern zend_module_entry aikido_module_entry;
 #define phpext_aikido_ptr &aikido_module_entry
 
-#define PHP_AIKIDO_VERSION "1.0.93"
+#define PHP_AIKIDO_VERSION "1.0.94"
 
 #if defined(ZTS) && defined(COMPILE_DL_AIKIDO)
 ZEND_TSRMLS_CACHE_EXTERN()

diff --git a/lib/request-processor/globals/globals.go b/lib/request-processor/globals/globals.go
@@ -11,5 +11,5 @@ var CloudConfig CloudConfigData
 var CloudConfigMutex sync.Mutex
 
 const (
-	Version = "1.0.93"
+	Version = "1.0.94"
 )
diff --git a/package/rpm/aikido.spec b/package/rpm/aikido.spec
@@ -1,5 +1,5 @@
 Name:           aikido-php-firewall
-Version:        1.0.93
+Version:        1.0.94
 Release:        1
 Summary:        Aikido PHP Extension
 License:        GPL