support-advanced-model in all flavors

Jul 06 2023 dev

core/include/services_sdk/resources/log_utils.h

@@ -0,0 +1,36 @@
+// Copyright (C) 2022 Check Point Software Technologies Ltd. All rights reserved.
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#ifndef __LOG_UTILS_H__
+#define __LOG_UTILS_H__
+
+#include <sstream>
+
+#include "log_generator.h"
+
+template <ReportIS::Tags tag>
+struct ErrorCode
+{
+    template <typename CastableToUInt>
+    static LogField logError(CastableToUInt val) { return logError(static_cast<uint>(val)); }
+
+    static LogField
+    logError(uint val)
+    {
+        std::stringstream code;
+        code << std::setw(3) << std::setfill('0') << static_cast<uint>(tag) << '-' << std::setw(4) << val;
+        return LogField("eventCode", code.str());
+    }
+};
+
+#endif // __LOG_UTILS_H__

core/intelligence_is_v2/intelligence_is_v2_ut/CMakeLists.txt

@@ -3,5 +3,5 @@ link_directories(${BOOST_ROOT}/lib)
 
 add_unit_test(
     intelligence_is_v2_ut
-    "query_request_v2_ut.cc;query_response_v2_ut.cc;intelligence_comp_v2_ut.cc;invalidation_ut.cc" 
+    "query_request_v2_ut.cc;query_response_v2_ut.cc;intelligence_comp_v2_ut.cc" 
     "intelligence_is_v2;singleton;shell_cmd;event_is;metric;message;agent_details;connkey;-lboost_regex")

nodes/http_transaction_handler/package/install-http-transaction-handler.sh

@@ -87,6 +87,12 @@ install_waap()
     cp_exec "cp -f resources/cp-csrf.js /etc/cp/conf/waap/"
     cp_exec "chmod 777 /etc/cp/conf/waap/cp-ab.js"
     cp_exec "chmod 777 /etc/cp/conf/waap/cp-csrf.js"
+
+    # use advanced model if exist as data for waap
+    ADVANCED_MODEL_FILE=/advanced-model/open-appsec-advanced-model.tgz
+    if [ -f "$ADVANCED_MODEL_FILE" ]; then
+        cp_exec "tar -xzf $ADVANCED_MODEL_FILE -C /etc/cp/conf/waap"
+    fi
 }
 
 set_debug_configuration()

nodes/orchestration/package/cp-agent-info.sh

@@ -224,8 +224,8 @@ fi
 if [ -n "${SPLIT_DIR}" ]; then
     mkdir -p "$SPLIT_DIR"
     unsplited_tar="${CP_UNSPLITED_DIR}/agent-info.tar.gz"
-    if [ "$IS_SMB" != "1" ]; then
+    if [ `tar --help | grep absolute-names | wc -l` = "1" ]; then
-        TAR_EXTRA_PARAMS="-P"
+        TAR_EXTRA_PARAMS="--absolute-names"
     else
         TAR_EXTRA_PARAMS=""
     fi