diff --git a/examples/build-standalone.sh b/examples/build-standalone.sh
index c11b6c4..f11ce8e 100755
--- a/examples/build-standalone.sh
+++ b/examples/build-standalone.sh
@@ -9,9 +9,11 @@ cat > "$OUT" << HEADER
#!/bin/bash
set -euo pipefail
VERSION="$VERSION"
+SCRIPT_DIR="\$(cd "\$(dirname "\$0")" && pwd)"
+SCRIPT_PATH="\$SCRIPT_DIR/\$(basename "\$0")"
HEADER
-for lib in colors config detect validate dscl suppress backup status heal firewall harden whitelist check monitor history doctor selfupdate uninstall report ma_detect demo vpn; do
+for lib in colors config detect validate dscl suppress backup status launchd heal firewall harden whitelist check monitor history doctor selfupdate uninstall report ma_detect demo vpn; do
tail -n +1 "$SCRIPT_DIR/lib/$lib.sh" >> "$OUT"
echo "" >> "$OUT"
done
diff --git a/lib/heal.sh b/lib/heal.sh
index 08d5157..cfa8567 100644
--- a/lib/heal.sh
+++ b/lib/heal.sh
@@ -70,11 +70,7 @@ install_persist_launchdaemon() {
root="$(_persist_mount_root "$data_mount")"
local unleash_src
- if [ -n "$SCRIPT_DIR" ]; then
- unleash_src="$SCRIPT_DIR/unleash"
- else
- unleash_src="$(cd "$(dirname "$0")" && pwd)/unleash"
- fi
+ unleash_src=$(_launchd_script_path)
step "Installing LaunchDaemon for boot-time persistence..."
@@ -93,8 +89,8 @@ install_persist_launchdaemon() {
ProgramArguments
/bin/bash
- -c
- ${unleash_src} heal
+ ${unleash_src}
+ heal
RunAtLoad
diff --git a/lib/launchd.sh b/lib/launchd.sh
new file mode 100644
index 0000000..197a44c
--- /dev/null
+++ b/lib/launchd.sh
@@ -0,0 +1,7 @@
+_launchd_script_path() {
+ local script_path="${SCRIPT_PATH:-}"
+ if [ -z "$script_path" ]; then
+ script_path="$(cd "$(dirname "$0")" && pwd)/$(basename "$0")"
+ fi
+ printf '%s' "$script_path" | sed 's/&/\&/g; s/\</g; s/>/\>/g'
+}
diff --git a/tests/test_persistence.bats b/tests/test_persistence.bats
new file mode 100644
index 0000000..31e6706
--- /dev/null
+++ b/tests/test_persistence.bats
@@ -0,0 +1,39 @@
+#!/usr/bin/env bats
+
+@test "persistence invokes renamed scripts with spaces and XML text literally" {
+ local entrypoint
+ for entrypoint in unleash unleash-standalone.sh; do
+ local folder="$BATS_TEST_TMPDIR/$entrypoint/Tool Folder & \"quoted\""
+ local target="$BATS_TEST_TMPDIR/$entrypoint/Target"
+ local script="$folder/renamed standalone.sh"
+ local definitions="$BATS_TEST_TMPDIR/$entrypoint.functions"
+ mkdir -p "$folder" "$target/Library"
+ printf '#!/bin/bash\nprintf "ACTION=%%s\\n" "$1"\n' > "$script"
+ if [ "$entrypoint" = unleash ]; then
+ ln -s "$BATS_TEST_DIRNAME/../lib" "$folder/lib"
+ fi
+ sed '/^main "\$@"$/d' "$BATS_TEST_DIRNAME/../$entrypoint" > "$definitions"
+ run "${UNLEASH_TEST_SHELL:-bash}" -u -c '
+ unset SCRIPT_DIR SCRIPT_PATH
+ source "$1"
+ expected="$2/Library/LaunchDaemons"
+ mkdir() {
+ [ "$#" -eq 2 ] && [ "$1" = -p ] && [ "$2" = "$expected" ] || return 97
+ command mkdir "$@"
+ }
+ install_persist_launchdaemon "$2"
+ ' "$script" "$definitions" "$target"
+ [ "$status" -eq 0 ]
+ run python3 - "$target/Library/LaunchDaemons/com.unleash.heal.plist" "$script" <<'PY'
+import plistlib,subprocess,sys
+with open(sys.argv[1],'rb') as source:
+ data=plistlib.load(source)
+expected=['/bin/bash',sys.argv[2],'heal']
+assert data['ProgramArguments']==expected, data['ProgramArguments']
+result=subprocess.run(expected,capture_output=True,text=True,timeout=5)
+assert result.returncode==0, result.stderr
+assert result.stdout=='ACTION=heal\n', result.stdout
+PY
+ [ "$status" -eq 0 ]
+ done
+}
diff --git a/unleash b/unleash
index 2c09c35..93e1d35 100755
--- a/unleash
+++ b/unleash
@@ -4,9 +4,10 @@ set -euo pipefail
VERSION="2.0.0"
SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
+SCRIPT_PATH="$SCRIPT_DIR/$(basename "$0")"
LIB_DIR="$SCRIPT_DIR/lib"
-for _lib in colors config detect validate dscl suppress backup status heal firewall harden whitelist check monitor history doctor selfupdate uninstall report ma_detect demo vpn init suggest remediate telemetry predict discord; do
+for _lib in colors config detect validate dscl suppress backup status launchd heal firewall harden whitelist check monitor history doctor selfupdate uninstall report ma_detect demo vpn init suggest remediate telemetry predict discord; do
_lib_path="$LIB_DIR/$_lib.sh"
if [ -f "$_lib_path" ]; then
source "$_lib_path"
diff --git a/unleash-standalone.sh b/unleash-standalone.sh
index 5a5e151..b5a1bde 100755
--- a/unleash-standalone.sh
+++ b/unleash-standalone.sh
@@ -1,6 +1,8 @@
#!/bin/bash
set -euo pipefail
VERSION="2.0.0"
+SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
+SCRIPT_PATH="$SCRIPT_DIR/$(basename "$0")"
RED='\033[1;31m'
GRN='\033[1;32m'
BLU='\033[1;34m'
@@ -940,6 +942,14 @@ deep_status_json() {
echo -e "$json"
}
+_launchd_script_path() {
+ local script_path="${SCRIPT_PATH:-}"
+ if [ -z "$script_path" ]; then
+ script_path="$(cd "$(dirname "$0")" && pwd)/$(basename "$0")"
+ fi
+ printf '%s' "$script_path" | sed 's/&/\&/g; s/\</g; s/>/\>/g'
+}
+
heal_suppress() {
local data_mount="$1"
@@ -1012,11 +1022,7 @@ install_persist_launchdaemon() {
root="$(_persist_mount_root "$data_mount")"
local unleash_src
- if [ -n "$SCRIPT_DIR" ]; then
- unleash_src="$SCRIPT_DIR/unleash"
- else
- unleash_src="$(cd "$(dirname "$0")" && pwd)/unleash"
- fi
+ unleash_src=$(_launchd_script_path)
step "Installing LaunchDaemon for boot-time persistence..."
@@ -1035,8 +1041,8 @@ install_persist_launchdaemon() {
ProgramArguments
/bin/bash
- -c
- ${unleash_src} heal
+ ${unleash_src}
+ heal
RunAtLoad