RPM compression backwards-compatible (#330)

Author: tudor-timcu

.github/workflows/build.yml

@@ -13,7 +13,7 @@ jobs:
   build_libs:
     runs-on: ${{ matrix.os }}
     container:
-      image: ghcr.io/aikidosec/firewall-php-build-libs:v1  
+      image: ghcr.io/aikidosec/firewall-php-build-libs:v1
     strategy:
       matrix:
         os: [ ubuntu-24.04, ubuntu-24.04-arm ]
@@ -44,7 +44,7 @@ jobs:
         go test ./...
         go build -buildvcs=false -ldflags "-s -w" -o ../../build/aikido-agent
         ls -l ../../build
-    
+
 
     - name: Build Aikido Request Processor
       run: |
@@ -206,10 +206,11 @@ jobs:
 
       - name: Build rpm package
         run: |
+          cat /usr/lib/rpm/macros | grep level
           cd ~/rpmbuild/SOURCES
           tar czvf ~/rpmbuild/SOURCES/aikido-php-firewall-${{ env.AIKIDO_VERSION }}.tar.gz *
           rm -rf ~/rpmbuild/SOURCES/aikido-php-firewall-${{ env.AIKIDO_VERSION }}
-          rpmbuild -ba ~/rpmbuild/SPECS/aikido.spec
+          rpmbuild --define "_binary_payload w9.gzdio" --define "_source_payload w9.gzdio" -ba ~/rpmbuild/SPECS/aikido.spec
           ls -l ~/rpmbuild/RPMS/${{ env.ARCH }}/
           mv ~/rpmbuild/RPMS/${{ env.ARCH }}/${{ env.AIKIDO_ARTIFACT }} ~/rpmbuild/RPMS/${{ env.ARCH }}/${{ env.AIKIDO_ARTIFACT_RELEASE }}
 
@@ -426,7 +427,7 @@ jobs:
       - name: Ensure Apache uses PHP ${{ matrix.php_version }}
         if: matrix.server == 'apache-mod-php'
         run: |
-          a2-switch-php ${{ matrix.php_version }}    
+          a2-switch-php ${{ matrix.php_version }}
 
       - name: Install DEB
         run: |
@@ -477,7 +478,7 @@ jobs:
       - name: Overwrite aikido.sh install script
         run: |
           echo "#!/usr/bin/env bash" > ./zen-demo-php/.fly/scripts/aikido.sh
-          echo "dpkg -i -E \"/var/www/html/aikido-php-firewall.\$(uname -i).deb\"" >> ./zen-demo-php/.fly/scripts/aikido.sh 
+          echo "dpkg -i -E \"/var/www/html/aikido-php-firewall.\$(uname -i).deb\"" >> ./zen-demo-php/.fly/scripts/aikido.sh
       - name: Run Firewall QA Tests
         uses: AikidoSec/firewall-tester-action@add-control-server-tests
         with:
@@ -513,7 +514,7 @@ jobs:
       - name: Overwrite aikido.sh install script
         run: |
           echo "#!/usr/bin/env bash" > ./zen-demo-php/.fly/scripts/aikido.sh
-          echo "dpkg -i -E \"/var/www/html/aikido-php-firewall.\$(uname -i).deb\"" >> ./zen-demo-php/.fly/scripts/aikido.sh 
+          echo "dpkg -i -E \"/var/www/html/aikido-php-firewall.\$(uname -i).deb\"" >> ./zen-demo-php/.fly/scripts/aikido.sh
       - name: Run Firewall QA Tests
         uses: AikidoSec/firewall-tester-action@add-control-server-tests
         with:
@@ -549,12 +550,12 @@ jobs:
       - name: Overwrite aikido.sh install script
         run: |
           echo "#!/usr/bin/env bash" > ./zen-demo-php/.fly/scripts/aikido.sh
-          echo "dpkg -i -E \"/var/www/html/aikido-php-firewall.\$(uname -i).deb\"" >> ./zen-demo-php/.fly/scripts/aikido.sh 
+          echo "dpkg -i -E \"/var/www/html/aikido-php-firewall.\$(uname -i).deb\"" >> ./zen-demo-php/.fly/scripts/aikido.sh
       - name: Run Firewall QA Tests
         uses: AikidoSec/firewall-tester-action@add-control-server-tests
         with:
           dockerfile_path: ./zen-demo-php/Dockerfile
           extra_args: '--env-file=./zen-demo-php/.env.example -e APP_KEY=base64:W2v6u6VR4lURkxuMT9xZ6pdhXSt5rxsmWTbd1HGqlIM='
           sleep_before_test: 20
           max_parallel_tests: 7
-          test_type: control
+          test_type: control

README.md

@@ -38,25 +38,25 @@ Prerequisites:
 
 ##### x86_64
 ```
-rpm -Uvh --oldpackage https://github.com/AikidoSec/firewall-php/releases/download/v1.4.3/aikido-php-firewall.x86_64.rpm
+rpm -Uvh --oldpackage https://github.com/AikidoSec/firewall-php/releases/download/v1.4.4/aikido-php-firewall.x86_64.rpm
 ```
 
 ##### arm64 / aarch64
 ```
-rpm -Uvh --oldpackage https://github.com/AikidoSec/firewall-php/releases/download/v1.4.3/aikido-php-firewall.aarch64.rpm
+rpm -Uvh --oldpackage https://github.com/AikidoSec/firewall-php/releases/download/v1.4.4/aikido-php-firewall.aarch64.rpm
 ```
 
 #### For Debian-based Systems (Debian, Ubuntu)
 
 ##### x86_64
 ```
-curl -L -O https://github.com/AikidoSec/firewall-php/releases/download/v1.4.3/aikido-php-firewall.x86_64.deb
+curl -L -O https://github.com/AikidoSec/firewall-php/releases/download/v1.4.4/aikido-php-firewall.x86_64.deb
 dpkg -i -E ./aikido-php-firewall.x86_64.deb
 ```
 
 ##### arm64 / aarch64
 ```
-curl -L -O https://github.com/AikidoSec/firewall-php/releases/download/v1.4.3/aikido-php-firewall.aarch64.deb
+curl -L -O https://github.com/AikidoSec/firewall-php/releases/download/v1.4.4/aikido-php-firewall.aarch64.deb
 dpkg -i -E ./aikido-php-firewall.aarch64.deb
 ```
 

docs/aws-elastic-beanstalk.md

@@ -4,7 +4,7 @@
 ```
 commands:
   aikido-php-firewall:
-    command: "rpm -Uvh --oldpackage https://github.com/AikidoSec/firewall-php/releases/download/v1.4.3/aikido-php-firewall.x86_64.rpm"
+    command: "rpm -Uvh --oldpackage https://github.com/AikidoSec/firewall-php/releases/download/v1.4.4/aikido-php-firewall.x86_64.rpm"
     ignoreErrors: true
 
 files:

docs/fly-io.md

@@ -32,7 +32,7 @@ Create a script to install the Aikido PHP Firewall during deployment:
 #!/usr/bin/env bash
 cd /tmp
 
-curl -L -O https://github.com/AikidoSec/firewall-php/releases/download/v1.4.3/aikido-php-firewall.x86_64.deb
+curl -L -O https://github.com/AikidoSec/firewall-php/releases/download/v1.4.4/aikido-php-firewall.x86_64.deb
 dpkg -i -E ./aikido-php-firewall.x86_64.deb
 ```
 

docs/laravel-forge.md

@@ -21,7 +21,7 @@ cd /tmp
 
 # Install commands from the "Manual install" section below, based on your OS
 
-curl -L -O https://github.com/AikidoSec/firewall-php/releases/download/v1.4.3/aikido-php-firewall.x86_64.deb
+curl -L -O https://github.com/AikidoSec/firewall-php/releases/download/v1.4.4/aikido-php-firewall.x86_64.deb
 dpkg -i -E ./aikido-php-firewall.x86_64.deb
 
 # Restarting the php services in order to load the Aikido PHP Firewall

lib/agent/constants/constants.go

@@ -1,7 +1,7 @@
 package constants
 
 const (
-	Version                             = "1.4.3"
+	Version                             = "1.4.4"
 	SocketPath                          = "/run/aikido-" + Version + "/aikido-agent.sock"
 	PidPath                             = "/run/aikido-" + Version + "/aikido-agent.pid"
 	ConfigUpdatedAtMethod               = "GET"

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.4.3"
+#define PHP_AIKIDO_VERSION "1.4.4"
 
 #if defined(ZTS) && defined(COMPILE_DL_AIKIDO)
 ZEND_TSRMLS_CACHE_EXTERN()

lib/request-processor/globals/globals.go

@@ -60,6 +60,6 @@ func CreateServer(token string) *ServerData {
 }
 
 const (
-	Version    = "1.4.3"
+	Version    = "1.4.4"
 	SocketPath = "/run/aikido-" + Version + "/aikido-agent.sock"
 )

package/rpm/aikido.spec

@@ -1,5 +1,5 @@
 Name:           aikido-php-firewall
-Version:        1.4.3
+Version:        1.4.4
 Release:        1
 Summary:        Aikido PHP Extension
 License:        GPL