fix: harden restart-mac signing (#580) (thanks @jeffersonwarrior)

This commit is contained in:
Peter Steinberger
2026-01-10 23:48:33 +01:00
parent cb213b55f6
commit 317e15c746
4 changed files with 18 additions and 18 deletions

View File

@@ -294,7 +294,7 @@ package_relay_node() {
cp "$relay_node_build_dir/node-${BUILD_ARCHS[0]}" "$relay_node"
fi
chmod +x "$relay_node"
if [[ "${STRIP_NODE:-1}" == "1" ]]; then
if [[ "${STRIP_NODE:-0}" == "1" ]]; then
/usr/bin/strip -x "$relay_node" 2>/dev/null || true
fi
rm -rf "$relay_node_build_dir"

View File

@@ -68,14 +68,8 @@ acquire_lock() {
}
check_signing_keys() {
local available_identities
available_identities="$(security find-identity -p codesigning -v 2>/dev/null | grep -E '(Developer ID Application|Apple Distribution|Apple Development)' || true)"
if [ -n "$available_identities" ]; then
return 0
else
return 1
fi
security find-identity -p codesigning -v 2>/dev/null \
| grep -Eq '(Developer ID Application|Apple Distribution|Apple Development)'
}
trap cleanup EXIT INT TERM
@@ -98,6 +92,10 @@ for arg in "$@"; do
esac
done
if [[ "$NO_SIGN" -eq 1 && "$SIGN" -eq 1 ]]; then
fail "Cannot use --sign and --no-sign together"
fi
mkdir -p "$(dirname "$LOG_PATH")"
rm -f "$LOG_PATH"
exec > >(tee "$LOG_PATH") 2>&1
@@ -153,6 +151,9 @@ if [ "$NO_SIGN" -eq 1 ]; then
export ALLOW_ADHOC_SIGNING=1
export SIGN_IDENTITY="-"
elif [ "$SIGN" -eq 1 ]; then
if ! check_signing_keys; then
fail "No signing identity found. Use --no-sign or install a signing key."
fi
unset ALLOW_ADHOC_SIGNING
unset SIGN_IDENTITY
fi