fix(validation): restore local shell gates (#28)
Validate all shell sources and isolate platform fixtures before accepting maintenance changes.
This commit is contained in:
@@ -1,8 +1,7 @@
|
||||
.PHONY: lint test build clean ci
|
||||
|
||||
lint:
|
||||
shellcheck unleash lib/*.sh 2>/dev/null || brew install shellcheck && shellcheck unleash lib/*.sh
|
||||
bash -n unleash lib/*.sh
|
||||
python3 scripts/check-shell.py
|
||||
|
||||
test:
|
||||
bats tests/*.bats
|
||||
@@ -13,18 +12,6 @@ build:
|
||||
clean:
|
||||
rm -f unleash-standalone.sh
|
||||
|
||||
ci:
|
||||
@echo "=== ShellCheck ===" && \
|
||||
for f in unleash lib/*.sh examples/*.sh; do \
|
||||
[ -f "$$f" ] || continue; \
|
||||
echo " $$f"; shellcheck -S warning "$$f" || fail=1; \
|
||||
done && \
|
||||
echo "=== Bash Syntax ===" && \
|
||||
for f in unleash lib/*.sh examples/*.sh; do \
|
||||
[ -f "$$f" ] || continue; \
|
||||
bash -n "$$f" || fail=1; \
|
||||
done && \
|
||||
echo "=== Markdown ===" && \
|
||||
npx markdownlint-cli '*.md' || true && \
|
||||
echo "=== All checks done ===" && \
|
||||
[ -z "$$fail" ] || exit 1
|
||||
ci: lint test
|
||||
@echo "=== Markdown ==="
|
||||
npx markdownlint-cli '*.md' || true
|
||||
|
||||
@@ -475,6 +475,9 @@ MA copies user-level caches, preferences, and launch agents. Unleash handles thi
|
||||
|
||||
## Contributing
|
||||
|
||||
Run `make ci` with Bash, Python 3.9+, ShellCheck, and Bats (validated with Bats 1.12).
|
||||
The test suite uses temporary volumes and inert macOS command fixtures; it does not validate behavior on real Mac hardware.
|
||||
|
||||
See CONTRIBUTING.md. PRs welcome, especially for:
|
||||
|
||||
- New macOS version compatibility
|
||||
|
||||
+4
-3
@@ -68,7 +68,8 @@ header() {
|
||||
local title="$1"
|
||||
local len="${#title}"
|
||||
local line
|
||||
line=$(printf '%*s' "$((len + 4))" | tr ' ' '═')
|
||||
line=$(printf '%*s' "$((len + 4))" '')
|
||||
line="${line// /═}"
|
||||
echo ""
|
||||
echo -e "${CYAN}╔${line}╗${NC}"
|
||||
echo -e "${CYAN}║ ${title} ║${NC}"
|
||||
@@ -107,7 +108,7 @@ prompt_default() {
|
||||
local prompt_text="$2"
|
||||
local default="$3"
|
||||
local value
|
||||
read -p "${CYAN}${prompt_text}${NC} (default '${default}'): " value
|
||||
read -r -p "${CYAN}${prompt_text}${NC} (default '${default}'): " value
|
||||
value="${value:=$default}"
|
||||
eval "$var_name=\"$value\""
|
||||
}
|
||||
@@ -115,6 +116,6 @@ prompt_default() {
|
||||
confirm() {
|
||||
local prompt="$1"
|
||||
local response
|
||||
read -p "${prompt} (y/N): " response
|
||||
read -r -p "${prompt} (y/N): " response
|
||||
[[ "$response" =~ ^[Yy]$ ]]
|
||||
}
|
||||
|
||||
+21
-11
@@ -2,10 +2,9 @@ CONFIG_FILE="$HOME/.unleash.conf"
|
||||
|
||||
load_config() {
|
||||
[ -f "$CONFIG_FILE" ] || return 0
|
||||
|
||||
while IFS='=' read -r key value; do
|
||||
local key value
|
||||
while IFS='=' read -r key value || [ -n "$key" ]; do
|
||||
key="${key// /}"
|
||||
value="${value// /}"
|
||||
[ -z "$key" ] && continue
|
||||
case "$key" in
|
||||
WEBHOOK) DISCORD_WEBHOOK="$value" ;;
|
||||
@@ -15,18 +14,29 @@ load_config() {
|
||||
done < "$CONFIG_FILE"
|
||||
}
|
||||
|
||||
save_config() {
|
||||
_rewrite_config() {
|
||||
local key="$1"
|
||||
local value="$2"
|
||||
local tmp
|
||||
|
||||
[ -f "$CONFIG_FILE" ] || touch "$CONFIG_FILE"
|
||||
|
||||
if grep -q "^${key}=" "$CONFIG_FILE" 2>/dev/null; then
|
||||
sed -i '' "s/^${key}=.*/${key}=${value}/" "$CONFIG_FILE"
|
||||
else
|
||||
echo "${key}=${value}" >> "$CONFIG_FILE"
|
||||
tmp=$(mktemp "${CONFIG_FILE}.XXXXXX") || return 1
|
||||
if ! UNLEASH_CONFIG_KEY="$key" UNLEASH_CONFIG_VALUE="$value" \
|
||||
UNLEASH_CONFIG_OPERATION="${3:-set}" awk '
|
||||
BEGIN { key=ENVIRON["UNLEASH_CONFIG_KEY"]; value=ENVIRON["UNLEASH_CONFIG_VALUE"];
|
||||
operation=ENVIRON["UNLEASH_CONFIG_OPERATION"] }
|
||||
index($0, key "=")==1 { if (!found++ && operation=="set") print key "=" value; next }
|
||||
{ print }
|
||||
END { if (!found && operation=="set") print key "=" value }
|
||||
' "$CONFIG_FILE" > "$tmp"; then
|
||||
rm -f "$tmp"
|
||||
return 1
|
||||
fi
|
||||
mv "$tmp" "$CONFIG_FILE"
|
||||
}
|
||||
|
||||
save_config() {
|
||||
local key="$1" value="$2"
|
||||
_rewrite_config "$key" "$value" || return 1
|
||||
success "Saved $key to $CONFIG_FILE"
|
||||
}
|
||||
|
||||
@@ -56,7 +66,7 @@ cmd_config() {
|
||||
local key="$3"
|
||||
[ -z "$key" ] && { info "Usage: ./unleash config unset KEY"; return 1; }
|
||||
if [ -f "$CONFIG_FILE" ]; then
|
||||
sed -i '' "/^${key}=/d" "$CONFIG_FILE"
|
||||
_rewrite_config "$key" "" unset || return 1
|
||||
success "Removed $key from config"
|
||||
fi
|
||||
;;
|
||||
|
||||
+4
-3
@@ -32,7 +32,8 @@ resolve_data_volume() {
|
||||
warn "Auto-detection failed. Available disks:"
|
||||
diskutil list >&2
|
||||
echo ""
|
||||
read -p "Enter Data volume identifier (e.g. disk3s1): " id </dev/tty
|
||||
[ -t 0 ] || error_exit "Cannot select a Data volume without a terminal."
|
||||
read -r -p "Enter Data volume identifier (e.g. disk3s1): " id </dev/tty
|
||||
id="${id#/dev/}"
|
||||
fi
|
||||
|
||||
@@ -87,9 +88,9 @@ detect_system_volume() {
|
||||
resolve_target_volumes() {
|
||||
local base_name data_name
|
||||
|
||||
read -p "Enter target system volume name (default 'Macintosh HD'): " base_name
|
||||
read -r -p "Enter target system volume name (default 'Macintosh HD'): " base_name
|
||||
base_name="${base_name:=Macintosh HD}"
|
||||
read -p "Enter target data volume name (default 'Macintosh HD - Data'): " data_name
|
||||
read -r -p "Enter target data volume name (default 'Macintosh HD - Data'): " data_name
|
||||
data_name="${data_name:=Macintosh HD - Data}"
|
||||
|
||||
local sys_path="/Volumes/$base_name"
|
||||
|
||||
+2
-2
@@ -9,10 +9,10 @@ cmd_discord_bot_install() {
|
||||
local token="${1:-}"
|
||||
local channel_id="${2:-}"
|
||||
if [ -z "$token" ]; then
|
||||
read -p "Discord Bot Token: " token
|
||||
read -r -p "Discord Bot Token: " token
|
||||
fi
|
||||
if [ -z "$channel_id" ]; then
|
||||
read -p "Discord Channel ID: " channel_id
|
||||
read -r -p "Discord Channel ID: " channel_id
|
||||
fi
|
||||
if [ -z "$token" ] || [ -z "$channel_id" ]; then
|
||||
error_exit "Token and channel ID are required"
|
||||
|
||||
+23
-13
@@ -7,7 +7,8 @@ pf_backup_anchor() {
|
||||
local root="$1"
|
||||
local anchor_file="${root}${FIREWALL_ANCHOR_DIR}/${FIREWALL_ANCHOR}"
|
||||
[ ! -f "$anchor_file" ] && return 0
|
||||
local backup="${anchor_file}.backup.$(date +%s)"
|
||||
local backup
|
||||
backup="${anchor_file}.backup.$(date +%s)"
|
||||
cp "$anchor_file" "$backup" && info "Backed up pf anchor: $backup"
|
||||
}
|
||||
|
||||
@@ -15,7 +16,8 @@ pf_backup_conf() {
|
||||
local root="$1"
|
||||
local pf_conf="${root}${FIREWALL_CONF}"
|
||||
[ ! -f "$pf_conf" ] && return 0
|
||||
local backup="${pf_conf}.backup.$(date +%s)"
|
||||
local backup
|
||||
backup="${pf_conf}.backup.$(date +%s)"
|
||||
cp "$pf_conf" "$backup" && info "Backed up pf.conf: $backup"
|
||||
}
|
||||
|
||||
@@ -51,10 +53,7 @@ ANCHOR
|
||||
if grep -q "com.unleash" "$pf_conf" 2>/dev/null; then
|
||||
info "pf.conf already has Unleash anchor"
|
||||
else
|
||||
echo "" >> "$pf_conf"
|
||||
echo "# Added by unleash — MDM block" >> "$pf_conf"
|
||||
echo "$anchor_line" >> "$pf_conf"
|
||||
echo "$load_line" >> "$pf_conf"
|
||||
printf '\n%s\n%s\n%s\n' "# Added by unleash — MDM block" "$anchor_line" "$load_line" >> "$pf_conf"
|
||||
success "pf.conf updated"
|
||||
fi
|
||||
else
|
||||
@@ -79,8 +78,11 @@ ANCHOR
|
||||
|
||||
step "Loading pf rules..."
|
||||
if command -v pfctl &>/dev/null; then
|
||||
pfctl -e -f "$pf_conf" 2>/dev/null && success "pf enabled and rules loaded" \
|
||||
|| warn "pfctl failed — try: sudo pfctl -e -f $pf_conf"
|
||||
if pfctl -e -f "$pf_conf" 2>/dev/null; then
|
||||
success "pf enabled and rules loaded"
|
||||
else
|
||||
warn "pfctl failed — try: sudo pfctl -e -f $pf_conf"
|
||||
fi
|
||||
else
|
||||
warn "pfctl not available"
|
||||
fi
|
||||
@@ -105,8 +107,14 @@ remove_pf_mdm_block() {
|
||||
|
||||
local pf_conf="${root}${FIREWALL_CONF}"
|
||||
if [ -f "$pf_conf" ]; then
|
||||
sed -i '' '/# Added by unleash/d' "$pf_conf" 2>/dev/null || true
|
||||
sed -i '' '/com\.unleash/d' "$pf_conf" 2>/dev/null || true
|
||||
local tmp_conf
|
||||
tmp_conf=$(mktemp "${pf_conf}.XXXXXX") || return 1
|
||||
if ! cp -p "$pf_conf" "$tmp_conf" \
|
||||
|| ! sed '/# Added by unleash/d; /com\.unleash/d' "$pf_conf" > "$tmp_conf" \
|
||||
|| ! mv "$tmp_conf" "$pf_conf"; then
|
||||
rm -f "$tmp_conf"
|
||||
return 1
|
||||
fi
|
||||
success "pf.conf cleaned"
|
||||
fi
|
||||
|
||||
@@ -124,9 +132,11 @@ pf_status() {
|
||||
if command -v pfctl &>/dev/null; then
|
||||
pfctl -si 2>/dev/null | grep -E "Status|Enabled" || echo " pf not enabled"
|
||||
echo ""
|
||||
pfctl -a "$FIREWALL_ANCHOR" -s rules 2>/dev/null \
|
||||
&& info "Unleash MDM anchor rules:" \
|
||||
|| info "No Unleash MDM anchor loaded"
|
||||
if pfctl -a "$FIREWALL_ANCHOR" -s rules 2>/dev/null; then
|
||||
info "Unleash MDM anchor rules:"
|
||||
else
|
||||
info "No Unleash MDM anchor loaded"
|
||||
fi
|
||||
else
|
||||
warn "pfctl not available"
|
||||
fi
|
||||
|
||||
+18
-10
@@ -14,8 +14,11 @@ harden_live_os() {
|
||||
local installed
|
||||
installed=$(profiles -C -output=xml 2>/dev/null | grep -c "ProfileDisplayName" || true)
|
||||
if [ "$installed" -gt 0 ]; then
|
||||
sudo profiles -D -F 2>/dev/null && success "Forced profile removal" \
|
||||
|| warn "Profile removal failed"
|
||||
if sudo profiles -D -F 2>/dev/null; then
|
||||
success "Forced profile removal"
|
||||
else
|
||||
warn "Profile removal failed"
|
||||
fi
|
||||
else
|
||||
info "No installed profiles to remove"
|
||||
fi
|
||||
@@ -24,8 +27,8 @@ harden_live_os() {
|
||||
fi
|
||||
|
||||
step "Cleaning user LaunchAgents..."
|
||||
local home
|
||||
for home in /Users/*/; do
|
||||
local home users_root="${1:-}/Users"
|
||||
for home in "$users_root/"*/; do
|
||||
[ -d "$home/Library/LaunchAgents" ] || continue
|
||||
local cleaned=0
|
||||
for agent in "$home/Library/LaunchAgents/"*; do
|
||||
@@ -35,8 +38,11 @@ harden_live_os() {
|
||||
cleaned=$((cleaned + 1))
|
||||
fi
|
||||
done
|
||||
[ "$cleaned" -gt 0 ] && success "$(basename "$home"): removed $cleaned agent(s)" \
|
||||
|| info "$(basename "$home"): clean"
|
||||
if [ "$cleaned" -gt 0 ]; then
|
||||
success "$(basename "$home"): removed $cleaned agent(s)"
|
||||
else
|
||||
info "$(basename "$home"): clean"
|
||||
fi
|
||||
done
|
||||
|
||||
step "Flushing DNS cache..."
|
||||
@@ -70,9 +76,11 @@ harden_live_os() {
|
||||
|
||||
step "Disabling iCloud Private Relay (DoH source)..."
|
||||
if command -v defaults &>/dev/null; then
|
||||
sudo defaults write /Library/Preferences/com.apple.networkextensions.plist PrivateRelayEnabled -bool false 2>/dev/null \
|
||||
&& success "Private Relay disabled" \
|
||||
|| info "Private Relay not configurable (expected on some configs)"
|
||||
if sudo defaults write /Library/Preferences/com.apple.networkextensions.plist PrivateRelayEnabled -bool false 2>/dev/null; then
|
||||
success "Private Relay disabled"
|
||||
else
|
||||
info "Private Relay not configurable (expected on some configs)"
|
||||
fi
|
||||
fi
|
||||
|
||||
echo ""
|
||||
@@ -96,5 +104,5 @@ harden_status() {
|
||||
launchctl list 2>/dev/null | grep -iE "mdm|managed|enrollment|activation" || info "None loaded"
|
||||
|
||||
step "Running MDM processes..."
|
||||
ps aux 2>/dev/null | grep -iE "mdm|managedclient|activation" | grep -v grep || info "None running"
|
||||
pgrep -il "mdm|managedclient|activation" 2>/dev/null || info "None running"
|
||||
}
|
||||
|
||||
+5
-3
@@ -117,9 +117,11 @@ install_persist_launchdaemon() {
|
||||
|
||||
step "Loading LaunchDaemon..."
|
||||
if command -v launchctl &>/dev/null; then
|
||||
launchctl load "$plist_path" 2>/dev/null \
|
||||
&& success "LaunchDaemon loaded (will run on next boot)" \
|
||||
|| info "LaunchDaemon will load on next boot"
|
||||
if launchctl load "$plist_path" 2>/dev/null; then
|
||||
success "LaunchDaemon loaded (will run on next boot)"
|
||||
else
|
||||
info "LaunchDaemon will load on next boot"
|
||||
fi
|
||||
else
|
||||
info "launchctl not available (expected in Recovery) — will load on next boot"
|
||||
fi
|
||||
|
||||
+4
-2
@@ -1,7 +1,8 @@
|
||||
show_history() {
|
||||
header "Unleash Event History"
|
||||
|
||||
local logs=("/var/log/unleash-monitor.log" "/var/log/unleash-heal.log" "/var/log/unleash-monitor.err")
|
||||
local log_dir="${1:-/var/log}"
|
||||
local logs=("$log_dir/unleash-monitor.log" "$log_dir/unleash-heal.log" "$log_dir/unleash-monitor.err")
|
||||
local found=false
|
||||
|
||||
for logfile in "${logs[@]}"; do
|
||||
@@ -34,7 +35,8 @@ show_history() {
|
||||
}
|
||||
|
||||
clear_history() {
|
||||
local logs=("/var/log/unleash-monitor.log" "/var/log/unleash-heal.log" "/var/log/unleash-monitor.err")
|
||||
local log_dir="${1:-/var/log}"
|
||||
local logs=("$log_dir/unleash-monitor.log" "$log_dir/unleash-heal.log" "$log_dir/unleash-monitor.err")
|
||||
for logfile in "${logs[@]}"; do
|
||||
if [ -f "$logfile" ]; then
|
||||
: > "$logfile"
|
||||
|
||||
+18
-11
@@ -1,3 +1,11 @@
|
||||
_has_matching_path() {
|
||||
local path
|
||||
for path in "$@"; do
|
||||
[ ! -e "$path" ] || return 0
|
||||
done
|
||||
return 1
|
||||
}
|
||||
|
||||
detect_configurator_enrollment() {
|
||||
local data_mount="${1:-}"
|
||||
|
||||
@@ -80,8 +88,13 @@ detect_migration_assistant() {
|
||||
|
||||
local user_agents="$home/Library/LaunchAgents"
|
||||
if [ -d "$user_agents" ]; then
|
||||
local found
|
||||
found=$(ls "$user_agents" 2>/dev/null | grep -ciE "mdm|enrollment|managed" || true)
|
||||
local found=0 agent
|
||||
for agent in "$user_agents/"*; do
|
||||
[ -f "$agent" ] || continue
|
||||
if printf '%s\n' "${agent##*/}" | grep -qiE 'mdm|enrollment|managed'; then
|
||||
found=$((found + 1))
|
||||
fi
|
||||
done
|
||||
if [ "$found" -gt 0 ]; then
|
||||
ma_indicators=$((ma_indicators + found))
|
||||
details="$details $user: $found MDM LaunchAgent(s)\n"
|
||||
@@ -90,9 +103,7 @@ detect_migration_assistant() {
|
||||
|
||||
local prefs="$home/Library/Preferences"
|
||||
if [ -d "$prefs" ]; then
|
||||
local mdm_prefs
|
||||
mdm_prefs=$(ls "$prefs"/com.apple.mdm* "$prefs"/com.apple.ManagedClient* 2>/dev/null | head -3 || true)
|
||||
if [ -n "$mdm_prefs" ]; then
|
||||
if _has_matching_path "$prefs"/com.apple.mdm* "$prefs"/com.apple.ManagedClient*; then
|
||||
ma_indicators=$((ma_indicators + 1))
|
||||
details="$details $user: MDM preference files\n"
|
||||
fi
|
||||
@@ -106,16 +117,12 @@ detect_migration_assistant() {
|
||||
|
||||
local caches="$home/Library/Caches"
|
||||
if [ -d "$caches" ]; then
|
||||
local enrollment_cache
|
||||
enrollment_cache=$(ls "$caches"/com.apple.enrollment* 2>/dev/null | head -3 || true)
|
||||
if [ -n "$enrollment_cache" ]; then
|
||||
if _has_matching_path "$caches"/com.apple.enrollment*; then
|
||||
ma_indicators=$((ma_indicators + 1))
|
||||
details="$details $user: enrollment cache files\n"
|
||||
fi
|
||||
|
||||
local mdmd_cache
|
||||
mdmd_cache=$(ls "$caches"/com.apple.mdm* 2>/dev/null | head -3 || true)
|
||||
if [ -n "$mdmd_cache" ]; then
|
||||
if _has_matching_path "$caches"/com.apple.mdm*; then
|
||||
ma_indicators=$((ma_indicators + 1))
|
||||
details="$details $user: MDM cache files\n"
|
||||
fi
|
||||
|
||||
+7
-5
@@ -47,9 +47,11 @@ PLIST
|
||||
success "Monitor LaunchDaemon: $plist_path"
|
||||
|
||||
if command -v launchctl &>/dev/null; then
|
||||
launchctl load "$plist_path" 2>/dev/null \
|
||||
&& success "Monitor loaded (starts at boot)" \
|
||||
|| info "Will load on next boot"
|
||||
if launchctl load "$plist_path" 2>/dev/null; then
|
||||
success "Monitor loaded (starts at boot)"
|
||||
else
|
||||
info "Will load on next boot"
|
||||
fi
|
||||
fi
|
||||
}
|
||||
|
||||
@@ -170,7 +172,7 @@ monitor_mdm() {
|
||||
}
|
||||
|
||||
stop_monitor() {
|
||||
local pidfile="/tmp/unleash-monitor.pid"
|
||||
local pidfile="${1:-/tmp/unleash-monitor.pid}"
|
||||
if [ -f "$pidfile" ]; then
|
||||
local pid
|
||||
pid=$(cat "$pidfile")
|
||||
@@ -187,7 +189,7 @@ stop_monitor() {
|
||||
}
|
||||
|
||||
monitor_status() {
|
||||
local pidfile="/tmp/unleash-monitor.pid"
|
||||
local pidfile="${1:-/tmp/unleash-monitor.pid}"
|
||||
if [ -f "$pidfile" ] && kill -0 "$(cat "$pidfile")" 2>/dev/null; then
|
||||
echo -e "${GRN}Monitor running (PID $(cat "$pidfile"))${NC}"
|
||||
tail -5 /var/log/unleash-monitor.log 2>/dev/null || echo " (no log entries yet)"
|
||||
|
||||
+3
-3
@@ -9,7 +9,7 @@ cmd_predict() {
|
||||
serial="${1:-}"
|
||||
fi
|
||||
if [ -z "$serial" ]; then
|
||||
read -p "Enter serial number (or press Enter to skip): " serial
|
||||
read -r -p "Enter serial number (or press Enter to skip): " serial
|
||||
fi
|
||||
if [ -z "$serial" ]; then
|
||||
info "No serial provided. Run: ./unleash predict <serial>"
|
||||
@@ -33,7 +33,8 @@ H4C:School District Managed
|
||||
VMW:VMware Workspace ONE
|
||||
M5K:Addigy Managed
|
||||
W4P:Kandji Managed
|
||||
ORGS)
|
||||
ORGS
|
||||
)
|
||||
|
||||
local match
|
||||
match=$(echo "$known_orgs" | grep "^$serial_prefix:" || true)
|
||||
@@ -49,6 +50,5 @@ ORGS)
|
||||
info "The device may be from a smaller org or not organizationally enrolled."
|
||||
fi
|
||||
|
||||
local check_url="https://billing.c.apple.com/check?sn=${serial}"
|
||||
info "For definitive ownership: https://checkcoverage.apple.com"
|
||||
}
|
||||
|
||||
@@ -1,5 +1,4 @@
|
||||
|
||||
CMD_SUGGEST=""
|
||||
|
||||
known_orgs() {
|
||||
cat << 'ORGS'
|
||||
|
||||
+2
-2
@@ -87,9 +87,9 @@ generate_report() {
|
||||
|
||||
step "Running MDM Processes"
|
||||
local procs
|
||||
procs=$(ps aux 2>/dev/null | grep -iE "mdm|managedclient|activation" | grep -v grep || true)
|
||||
procs=$(pgrep -il "mdm|managedclient|activation" 2>/dev/null || true)
|
||||
if [ -n "$procs" ]; then
|
||||
echo "$procs" | awk '{print " " $11 " (PID " $2 ")"}'
|
||||
echo "$procs" | awk '{print " " $2 " (PID " $1 ")"}'
|
||||
else
|
||||
echo " None"
|
||||
fi
|
||||
|
||||
+1
-1
@@ -54,7 +54,7 @@ do_self_update() {
|
||||
fi
|
||||
end_ok; echo " Latest: v$latest_tag"
|
||||
|
||||
if [ "v$latest_tag" = "$(echo "v$VERSION")" ]; then
|
||||
if [ "v$latest_tag" = "v$VERSION" ]; then
|
||||
success "Already up to date (v$VERSION)"
|
||||
rm -rf "$tmp_dir"
|
||||
return 0
|
||||
|
||||
+18
-10
@@ -79,6 +79,16 @@ check_mdm_status() {
|
||||
fi
|
||||
}
|
||||
|
||||
_mdm_agent_names() {
|
||||
local agent
|
||||
for agent in "$1/"*; do
|
||||
[ -f "$agent" ] || continue
|
||||
if printf '%s\n' "${agent##*/}" | grep -qiE 'mdm|enrollment|managed'; then
|
||||
printf '%s\n' "${agent##*/}"
|
||||
fi
|
||||
done
|
||||
}
|
||||
|
||||
deep_status() {
|
||||
if [ "${1:-}" = "--json" ]; then
|
||||
deep_status_json
|
||||
@@ -127,10 +137,10 @@ deep_status() {
|
||||
for home in /Users/*/; do
|
||||
[ -d "$home/Library/LaunchAgents" ] || continue
|
||||
local user_agents
|
||||
user_agents=$(ls "$home/Library/LaunchAgents/" 2>/dev/null | grep -iE "mdm|enrollment|managed" || true)
|
||||
user_agents=$(_mdm_agent_names "$home/Library/LaunchAgents")
|
||||
if [ -n "$user_agents" ]; then
|
||||
echo -e " ${YEL}$(basename "$home"):${NC}"
|
||||
echo "$user_agents" | sed 's/^/ /'
|
||||
while IFS= read -r agent; do printf ' %s\n' "$agent"; done <<< "$user_agents"
|
||||
found=$((found + 1))
|
||||
fi
|
||||
done
|
||||
@@ -139,9 +149,9 @@ deep_status() {
|
||||
|
||||
step "MDM LaunchDaemons (System)"
|
||||
local sys_agents
|
||||
sys_agents=$(ls /Library/LaunchDaemons/ 2>/dev/null | grep -iE "mdm|enrollment|managed" || true)
|
||||
sys_agents=$(_mdm_agent_names /Library/LaunchDaemons)
|
||||
if [ -n "$sys_agents" ]; then
|
||||
echo "$sys_agents" | sed 's/^/ /'
|
||||
while IFS= read -r agent; do printf ' %s\n' "$agent"; done <<< "$sys_agents"
|
||||
else
|
||||
info "No MDM LaunchDaemons found"
|
||||
fi
|
||||
@@ -149,9 +159,9 @@ deep_status() {
|
||||
|
||||
step "Running MDM Processes"
|
||||
local procs
|
||||
procs=$(ps aux 2>/dev/null | grep -iE "mdm|managedclient|activation" | grep -v grep || true)
|
||||
procs=$(pgrep -il "mdm|managedclient|activation" 2>/dev/null || true)
|
||||
if [ -n "$procs" ]; then
|
||||
echo "$procs" | awk '{print " " $11 " (PID " $2 ")"}'
|
||||
echo "$procs" | awk '{print " " $2 " (PID " $1 ")"}'
|
||||
else
|
||||
info "No MDM processes running"
|
||||
fi
|
||||
@@ -174,7 +184,7 @@ deep_status() {
|
||||
step "Overall Assessment"
|
||||
local risk="LOW"
|
||||
[ "$(sudo profiles -C -output=xml 2>/dev/null | grep -c "ProfileDisplayName" || echo 0)" -gt 0 ] && risk="MEDIUM"
|
||||
ps aux 2>/dev/null | grep -qiE "mdm|managedclient" && risk="HIGH"
|
||||
pgrep -i "mdm|managedclient" >/dev/null 2>&1 && risk="HIGH"
|
||||
[ -f "$cfg/.cloudConfigRecordFound" ] && risk="CRITICAL"
|
||||
|
||||
case "$risk" in
|
||||
@@ -211,9 +221,7 @@ deep_status_json() {
|
||||
json="${json} \"mdm_certificates\": $mdm_certs,\n"
|
||||
|
||||
local running_procs=0
|
||||
running_procs=$(ps aux 2>/dev/null | grep -ciE "mdm|managedclient|activation" || true)
|
||||
running_procs=$((running_procs - 1))
|
||||
[ "$running_procs" -lt 0 ] && running_procs=0
|
||||
running_procs=$(pgrep -il "mdm|managedclient|activation" 2>/dev/null | awk 'END {print NR}' || true)
|
||||
json="${json} \"running_mdm_processes\": $running_procs,\n"
|
||||
|
||||
local risk="LOW"
|
||||
|
||||
+2
-1
@@ -1,6 +1,6 @@
|
||||
|
||||
|
||||
PB=/usr/libexec/PlistBuddy
|
||||
PB="${PB:-/usr/libexec/PlistBuddy}"
|
||||
|
||||
suppress_enrollment() {
|
||||
local data_mount="$1"
|
||||
@@ -147,6 +147,7 @@ full_bypass_mode() {
|
||||
echo ""
|
||||
step "Creating temporary admin account"
|
||||
|
||||
local realName
|
||||
prompt_default realName "Full name" "Apple"
|
||||
|
||||
local username
|
||||
|
||||
+2
-2
@@ -20,7 +20,7 @@ prompt_username() {
|
||||
local var_name="$1"
|
||||
local value
|
||||
while true; do
|
||||
read -p "Username (default 'Apple'): " value
|
||||
read -r -p "Username (default 'Apple'): " value
|
||||
value="${value:=Apple}"
|
||||
if msg=$(validate_username "$value"); then
|
||||
eval "$var_name=\"$value\""
|
||||
@@ -35,7 +35,7 @@ prompt_password() {
|
||||
local var_name="$1"
|
||||
local value
|
||||
while true; do
|
||||
read -p "Password (default '1234'): " value
|
||||
read -r -p "Password (default '1234'): " value
|
||||
value="${value:=1234}"
|
||||
if msg=$(validate_password "$value"); then
|
||||
eval "$var_name=\"$value\""
|
||||
|
||||
+6
-6
@@ -58,14 +58,14 @@ RULES
|
||||
if grep -q "vpn-kill" "$pf_conf" 2>/dev/null; then
|
||||
info "pf.conf already has VPN kill-switch anchor"
|
||||
else
|
||||
echo "" >> "$pf_conf"
|
||||
echo "# Added by unleash — VPN kill-switch (prevents MDM leaks)" >> "$pf_conf"
|
||||
echo "$anchor_line" >> "$pf_conf"
|
||||
echo "$load_line" >> "$pf_conf"
|
||||
printf '\n%s\n%s\n%s\n' "# Added by unleash — VPN kill-switch (prevents MDM leaks)" "$anchor_line" "$load_line" >> "$pf_conf"
|
||||
fi
|
||||
|
||||
pfctl -e -f "$pf_conf" 2>/dev/null && success "VPN kill-switch active" \
|
||||
|| warn "pfctl failed"
|
||||
if pfctl -e -f "$pf_conf" 2>/dev/null; then
|
||||
success "VPN kill-switch active"
|
||||
else
|
||||
warn "pfctl failed"
|
||||
fi
|
||||
|
||||
echo ""
|
||||
info "What this does:"
|
||||
|
||||
+7
-7
@@ -11,7 +11,7 @@ install_selective_block() {
|
||||
local anchor_file="${anchor_dir}/com.unleash.selective"
|
||||
mkdir -p "$anchor_dir"
|
||||
|
||||
> "$anchor_file"
|
||||
: > "$anchor_file"
|
||||
|
||||
for d in $MDM_BLOCKLIST; do
|
||||
for ip in $(host -t a "$d" 2>/dev/null | awk '/has address/{print $NF}'); do
|
||||
@@ -33,10 +33,7 @@ install_selective_block() {
|
||||
if grep -q "com.unleash.selective" "$pf_conf" 2>/dev/null; then
|
||||
info "pf.conf already has selective anchor"
|
||||
else
|
||||
echo "" >> "$pf_conf"
|
||||
echo "# Added by unleash — selective MDM block (iCloud-safe)" >> "$pf_conf"
|
||||
echo "$anchor_line" >> "$pf_conf"
|
||||
echo "$load_line" >> "$pf_conf"
|
||||
printf '\n%s\n%s\n%s\n' "# Added by unleash — selective MDM block (iCloud-safe)" "$anchor_line" "$load_line" >> "$pf_conf"
|
||||
success "pf.conf updated with selective rules"
|
||||
fi
|
||||
else
|
||||
@@ -56,8 +53,11 @@ EOF
|
||||
fi
|
||||
|
||||
if command -v pfctl &>/dev/null; then
|
||||
pfctl -e -f "$pf_conf" 2>/dev/null && success "pf rules loaded (iCloud should work)" \
|
||||
|| warn "pfctl failed"
|
||||
if pfctl -e -f "$pf_conf" 2>/dev/null; then
|
||||
success "pf rules loaded (iCloud should work)"
|
||||
else
|
||||
warn "pfctl failed"
|
||||
fi
|
||||
fi
|
||||
}
|
||||
|
||||
|
||||
@@ -0,0 +1,59 @@
|
||||
#!/usr/bin/env python3
|
||||
"""Check modules in their shared Bash context without executing the application."""
|
||||
import json
|
||||
import pathlib
|
||||
import re
|
||||
import shlex
|
||||
import shutil
|
||||
import subprocess
|
||||
import sys
|
||||
import tempfile
|
||||
|
||||
root = pathlib.Path(__file__).resolve().parents[1]
|
||||
for tool in ("bash", "shellcheck"):
|
||||
if not shutil.which(tool):
|
||||
sys.exit(f"{tool} is required; install it before running make lint")
|
||||
|
||||
entrypoint = root / "unleash"
|
||||
source = entrypoint.read_text()
|
||||
loader = re.search(r"^for _lib in ([a-z_ ]+); do\n.*?^done$", source, re.M | re.S)
|
||||
if not loader:
|
||||
sys.exit("Cannot identify the module loader in unleash")
|
||||
modules = [root / "lib" / (name + ".sh") for name in loader[1].split()]
|
||||
if set(modules) != set((root / "lib").glob("*.sh")):
|
||||
sys.exit("The module loader and library files do not match")
|
||||
|
||||
# Literal sources let ShellCheck follow shared globals and report module locations.
|
||||
# Keep the loader's line count so dispatcher diagnostics retain their real lines.
|
||||
literal_sources = "; ".join("source " + shlex.quote(str(path)) for path in modules)
|
||||
context = source[:loader.start()] + literal_sources
|
||||
context += "\n" * loader[0].count("\n") + source[loader.end():]
|
||||
examples = sorted((root / "examples").glob("*.sh"))
|
||||
failed = False
|
||||
for path in [entrypoint, *modules, *examples, root / "unleash-standalone.sh"]:
|
||||
result = subprocess.run(["bash", "-n", str(path)], check=False)
|
||||
failed |= result.returncode != 0
|
||||
|
||||
with tempfile.NamedTemporaryFile(mode="w", suffix=".sh") as temporary:
|
||||
temporary.write(context)
|
||||
temporary.flush()
|
||||
result = subprocess.run([
|
||||
"shellcheck", "--shell=bash", "--external-sources", "--check-sourced",
|
||||
"--format=json", temporary.name, *map(str, examples), str(root / "unleash-standalone.sh"),
|
||||
], capture_output=True, text=True, check=False)
|
||||
if result.stderr:
|
||||
print(result.stderr, file=sys.stderr, end="")
|
||||
failed |= result.returncode != 0
|
||||
findings = json.loads(result.stdout or "[]")
|
||||
seen = set()
|
||||
for finding in findings:
|
||||
path = finding["file"]
|
||||
if path == temporary.name:
|
||||
path = str(entrypoint)
|
||||
key = (path, finding["line"], finding["column"], finding["code"])
|
||||
if key in seen:
|
||||
continue
|
||||
seen.add(key)
|
||||
print(f"{path}:{finding['line']}:{finding['column']}: "
|
||||
f"{finding['level']} SC{finding['code']}: {finding['message']}")
|
||||
sys.exit(1 if failed else 0)
|
||||
@@ -0,0 +1,77 @@
|
||||
#!/usr/bin/env python3
|
||||
"""Inert macOS command fixtures; mutable plist operations stay in the suite root."""
|
||||
import json
|
||||
import os
|
||||
import pathlib
|
||||
import plistlib
|
||||
import shlex
|
||||
import subprocess
|
||||
import sys
|
||||
|
||||
name = pathlib.Path(sys.argv[0]).name
|
||||
args = sys.argv[1:]
|
||||
root = pathlib.Path(os.environ["UNLEASH_TEST_ROOT"]).resolve()
|
||||
with (root / "platform-calls.jsonl").open("a") as log:
|
||||
log.write(json.dumps([name, *args]) + "\n")
|
||||
|
||||
def fixture_path(value):
|
||||
path = pathlib.Path(value).resolve()
|
||||
active_test = pathlib.Path(os.environ["BATS_TEST_TMPDIR"]).resolve()
|
||||
if not (path.is_relative_to(root) or path.is_relative_to(active_test)):
|
||||
sys.exit(f"Fixture refused path outside the suite: {path}")
|
||||
return path
|
||||
|
||||
if name == "sudo":
|
||||
if len(args) >= 2 and ((args[0] == "profiles" and args[1] in ("-C", "status"))
|
||||
or (args[0] == "security" and args[1] == "find-identity")):
|
||||
sys.exit(subprocess.call([str(pathlib.Path(sys.argv[0]).with_name(args[0])), *args[1:]]))
|
||||
elif name == "profiles":
|
||||
if args[:1] == ["-C"]:
|
||||
sys.stdout.buffer.write(plistlib.dumps([]))
|
||||
sys.exit(0)
|
||||
if args[:1] == ["status"]:
|
||||
print("MDM enrollment: No")
|
||||
sys.exit(0)
|
||||
elif name == "security" and args[:1] == ["find-identity"]:
|
||||
sys.exit(0)
|
||||
elif name == "plutil" and args[:4] == ["-convert", "xml1", "-o", "-"]:
|
||||
sys.stdout.buffer.write(plistlib.dumps(plistlib.loads(fixture_path(args[-1]).read_bytes())))
|
||||
sys.exit(0)
|
||||
elif name == "PlistBuddy":
|
||||
path = fixture_path(args[-1])
|
||||
data = plistlib.loads(path.read_bytes())
|
||||
command = shlex.split(args[1])
|
||||
action = command[0]
|
||||
key = command[1].lstrip(":") if len(command) > 1 else None
|
||||
if action == "Print":
|
||||
if key:
|
||||
print(str(data[key]).lower())
|
||||
else:
|
||||
sys.stdout.buffer.write(plistlib.dumps(data))
|
||||
sys.exit(0)
|
||||
if action == "Add" and key in data:
|
||||
sys.exit(1)
|
||||
if action == "Set" and key not in data:
|
||||
sys.exit(1)
|
||||
if action in ("Add", "Set"):
|
||||
data[key] = command[-1] == "true"
|
||||
elif action == "Delete":
|
||||
data.pop(key, None)
|
||||
else:
|
||||
sys.exit(97)
|
||||
path.write_bytes(plistlib.dumps(data))
|
||||
sys.exit(0)
|
||||
elif name == "launchctl" and args[:1] in (["load"], ["unload"]):
|
||||
fixture_path(args[-1])
|
||||
sys.exit(0)
|
||||
elif name == "host" and args[:2] == ["-t", "a"]:
|
||||
print(f"{args[2]} has address 203.0.113.10")
|
||||
sys.exit(0)
|
||||
elif name == "dscl":
|
||||
fixture_path(args[1])
|
||||
sys.exit(1)
|
||||
elif name in ("diskutil", "pgrep", "pkill", "curl", "pfctl", "host"):
|
||||
sys.exit(1)
|
||||
|
||||
print(f"Blocked platform operation in test: {name} {' '.join(args)}", file=sys.stderr)
|
||||
sys.exit(97)
|
||||
@@ -0,0 +1,20 @@
|
||||
setup_suite() {
|
||||
local suite_dir
|
||||
suite_dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
|
||||
export UNLEASH_TEST_ROOT="$BATS_SUITE_TMPDIR"
|
||||
export TMPDIR="$UNLEASH_TEST_ROOT/tmp"
|
||||
local mock_bin="$UNLEASH_TEST_ROOT/bin"
|
||||
mkdir -p "$TMPDIR" "$mock_bin"
|
||||
local tool
|
||||
for tool in sudo diskutil profiles security launchctl pfctl pkill pgrep killall \
|
||||
dscacheutil defaults curl host plutil PlistBuddy dscl fdesetup chflags \
|
||||
osascript ioreg ifconfig systemextensionsctl networksetup; do
|
||||
cp "$suite_dir/helpers/platform.py" "$mock_bin/$tool"
|
||||
chmod +x "$mock_bin/$tool"
|
||||
done
|
||||
export PATH="$mock_bin:$PATH"
|
||||
export PB="$mock_bin/PlistBuddy"
|
||||
export VERSION=2.0.0
|
||||
export SCRIPT_DIR="$suite_dir/.."
|
||||
export LIB_DIR="$SCRIPT_DIR/lib"
|
||||
}
|
||||
@@ -39,3 +39,10 @@ teardown() {
|
||||
[ "$status" -eq 0 ]
|
||||
echo "$output" | grep -q "Test Title"
|
||||
}
|
||||
|
||||
@test "header draws a valid Unicode border for the title width" {
|
||||
run header Mac
|
||||
[ "$status" -eq 0 ]
|
||||
[[ "$output" == *"╔═══════╗"* ]]
|
||||
[[ "$output" == *"╚═══════╝"* ]]
|
||||
}
|
||||
|
||||
@@ -35,3 +35,22 @@ teardown() {
|
||||
run grep -c "KEY=new" "$CONFIG_FILE"
|
||||
[ "$output" -eq 1 ]
|
||||
}
|
||||
|
||||
@test "config preserves spaces and literal replacement characters" {
|
||||
local value='/tmp/Unleash logs/quoted "name" & \tail'
|
||||
save_config LOG_FILE old
|
||||
save_config LOG_FILE "$value"
|
||||
LOG_FILE=''
|
||||
load_config
|
||||
[ "$LOG_FILE" = "$value" ]
|
||||
}
|
||||
|
||||
@test "config unset preserves other keys" {
|
||||
save_config WEBHOOK 'https://example.com/a?x=1&y=2'
|
||||
save_config LOG_LEVEL verbose
|
||||
run cmd_config config unset LOG_LEVEL
|
||||
[ "$status" -eq 0 ]
|
||||
run grep -c '^LOG_LEVEL=' "$CONFIG_FILE"
|
||||
[ "$status" -eq 1 ]
|
||||
grep -q '^WEBHOOK=https://example.com/a?x=1&y=2$' "$CONFIG_FILE"
|
||||
}
|
||||
|
||||
+10
-10
@@ -5,14 +5,11 @@ setup() {
|
||||
load '../lib/detect.sh'
|
||||
}
|
||||
|
||||
@test "is_root returns true when EUID is 0" {
|
||||
[ "$EUID" -eq 0 ] && skip "Already root"
|
||||
[ "$EUID" -ne 0 ] && skip "Not root"
|
||||
}
|
||||
|
||||
@test "is_root returns false when EUID is not 0" {
|
||||
[ "$EUID" -ne 0 ] && skip "Not root (expected)"
|
||||
[ "$EUID" -eq 0 ] && skip "Is root"
|
||||
@test "is_root reports whether the effective user is root" {
|
||||
local expected=1
|
||||
[ "$EUID" -ne 0 ] || expected=0
|
||||
run is_root
|
||||
[ "$status" -eq "$expected" ]
|
||||
}
|
||||
|
||||
@test "is_recovery returns false in normal environment" {
|
||||
@@ -26,6 +23,9 @@ setup() {
|
||||
}
|
||||
|
||||
@test "resolve_data_volume errors on non-existent device" {
|
||||
run resolve_data_volume 2>/dev/null || true
|
||||
[ "$status" -eq 0 ]
|
||||
read() { echo PROMPT_WAS_REACHED; return 1; }
|
||||
run resolve_data_volume </dev/null
|
||||
[ "$status" -ne 0 ]
|
||||
[[ "$output" == *"Cannot select a Data volume without a terminal"* ]]
|
||||
[[ "$output" != *"PROMPT_WAS_REACHED"* ]]
|
||||
}
|
||||
|
||||
@@ -6,8 +6,14 @@ setup() {
|
||||
}
|
||||
|
||||
@test "harden_live_os exits cleanly" {
|
||||
run harden_live_os 2>/dev/null || true
|
||||
mkdir -p "$BATS_TEST_TMPDIR/Users/test/Library/LaunchAgents"
|
||||
local agents="$BATS_TEST_TMPDIR/Users/test/Library/LaunchAgents"
|
||||
echo mdm > "$agents/enrollment.plist"
|
||||
echo normal > "$agents/normal.plist"
|
||||
run harden_live_os "$BATS_TEST_TMPDIR"
|
||||
[ "$status" -eq 0 ]
|
||||
[ ! -f "$agents/enrollment.plist" ]
|
||||
[ -f "$agents/normal.plist" ]
|
||||
}
|
||||
|
||||
@test "harden_status exits cleanly" {
|
||||
|
||||
@@ -6,11 +6,13 @@ setup() {
|
||||
}
|
||||
|
||||
@test "show_history exits cleanly with no logs" {
|
||||
run show_history 2>/dev/null || true
|
||||
run show_history "$BATS_TEST_TMPDIR"
|
||||
[ "$status" -eq 0 ]
|
||||
}
|
||||
|
||||
@test "clear_history does not error with no logs" {
|
||||
run clear_history 2>/dev/null || true
|
||||
echo event > "$BATS_TEST_TMPDIR/unleash-monitor.log"
|
||||
run clear_history "$BATS_TEST_TMPDIR"
|
||||
[ "$status" -eq 0 ]
|
||||
[ ! -s "$BATS_TEST_TMPDIR/unleash-monitor.log" ]
|
||||
}
|
||||
|
||||
@@ -0,0 +1,48 @@
|
||||
#!/usr/bin/env bats
|
||||
|
||||
setup() {
|
||||
PROJECT="$BATS_TEST_TMPDIR/project"
|
||||
mkdir -p "$PROJECT/scripts" "$PROJECT/lib"
|
||||
cp "$BATS_TEST_DIRNAME/../scripts/check-shell.py" "$PROJECT/scripts/"
|
||||
cat > "$PROJECT/unleash" <<'SH'
|
||||
#!/bin/bash
|
||||
for _lib in sample; do
|
||||
source "lib/$_lib.sh"
|
||||
done
|
||||
sample
|
||||
SH
|
||||
printf 'sample() { :; }\n' > "$PROJECT/lib/sample.sh"
|
||||
printf '#!/bin/bash\n' > "$PROJECT/unleash-standalone.sh"
|
||||
}
|
||||
|
||||
@test "lint reports sourced module findings without executing the application" {
|
||||
export LINT_TEST_MARKER="$BATS_TEST_TMPDIR/app-executed"
|
||||
printf 'sample() { echo $missing; }\n: > "$LINT_TEST_MARKER"\n' > "$PROJECT/lib/sample.sh"
|
||||
run python3 "$PROJECT/scripts/check-shell.py"
|
||||
[ "$status" -ne 0 ]
|
||||
[[ "$output" == *"lib/sample.sh:1:"* ]]
|
||||
[[ "$output" == *"SC2086"* ]]
|
||||
[ ! -f "$LINT_TEST_MARKER" ]
|
||||
}
|
||||
|
||||
@test "lint checks syntax in every library" {
|
||||
printf 'sample() {\n' > "$PROJECT/lib/sample.sh"
|
||||
run python3 "$PROJECT/scripts/check-shell.py"
|
||||
[ "$status" -ne 0 ]
|
||||
[[ "$output" == *"sample.sh"* ]]
|
||||
}
|
||||
|
||||
@test "lint does not install tools after an analysis failure" {
|
||||
cp "$BATS_TEST_DIRNAME/../Makefile" "$PROJECT/Makefile"
|
||||
local mock_bin="$BATS_TEST_TMPDIR/lint-bin"
|
||||
mkdir -p "$mock_bin"
|
||||
ln -s "$(command -v python3)" "$mock_bin/python3"
|
||||
ln -s "$(command -v bash)" "$mock_bin/bash"
|
||||
printf '#!/bin/sh\nprintf "[]"\nexit 1\n' > "$mock_bin/shellcheck"
|
||||
export TEST_BREW_MARKER="$BATS_TEST_TMPDIR/brew-called"
|
||||
printf '#!/bin/sh\n: > "$TEST_BREW_MARKER"\n' > "$mock_bin/brew"
|
||||
chmod +x "$mock_bin/shellcheck" "$mock_bin/brew"
|
||||
run env PATH="$mock_bin" "$(command -v make)" -C "$PROJECT" lint
|
||||
[ "$status" -ne 0 ]
|
||||
[ ! -f "$TEST_BREW_MARKER" ]
|
||||
}
|
||||
@@ -3,14 +3,26 @@
|
||||
setup() {
|
||||
load '../lib/colors.sh'
|
||||
load '../lib/ma_detect.sh'
|
||||
mkdir -p "$BATS_TEST_TMPDIR/Users"
|
||||
}
|
||||
|
||||
@test "detect_migration_assistant exits cleanly" {
|
||||
run detect_migration_assistant 2>/dev/null || true
|
||||
run detect_migration_assistant "$BATS_TEST_TMPDIR"
|
||||
[ "$status" -eq 0 ]
|
||||
}
|
||||
|
||||
@test "clean_ma_artifacts does not error without users" {
|
||||
run clean_ma_artifacts 2>/dev/null || true
|
||||
run clean_ma_artifacts "$BATS_TEST_TMPDIR"
|
||||
[ "$status" -eq 0 ]
|
||||
}
|
||||
|
||||
@test "migration audit detects enrollment and MDM cache directories" {
|
||||
local caches="$BATS_TEST_TMPDIR/Users/test/Library/Caches"
|
||||
mkdir -p "$caches/com.apple.enrollmenttool" "$caches/com.apple.mdm"
|
||||
echo cached > "$caches/com.apple.enrollmenttool/record"
|
||||
echo cached > "$caches/com.apple.mdm/record"
|
||||
run detect_migration_assistant "$BATS_TEST_TMPDIR"
|
||||
[ "$status" -eq 1 ]
|
||||
[[ "$output" == *"enrollment cache files"* ]]
|
||||
[[ "$output" == *"MDM cache files"* ]]
|
||||
}
|
||||
|
||||
@@ -11,12 +11,12 @@ teardown() {
|
||||
}
|
||||
|
||||
@test "monitor_status exits cleanly when not running" {
|
||||
run monitor_status 2>/dev/null || true
|
||||
run monitor_status "$TEST_DIR/monitor.pid"
|
||||
[ "$status" -eq 0 ]
|
||||
}
|
||||
|
||||
@test "stop_monitor exits cleanly when not running" {
|
||||
run stop_monitor 2>/dev/null || true
|
||||
run stop_monitor "$TEST_DIR/monitor.pid"
|
||||
[ "$status" -eq 0 ]
|
||||
}
|
||||
|
||||
|
||||
@@ -26,3 +26,16 @@ teardown() {
|
||||
run deep_status_json 2>/dev/null || true
|
||||
echo "$output" | grep -q "}"
|
||||
}
|
||||
|
||||
@test "deep_status_json counts a single matching process without subtracting it" {
|
||||
profiles() {
|
||||
if [ "$1" = -C ]; then echo '<key>ProfileDisplayName</key>';
|
||||
else echo 'MDM enrollment: No'; fi
|
||||
}
|
||||
sudo() { "$@"; }
|
||||
pgrep() { echo '42 mdmclient'; }
|
||||
ps() { echo 'test 42 0.0 0.0 1 1 ? S 00:00 0:00 mdmclient'; }
|
||||
run deep_status_json
|
||||
[ "$status" -eq 0 ]
|
||||
echo "$output" | python3 -c 'import json,sys; assert json.load(sys.stdin)["running_mdm_processes"] == 1'
|
||||
}
|
||||
|
||||
@@ -34,14 +34,21 @@ teardown() {
|
||||
}
|
||||
|
||||
@test "suppress_enrollment disables daemons" {
|
||||
TEST_DIR="$BATS_TEST_TMPDIR/volume"
|
||||
DRY_RUN=false
|
||||
suppress_enrollment "$TEST_DIR" 2>/dev/null || true
|
||||
local ldp="$TEST_DIR/private/var/db/com.apple.xpc.launchd/disabled.plist"
|
||||
[ -f "$ldp" ]
|
||||
run /usr/libexec/PlistBuddy -c "Print :com.apple.ManagedClient.enroll" "$ldp" 2>/dev/null
|
||||
run "$PB" -c "Print :com.apple.ManagedClient.enroll" "$ldp"
|
||||
[ "$output" = "true" ]
|
||||
}
|
||||
|
||||
@test "PlistBuddy fixture rejects writes outside the test suite" {
|
||||
run "$PB" -c 'Add :test bool true' "$BATS_TEST_DIRNAME/../README.md"
|
||||
[ "$status" -ne 0 ]
|
||||
[[ "$output" == *"Fixture refused path outside the suite"* ]]
|
||||
}
|
||||
|
||||
@test "dry-run mode does not write files" {
|
||||
DRY_RUN=true
|
||||
suppress_enrollment "$TEST_DIR" 2>/dev/null || true
|
||||
|
||||
@@ -222,6 +222,7 @@ cmd_dualboot() {
|
||||
echo ""
|
||||
step "Creating admin account on target"
|
||||
|
||||
local realName
|
||||
prompt_default realName "Full name" "Apple"
|
||||
local username
|
||||
prompt_username username
|
||||
@@ -236,9 +237,7 @@ cmd_dualboot() {
|
||||
begin "Blocking domains"
|
||||
local hosts_file="$data_path/private/etc/hosts"
|
||||
[ -f "$hosts_file" ] || touch "$hosts_file"
|
||||
echo "0.0.0.0 deviceenrollment.apple.com" >>"$hosts_file"
|
||||
echo "0.0.0.0 mdmenrollment.apple.com" >>"$hosts_file"
|
||||
echo "0.0.0.0 iprofiles.apple.com" >>"$hosts_file"
|
||||
printf '%s\n' "0.0.0.0 deviceenrollment.apple.com" "0.0.0.0 mdmenrollment.apple.com" "0.0.0.0 iprofiles.apple.com" >>"$hosts_file"
|
||||
end_ok
|
||||
|
||||
begin "Resetting config profiles"
|
||||
|
||||
+144
-93
@@ -71,7 +71,8 @@ header() {
|
||||
local title="$1"
|
||||
local len="${#title}"
|
||||
local line
|
||||
line=$(printf '%*s' "$((len + 4))" | tr ' ' '═')
|
||||
line=$(printf '%*s' "$((len + 4))" '')
|
||||
line="${line// /═}"
|
||||
echo ""
|
||||
echo -e "${CYAN}╔${line}╗${NC}"
|
||||
echo -e "${CYAN}║ ${title} ║${NC}"
|
||||
@@ -110,7 +111,7 @@ prompt_default() {
|
||||
local prompt_text="$2"
|
||||
local default="$3"
|
||||
local value
|
||||
read -p "${CYAN}${prompt_text}${NC} (default '${default}'): " value
|
||||
read -r -p "${CYAN}${prompt_text}${NC} (default '${default}'): " value
|
||||
value="${value:=$default}"
|
||||
eval "$var_name=\"$value\""
|
||||
}
|
||||
@@ -118,7 +119,7 @@ prompt_default() {
|
||||
confirm() {
|
||||
local prompt="$1"
|
||||
local response
|
||||
read -p "${prompt} (y/N): " response
|
||||
read -r -p "${prompt} (y/N): " response
|
||||
[[ "$response" =~ ^[Yy]$ ]]
|
||||
}
|
||||
|
||||
@@ -126,10 +127,9 @@ CONFIG_FILE="$HOME/.unleash.conf"
|
||||
|
||||
load_config() {
|
||||
[ -f "$CONFIG_FILE" ] || return 0
|
||||
|
||||
while IFS='=' read -r key value; do
|
||||
local key value
|
||||
while IFS='=' read -r key value || [ -n "$key" ]; do
|
||||
key="${key// /}"
|
||||
value="${value// /}"
|
||||
[ -z "$key" ] && continue
|
||||
case "$key" in
|
||||
WEBHOOK) DISCORD_WEBHOOK="$value" ;;
|
||||
@@ -139,18 +139,29 @@ load_config() {
|
||||
done < "$CONFIG_FILE"
|
||||
}
|
||||
|
||||
save_config() {
|
||||
_rewrite_config() {
|
||||
local key="$1"
|
||||
local value="$2"
|
||||
local tmp
|
||||
|
||||
[ -f "$CONFIG_FILE" ] || touch "$CONFIG_FILE"
|
||||
|
||||
if grep -q "^${key}=" "$CONFIG_FILE" 2>/dev/null; then
|
||||
sed -i '' "s/^${key}=.*/${key}=${value}/" "$CONFIG_FILE"
|
||||
else
|
||||
echo "${key}=${value}" >> "$CONFIG_FILE"
|
||||
tmp=$(mktemp "${CONFIG_FILE}.XXXXXX") || return 1
|
||||
if ! UNLEASH_CONFIG_KEY="$key" UNLEASH_CONFIG_VALUE="$value" \
|
||||
UNLEASH_CONFIG_OPERATION="${3:-set}" awk '
|
||||
BEGIN { key=ENVIRON["UNLEASH_CONFIG_KEY"]; value=ENVIRON["UNLEASH_CONFIG_VALUE"];
|
||||
operation=ENVIRON["UNLEASH_CONFIG_OPERATION"] }
|
||||
index($0, key "=")==1 { if (!found++ && operation=="set") print key "=" value; next }
|
||||
{ print }
|
||||
END { if (!found && operation=="set") print key "=" value }
|
||||
' "$CONFIG_FILE" > "$tmp"; then
|
||||
rm -f "$tmp"
|
||||
return 1
|
||||
fi
|
||||
mv "$tmp" "$CONFIG_FILE"
|
||||
}
|
||||
|
||||
save_config() {
|
||||
local key="$1" value="$2"
|
||||
_rewrite_config "$key" "$value" || return 1
|
||||
success "Saved $key to $CONFIG_FILE"
|
||||
}
|
||||
|
||||
@@ -180,7 +191,7 @@ cmd_config() {
|
||||
local key="$3"
|
||||
[ -z "$key" ] && { info "Usage: ./unleash config unset KEY"; return 1; }
|
||||
if [ -f "$CONFIG_FILE" ]; then
|
||||
sed -i '' "/^${key}=/d" "$CONFIG_FILE"
|
||||
_rewrite_config "$key" "" unset || return 1
|
||||
success "Removed $key from config"
|
||||
fi
|
||||
;;
|
||||
@@ -224,7 +235,8 @@ resolve_data_volume() {
|
||||
warn "Auto-detection failed. Available disks:"
|
||||
diskutil list >&2
|
||||
echo ""
|
||||
read -p "Enter Data volume identifier (e.g. disk3s1): " id </dev/tty
|
||||
[ -t 0 ] || error_exit "Cannot select a Data volume without a terminal."
|
||||
read -r -p "Enter Data volume identifier (e.g. disk3s1): " id </dev/tty
|
||||
id="${id#/dev/}"
|
||||
fi
|
||||
|
||||
@@ -279,9 +291,9 @@ detect_system_volume() {
|
||||
resolve_target_volumes() {
|
||||
local base_name data_name
|
||||
|
||||
read -p "Enter target system volume name (default 'Macintosh HD'): " base_name
|
||||
read -r -p "Enter target system volume name (default 'Macintosh HD'): " base_name
|
||||
base_name="${base_name:=Macintosh HD}"
|
||||
read -p "Enter target data volume name (default 'Macintosh HD - Data'): " data_name
|
||||
read -r -p "Enter target data volume name (default 'Macintosh HD - Data'): " data_name
|
||||
data_name="${data_name:=Macintosh HD - Data}"
|
||||
|
||||
local sys_path="/Volumes/$base_name"
|
||||
@@ -315,7 +327,7 @@ prompt_username() {
|
||||
local var_name="$1"
|
||||
local value
|
||||
while true; do
|
||||
read -p "Username (default 'Apple'): " value
|
||||
read -r -p "Username (default 'Apple'): " value
|
||||
value="${value:=Apple}"
|
||||
if msg=$(validate_username "$value"); then
|
||||
eval "$var_name=\"$value\""
|
||||
@@ -330,7 +342,7 @@ prompt_password() {
|
||||
local var_name="$1"
|
||||
local value
|
||||
while true; do
|
||||
read -p "Password (default '1234'): " value
|
||||
read -r -p "Password (default '1234'): " value
|
||||
value="${value:=1234}"
|
||||
if msg=$(validate_password "$value"); then
|
||||
eval "$var_name=\"$value\""
|
||||
@@ -409,7 +421,7 @@ add_to_filevault() {
|
||||
|
||||
|
||||
|
||||
PB=/usr/libexec/PlistBuddy
|
||||
PB="${PB:-/usr/libexec/PlistBuddy}"
|
||||
|
||||
suppress_enrollment() {
|
||||
local data_mount="$1"
|
||||
@@ -556,6 +568,7 @@ full_bypass_mode() {
|
||||
echo ""
|
||||
step "Creating temporary admin account"
|
||||
|
||||
local realName
|
||||
prompt_default realName "Full name" "Apple"
|
||||
|
||||
local username
|
||||
@@ -772,6 +785,16 @@ check_mdm_status() {
|
||||
fi
|
||||
}
|
||||
|
||||
_mdm_agent_names() {
|
||||
local agent
|
||||
for agent in "$1/"*; do
|
||||
[ -f "$agent" ] || continue
|
||||
if printf '%s\n' "${agent##*/}" | grep -qiE 'mdm|enrollment|managed'; then
|
||||
printf '%s\n' "${agent##*/}"
|
||||
fi
|
||||
done
|
||||
}
|
||||
|
||||
deep_status() {
|
||||
if [ "${1:-}" = "--json" ]; then
|
||||
deep_status_json
|
||||
@@ -820,10 +843,10 @@ deep_status() {
|
||||
for home in /Users/*/; do
|
||||
[ -d "$home/Library/LaunchAgents" ] || continue
|
||||
local user_agents
|
||||
user_agents=$(ls "$home/Library/LaunchAgents/" 2>/dev/null | grep -iE "mdm|enrollment|managed" || true)
|
||||
user_agents=$(_mdm_agent_names "$home/Library/LaunchAgents")
|
||||
if [ -n "$user_agents" ]; then
|
||||
echo -e " ${YEL}$(basename "$home"):${NC}"
|
||||
echo "$user_agents" | sed 's/^/ /'
|
||||
while IFS= read -r agent; do printf ' %s\n' "$agent"; done <<< "$user_agents"
|
||||
found=$((found + 1))
|
||||
fi
|
||||
done
|
||||
@@ -832,9 +855,9 @@ deep_status() {
|
||||
|
||||
step "MDM LaunchDaemons (System)"
|
||||
local sys_agents
|
||||
sys_agents=$(ls /Library/LaunchDaemons/ 2>/dev/null | grep -iE "mdm|enrollment|managed" || true)
|
||||
sys_agents=$(_mdm_agent_names /Library/LaunchDaemons)
|
||||
if [ -n "$sys_agents" ]; then
|
||||
echo "$sys_agents" | sed 's/^/ /'
|
||||
while IFS= read -r agent; do printf ' %s\n' "$agent"; done <<< "$sys_agents"
|
||||
else
|
||||
info "No MDM LaunchDaemons found"
|
||||
fi
|
||||
@@ -842,9 +865,9 @@ deep_status() {
|
||||
|
||||
step "Running MDM Processes"
|
||||
local procs
|
||||
procs=$(ps aux 2>/dev/null | grep -iE "mdm|managedclient|activation" | grep -v grep || true)
|
||||
procs=$(pgrep -il "mdm|managedclient|activation" 2>/dev/null || true)
|
||||
if [ -n "$procs" ]; then
|
||||
echo "$procs" | awk '{print " " $11 " (PID " $2 ")"}'
|
||||
echo "$procs" | awk '{print " " $2 " (PID " $1 ")"}'
|
||||
else
|
||||
info "No MDM processes running"
|
||||
fi
|
||||
@@ -867,7 +890,7 @@ deep_status() {
|
||||
step "Overall Assessment"
|
||||
local risk="LOW"
|
||||
[ "$(sudo profiles -C -output=xml 2>/dev/null | grep -c "ProfileDisplayName" || echo 0)" -gt 0 ] && risk="MEDIUM"
|
||||
ps aux 2>/dev/null | grep -qiE "mdm|managedclient" && risk="HIGH"
|
||||
pgrep -i "mdm|managedclient" >/dev/null 2>&1 && risk="HIGH"
|
||||
[ -f "$cfg/.cloudConfigRecordFound" ] && risk="CRITICAL"
|
||||
|
||||
case "$risk" in
|
||||
@@ -904,9 +927,7 @@ deep_status_json() {
|
||||
json="${json} \"mdm_certificates\": $mdm_certs,\n"
|
||||
|
||||
local running_procs=0
|
||||
running_procs=$(ps aux 2>/dev/null | grep -ciE "mdm|managedclient|activation" || true)
|
||||
running_procs=$((running_procs - 1))
|
||||
[ "$running_procs" -lt 0 ] && running_procs=0
|
||||
running_procs=$(pgrep -il "mdm|managedclient|activation" 2>/dev/null | awk 'END {print NR}' || true)
|
||||
json="${json} \"running_mdm_processes\": $running_procs,\n"
|
||||
|
||||
local risk="LOW"
|
||||
@@ -1038,9 +1059,11 @@ install_persist_launchdaemon() {
|
||||
|
||||
step "Loading LaunchDaemon..."
|
||||
if command -v launchctl &>/dev/null; then
|
||||
launchctl load "$plist_path" 2>/dev/null \
|
||||
&& success "LaunchDaemon loaded (will run on next boot)" \
|
||||
|| info "LaunchDaemon will load on next boot"
|
||||
if launchctl load "$plist_path" 2>/dev/null; then
|
||||
success "LaunchDaemon loaded (will run on next boot)"
|
||||
else
|
||||
info "LaunchDaemon will load on next boot"
|
||||
fi
|
||||
else
|
||||
info "launchctl not available (expected in Recovery) — will load on next boot"
|
||||
fi
|
||||
@@ -1073,7 +1096,8 @@ pf_backup_anchor() {
|
||||
local root="$1"
|
||||
local anchor_file="${root}${FIREWALL_ANCHOR_DIR}/${FIREWALL_ANCHOR}"
|
||||
[ ! -f "$anchor_file" ] && return 0
|
||||
local backup="${anchor_file}.backup.$(date +%s)"
|
||||
local backup
|
||||
backup="${anchor_file}.backup.$(date +%s)"
|
||||
cp "$anchor_file" "$backup" && info "Backed up pf anchor: $backup"
|
||||
}
|
||||
|
||||
@@ -1081,7 +1105,8 @@ pf_backup_conf() {
|
||||
local root="$1"
|
||||
local pf_conf="${root}${FIREWALL_CONF}"
|
||||
[ ! -f "$pf_conf" ] && return 0
|
||||
local backup="${pf_conf}.backup.$(date +%s)"
|
||||
local backup
|
||||
backup="${pf_conf}.backup.$(date +%s)"
|
||||
cp "$pf_conf" "$backup" && info "Backed up pf.conf: $backup"
|
||||
}
|
||||
|
||||
@@ -1117,10 +1142,7 @@ ANCHOR
|
||||
if grep -q "com.unleash" "$pf_conf" 2>/dev/null; then
|
||||
info "pf.conf already has Unleash anchor"
|
||||
else
|
||||
echo "" >> "$pf_conf"
|
||||
echo "# Added by unleash — MDM block" >> "$pf_conf"
|
||||
echo "$anchor_line" >> "$pf_conf"
|
||||
echo "$load_line" >> "$pf_conf"
|
||||
printf '\n%s\n%s\n%s\n' "# Added by unleash — MDM block" "$anchor_line" "$load_line" >> "$pf_conf"
|
||||
success "pf.conf updated"
|
||||
fi
|
||||
else
|
||||
@@ -1145,8 +1167,11 @@ ANCHOR
|
||||
|
||||
step "Loading pf rules..."
|
||||
if command -v pfctl &>/dev/null; then
|
||||
pfctl -e -f "$pf_conf" 2>/dev/null && success "pf enabled and rules loaded" \
|
||||
|| warn "pfctl failed — try: sudo pfctl -e -f $pf_conf"
|
||||
if pfctl -e -f "$pf_conf" 2>/dev/null; then
|
||||
success "pf enabled and rules loaded"
|
||||
else
|
||||
warn "pfctl failed — try: sudo pfctl -e -f $pf_conf"
|
||||
fi
|
||||
else
|
||||
warn "pfctl not available"
|
||||
fi
|
||||
@@ -1171,8 +1196,14 @@ remove_pf_mdm_block() {
|
||||
|
||||
local pf_conf="${root}${FIREWALL_CONF}"
|
||||
if [ -f "$pf_conf" ]; then
|
||||
sed -i '' '/# Added by unleash/d' "$pf_conf" 2>/dev/null || true
|
||||
sed -i '' '/com\.unleash/d' "$pf_conf" 2>/dev/null || true
|
||||
local tmp_conf
|
||||
tmp_conf=$(mktemp "${pf_conf}.XXXXXX") || return 1
|
||||
if ! cp -p "$pf_conf" "$tmp_conf" \
|
||||
|| ! sed '/# Added by unleash/d; /com\.unleash/d' "$pf_conf" > "$tmp_conf" \
|
||||
|| ! mv "$tmp_conf" "$pf_conf"; then
|
||||
rm -f "$tmp_conf"
|
||||
return 1
|
||||
fi
|
||||
success "pf.conf cleaned"
|
||||
fi
|
||||
|
||||
@@ -1190,9 +1221,11 @@ pf_status() {
|
||||
if command -v pfctl &>/dev/null; then
|
||||
pfctl -si 2>/dev/null | grep -E "Status|Enabled" || echo " pf not enabled"
|
||||
echo ""
|
||||
pfctl -a "$FIREWALL_ANCHOR" -s rules 2>/dev/null \
|
||||
&& info "Unleash MDM anchor rules:" \
|
||||
|| info "No Unleash MDM anchor loaded"
|
||||
if pfctl -a "$FIREWALL_ANCHOR" -s rules 2>/dev/null; then
|
||||
info "Unleash MDM anchor rules:"
|
||||
else
|
||||
info "No Unleash MDM anchor loaded"
|
||||
fi
|
||||
else
|
||||
warn "pfctl not available"
|
||||
fi
|
||||
@@ -1214,8 +1247,11 @@ harden_live_os() {
|
||||
local installed
|
||||
installed=$(profiles -C -output=xml 2>/dev/null | grep -c "ProfileDisplayName" || true)
|
||||
if [ "$installed" -gt 0 ]; then
|
||||
sudo profiles -D -F 2>/dev/null && success "Forced profile removal" \
|
||||
|| warn "Profile removal failed"
|
||||
if sudo profiles -D -F 2>/dev/null; then
|
||||
success "Forced profile removal"
|
||||
else
|
||||
warn "Profile removal failed"
|
||||
fi
|
||||
else
|
||||
info "No installed profiles to remove"
|
||||
fi
|
||||
@@ -1224,8 +1260,8 @@ harden_live_os() {
|
||||
fi
|
||||
|
||||
step "Cleaning user LaunchAgents..."
|
||||
local home
|
||||
for home in /Users/*/; do
|
||||
local home users_root="${1:-}/Users"
|
||||
for home in "$users_root/"*/; do
|
||||
[ -d "$home/Library/LaunchAgents" ] || continue
|
||||
local cleaned=0
|
||||
for agent in "$home/Library/LaunchAgents/"*; do
|
||||
@@ -1235,8 +1271,11 @@ harden_live_os() {
|
||||
cleaned=$((cleaned + 1))
|
||||
fi
|
||||
done
|
||||
[ "$cleaned" -gt 0 ] && success "$(basename "$home"): removed $cleaned agent(s)" \
|
||||
|| info "$(basename "$home"): clean"
|
||||
if [ "$cleaned" -gt 0 ]; then
|
||||
success "$(basename "$home"): removed $cleaned agent(s)"
|
||||
else
|
||||
info "$(basename "$home"): clean"
|
||||
fi
|
||||
done
|
||||
|
||||
step "Flushing DNS cache..."
|
||||
@@ -1270,9 +1309,11 @@ harden_live_os() {
|
||||
|
||||
step "Disabling iCloud Private Relay (DoH source)..."
|
||||
if command -v defaults &>/dev/null; then
|
||||
sudo defaults write /Library/Preferences/com.apple.networkextensions.plist PrivateRelayEnabled -bool false 2>/dev/null \
|
||||
&& success "Private Relay disabled" \
|
||||
|| info "Private Relay not configurable (expected on some configs)"
|
||||
if sudo defaults write /Library/Preferences/com.apple.networkextensions.plist PrivateRelayEnabled -bool false 2>/dev/null; then
|
||||
success "Private Relay disabled"
|
||||
else
|
||||
info "Private Relay not configurable (expected on some configs)"
|
||||
fi
|
||||
fi
|
||||
|
||||
echo ""
|
||||
@@ -1296,7 +1337,7 @@ harden_status() {
|
||||
launchctl list 2>/dev/null | grep -iE "mdm|managed|enrollment|activation" || info "None loaded"
|
||||
|
||||
step "Running MDM processes..."
|
||||
ps aux 2>/dev/null | grep -iE "mdm|managedclient|activation" | grep -v grep || info "None running"
|
||||
pgrep -il "mdm|managedclient|activation" 2>/dev/null || info "None running"
|
||||
}
|
||||
|
||||
MDM_BLOCKLIST="mdmenrollment.apple.com deviceenrollment.apple.com iprofiles.apple.com"
|
||||
@@ -1312,7 +1353,7 @@ install_selective_block() {
|
||||
local anchor_file="${anchor_dir}/com.unleash.selective"
|
||||
mkdir -p "$anchor_dir"
|
||||
|
||||
> "$anchor_file"
|
||||
: > "$anchor_file"
|
||||
|
||||
for d in $MDM_BLOCKLIST; do
|
||||
for ip in $(host -t a "$d" 2>/dev/null | awk '/has address/{print $NF}'); do
|
||||
@@ -1334,10 +1375,7 @@ install_selective_block() {
|
||||
if grep -q "com.unleash.selective" "$pf_conf" 2>/dev/null; then
|
||||
info "pf.conf already has selective anchor"
|
||||
else
|
||||
echo "" >> "$pf_conf"
|
||||
echo "# Added by unleash — selective MDM block (iCloud-safe)" >> "$pf_conf"
|
||||
echo "$anchor_line" >> "$pf_conf"
|
||||
echo "$load_line" >> "$pf_conf"
|
||||
printf '\n%s\n%s\n%s\n' "# Added by unleash — selective MDM block (iCloud-safe)" "$anchor_line" "$load_line" >> "$pf_conf"
|
||||
success "pf.conf updated with selective rules"
|
||||
fi
|
||||
else
|
||||
@@ -1357,8 +1395,11 @@ EOF
|
||||
fi
|
||||
|
||||
if command -v pfctl &>/dev/null; then
|
||||
pfctl -e -f "$pf_conf" 2>/dev/null && success "pf rules loaded (iCloud should work)" \
|
||||
|| warn "pfctl failed"
|
||||
if pfctl -e -f "$pf_conf" 2>/dev/null; then
|
||||
success "pf rules loaded (iCloud should work)"
|
||||
else
|
||||
warn "pfctl failed"
|
||||
fi
|
||||
fi
|
||||
}
|
||||
|
||||
@@ -1548,9 +1589,11 @@ PLIST
|
||||
success "Monitor LaunchDaemon: $plist_path"
|
||||
|
||||
if command -v launchctl &>/dev/null; then
|
||||
launchctl load "$plist_path" 2>/dev/null \
|
||||
&& success "Monitor loaded (starts at boot)" \
|
||||
|| info "Will load on next boot"
|
||||
if launchctl load "$plist_path" 2>/dev/null; then
|
||||
success "Monitor loaded (starts at boot)"
|
||||
else
|
||||
info "Will load on next boot"
|
||||
fi
|
||||
fi
|
||||
}
|
||||
|
||||
@@ -1671,7 +1714,7 @@ monitor_mdm() {
|
||||
}
|
||||
|
||||
stop_monitor() {
|
||||
local pidfile="/tmp/unleash-monitor.pid"
|
||||
local pidfile="${1:-/tmp/unleash-monitor.pid}"
|
||||
if [ -f "$pidfile" ]; then
|
||||
local pid
|
||||
pid=$(cat "$pidfile")
|
||||
@@ -1688,7 +1731,7 @@ stop_monitor() {
|
||||
}
|
||||
|
||||
monitor_status() {
|
||||
local pidfile="/tmp/unleash-monitor.pid"
|
||||
local pidfile="${1:-/tmp/unleash-monitor.pid}"
|
||||
if [ -f "$pidfile" ] && kill -0 "$(cat "$pidfile")" 2>/dev/null; then
|
||||
echo -e "${GRN}Monitor running (PID $(cat "$pidfile"))${NC}"
|
||||
tail -5 /var/log/unleash-monitor.log 2>/dev/null || echo " (no log entries yet)"
|
||||
@@ -1700,7 +1743,8 @@ monitor_status() {
|
||||
show_history() {
|
||||
header "Unleash Event History"
|
||||
|
||||
local logs=("/var/log/unleash-monitor.log" "/var/log/unleash-heal.log" "/var/log/unleash-monitor.err")
|
||||
local log_dir="${1:-/var/log}"
|
||||
local logs=("$log_dir/unleash-monitor.log" "$log_dir/unleash-heal.log" "$log_dir/unleash-monitor.err")
|
||||
local found=false
|
||||
|
||||
for logfile in "${logs[@]}"; do
|
||||
@@ -1733,7 +1777,8 @@ show_history() {
|
||||
}
|
||||
|
||||
clear_history() {
|
||||
local logs=("/var/log/unleash-monitor.log" "/var/log/unleash-heal.log" "/var/log/unleash-monitor.err")
|
||||
local log_dir="${1:-/var/log}"
|
||||
local logs=("$log_dir/unleash-monitor.log" "$log_dir/unleash-heal.log" "$log_dir/unleash-monitor.err")
|
||||
for logfile in "${logs[@]}"; do
|
||||
if [ -f "$logfile" ]; then
|
||||
: > "$logfile"
|
||||
@@ -1926,7 +1971,7 @@ do_self_update() {
|
||||
fi
|
||||
end_ok; echo " Latest: v$latest_tag"
|
||||
|
||||
if [ "v$latest_tag" = "$(echo "v$VERSION")" ]; then
|
||||
if [ "v$latest_tag" = "v$VERSION" ]; then
|
||||
success "Already up to date (v$VERSION)"
|
||||
rm -rf "$tmp_dir"
|
||||
return 0
|
||||
@@ -2166,9 +2211,9 @@ generate_report() {
|
||||
|
||||
step "Running MDM Processes"
|
||||
local procs
|
||||
procs=$(ps aux 2>/dev/null | grep -iE "mdm|managedclient|activation" | grep -v grep || true)
|
||||
procs=$(pgrep -il "mdm|managedclient|activation" 2>/dev/null || true)
|
||||
if [ -n "$procs" ]; then
|
||||
echo "$procs" | awk '{print " " $11 " (PID " $2 ")"}'
|
||||
echo "$procs" | awk '{print " " $2 " (PID " $1 ")"}'
|
||||
else
|
||||
echo " None"
|
||||
fi
|
||||
@@ -2234,6 +2279,14 @@ generate_report_json() {
|
||||
echo -e "$report"
|
||||
}
|
||||
|
||||
_has_matching_path() {
|
||||
local path
|
||||
for path in "$@"; do
|
||||
[ ! -e "$path" ] || return 0
|
||||
done
|
||||
return 1
|
||||
}
|
||||
|
||||
detect_configurator_enrollment() {
|
||||
local data_mount="${1:-}"
|
||||
|
||||
@@ -2316,8 +2369,13 @@ detect_migration_assistant() {
|
||||
|
||||
local user_agents="$home/Library/LaunchAgents"
|
||||
if [ -d "$user_agents" ]; then
|
||||
local found
|
||||
found=$(ls "$user_agents" 2>/dev/null | grep -ciE "mdm|enrollment|managed" || true)
|
||||
local found=0 agent
|
||||
for agent in "$user_agents/"*; do
|
||||
[ -f "$agent" ] || continue
|
||||
if printf '%s\n' "${agent##*/}" | grep -qiE 'mdm|enrollment|managed'; then
|
||||
found=$((found + 1))
|
||||
fi
|
||||
done
|
||||
if [ "$found" -gt 0 ]; then
|
||||
ma_indicators=$((ma_indicators + found))
|
||||
details="$details $user: $found MDM LaunchAgent(s)\n"
|
||||
@@ -2326,9 +2384,7 @@ detect_migration_assistant() {
|
||||
|
||||
local prefs="$home/Library/Preferences"
|
||||
if [ -d "$prefs" ]; then
|
||||
local mdm_prefs
|
||||
mdm_prefs=$(ls "$prefs"/com.apple.mdm* "$prefs"/com.apple.ManagedClient* 2>/dev/null | head -3 || true)
|
||||
if [ -n "$mdm_prefs" ]; then
|
||||
if _has_matching_path "$prefs"/com.apple.mdm* "$prefs"/com.apple.ManagedClient*; then
|
||||
ma_indicators=$((ma_indicators + 1))
|
||||
details="$details $user: MDM preference files\n"
|
||||
fi
|
||||
@@ -2342,16 +2398,12 @@ detect_migration_assistant() {
|
||||
|
||||
local caches="$home/Library/Caches"
|
||||
if [ -d "$caches" ]; then
|
||||
local enrollment_cache
|
||||
enrollment_cache=$(ls "$caches"/com.apple.enrollment* 2>/dev/null | head -3 || true)
|
||||
if [ -n "$enrollment_cache" ]; then
|
||||
if _has_matching_path "$caches"/com.apple.enrollment*; then
|
||||
ma_indicators=$((ma_indicators + 1))
|
||||
details="$details $user: enrollment cache files\n"
|
||||
fi
|
||||
|
||||
local mdmd_cache
|
||||
mdmd_cache=$(ls "$caches"/com.apple.mdm* 2>/dev/null | head -3 || true)
|
||||
if [ -n "$mdmd_cache" ]; then
|
||||
if _has_matching_path "$caches"/com.apple.mdm*; then
|
||||
ma_indicators=$((ma_indicators + 1))
|
||||
details="$details $user: MDM cache files\n"
|
||||
fi
|
||||
@@ -2549,14 +2601,14 @@ RULES
|
||||
if grep -q "vpn-kill" "$pf_conf" 2>/dev/null; then
|
||||
info "pf.conf already has VPN kill-switch anchor"
|
||||
else
|
||||
echo "" >> "$pf_conf"
|
||||
echo "# Added by unleash — VPN kill-switch (prevents MDM leaks)" >> "$pf_conf"
|
||||
echo "$anchor_line" >> "$pf_conf"
|
||||
echo "$load_line" >> "$pf_conf"
|
||||
printf '\n%s\n%s\n%s\n' "# Added by unleash — VPN kill-switch (prevents MDM leaks)" "$anchor_line" "$load_line" >> "$pf_conf"
|
||||
fi
|
||||
|
||||
pfctl -e -f "$pf_conf" 2>/dev/null && success "VPN kill-switch active" \
|
||||
|| warn "pfctl failed"
|
||||
if pfctl -e -f "$pf_conf" 2>/dev/null; then
|
||||
success "VPN kill-switch active"
|
||||
else
|
||||
warn "pfctl failed"
|
||||
fi
|
||||
|
||||
echo ""
|
||||
info "What this does:"
|
||||
@@ -2814,6 +2866,7 @@ cmd_dualboot() {
|
||||
echo ""
|
||||
step "Creating admin account on target"
|
||||
|
||||
local realName
|
||||
prompt_default realName "Full name" "Apple"
|
||||
local username
|
||||
prompt_username username
|
||||
@@ -2828,9 +2881,7 @@ cmd_dualboot() {
|
||||
begin "Blocking domains"
|
||||
local hosts_file="$data_path/private/etc/hosts"
|
||||
[ -f "$hosts_file" ] || touch "$hosts_file"
|
||||
echo "0.0.0.0 deviceenrollment.apple.com" >>"$hosts_file"
|
||||
echo "0.0.0.0 mdmenrollment.apple.com" >>"$hosts_file"
|
||||
echo "0.0.0.0 iprofiles.apple.com" >>"$hosts_file"
|
||||
printf '%s\n' "0.0.0.0 deviceenrollment.apple.com" "0.0.0.0 mdmenrollment.apple.com" "0.0.0.0 iprofiles.apple.com" >>"$hosts_file"
|
||||
end_ok
|
||||
|
||||
begin "Resetting config profiles"
|
||||
|
||||
Reference in New Issue
Block a user