One agent fixes (#321)

Author: tudor-timcu

README.md

@@ -38,25 +38,25 @@ Prerequisites:
 
 ##### x86_64
 ```
-rpm -Uvh --oldpackage https://github.com/AikidoSec/firewall-php/releases/download/v1.4.0/aikido-php-firewall.x86_64.rpm
+rpm -Uvh --oldpackage https://github.com/AikidoSec/firewall-php/releases/download/v1.4.1/aikido-php-firewall.x86_64.rpm
 ```
 
 ##### arm64 / aarch64
 ```
-rpm -Uvh --oldpackage https://github.com/AikidoSec/firewall-php/releases/download/v1.4.0/aikido-php-firewall.aarch64.rpm
+rpm -Uvh --oldpackage https://github.com/AikidoSec/firewall-php/releases/download/v1.4.1/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.0/aikido-php-firewall.x86_64.deb
+curl -L -O https://github.com/AikidoSec/firewall-php/releases/download/v1.4.1/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.0/aikido-php-firewall.aarch64.deb
+curl -L -O https://github.com/AikidoSec/firewall-php/releases/download/v1.4.1/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.0/aikido-php-firewall.x86_64.rpm"
+    command: "rpm -Uvh --oldpackage https://github.com/AikidoSec/firewall-php/releases/download/v1.4.1/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.0/aikido-php-firewall.x86_64.deb
+curl -L -O https://github.com/AikidoSec/firewall-php/releases/download/v1.4.1/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.0/aikido-php-firewall.x86_64.deb
+curl -L -O https://github.com/AikidoSec/firewall-php/releases/download/v1.4.1/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.0"
+	Version                             = "1.4.1"
 	SocketPath                          = "/run/aikido-" + Version + "/aikido-agent.sock"
 	PidPath                             = "/run/aikido-" + Version + "/aikido-agent.pid"
 	ConfigUpdatedAtMethod               = "GET"

lib/php-extension/PhpWrappers.cpp

@@ -41,7 +41,6 @@ bool CallPhpFunction(std::string function_name, unsigned int params_number, zval
     if (!return_value) {
         zval_ptr_dtor(&_temp_return_value);
     }
-    AIKIDO_LOG_INFO("Called user function '%s' -> result %d\n", function_name.c_str(), _result == SUCCESS);
     return _result == SUCCESS;
 }
 

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

lib/request-processor/config/config.go

@@ -19,21 +19,28 @@ func UpdateToken(token string) {
 	log.Infof("Token changed to \"AIK_RUNTIME_***%s\"", utils.AnonymizeToken(token))
 }
 
-func ReloadAikidoConfig(conf *AikidoConfigData, initJson string) {
+func ReloadAikidoConfig(conf *AikidoConfigData, initJson string) bool {
 	err := json.Unmarshal([]byte(initJson), conf)
 	if err != nil {
-		panic(fmt.Sprintf("Error parsing JSON to AikidoConfig: %s", err))
+		return false
 	}
 
 	if err := log.SetLogLevel(conf.LogLevel); err != nil {
-		panic(fmt.Sprintf("Error setting log level: %s", err))
+		return false
 	}
 
-	if conf.Token != "" {
-		server := globals.CreateServer(conf.Token)
-		server.AikidoConfig = *conf
+	if conf.Token == "" {
+		return false
+	}
+
+	if globals.ServerExists(conf.Token) {
 		UpdateToken(conf.Token)
+		return false
 	}
+	server := globals.CreateServer(conf.Token)
+	server.AikidoConfig = *conf
+	UpdateToken(conf.Token)
+	return true
 }
 
 func Init(initJson string) {

lib/request-processor/globals/globals.go

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

lib/request-processor/grpc/client.go

@@ -143,12 +143,12 @@ func OnRequestShutdown(server *ServerData, method string, route string, routePar
 }
 
 /* Get latest cloud config from Aikido Agent via gRPC */
-func GetCloudConfig(server *ServerData) {
+func GetCloudConfig(server *ServerData, timeout time.Duration) {
 	if client == nil {
 		return
 	}
 
-	ctx, cancel := context.WithTimeout(context.Background(), 30*time.Second)
+	ctx, cancel := context.WithTimeout(context.Background(), timeout)
 	defer cancel()
 
 	cloudConfig, err := client.GetCloudConfig(ctx, &protos.CloudConfigUpdatedAt{Token: server.AikidoConfig.Token, ConfigUpdatedAt: utils.GetCloudConfigUpdatedAt(server)})
@@ -160,9 +160,9 @@ func GetCloudConfig(server *ServerData) {
 	setCloudConfig(server, cloudConfig)
 }
 
-func GetCloudConfigForAllServers() {
+func GetCloudConfigForAllServers(timeout time.Duration) {
 	for _, server := range globals.GetServers() {
-		GetCloudConfig(server)
+		GetCloudConfig(server, timeout)
 	}
 }