github_mirrors/openappsec
3
0
Fork 1
mirror of https://github.com/openappsec/openappsec.git synced 2025-09-29 11:16:30 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #37 from openappsec/Jul_06_2023-Dev

Browse Source 
Jul 06 2023 dev
This commit is contained in:
WrightNed
2023-07-16 15:53:39 +03:00
committed by GitHub
parent ebc2b2be0d 01b6544ca5
commit 19e8906704
87 changed files with 2528 additions and 1773 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
nodes/http_transaction_handler/CMakeLists.txt
View File

@@ -42,19 +42,19 @@ install(TARGETS cp-nano-http-transaction-handler DESTINATION bin)
install(TARGETS cp-nano-http-transaction-handler DESTINATION http_transaction_handler_service/bin)
execute_process (
COMMAND bash -c "ldconfig -p | awk '/libpcre2-8.so/{sub(/[^/]*$/,\"\", $NF); path=$NF}END{system(\"ls \"path\"libpcre2-8.so*\")}' | awk '{printf $1\";\"}'"
COMMAND bash -c "find /usr/lib -name \"libpcre2-8.so*\" | awk '{printf $0\";\"}'"
OUTPUT_VARIABLE pcre2-8
)
install(FILES ${pcre2-8} DESTINATION http_transaction_handler_service/lib)
execute_process (
COMMAND bash -c "ldconfig -p | awk '/libpcre2-posix.so/{sub(/[^/]*$/,\"\", $NF); path=$NF}END{system(\"ls \"path\"libpcre2-posix.so*\")}' | awk '{printf $1\";\"}'"
COMMAND bash -c "find /usr/lib -name \"libpcre2-posix.so*\" | awk '{printf $0\";\"}'"
OUTPUT_VARIABLE pcre2-posix
)
install(FILES ${pcre2-posix} DESTINATION http_transaction_handler_service/lib)
execute_process (
COMMAND bash -c "ldconfig -p | awk '/libxml2.so/{sub(/[^/]*$/,\"\", $NF); path=$NF}END{system(\"ls \"path\"libxml2.so*\")}' | awk '{printf $1\";\"}'"
COMMAND bash -c "find /usr/lib -name \"libxml2.so*\" | awk '{printf $0\";\"}'"
OUTPUT_VARIABLE xml2
)
install(FILES ${xml2} DESTINATION http_transaction_handler_service/lib)

42
nodes/orchestration/CMakeLists.txt
View File

@@ -27,7 +27,6 @@ target_link_libraries(
update_communication
orchestration_tools
env_details
messaging_downloader_client
local_policy_mgmt_gen
curl
@@ -44,79 +43,94 @@ install(FILES package/certificate/public-keys/i2.pem DESTINATION orchestration/c
install(FILES package/certificate/public-keys/stg-i2.pem DESTINATION orchestration/certificate/ PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ)
execute_process (
COMMAND bash -c "ldconfig -p | awk '/libboost_regex.so/{printf $NF\";\"}'"
COMMAND bash -c "find /usr/lib -name \"libboost_regex.so*\" | awk '{printf $0\";\"}'"
OUTPUT_VARIABLE boost_regex
)
install(FILES ${boost_regex} DESTINATION orchestration/lib/boost)
execute_process (
COMMAND bash -c "ldconfig -p | awk '/libboost_atomic.so/{printf $NF\";\"}'"
COMMAND bash -c "find /usr/lib -name \"libboost_atomic.so*\" | awk '{printf $0\";\"}'"
OUTPUT_VARIABLE boost_atomic
)
install(FILES ${boost_atomic} DESTINATION orchestration/lib/boost)
execute_process (
COMMAND bash -c "ldconfig -p | awk '/libboost_chrono.so/{printf $NF\";\"}'"
COMMAND bash -c "find /usr/lib -name \"libboost_chrono.so*\" | awk '{printf $0\";\"}'"
OUTPUT_VARIABLE boost_chrono
)
install(FILES ${boost_chrono} DESTINATION orchestration/lib/boost)
execute_process (
COMMAND bash -c "ldconfig -p | awk '/libboost_context.so/{printf $NF\";\"}'"
COMMAND bash -c "find /usr/lib -name \"libboost_context.so*\" | awk '{printf $0\";\"}'"
OUTPUT_VARIABLE boost_context
)
install(FILES ${boost_context} DESTINATION orchestration/lib/boost)
execute_process (
COMMAND bash -c "ldconfig -p | awk '/libboost_filesystem.so/{printf $NF\";\"}'"
COMMAND bash -c "find /usr/lib -name \"libboost_filesystem.so*\" | awk '{printf $0\";\"}'"
OUTPUT_VARIABLE boost_filesystem
)
install(FILES ${boost_filesystem} DESTINATION orchestration/lib/boost)
execute_process (
COMMAND bash -c "ldconfig -p | awk '/libboost_iostreams.so/{printf $NF\";\"}'"
COMMAND bash -c "find /usr/lib -name \"libboost_iostreams.so*\" | awk '{printf $0\";\"}'"
OUTPUT_VARIABLE boost_iostreams
)
install(FILES ${boost_iostreams} DESTINATION orchestration/lib/boost)
execute_process (
COMMAND bash -c "ldconfig -p | awk '/libboost_system.so/{printf $NF\";\"}'"
COMMAND bash -c "find /usr/lib -name \"libboost_system.so*\" | awk '{printf $0\";\"}'"
OUTPUT_VARIABLE boost_system
)
install(FILES ${boost_system} DESTINATION orchestration/lib/boost)
execute_process (
COMMAND bash -c "ldconfig -p | awk '/libboost_system.so/{printf $NF\";\"}'"
COMMAND bash -c "find /usr/lib -name \"libboost_system.so*\" | awk '{printf $0\";\"}'"
OUTPUT_VARIABLE boost_system
)
install(FILES ${boost_system} DESTINATION orchestration/lib/boost)
execute_process (
COMMAND bash -c "ldconfig -p | awk '/libboost_thread.so/{printf $NF\";\"}'"
COMMAND bash -c "find /usr/lib -name \"libboost_thread.so*\" | awk '{printf $0\";\"}'"
OUTPUT_VARIABLE boost_thread
)
install(FILES ${boost_thread} DESTINATION orchestration/lib/boost)
execute_process (
COMMAND bash -c "ldconfig -p | awk '/libcrypto.so/{printf $NF\";\"}'"
COMMAND bash -c "find /usr/lib -name \"libcrypto.so\" | awk '{printf $0\";\"}'"
OUTPUT_VARIABLE crypto
)
install(FILES ${crypto} DESTINATION orchestration/lib)
execute_process (
COMMAND bash -c "find /lib -name \"libcrypto.so*\" | awk '{printf $0\";\"}'"
OUTPUT_VARIABLE crypto2
)
install(FILES ${crypto2} DESTINATION orchestration/lib)
execute_process (
COMMAND bash -c "ldconfig -p | awk '/libssl.so/{printf $NF\";\"}'"
COMMAND bash -c "find /usr/lib -name \"libssl.so\" | awk '{printf $1\";\"}'"
OUTPUT_VARIABLE ssl
)
install(FILES ${ssl} DESTINATION orchestration/lib)
execute_process (
COMMAND bash -c "find /lib -name \"libssl.so*\" | awk '{printf $1\";\"}'"
OUTPUT_VARIABLE ssl2
)
install(FILES ${ssl2} DESTINATION orchestration/lib)
execute_process (
COMMAND bash -c "ldconfig -p | awk '/libcurl.so/{sub(/[^/]*$/,\"\", $NF); path=$NF}END{system(\"ls \"path\"libcurl.so*\")}' | awk '{printf $1\";\"}'"
COMMAND bash -c "find /usr/lib -name \"libcurl.so\" | awk '{printf $1\";\"}'"
OUTPUT_VARIABLE curl
)
install(FILES ${curl} DESTINATION orchestration/lib)
execute_process (
COMMAND bash -c "find /lib -name \"libcurl.so*\" | awk '{printf $1\";\"}'"
OUTPUT_VARIABLE curl2
)
install(FILES ${curl2} DESTINATION orchestration/lib)
execute_process (
COMMAND bash -c "ldconfig -p | awk '/libz.so/{sub(/[^/]*$/,\"\", $NF); path=$NF}END{system(\"ls \"path\"libz.so*\")}' | awk '{printf $1\";\"}'"
COMMAND bash -c "find /usr/lib -name \"libz.so*\" | awk '{printf $0\";\"}'"
OUTPUT_VARIABLE z
)
install(FILES ${z} DESTINATION orchestration/lib)

4
nodes/orchestration/main.cc
View File

@@ -17,7 +17,6 @@
#include <algorithm>
#include <unistd.h>
#include "messaging_downloader_client.h"
#include "time_proxy.h"
#include "shell_cmd.h"
#include "debug.h"
@@ -58,8 +57,6 @@
using namespace std;
#include "components_list.h"
#include "messaging_downloader_server.h"
#include "external_sdk_server.h"
int
main(int argc, char **argv)
@@ -77,7 +74,6 @@ main(int argc, char **argv)
OrchestrationComp,
HealthChecker,
HealthCheckManager,
MessagingDownloaderClient,
LocalPolicyMgmtGenerator
> comps;

9
nodes/orchestration/package/cpnano_debug/cpnano_debug.cc
View File

@@ -91,7 +91,6 @@ enum class Service {
CPVIEW_METRIC_PROVIDER,
HTTP_TRANSACTION_HANDLER,
DEDICATED_NETWORK_HANDLER,
MESSAGING_PROXY,
HELLO_WORLD,
IDA,
IOT_ACCESS_CONTROL,
@@ -165,7 +164,6 @@ getServiceString(const Service service)
case (Service::ATTACHMENT_REGISTRATOR): return "attachment-registrator";
case (Service::CPVIEW_METRIC_PROVIDER): return "cpview-metric-provider";
case (Service::DEDICATED_NETWORK_HANDLER): return "dedicated-network-handler";
case (Service::MESSAGING_PROXY): return "messaging-proxy";
case (Service::SDWAN): return "sdwan";
case (Service::LOGGER_SDWAN): return "logger-sdwan";
case (Service::IOT_WLP): return "workload-protection";
@@ -321,11 +319,6 @@ getServiceConfig (const Service service)
filesystem_path + "/conf/cp-nano-dedicated-network-handler-debug-conf.json",
log_files_path + "/nano_agent/cp-nano-dedicated-network-handler.dbg"
);
case (Service::MESSAGING_PROXY):
return ServiceConfig(
filesystem_path + "/conf/cp-nano-messaging-proxy-debug-conf.json",
log_files_path + "/nano_agent/cp-nano-messaging-proxy.dbg"
);
case (Service::SDWAN):
return ServiceConfig(
filesystem_path + "/conf/cp-nano-sdwan-debug-conf.json",
@@ -1282,8 +1275,6 @@ extractServices(const vector<string> &args)
services.push_back(Service::HTTP_TRANSACTION_HANDLER);
} else if (getServiceString(Service::DEDICATED_NETWORK_HANDLER).find(maybe_service) == 0) {
services.push_back(Service::DEDICATED_NETWORK_HANDLER);
} else if (getServiceString(Service::MESSAGING_PROXY).find(maybe_service) == 0) {
services.push_back(Service::MESSAGING_PROXY);
} else if (getServiceString(Service::SDWAN).find(maybe_service) == 0) {
services.push_back(Service::SDWAN);
} else if (getServiceString(Service::LOGGER_SDWAN).find(maybe_service) == 0) {

105
nodes/orchestration/package/open-appsec-ctl.sh
View File

@@ -26,6 +26,8 @@ DEFAULT_HEALTH_CHECK_TMP_FILE_PATH="/tmp/cpnano_health_check_output.txt"
var_default_fog_address="i2-agents.cloud.ngen.checkpoint.com/"
var_default_gem_fog_address="inext-agents.cloud.ngen.checkpoint.com"
var_default_us_fog_address="inext-agents-us.cloud.ngen.checkpoint.com"
var_default_au_fog_address="inext-agents-aus1.cloud.ngen.checkpoint.com"
var_default_in_fog_address="inext-agents-ind1.cloud.ngen.checkpoint.com"
#NOTE: open-appsec-ctl only supports nano services with name of the format cp-nano-<service>
cp_nano_service_name_prefix="cp-nano"
@@ -92,7 +94,8 @@ fi
get_basename()
{
if command -v basename &>/dev/null; then
is_basename_exist=$(command -v basename)
if [ -n $is_basename_exist ]; then
echo $(basename $1)
else
echo $(echo $1 | rev | cut -d / -f 1 | rev)
@@ -267,7 +270,7 @@ usage()
uninstall_option="-u, --uninstall"
load_config_option="-lc, --load-config <$(get_installed_services '|')>"
display_config_option="-dc, --display-config [$(get_installed_services '|')]"
cp_agent_info_option="-ai, --cp-agent-info [-wd|--with_dump|-u|--upload|-fms|--file_max_size|-an|--additional_name]"
cp_agent_info_option="-ai, --cp-agent-info [-wd|--with_dump|-fms|--file_max_size|-an|--additional_name]"
display_policy_option="-dp, --display-policy"
set_gradual_policy_option="-gp, --set-gradual-policy [access-control|http-manager] <ip-ranges>"
delete_gradual_policy_option="-dg, --delete-gradual-policy [access-control|http-manager]"
@@ -1217,16 +1220,11 @@ run_ai() # Initials - ra
ra_tenant_id=
ra_agent_id=
ra_token=
ra_upload_to_fog=false
# we use this address as default and replace later if needed
ra_fog_address="inext-agents.cloud.ngen.checkpoint.com"
for arg; do
if [ "$arg" = "--upload" ] || [ "$arg" = "-u" ]; then
ra_upload_to_fog=true
shift
continue
elif [ "$arg" = "--verbose" ] || [ "$arg" = "-v" ]; then
if [ "$arg" = "--verbose" ] || [ "$arg" = "-v" ]; then
AI_VERBOSE=true
elif [ -z "$1" ]; then
break
@@ -1235,14 +1233,6 @@ run_ai() # Initials - ra
shift
done
if [ "$ra_upload_to_fog" = "false" ]; then
printf "Should upload to Checkpoints' cloud? [y/n] " && read -r ra_should_upload
case $ra_should_upload in
[Yy] | [Yy][Ee][Ss]) ra_upload_to_fog=true ;;
*) ;;
esac
fi
ra_https_prefix="https://"
ra_agent_details=$(cat ${FILESYSTEM_PATH}/$cp_nano_conf_location/agent_details.json)
if echo "$ra_agent_details" | grep -q "Fog domain"; then
@@ -1274,49 +1264,6 @@ run_ai() # Initials - ra
echo "Failed to calculate agent-info data."
exit 1
fi
if [ "$ra_upload_to_fog" = "true" ]; then
ra_token_data="$(curl_func "$(extract_api_port orchestration)"/show-access-token)"
ra_token_hex=$(echo "$ra_token_data" | grep "token" | cut -d '"' -f4 | base64 -d | od -t x1 -An)
ra_token_hex_formatted=$(echo $ra_token_hex | tr -d ' ')
ra_token="$(xor_decrypt "${ra_token_hex_formatted}")"
ra_proxy_val=""
if [ -n "${is_gaia}" ]; then
ra_gaia_proxy_address=$(dbget proxy:ip-address | tr -d '\n')
ra_gaia_proxy_ip=$(dbget proxy:port | tr -d '\n')
if [ -n "$ra_gaia_proxy_address" ] && [ -n "$ra_gaia_proxy_ip" ]; then
ra_proxy_val="--proxy http://${ra_gaia_proxy_address}:${ra_gaia_proxy_ip}"
fi
fi
if [ "$is_smb_release" = "1" ]; then
is_proxy_enabled=$(pt proxySettings | awk '{if ($1 == "useProxy") printf("%s", $3)}')
if [ "$is_proxy_enabled" = "true" ]; then
ra_smb_proxy_address=$(pt proxySettings | awk '{if ($1 == "ipAddress") printf("%s", $3)}')
ra_smb_proxy_port=$(pt proxySettings | awk '{if ($1 == "port") printf("%s", $3)}')
if [ ! -z $ra_smb_proxy_address ] && [ ! -z $ra_smb_proxy_port ]; then
ra_proxy_val="--proxy http://${ra_smb_proxy_address}:${ra_smb_proxy_port}"
fi
fi
fi
echo "---- Uploading agent information to Check Point ----"
sleep 1
upload_ai "$ra_cp_info_path" "$ra_token" "$ra_fog_address" "$ra_tenant_id" "$ra_agent_id" "$ra_current_time" "$ra_file_dir"
if [ "$AI_UPLOAD_TOO_LARGE_FLAG" = "true" ]; then
echo "Files are too large - splitting to files of size of $SPLIT_FILE_SMALL_SIZE"
cat "$ra_cp_info_path"/* >"$ra_cp_info_path"/temp_reassembled_files
rm "$ra_cp_info_path"/*.*
split -b "$SPLIT_FILE_SMALL_SIZE" "$ra_cp_info_path"/temp_reassembled_files "$ra_cp_info_path"/cp-nano-info-"$ra_agent_id"-"$ra_current_time".tar.gz
rm "$ra_cp_info_path"/temp_reassembled_files
upload_ai "$ra_cp_info_path" "$ra_token" "$ra_fog_address" "$ra_tenant_id" "$ra_agent_id" "$ra_current_time" "$ra_file_dir"
fi
echo "File upload to cloud: Succeeded"
else
echo "ignore uploading file to the Fog."
fi
}
create_entries_file() # Initials - cef
@@ -1346,38 +1293,6 @@ create_entries_file() # Initials - cef
} >>"$cef_entries_file_path"
}
upload_ai() # Initials - uai
{
uai_cp_info_path="$1"
uai_token="$2"
uai_fog_address="$3"
uai_tenant_id="$4"
uai_agent_id="$5"
uai_current_time="$6"
uai_file_dir="$7"
create_entries_file "$uai_cp_info_path"
for file in "$uai_cp_info_path"/*; do
if [ "$AI_VERBOSE" = "true" ]; then
echo "Uploading file $file"
fi
if [ -z "${is_gaia}" -o "$is_smb_release" = "1" ]; then
uai_curl_output=$(${curl_cmd} -o /dev/null -s -w "%{http_code}\n" --progress-bar --request PUT -T "${file}" -H "user-agent: Infinity Next (a7030abf93a4c13)" -H "Content-Type: application/json" -H "Authorization: Bearer ${uai_token}" "$uai_fog_address"/agents-core/storage/"$uai_tenant_id"/"$uai_agent_id"/"$uai_current_time"/"$uai_file_dir" 2>&1)
elif [ "${remove_curl_ld_path}" = "true" ]; then
uai_curl_output=$(LD_LIBRARY_PATH="" ${curl_cmd} --cacert ${FILESYSTEM_PATH}/certs/fog.pem "${uai_proxy_val}" -o /dev/null -s -w "%{http_code}\n" --progress-bar --request PUT -T "${file}" -H "user-agent: Infinity Next (a7030abf93a4c13)" -H "Content-Type: application/json" -H "Authorization: Bearer ${uai_token}" "$uai_fog_address"/agents-core/storage/"$uai_tenant_id"/"$uai_agent_id"/"$uai_current_time"/"$uai_file_dir" 2>&1)
else
uai_curl_output=$(${curl_cmd} --cacert ${FILESYSTEM_PATH}/certs/fog.pem "${uai_proxy_val}" -o /dev/null -s -w "%{http_code}\n" --progress-bar --request PUT -T "${file}" -H "user-agent: Infinity Next (a7030abf93a4c13)" -H "Content-Type: application/json" -H "Authorization: Bearer ${uai_token}" "$uai_fog_address"/agents-core/storage/"$uai_tenant_id"/"$uai_agent_id"/"$uai_current_time"/"$uai_file_dir" 2>&1)
fi
if [ "$AI_UPLOAD_TOO_LARGE_FLAG" = "false" ] && [ "$uai_curl_output" = "413" ]; then
AI_UPLOAD_TOO_LARGE_FLAG=true
return
fi
if test "$uai_curl_output" != "200"; then
echo "File upload to cloud: Failed Error code ${uai_curl_output}"
exit 1
fi
done
}
set_mode_usage_message()
{
echo "Usage:"
@@ -1464,9 +1379,17 @@ set_mode()
gem_prefix_uppercase="CP-"
us_prefix="cp-us-"
us_prefix_uppercase="CP-US-"
au_prefix="cp-au-"
au_prefix_uppercase="CP-AU-"
in_prefix="cp-in-"
in_prefix_uppercase="CP-IN-"
if [ "${var_token#"$us_prefix"}" != "${var_token}" ] || [ "${var_token#"$us_prefix_uppercase"}" != "${var_token}" ]; then
var_fog_address="$var_default_us_fog_address"
elif [ "${var_token#$au_prefix}" != "${var_token}" ] || [ "${var_token#"$au_prefix_uppercase"}" != "${var_token}" ]; then
var_fog_address="$var_default_au_fog_address"
elif [ "${var_token#$in_prefix}" != "${var_token}" ] || [ "${var_token#"$in_prefix_uppercase"}" != "${var_token}" ]; then
var_fog_address="$var_default_in_fog_address"
elif [ "${var_token#"$gem_prefix"}" != "${var_token}" ] || [ "${var_token#"$gem_prefix_uppercase"}" != "${var_token}" ]; then
var_fog_address="$var_default_gem_fog_address"
else

34
nodes/orchestration/package/orchestration_package.sh
View File

@@ -43,6 +43,8 @@ DEFAULT_SETTINGS_PATH="${CONF_PATH}/settings.json"
var_default_fog_address="https://i2-agents.cloud.ngen.checkpoint.com/"
var_default_gem_fog_address="https://inext-agents.cloud.ngen.checkpoint.com"
var_default_us_fog_address="https://inext-agents-us.cloud.ngen.checkpoint.com"
var_default_au_fog_address="https://inext-agents-aus1.cloud.ngen.checkpoint.com"
var_default_in_fog_address="https://inext-agents-ind1.cloud.ngen.checkpoint.com"
var_fog_address=
var_certs_dir=
var_public_key=
@@ -330,9 +332,17 @@ if [ "$RUN_MODE" = "install" ] && [ $var_offline_mode = false ]; then
gem_prefix_uppercase="CP-"
us_prefix="cp-us-"
us_prefix_uppercase="CP-US-"
au_prefix="cp-au-"
au_prefix_uppercase="CP-AU-"
in_prefix="cp-in-"
in_prefix_uppercase="CP-IN-"
if [ "${var_token#"$us_prefix"}" != "${var_token}" ] || [ "${var_token#"$us_prefix_uppercase"}" != "${var_token}" ]; then
var_fog_address="$var_default_us_fog_address"
elif [ "${var_token#$au_prefix}" != "${var_token}" ] || [ "${var_token#"$au_prefix_uppercase"}" != "${var_token}" ]; then
var_fog_address="$var_default_au_fog_address"
elif [ "${var_token#$in_prefix}" != "${var_token}" ] || [ "${var_token#"$in_prefix_uppercase"}" != "${var_token}" ]; then
var_fog_address="$var_default_in_fog_address"
elif [ "${var_token#"$gem_prefix"}" != "${var_token}" ] || [ "${var_token#"$gem_prefix_uppercase"}" != "${var_token}" ]; then
var_fog_address="$var_default_gem_fog_address"
else
@@ -567,7 +577,7 @@ install_cp_nano_ctl()
if [ -f ${FILESYSTEM_PATH}/${CONF_PATH}/CP_NANO_AGENT_CTL ]; then
cp_exec "rm -rf ${FILESYSTEM_PATH}/${CONF_PATH}/$CP_NANO_AGENT_CTL"
fi
if [ -f ${FILESYSTEM_PATH}/${SCRIPTS_PATH}/${CP_NANO_AGENT_CTL_DEPRECATED} ]; then
cp_exec "rm -f ${FILESYSTEM_PATH}/${SCRIPTS_PATH}/${CP_NANO_AGENT_CTL_DEPRECATED} $USR_SBIN_PATH/${CP_NANO_CTL_DEPRECATED}"
fi
@@ -602,7 +612,7 @@ set_conf_temp_location()
if ! cat ${FILESYSTEM_PATH}/${ORCHESTRATION_CONF_FILE} | grep -q "\"orchestration\":"; then
sed -i -e "1 s/{/{\n\"orchestration\": {\"Default file download path\": [{\"value\":\""${escaped_temp_location}"\"}]},/" ${FILESYSTEM_PATH}/${ORCHESTRATION_CONF_FILE}
else
sed -i -e "/\"orchestration\"/ s/\"orchestration\".*:.*{/\"orchestration\":{\"Default file download path\": [{\"value\":\""${escaped_temp_location}"\"}],/" ${FILESYSTEM_PATH}/${ORCHESTRATION_CONF_FILE}
sed -i -e "/\"orchestration\"/ s/\"orchestration\".*:.*{/\"orchestration\":{\"Default file download path\": [{\"value\":\""${escaped_temp_location}"\"}],/" ${FILESYSTEM_PATH}/${ORCHESTRATION_CONF_FILE}
fi
fi
}
@@ -753,6 +763,16 @@ install_public_key()
fi
}
uninstall_messaging_proxy_if_needed()
{
messaging_exec_path="${FILESYSTEM_PATH}/packages/messagingProxy/messagingProxy"
if [ -f ${messaging_exec_path} ]; then
chmod +x ${messaging_exec_path}
${messaging_exec_path} --uninstall
rm -rf ${FILESYSTEM_PATH}/packages/messagingProxy
fi
}
install_orchestration()
{
INSTALLATION_TIME=$(date)
@@ -837,6 +857,8 @@ install_orchestration()
install_watchdog
cp_print "Upgrade to latest"
uninstall_messaging_proxy_if_needed
${FILESYSTEM_PATH}/${WATCHDOG_PATH}/cp-nano-watchdog --un-register ${FILESYSTEM_PATH}/${SERVICE_PATH}/cp-nano-orchestration "$var_arch_flag" > /dev/null 2>&1
if [ "$IS_K8S_ENV" = "true" ]; then
${FILESYSTEM_PATH}/${WATCHDOG_PATH}/cp-nano-watchdog --un-register ${FILESYSTEM_PATH}/${SERVICE_PATH}/k8s-check-update-listener.sh
@@ -1043,19 +1065,19 @@ run_pre_install_test()
run_post_install_test()
{
if [ $var_is_alpine = false ]; then
if [ ! -f ${USR_LIB_PATH}/cpnano/libboost_chrono.so ]; then
if [ ! -f ${USR_LIB_PATH}/cpnano/libboost_chrono.so* ]; then
cp_print "Error, libboost_chrono .so file is missing" ${FORCE_STDOUT}
exit 1
fi
if [ ! -f ${USR_LIB_PATH}/cpnano/libboost_context.so ]; then
if [ ! -f ${USR_LIB_PATH}/cpnano/libboost_context.so* ]; then
cp_print "Error, libboost_context .so file is missing" ${FORCE_STDOUT}
exit 1
fi
if [ ! -f ${USR_LIB_PATH}/cpnano/libboost_system.so ]; then
if [ ! -f ${USR_LIB_PATH}/cpnano/libboost_system.so* ]; then
cp_print "Error, libboost_system .so file is missing" ${FORCE_STDOUT}
exit 1
fi
if [ ! -f ${USR_LIB_PATH}/cpnano/libboost_thread.so ]; then
if [ ! -f ${USR_LIB_PATH}/cpnano/libboost_thread.so* ]; then
cp_print "Error, libboost_thread .so file is missing" ${FORCE_STDOUT}
exit 1
fi