Install macOS helper from PKG for XPC enroll

Browser enrollment used osascript on every elevate. Ship a signed
privileged helper installed at PKG time so probo:// can enroll over
XPC with no second admin prompt. Add make install/uninstall/clean for
local PKG test loops, and show alerts only on failure.

Mirror the Go lint path for the macOS SPM package: Make
targets, root configs, and a Linux CI job. Keep checks
syntax-only so they do not need a macOS SDK. Format the
existing sources so the new gates start clean.

Signed-off-by: Ludovic Vielle <ludovic@probo.com>
This commit is contained in:
Ludovic Vielle
2026-07-20 18:18:04 +02:00
parent 754d12d583
commit 85864a580c
42 changed files with 1903 additions and 341 deletions

View File

@@ -25,9 +25,11 @@ import (
"encoding/json"
"errors"
"fmt"
"io"
"os"
"os/signal"
"path/filepath"
"runtime"
"syscall"
"time"
@@ -100,6 +102,8 @@ func newRootCmd() *cobra.Command {
}
func newEnrollURLCmd() *cobra.Command {
var preflight bool
cmd := &cobra.Command{
Use: "enroll-url [url]",
Hidden: true,
@@ -112,14 +116,32 @@ func newEnrollURLCmd() *cobra.Command {
dir := resolveDir(cmd)
if preflight {
enrolled, err := deviceagent.IsEnrolled(deviceagent.EnrollmentRunDir(dir))
if err != nil {
return fmt.Errorf("cannot check enrollment state: %w", err)
}
return writeEnrollPreflight(cmd.OutOrStdout(), serverURL, enrollmentToken, dir, enrolled)
}
already, err := reportIfAlreadyEnrolled(dir)
if err != nil {
return err
}
if already {
return nil
}
if runtime.GOOS == "darwin" {
return fmt.Errorf(
"macOS browser enrollment must use the signed Probo Agent.app " +
"(probo:// deeplink); for CLI use: sudo probo-agent install " +
"--server … --enrollment-token …",
)
}
exePath, err := os.Executable()
if err != nil {
return fmt.Errorf("cannot resolve current executable path: %w", err)
@@ -135,9 +157,42 @@ func newEnrollURLCmd() *cobra.Command {
},
}
cmd.Flags().BoolVar(&preflight, "preflight", false, "validate enrollment URL and print JSON for the macOS URL handler")
return cmd
}
type enrollPreflightResponse struct {
Server string `json:"server"`
Token string `json:"token"`
AlreadyEnrolled bool `json:"alreadyEnrolled"`
ConfigDir string `json:"configDir"`
}
func writeEnrollPreflight(
w io.Writer,
serverURL, enrollmentToken, dir string,
alreadyEnrolled bool,
) error {
payload := enrollPreflightResponse{
Server: serverURL,
Token: enrollmentToken,
AlreadyEnrolled: alreadyEnrolled,
ConfigDir: dir,
}
out, err := json.Marshal(payload)
if err != nil {
return fmt.Errorf("cannot encode enrollment preflight response: %w", err)
}
if _, err := fmt.Fprintln(w, string(out)); err != nil {
return fmt.Errorf("cannot write enrollment preflight response: %w", err)
}
return nil
}
// reportIfAlreadyEnrolled prints a success message and returns true when
// the local enrollment marker is already present. Deep-link retries must
// exit 0 so the macOS URL handler does not show "Enrollment failed".
@@ -231,6 +286,7 @@ func newInstallCmd() *cobra.Command {
if err != nil {
return err
}
if already {
return nil
}