소스 검색

Fix docker_start.sh not properly handling env vars (#1993)

For example, the COLLECTIONS environment variable is supposed to do a space separated list.
But with the unquoted call to cscli_if_clean without quotes on the $COLLECTIONS environment variable, only the first entry is passed to it.
As a result, only the first entry is installed.

Would likely affect all call sites to cscli_if_clean
Yip Rui Fung 2 년 전
부모
커밋
ecb5562b57
1개의 변경된 파일8개의 추가작업 그리고 8개의 파일을 삭제
  1. 8 8
      docker/docker_start.sh

+ 8 - 8
docker/docker_start.sh

@@ -266,43 +266,43 @@ cscli_if_clean parsers install crowdsecurity/docker-logs
 
 
 if [ "$COLLECTIONS" != "" ]; then
 if [ "$COLLECTIONS" != "" ]; then
     # shellcheck disable=SC2086
     # shellcheck disable=SC2086
-    cscli_if_clean collections install $COLLECTIONS
+    cscli_if_clean collections install "$COLLECTIONS"
 fi
 fi
 
 
 if [ "$PARSERS" != "" ]; then
 if [ "$PARSERS" != "" ]; then
     # shellcheck disable=SC2086
     # shellcheck disable=SC2086
-    cscli_if_clean parsers install $PARSERS
+    cscli_if_clean parsers install "$PARSERS"
 fi
 fi
 
 
 if [ "$SCENARIOS" != "" ]; then
 if [ "$SCENARIOS" != "" ]; then
     # shellcheck disable=SC2086
     # shellcheck disable=SC2086
-    cscli_if_clean scenarios install $SCENARIOS
+    cscli_if_clean scenarios install "$SCENARIOS"
 fi
 fi
 
 
 if [ "$POSTOVERFLOWS" != "" ]; then
 if [ "$POSTOVERFLOWS" != "" ]; then
     # shellcheck disable=SC2086
     # shellcheck disable=SC2086
-    cscli_if_clean postoverflows install $POSTOVERFLOWS
+    cscli_if_clean postoverflows install "$POSTOVERFLOWS"
 fi
 fi
 
 
 ## Remove collections, parsers, scenarios & postoverflows
 ## Remove collections, parsers, scenarios & postoverflows
 if [ "$DISABLE_COLLECTIONS" != "" ]; then
 if [ "$DISABLE_COLLECTIONS" != "" ]; then
     # shellcheck disable=SC2086
     # shellcheck disable=SC2086
-    cscli_if_clean collections remove $DISABLE_COLLECTIONS
+    cscli_if_clean collections remove "$DISABLE_COLLECTIONS"
 fi
 fi
 
 
 if [ "$DISABLE_PARSERS" != "" ]; then
 if [ "$DISABLE_PARSERS" != "" ]; then
     # shellcheck disable=SC2086
     # shellcheck disable=SC2086
-    cscli_if_clean parsers remove $DISABLE_PARSERS
+    cscli_if_clean parsers remove "$DISABLE_PARSERS"
 fi
 fi
 
 
 if [ "$DISABLE_SCENARIOS" != "" ]; then
 if [ "$DISABLE_SCENARIOS" != "" ]; then
     # shellcheck disable=SC2086
     # shellcheck disable=SC2086
-    cscli_if_clean scenarios remove $DISABLE_SCENARIOS
+    cscli_if_clean scenarios remove "$DISABLE_SCENARIOS"
 fi
 fi
 
 
 if [ "$DISABLE_POSTOVERFLOWS" != "" ]; then
 if [ "$DISABLE_POSTOVERFLOWS" != "" ]; then
     # shellcheck disable=SC2086
     # shellcheck disable=SC2086
-    cscli_if_clean postoverflows remove $DISABLE_POSTOVERFLOWS
+    cscli_if_clean postoverflows remove "$DISABLE_POSTOVERFLOWS"
 fi
 fi
 
 
 ## Register bouncers via env
 ## Register bouncers via env