From ed911f70d07a99d795383a9bbcd53a1498fe6c24 Mon Sep 17 00:00:00 2001 From: Alexey Bannov Date: Wed, 27 Dec 2023 23:50:26 +0300 Subject: [PATCH 1/4] rabbitmq: webstudio queue --- run/WebStudio.bat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/run/WebStudio.bat b/run/WebStudio.bat index ccc72959e9..43b5e8dc41 100644 --- a/run/WebStudio.bat +++ b/run/WebStudio.bat @@ -1,4 +1,4 @@ @echo off PUSHD %~dp0..\.. -set servicepath=%cd%\server\web\ASC.Web.Studio\bin\Debug\ASC.Web.Studio.exe urls=http://0.0.0.0:5003 $STORAGE_ROOT=%cd%\Data log:dir=%cd%\Logs log:name=web.studio pathToConf=%cd%\buildtools\config core:products:folder=%cd%\server\products \ No newline at end of file +set servicepath=%cd%\server\web\ASC.Web.Studio\bin\Debug\ASC.Web.Studio.exe urls=http://0.0.0.0:5003 $STORAGE_ROOT=%cd%\Data log:dir=%cd%\Logs log:name=web.studio pathToConf=%cd%\buildtools\config core:products:folder=%cd%\server\products core:eventBus:subscriptionClientName=asc_event_bus_webstudio_queue \ No newline at end of file From f6c2a78c8dc6ff3c4128c0c850bb9733fe626895 Mon Sep 17 00:00:00 2001 From: pavelbannov Date: Thu, 11 Jan 2024 16:20:36 +0300 Subject: [PATCH 2/4] bug 65729 --- config/appsettings.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/config/appsettings.json b/config/appsettings.json index 07986a64e2..17ba1d617e 100644 --- a/config/appsettings.json +++ b/config/appsettings.json @@ -574,5 +574,8 @@ "region": "us-east-1", "tableName": "" } + }, + "webhooks": { + "blacklist": [ ] } } From c1c55513a3a251ed00345002542badded7d0be88 Mon Sep 17 00:00:00 2001 From: Evgeniy Antonyuk Date: Sat, 13 Jan 2024 18:53:40 +0800 Subject: [PATCH 3/4] Implement elasticsearch memory limits when requirements aren't met --- install/common/product-configuration | 33 ++++++++++++---------------- 1 file changed, 14 insertions(+), 19 deletions(-) diff --git a/install/common/product-configuration b/install/common/product-configuration index 0130237cef..4bf18f7154 100644 --- a/install/common/product-configuration +++ b/install/common/product-configuration @@ -647,30 +647,25 @@ change_elasticsearch_config(){ sed -i "s/ingest.geoip.downloader.enabled.*/ingest.geoip.downloader.enabled: false/" ${ELASTIC_SEARCH_CONF_PATH} fi - ELASTIC_SYSTEMD_DIR="${SYSTEMD_DIR}/elasticsearch.service.d" - mkdir -p "${ELASTIC_SYSTEMD_DIR}" - - if [ ! -e "${ELASTIC_SYSTEMD_DIR}/overwrite.conf" ]; then - echo "[Service]" > "${ELASTIC_SYSTEMD_DIR}/overwrite.conf" - echo "TimeoutStartSec=600" >> "${ELASTIC_SYSTEMD_DIR}/overwrite.conf" - systemctl daemon-reload >/dev/null 2>&1 - fi - local TOTAL_MEMORY=$(free -m | grep -oP '\d+' | head -n 1); local MEMORY_REQUIREMENTS=12228; #RAM ~4*3Gb if [ ${TOTAL_MEMORY} -gt ${MEMORY_REQUIREMENTS} ]; then - if ! grep -q "[-]Xms1g" ${ELASTIC_SEARCH_JAVA_CONF_PATH}; then - echo "-Xms4g" >> ${ELASTIC_SEARCH_JAVA_CONF_PATH} - else - sed -i "s/-Xms1g/-Xms4g/" ${ELASTIC_SEARCH_JAVA_CONF_PATH} - fi + ELASTICSEATCH_MEMORY="4g" + else + ELASTICSEATCH_MEMORY="1g" + fi - if ! grep -q "[-]Xmx1g" ${ELASTIC_SEARCH_JAVA_CONF_PATH}; then - echo "-Xmx4g" >> ${ELASTIC_SEARCH_JAVA_CONF_PATH} - else - sed -i "s/-Xmx1g/-Xmx4g/" ${ELASTIC_SEARCH_JAVA_CONF_PATH} - fi + if grep -qE "^[^#]*-Xms[0-9]g" "${ELASTIC_SEARCH_JAVA_CONF_PATH}"; then + sed -i "s/-Xms[0-9]g/-Xms${ELASTICSEATCH_MEMORY}/" "${ELASTIC_SEARCH_JAVA_CONF_PATH}" + else + echo "-Xms${ELASTICSEATCH_MEMORY}" >> "${ELASTIC_SEARCH_JAVA_CONF_PATH}" + fi + + if grep -qE "^[^#]*-Xmx[0-9]g" "${ELASTIC_SEARCH_JAVA_CONF_PATH}"; then + sed -i "s/-Xmx[0-9]g/-Xmx${ELASTICSEATCH_MEMORY}/" "${ELASTIC_SEARCH_JAVA_CONF_PATH}" + else + echo "-Xmx${ELASTICSEATCH_MEMORY}" >> "${ELASTIC_SEARCH_JAVA_CONF_PATH}" fi if [ -d /etc/elasticsearch/ ]; then From 6c29cf750854681546853f4aac0bffe7066cbf37 Mon Sep 17 00:00:00 2001 From: Evgeniy Antonyuk Date: Sat, 13 Jan 2024 20:16:10 +0700 Subject: [PATCH 4/4] fix Bug 65729 - Add private IP and link-local addresses to the blacklist (#117) --- config/appsettings.json | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/config/appsettings.json b/config/appsettings.json index 17ba1d617e..00e1fc4a33 100644 --- a/config/appsettings.json +++ b/config/appsettings.json @@ -576,6 +576,14 @@ } }, "webhooks": { - "blacklist": [ ] + "blacklist": [ + "0.0.0.0/8", + "10.0.0.0/8", + "100.64.0.0/10", + "127.0.0.0/8", + "169.254.0.0/16", + "172.16.0.0/12", + "192.168.0.0/16" + ] } }