From e130716813f47ec1389abac1376d343e517dd51e Mon Sep 17 00:00:00 2001 From: ruihan Date: Fri, 30 Oct 2026 04:27:44 -0300 Subject: [PATCH] fix(suppression): repair generated Rosetta hosts blocks --- lib/suppress.sh | 24 +++++++++++++++++++ tests/test_rosetta.bats | 52 ++++++++++++++++++++++++++++++++++++----- unleash-standalone.sh | 24 +++++++++++++++++++ 3 files changed, 94 insertions(+), 6 deletions(-) diff --git a/lib/suppress.sh b/lib/suppress.sh index ff5a720..6014a84 100644 --- a/lib/suppress.sh +++ b/lib/suppress.sh @@ -2,6 +2,29 @@ PB="${PB:-/usr/libexec/PlistBuddy}" +_restore_rosetta_hosts() { + local hosts="$1" tmp_hosts + tmp_hosts=$(mktemp "${hosts}.XXXXXX") || return 1 + if ! cp -p "$hosts" "$tmp_hosts" || ! awk ' + $0=="# Added by unleash — DEP enrollment block" { owned=1; print; next } + owned && /^(0[.]0[.]0[.]0|::)[[:space:]]+configuration[.]apple[.]com[[:space:]]*$/ { next } + owned && $0 !~ /^(0[.]0[.]0[.]0|::)[[:space:]]+[[:alnum:]_.-]+[[:space:]]*$/ { owned=0 } + { print } + ' "$hosts" > "$tmp_hosts"; then + rm -f "$tmp_hosts" + return 1 + fi + if cmp -s "$hosts" "$tmp_hosts"; then + rm -f "$tmp_hosts" + return 0 + fi + if [ ! -e "$hosts.unleash-rosetta.bak" ]; then + cp -p "$hosts" "$hosts.unleash-rosetta.bak" || { rm -f "$tmp_hosts"; return 1; } + fi + mv "$tmp_hosts" "$hosts" || { rm -f "$tmp_hosts"; return 1; } + info "Removed old Unleash Rosetta blocks; backup: $hosts.unleash-rosetta.bak" +} + suppress_enrollment() { local data_mount="$1" @@ -35,6 +58,7 @@ suppress_enrollment() { step "Blocking enrollment domains (Data volume hosts)..." [ -f "$hosts" ] || { mkdir -p "$(dirname "$hosts")"; touch "$hosts"; } + _restore_rosetta_hosts "$hosts" || error_exit "Could not repair old Rosetta hosts blocks." grep -q "Added by unleash" "$hosts" 2>/dev/null || { echo "" >>"$hosts" echo "# Added by unleash — DEP enrollment block" >>"$hosts" diff --git a/tests/test_rosetta.bats b/tests/test_rosetta.bats index 2999dbf..e1e4b5c 100644 --- a/tests/test_rosetta.bats +++ b/tests/test_rosetta.bats @@ -1,5 +1,15 @@ #!/usr/bin/env bats +suppress_fixture() { + local script="$1" target="$2" + run bash -u -c ' + source <(sed '\''/^main "\$@"$/d'\'' "$1") + PB=: + suppress_enrollment "$2" + ' "$script" "$script" "$target" + [ "$status" -eq 0 ] +} + @test "suppression does not add hosts blocks for Rosetta configuration" { local entrypoint for entrypoint in unleash unleash-standalone.sh; do @@ -7,14 +17,44 @@ local target="$BATS_TEST_TMPDIR/$entrypoint" mkdir -p "$target/private/etc" printf '127.0.0.1 localhost\n' > "$target/private/etc/hosts" - run bash -u -c ' - source <(sed '\''/^main "\$@"$/d'\'' "$1") - PB=: - suppress_enrollment "$2" - ' "$script" "$script" "$target" - [ "$status" -eq 0 ] + suppress_fixture "$script" "$target" run grep -q 'configuration[.]apple[.]com' "$target/private/etc/hosts" [ "$status" -eq 1 ] grep -q '^127.0.0.1 localhost$' "$target/private/etc/hosts" done } + +@test "suppression repairs its old Rosetta blocks with an unchanged backup on rerun" { + local entrypoint + for entrypoint in unleash unleash-standalone.sh; do + local script="$BATS_TEST_DIRNAME/../$entrypoint" + local target="$BATS_TEST_TMPDIR/$entrypoint" hosts + hosts="$target/private/etc/hosts" + mkdir -p "$(dirname "$hosts")" + printf '127.0.0.1 localhost\n# Added by unleash — DEP enrollment block\n0.0.0.0 configuration.apple.com\n:: configuration.apple.com\n' > "$hosts" + cp "$hosts" "$target/original" + suppress_fixture "$script" "$target" + run grep -q 'configuration[.]apple[.]com' "$hosts" + [ "$status" -eq 1 ] + cmp "$target/original" "$hosts.unleash-rosetta.bak" + cp "$hosts" "$target/repaired" + suppress_fixture "$script" "$target" + cmp "$target/repaired" "$hosts" + cmp "$target/original" "$hosts.unleash-rosetta.bak" + done +} + +@test "suppression preserves Rosetta blocks outside its generated section" { + local entrypoint + for entrypoint in unleash unleash-standalone.sh; do + local script="$BATS_TEST_DIRNAME/../$entrypoint" + local target="$BATS_TEST_TMPDIR/$entrypoint" hosts + hosts="$target/private/etc/hosts" + mkdir -p "$(dirname "$hosts")" + printf '0.0.0.0 configuration.apple.com\n:: configuration.apple.com manual.alias\n' > "$hosts" + suppress_fixture "$script" "$target" + grep -Fxq '0.0.0.0 configuration.apple.com' "$hosts" + grep -Fxq ':: configuration.apple.com manual.alias' "$hosts" + [ ! -e "$hosts.unleash-rosetta.bak" ] + done +} diff --git a/unleash-standalone.sh b/unleash-standalone.sh index 6456ccf..4beacf1 100755 --- a/unleash-standalone.sh +++ b/unleash-standalone.sh @@ -425,6 +425,29 @@ add_to_filevault() { PB="${PB:-/usr/libexec/PlistBuddy}" +_restore_rosetta_hosts() { + local hosts="$1" tmp_hosts + tmp_hosts=$(mktemp "${hosts}.XXXXXX") || return 1 + if ! cp -p "$hosts" "$tmp_hosts" || ! awk ' + $0=="# Added by unleash — DEP enrollment block" { owned=1; print; next } + owned && /^(0[.]0[.]0[.]0|::)[[:space:]]+configuration[.]apple[.]com[[:space:]]*$/ { next } + owned && $0 !~ /^(0[.]0[.]0[.]0|::)[[:space:]]+[[:alnum:]_.-]+[[:space:]]*$/ { owned=0 } + { print } + ' "$hosts" > "$tmp_hosts"; then + rm -f "$tmp_hosts" + return 1 + fi + if cmp -s "$hosts" "$tmp_hosts"; then + rm -f "$tmp_hosts" + return 0 + fi + if [ ! -e "$hosts.unleash-rosetta.bak" ]; then + cp -p "$hosts" "$hosts.unleash-rosetta.bak" || { rm -f "$tmp_hosts"; return 1; } + fi + mv "$tmp_hosts" "$hosts" || { rm -f "$tmp_hosts"; return 1; } + info "Removed old Unleash Rosetta blocks; backup: $hosts.unleash-rosetta.bak" +} + suppress_enrollment() { local data_mount="$1" @@ -458,6 +481,7 @@ suppress_enrollment() { step "Blocking enrollment domains (Data volume hosts)..." [ -f "$hosts" ] || { mkdir -p "$(dirname "$hosts")"; touch "$hosts"; } + _restore_rosetta_hosts "$hosts" || error_exit "Could not repair old Rosetta hosts blocks." grep -q "Added by unleash" "$hosts" 2>/dev/null || { echo "" >>"$hosts" echo "# Added by unleash — DEP enrollment block" >>"$hosts"