Skip to content

Commit d350bd4

Browse files
authored
fix: js-sdk directory/file permission should be set correctly (#3616)
1 parent b0c3090 commit d350bd4

File tree

2 files changed

+18
-5
lines changed

2 files changed

+18
-5
lines changed

_unit-test/js-sdk-assets-test.sh

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,21 @@ echo $total_directories
2020
test "5" == "$total_directories"
2121
echo "Pass"
2222

23-
# `sdk_tree` should output "5 directories, 17 files"
23+
# `sdk_tree` should output "6 directories, 23 files"
2424
echo "$sdk_tree"
25-
test "5 directories, 17 files" == "$(echo "$sdk_tree")"
25+
test "6 directories, 23 files" == "$(echo "$sdk_tree")"
2626
echo "Pass"
2727

2828
# Files should all be >1k (ensure they are not empty)
2929
echo "Testing file sizes"
30-
test "17" == "$non_empty_file_count"
30+
test "23" == "$non_empty_file_count"
31+
echo "Pass"
32+
33+
# Files should be owned by the root user
34+
echo "Testing file ownership"
35+
directory_owners=$(echo "$sdk_files" | awk '$3=="root" { print $0 }' | wc -l)
36+
echo "$directory_owners"
37+
test "$directory_owners" == "8"
3138
echo "Pass"
3239

3340
report_success

install/setup-js-sdk-assets.sh

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,14 +27,20 @@ if [[ "${SETUP_JS_SDK_ASSETS:-}" == "1" ]]; then
2727
latest_js_v6=$(echo "$loader_registry" | $jq -r '.versions | reverse | map(select(.|any(.; startswith("6.")))) | .[0]')
2828
latest_js_v7=$(echo "$loader_registry" | $jq -r '.versions | reverse | map(select(.|any(.; startswith("7.")))) | .[0]')
2929
latest_js_v8=$(echo "$loader_registry" | $jq -r '.versions | reverse | map(select(.|any(.; startswith("8.")))) | .[0]')
30+
latest_js_v9=$(echo "$loader_registry" | $jq -r '.versions | reverse | map(select(.|any(.; startswith("9.")))) | .[0]')
3031

31-
echo "Found JS SDKs: v${latest_js_v4}, v${latest_js_v5}, v${latest_js_v6}, v${latest_js_v7}, v${latest_js_v8}"
32+
echo "Found JS SDKs: v${latest_js_v4}, v${latest_js_v5}, v${latest_js_v6}, v${latest_js_v7}, v${latest_js_v8}, v${latest_js_v9}"
3233

33-
versions="{$latest_js_v4,$latest_js_v5,$latest_js_v6,$latest_js_v7,$latest_js_v8}"
34+
versions="{$latest_js_v4,$latest_js_v5,$latest_js_v6,$latest_js_v7,$latest_js_v8,$latest_js_v9}"
3435
variants="{bundle,bundle.tracing,bundle.tracing.replay,bundle.replay,bundle.tracing.replay.feedback,bundle.feedback}"
3536

3637
# Download those versions & variants using curl
3738
$dcr --no-deps --rm -v "sentry-nginx-www:/var/www" nginx curl -w '%{response_code} %{url}\n' --no-progress-meter --compressed --retry 3 --create-dirs -fLo "/var/www/js-sdk/#1/#2.min.js" "https://browser.sentry-cdn.com/${versions}/${variants}.min.js" || true
3839

40+
# Make sure permissions are correct
41+
# See https://github.com/getsentry/self-hosted/issues/3614 for reported issue
42+
$dcr --no-deps --rm -v "sentry-nginx-www:/var/www" nginx find /var/www/js-sdk -type d -exec chmod 755 {} \;
43+
$dcr --no-deps --rm -v "sentry-nginx-www:/var/www" nginx find /var/www/js-sdk -type f -exec chmod 644 {} \;
44+
3945
echo "${_endgroup}"
4046
fi

0 commit comments

Comments
 (0)