mirror of
https://github.com/jmcorgan/fips.git
synced 2026-07-22 07:48:26 +00:00
Before bf77ece (Fix DNS responder silent-drop on systemd-resolved
deployments, 2026-04-29) the daemon defaulted dns.bind_addr to "::"
(wildcard, accepted v4 traffic too), so the macOS pkg's resolver shim
of `nameserver 127.0.0.1` reached the daemon fine over v4 loopback.
That commit tightened the default to "::1" — IPv6 loopback only,
which on Linux/macOS does not accept v4-mapped traffic — to defuse a
mesh-interface filter / IPV6_PKTINFO bug that was silently dropping
.fips queries on systemd-resolved hosts. The Linux side was updated
in the same commit: fips-dns-setup now writes [::1]:5354 in every
backend, and the gateway's DEFAULT_DNS_UPSTREAM moved to [::1]:5354
with an inline comment about the v4/v6 mismatch.
The macOS resolver shim in packaging/macos/build-pkg.sh was missed in
that sweep. Since 2026-04-29, every macOS install has shipped
/etc/resolver/fips with `nameserver 127.0.0.1` while the daemon
listened on `::1`, so .fips hostnames don't resolve via getaddrinfo
(ping6, curl, etc.) even though `dig @::1 -p 5354 …` works.
The mismatch is easy to miss: mDNSResponder swallows the timeout,
VPN clients that hijack DNS (NetworkExtension match-domain : *) mask
it entirely, and the symptom looks like "discovery hasn't found the
peer yet". Switch the shim to nameserver ::1 to match the daemon.
212 lines
6.3 KiB
Bash
Executable File
212 lines
6.3 KiB
Bash
Executable File
#!/usr/bin/env bash
|
|
# Build a macOS .pkg installer for FIPS.
|
|
#
|
|
# Usage: ./packaging/macos/build-pkg.sh [--version <version>] [--no-build]
|
|
# Output: deploy/fips-<version>-macos-<arch>.pkg
|
|
#
|
|
# Prerequisites: Xcode command-line tools (pkgbuild is included)
|
|
|
|
set -euo pipefail
|
|
|
|
SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
|
|
PACKAGING_DIR="$(cd "${SCRIPT_DIR}/.." && pwd)"
|
|
PROJECT_ROOT="$(cd "${PACKAGING_DIR}/.." && pwd)"
|
|
|
|
usage() {
|
|
cat <<'EOF'
|
|
Usage: packaging/macos/build-pkg.sh [options]
|
|
|
|
Options:
|
|
--version <version> Override package version
|
|
--target <triple> Rust target triple (e.g. x86_64-apple-darwin)
|
|
--no-build Package existing binaries without running cargo build
|
|
-h, --help Show this help
|
|
EOF
|
|
}
|
|
|
|
VERSION_OVERRIDE=""
|
|
TARGET_TRIPLE=""
|
|
NO_BUILD=0
|
|
|
|
while [[ $# -gt 0 ]]; do
|
|
case "$1" in
|
|
--version)
|
|
VERSION_OVERRIDE="${2:?missing value for --version}"
|
|
shift 2
|
|
;;
|
|
--target)
|
|
TARGET_TRIPLE="${2:?missing value for --target}"
|
|
shift 2
|
|
;;
|
|
--no-build)
|
|
NO_BUILD=1
|
|
shift
|
|
;;
|
|
-h|--help)
|
|
usage
|
|
exit 0
|
|
;;
|
|
*)
|
|
echo "Unknown option: $1" >&2
|
|
usage >&2
|
|
exit 1
|
|
;;
|
|
esac
|
|
done
|
|
|
|
VERSION="${VERSION_OVERRIDE:-$(grep '^version' "${PROJECT_ROOT}/Cargo.toml" | head -1 | sed 's/.*"\(.*\)"/\1/')}"
|
|
|
|
# Derive the package architecture from the build target, not the build
|
|
# host. When cross-compiling (for example building the x86_64 package on
|
|
# an Apple-silicon machine) `uname -m` reports the host architecture and
|
|
# would mislabel the package; the Rust target triple is authoritative.
|
|
if [[ -n "${TARGET_TRIPLE}" ]]; then
|
|
case "${TARGET_TRIPLE}" in
|
|
aarch64-*) ARCH="arm64" ;;
|
|
x86_64-*) ARCH="x86_64" ;;
|
|
*)
|
|
echo "Unsupported target triple: ${TARGET_TRIPLE}" >&2
|
|
exit 1
|
|
;;
|
|
esac
|
|
else
|
|
ARCH="$(uname -m)"
|
|
fi
|
|
PKG_NAME="fips-${VERSION}-macos-${ARCH}"
|
|
DEPLOY_DIR="${PROJECT_ROOT}/deploy"
|
|
STAGING_DIR="$(mktemp -d)"
|
|
SCRIPTS_DIR="$(mktemp -d)"
|
|
trap 'rm -rf "${STAGING_DIR}" "${SCRIPTS_DIR}"' EXIT
|
|
|
|
if [[ -n "${TARGET_TRIPLE}" ]]; then
|
|
BINARY_DIR="${PROJECT_ROOT}/target/${TARGET_TRIPLE}/release"
|
|
else
|
|
BINARY_DIR="${PROJECT_ROOT}/target/release"
|
|
fi
|
|
|
|
echo "Building FIPS v${VERSION} for macOS ${ARCH}..."
|
|
|
|
# Build release binaries
|
|
if [[ "${NO_BUILD}" -eq 0 ]]; then
|
|
cargo_args=(build --release --manifest-path="${PROJECT_ROOT}/Cargo.toml")
|
|
[[ -n "${TARGET_TRIPLE}" ]] && cargo_args+=(--target "${TARGET_TRIPLE}")
|
|
cargo "${cargo_args[@]}"
|
|
fi
|
|
|
|
# Verify binaries exist
|
|
for bin in fips fipsctl fipstop; do
|
|
if [[ ! -f "${BINARY_DIR}/${bin}" ]]; then
|
|
echo "Missing binary: ${BINARY_DIR}/${bin}" >&2
|
|
exit 1
|
|
fi
|
|
done
|
|
|
|
# Stage the payload (mirrors installed filesystem layout)
|
|
mkdir -p "${STAGING_DIR}/usr/local/bin"
|
|
mkdir -p "${STAGING_DIR}/usr/local/etc/fips"
|
|
mkdir -p "${STAGING_DIR}/usr/local/var/log/fips"
|
|
mkdir -p "${STAGING_DIR}/Library/LaunchDaemons"
|
|
mkdir -p "${STAGING_DIR}/etc/resolver"
|
|
|
|
# Binaries
|
|
for bin in fips fipsctl fipstop; do
|
|
cp "${BINARY_DIR}/${bin}" "${STAGING_DIR}/usr/local/bin/"
|
|
strip "${STAGING_DIR}/usr/local/bin/${bin}"
|
|
done
|
|
|
|
# Config (marked as conf file via postinstall logic — won't overwrite on upgrade)
|
|
cp "${PACKAGING_DIR}/common/fips.yaml" "${STAGING_DIR}/usr/local/etc/fips/fips.yaml.default"
|
|
cp "${PACKAGING_DIR}/common/hosts" "${STAGING_DIR}/usr/local/etc/fips/hosts.default"
|
|
|
|
# LaunchDaemon plist
|
|
cp "${SCRIPT_DIR}/com.fips.daemon.plist" "${STAGING_DIR}/Library/LaunchDaemons/"
|
|
|
|
# DNS resolver. Must match the daemon's dns.bind_addr (defaults to ::1).
|
|
cat > "${STAGING_DIR}/etc/resolver/fips" <<EOF
|
|
nameserver ::1
|
|
port 5354
|
|
EOF
|
|
|
|
# Create postinstall script
|
|
cat > "${SCRIPTS_DIR}/postinstall" <<'POSTINSTALL'
|
|
#!/bin/sh
|
|
set -e
|
|
|
|
LOG="/var/log/fips-install.log"
|
|
log() { echo "$(date '+%Y-%m-%d %H:%M:%S') $*" | tee -a "$LOG"; logger -t fips-install "$*"; }
|
|
|
|
log "postinstall started"
|
|
|
|
CONFDIR="/usr/local/etc/fips"
|
|
|
|
# Install default config only if none exists (preserve on upgrade)
|
|
if [ ! -f "$CONFDIR/fips.yaml" ]; then
|
|
cp "$CONFDIR/fips.yaml.default" "$CONFDIR/fips.yaml"
|
|
chmod 600 "$CONFDIR/fips.yaml"
|
|
log "installed default config"
|
|
fi
|
|
if [ ! -f "$CONFDIR/hosts" ]; then
|
|
cp "$CONFDIR/hosts.default" "$CONFDIR/hosts"
|
|
fi
|
|
|
|
# Flush DNS cache so macOS picks up the new /etc/resolver/fips file
|
|
dscacheutil -flushcache
|
|
killall -HUP mDNSResponder 2>/dev/null || true
|
|
log "flushed DNS cache"
|
|
|
|
# Create fips group if it doesn't exist
|
|
if ! dscl . -read /Groups/fips > /dev/null 2>&1; then
|
|
dscl . -create /Groups/fips RecordName fips
|
|
dscl . -create /Groups/fips PrimaryGroupID 999
|
|
log "created group fips"
|
|
fi
|
|
|
|
# stat /dev/console gives the user logged into the GUI session —
|
|
# logname/SUDO_USER are not set in pkg postinstall context
|
|
REAL_USER="$(stat -f '%Su' /dev/console 2>/dev/null || true)"
|
|
log "console user: ${REAL_USER:-unknown}"
|
|
if [ -n "$REAL_USER" ] && [ "$REAL_USER" != "root" ]; then
|
|
if ! dscl . -read /Groups/fips GroupMembership 2>/dev/null | grep -qw "$REAL_USER"; then
|
|
dscl . -append /Groups/fips GroupMembership "$REAL_USER"
|
|
log "added $REAL_USER to group fips"
|
|
else
|
|
log "$REAL_USER already in group fips"
|
|
fi
|
|
fi
|
|
|
|
# Load the launchd service
|
|
launchctl bootout system /Library/LaunchDaemons/com.fips.daemon.plist 2>/dev/null || true
|
|
launchctl bootstrap system /Library/LaunchDaemons/com.fips.daemon.plist 2>/dev/null || true
|
|
log "launchd service loaded"
|
|
|
|
log "postinstall complete"
|
|
exit 0
|
|
POSTINSTALL
|
|
chmod +x "${SCRIPTS_DIR}/postinstall"
|
|
|
|
# Create preinstall script (stop service before upgrade)
|
|
cat > "${SCRIPTS_DIR}/preinstall" <<'PREINSTALL'
|
|
#!/bin/sh
|
|
# Stop service before upgrade
|
|
launchctl bootout system /Library/LaunchDaemons/com.fips.daemon.plist 2>/dev/null || true
|
|
exit 0
|
|
PREINSTALL
|
|
chmod +x "${SCRIPTS_DIR}/preinstall"
|
|
|
|
# Build the .pkg
|
|
mkdir -p "${DEPLOY_DIR}"
|
|
pkgbuild \
|
|
--root "${STAGING_DIR}" \
|
|
--scripts "${SCRIPTS_DIR}" \
|
|
--identifier com.fips.pkg \
|
|
--version "${VERSION}" \
|
|
--ownership recommended \
|
|
"${DEPLOY_DIR}/${PKG_NAME}.pkg"
|
|
|
|
echo ""
|
|
echo "Package built: deploy/${PKG_NAME}.pkg"
|
|
ls -lh "${DEPLOY_DIR}/${PKG_NAME}.pkg"
|
|
echo ""
|
|
echo "Install with: sudo installer -pkg deploy/${PKG_NAME}.pkg -target /"
|
|
echo "Remove with: sudo packaging/macos/uninstall.sh"
|