diff --git a/.gitignore b/.gitignore index 40842501..49bfca3b 100644 --- a/.gitignore +++ b/.gitignore @@ -27,5 +27,5 @@ aikido-*-extension-php-*.so .vscode/settings.json src/extension/ndDb2pJ5Px *.deb -package/deb/opt/aikido/aikido-1.23.0* +package/deb/opt/aikido/aikido-1.24.0* src/agent/aikido_config.json diff --git a/include/php_aikido.h b/include/php_aikido.h index d319e140..504b39b8 100644 --- a/include/php_aikido.h +++ b/include/php_aikido.h @@ -6,7 +6,7 @@ extern zend_module_entry aikido_module_entry; # define phpext_aikido_ptr &aikido_module_entry -# define PHP_AIKIDO_VERSION "1.23.0" +# define PHP_AIKIDO_VERSION "1.24.0" # if defined(ZTS) && defined(COMPILE_DL_AIKIDO) ZEND_TSRMLS_CACHE_EXTERN() diff --git a/package/deb/DEBIAN/control b/package/deb/DEBIAN/control index 3ceb2662..16055be7 100644 --- a/package/deb/DEBIAN/control +++ b/package/deb/DEBIAN/control @@ -1,5 +1,5 @@ Package: aikido-firewall-php -Version: 1.23.0 +Version: 1.24.0 Section: base Priority: optional Architecture: all diff --git a/package/deb/DEBIAN/postinst b/package/deb/DEBIAN/postinst index 803bb126..0f6f63c3 100755 --- a/package/deb/DEBIAN/postinst +++ b/package/deb/DEBIAN/postinst @@ -1,6 +1,6 @@ #!/bin/bash -VERSION="1.23.0" +VERSION="1.24.0" declare -A php_api_versions diff --git a/package/rpm/aikido.spec b/package/rpm/aikido.spec index 02fa749f..af407be1 100644 --- a/package/rpm/aikido.spec +++ b/package/rpm/aikido.spec @@ -1,5 +1,5 @@ Name: aikido-php-firewall -Version: 1.23.0 +Version: 1.24.0 Release: 1 Summary: Aikido PHP extension and agent diff --git a/rpm_build_and_install.sh b/rpm_build_and_install.sh index 69a92678..2e0c5e56 100755 --- a/rpm_build_and_install.sh +++ b/rpm_build_and_install.sh @@ -1,7 +1,7 @@ rm -rf ~/rpmbuild rpmdev-setuptree -VERSION="1.23.0" +VERSION="1.24.0" mkdir -p ~/rpmbuild/SOURCES/aikido-php-firewall-$VERSION cp -rf package/rpm/etc ~/rpmbuild/SOURCES/aikido-php-firewall-$VERSION/ diff --git a/rpm_uninstall.sh b/rpm_uninstall.sh index a0e7fcab..5060a0d7 100755 --- a/rpm_uninstall.sh +++ b/rpm_uninstall.sh @@ -1 +1 @@ -rpm -e aikido-php-firewall-1.23.0-1.x86_64 \ No newline at end of file +rpm -e aikido-php-firewall-1.24.0-1.x86_64 \ No newline at end of file diff --git a/src/agent/globals/constants.go b/src/agent/globals/constants.go index 188e9e12..ef4b4232 100644 --- a/src/agent/globals/constants.go +++ b/src/agent/globals/constants.go @@ -1,7 +1,7 @@ package globals const ( - Version = "1.23.0" + Version = "1.24.0" ConfigFilePath = "/opt/aikido/config.json" DevConfigFilePath = "/opt/aikido/config-dev.json" LogFilePath = "/var/log/aikido/aikido.log" diff --git a/src/lib/grpc/client.go b/src/lib/grpc/client.go index e16d0f41..32f2df52 100644 --- a/src/lib/grpc/client.go +++ b/src/lib/grpc/client.go @@ -75,4 +75,5 @@ func OnReceiveDomain(domain string) { if err != nil { log.Debugf("Could not send domain %v: %v", domain, err) } + log.Debugf("Domain sent: %v", domain) } diff --git a/src/lib/handle_urls.go b/src/lib/handle_urls.go index c524da85..26d26f83 100644 --- a/src/lib/handle_urls.go +++ b/src/lib/handle_urls.go @@ -13,6 +13,6 @@ func OnFunctionExecutedCurl(parameters map[string]interface{}) string { } domain := utils.GetDomain(*url) log.Info("Got domain: ", domain) - go grpc.OnReceiveDomain(domain) + grpc.OnReceiveDomain(domain) return "{}" }