Merge branch 'main' into May_11_2023-Dev

nodes/http_transaction_handler/CMakeLists.txt

@@ -34,6 +34,7 @@ target_link_libraries(cp-nano-http-transaction-handler
 	reputation
         ips
         keywords
+	l7_access_control
 	-Wl,--end-group
 )
 

nodes/http_transaction_handler/main.cc

@@ -16,6 +16,7 @@
 #include "nginx_attachment.h"
 #include "gradual_deployment.h"
 #include "http_manager.h"
+#include "layer_7_access_control.h"
 #include "waap.h"
 #include "ips_comp.h"
 #include "keyword_comp.h"
@@ -28,7 +29,8 @@ main(int argc, char **argv)
         NginxAttachment,
         GradualDeployment,
         HttpManager,
-	WaapComponent,
+        Layer7AccessControl,
+        WaapComponent,
         IPSComp,
         KeywordComp
     > comps;

nodes/orchestration/package/cp-nano-package-list

@@ -27,4 +27,5 @@ sdwan="sdwan 1204 SD-WAN"
 sdwan_logger="sdwanLogger 2204 SD-WAN_Logger"
 cpview_metric_provider="cpviewMetricProvider 8282"
 hello_world="hello_world"
+crowdsec_aux="crowdsecAux 8081"
 # ** Please do not remove this comment - newline at end of file required.

nodes/orchestration/package/watchdog/watchdog

@@ -667,7 +667,7 @@ load_services()
             fi
 
             log "load_services" "Respawn ${service}"
-            if [ "${service}" == "/etc/cp/agentIntelligence/redis/redis-server" ]; then
+            if [ "${service}" == "/etc/cp/agentIntelligence/redis/redis-server" ] || [ "${service}" = "/etc/cp/crowdsecAux/cp-nano-crowdsec-aux" ]; then
                 eval "LD_LIBRARY_PATH=${NGEN_LIB_PATH} ${service} ${execution_flags} &"
             else
                 eval "LD_LIBRARY_PATH=${NGEN_LIB_PATH} ${service} ${execution_flags} --filesystem_path=${FILESYSTEM_PATH} --log_files_path=${LOG_FILE_PATH} &"