Skip to content

Commit ec01d2f

Browse files
authored
fix: bash avoiding newline when Base64 encoding a long string (#2437)
Signed-off-by: Viet Nguyen Duc <[email protected]>
1 parent 022c35f commit ec01d2f

File tree

11 files changed

+11
-10
lines changed

11 files changed

+11
-10
lines changed

Diff for: Base/check-grid.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ set -e
55

66
HOST="localhost"
77
PORT="4444"
8-
BASIC_AUTH="$(echo -n "${SE_ROUTER_USERNAME}:${SE_ROUTER_PASSWORD}" | base64)"
8+
BASIC_AUTH="$(echo -en "${SE_ROUTER_USERNAME}:${SE_ROUTER_PASSWORD}" | base64 -w0)"
99

1010
echoerr() { echo "$@" 1>&2; }
1111

Diff for: Makefile

+1
Original file line numberDiff line numberDiff line change
@@ -951,6 +951,7 @@ chart_test_autoscaling_job:
951951

952952
chart_test_autoscaling_playwright_connect_grid:
953953
PLATFORMS=$(PLATFORMS) CHART_ENABLE_TRACING=true CHART_ENABLE_BASIC_AUTH=true MATRIX_TESTS=CDPTests \
954+
BASIC_AUTH_USERNAME=docker-selenium BASIC_AUTH_PASSWORD=2NMI4jdBi6k7bENoeUfV25295VvzwAE9chM24a+2VL95uOHozo \
954955
SECURE_INGRESS_ONLY_DEFAULT=true SECURE_USE_EXTERNAL_CERT=true SELENIUM_GRID_PROTOCOL=https SELENIUM_GRID_HOST=$$(hostname -i) SELENIUM_GRID_PORT=443 \
955956
VERSION=$(TAG_VERSION) VIDEO_TAG=$(FFMPEG_TAG_VERSION)-$(BUILD_DATE) KEDA_BASED_NAME=$(KEDA_BASED_NAME) KEDA_BASED_TAG=$(KEDA_BASED_TAG) NAMESPACE=$(NAMESPACE) BINDING_VERSION=$(BINDING_VERSION) \
956957
TEMPLATE_OUTPUT_FILENAME="k8s_playwright_connect_grid_basicAuth_secureIngress_ingressPublicIP_autoScaling_patchKEDA.yaml" \

Diff for: Video/validate_endpoint.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ graphql_endpoint=${2:-false}
55
max_time=1
66
process_name="endpoint.checks"
77

8-
BASIC_AUTH="$(echo -n "${SE_ROUTER_USERNAME}:${SE_ROUTER_PASSWORD}" | base64)"
8+
BASIC_AUTH="$(echo -en "${SE_ROUTER_USERNAME}:${SE_ROUTER_PASSWORD}" | base64 -w0)"
99

1010
if [ "${graphql_endpoint}" = "true" ]; then
1111
endpoint_checks=$(curl --noproxy "*" -m ${max_time} -k -X POST \

Diff for: Video/video.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ else
2929
fi
3030

3131
/opt/bin/validate_endpoint.sh "${NODE_STATUS_ENDPOINT}"
32-
BASIC_AUTH="$(echo -n "${SE_ROUTER_USERNAME}:${SE_ROUTER_PASSWORD}" | base64)"
32+
BASIC_AUTH="$(echo -en "${SE_ROUTER_USERNAME}:${SE_ROUTER_PASSWORD}" | base64 -w0)"
3333

3434
if [ -d "${VIDEO_FOLDER}" ]; then
3535
echo "$(date +%FT%T%Z) [${process_name}] - Video folder exists: ${VIDEO_FOLDER}"

Diff for: Video/video_graphQLQuery.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ if [[ -n ${GRAPHQL_ENDPOINT} ]] && [[ ! ${GRAPHQL_ENDPOINT} == */graphql ]]; the
1414
GRAPHQL_ENDPOINT="${GRAPHQL_ENDPOINT}/graphql"
1515
fi
1616

17-
BASIC_AUTH="$(echo -n "${SE_ROUTER_USERNAME}:${SE_ROUTER_PASSWORD}" | base64)"
17+
BASIC_AUTH="$(echo -en "${SE_ROUTER_USERNAME}:${SE_ROUTER_PASSWORD}" | base64 -w0)"
1818

1919
VIDEO_CAP_NAME=${VIDEO_CAP_NAME:-"se:recordVideo"}
2020
TEST_NAME_CAP=${TEST_NAME_CAP:-"se:name"}

Diff for: charts/selenium-grid/configs/distributor/distributorProbe.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ ts_format=${SE_LOG_TIMESTAMP_FORMAT:-"+%T.%3N"}
77
ROUTER_CONFIG_DIRECTORY=${ROUTER_CONFIG_DIRECTORY:-"/opt/bin"}
88

99
GRID_GRAPHQL_URL=$(bash ${ROUTER_CONFIG_DIRECTORY}/routerGraphQLUrl.sh)
10-
BASIC_AUTH="$(echo -n "${SE_ROUTER_USERNAME}:${SE_ROUTER_PASSWORD}" | base64)"
10+
BASIC_AUTH="$(echo -en "${SE_ROUTER_USERNAME}:${SE_ROUTER_PASSWORD}" | base64 -w0)"
1111

1212
if [ -z "${GRID_GRAPHQL_URL}" ]; then
1313
echo "$(date ${ts_format}) DEBUG [${probe_name}] - Could not construct GraphQL endpoint, please provide SE_HUB_HOST (or SE_ROUTER_HOST) and SE_HUB_PORT (or SE_ROUTER_PORT). Bypass the probe checks for now."

Diff for: charts/selenium-grid/configs/node/nodeGridUrl.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
max_time=3
44

5-
BASIC_AUTH="$(echo -n "${SE_ROUTER_USERNAME}:${SE_ROUTER_PASSWORD}" | base64)"
5+
BASIC_AUTH="$(echo -en "${SE_ROUTER_USERNAME}:${SE_ROUTER_PASSWORD}" | base64 -w0)"
66

77
if [ "${SE_SUB_PATH}" = "/" ]; then
88
SE_SUB_PATH=""

Diff for: charts/selenium-grid/configs/node/nodePreStop.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ function signal_hub_to_drain_node() {
3333
return_list=($(bash ${NODE_CONFIG_DIRECTORY}/nodeGridUrl.sh))
3434
grid_url=${return_list[0]}
3535
grid_check=${return_list[1]}
36-
BASIC_AUTH="$(echo -n "${SE_ROUTER_USERNAME}:${SE_ROUTER_PASSWORD}" | base64)"
36+
BASIC_AUTH="$(echo -en "${SE_ROUTER_USERNAME}:${SE_ROUTER_PASSWORD}" | base64 -w0)"
3737
if [ -n "${grid_url}" ]; then
3838
if [ "${grid_check}" = "401" ]; then
3939
echo "$(date +%FT%T%Z) [${probe_name}] - Hub/Router requires authentication. Please check SE_ROUTER_USERNAME and SE_ROUTER_PASSWORD."

Diff for: charts/selenium-grid/configs/node/nodeProbe.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ if curl --noproxy "*" -m ${max_time} -sfk ${SE_SERVER_PROTOCOL}://127.0.0.1:${SE
3939
return_list=($(bash ${NODE_CONFIG_DIRECTORY}/nodeGridUrl.sh))
4040
grid_url=${return_list[0]}
4141
grid_check=${return_list[1]}
42-
BASIC_AUTH="$(echo -n "${SE_ROUTER_USERNAME}:${SE_ROUTER_PASSWORD}" | base64)"
42+
BASIC_AUTH="$(echo -en "${SE_ROUTER_USERNAME}:${SE_ROUTER_PASSWORD}" | base64 -w0)"
4343

4444
if [ -n "${grid_url}" ]; then
4545
if [ "${grid_check}" = "401" ]; then

Diff for: charts/selenium-grid/configs/router/routerProbe.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ ts_format=${SE_LOG_TIMESTAMP_FORMAT:-"+%T.%3N"}
77
ROUTER_CONFIG_DIRECTORY=${ROUTER_CONFIG_DIRECTORY:-"/opt/bin"}
88

99
GRID_GRAPHQL_URL=$(bash ${ROUTER_CONFIG_DIRECTORY}/routerGraphQLUrl.sh)
10-
BASIC_AUTH="$(echo -n "${SE_ROUTER_USERNAME}:${SE_ROUTER_PASSWORD}" | base64)"
10+
BASIC_AUTH="$(echo -en "${SE_ROUTER_USERNAME}:${SE_ROUTER_PASSWORD}" | base64 -w0)"
1111

1212
if [ -z "${GRID_GRAPHQL_URL}" ]; then
1313
echo "$(date ${ts_format}) DEBUG [${probe_name}] - Could not construct GraphQL endpoint, please provide SE_HUB_HOST (or SE_ROUTER_HOST) and SE_HUB_PORT (or SE_ROUTER_PORT). Bypass the probe checks for now."

Diff for: tests/CDPTests/bootstrap.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ SELENIUM_REMOTE_URL="${SELENIUM_GRID_PROTOCOL}://${SELENIUM_GRID_HOST}:${SELENIU
1111
echo "SELENIUM_REMOTE_URL=${SELENIUM_REMOTE_URL}" > .env
1212

1313
if [ -n ${SELENIUM_GRID_USERNAME} ] && [ -n ${SELENIUM_GRID_PASSWORD} ]; then
14-
BASIC_AUTH="$(echo -n "${SELENIUM_GRID_USERNAME}:${SELENIUM_GRID_PASSWORD}" | base64)"
14+
BASIC_AUTH="$(echo -en "${SELENIUM_GRID_USERNAME}:${SELENIUM_GRID_PASSWORD}" | base64 -w0)"
1515
echo "SELENIUM_REMOTE_HEADERS={\"Authorization\": \"Basic ${BASIC_AUTH}\"}" >> .env
1616
fi
1717

0 commit comments

Comments
 (0)