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:
@@ -32,6 +32,12 @@ type InstallOptions struct {
|
||||
ConfigDir string // agent config / keystore dir (--dir)
|
||||
}
|
||||
|
||||
// UninstallOptions configures an elevated probo-agent uninstall invocation.
|
||||
type UninstallOptions struct {
|
||||
ExePath string
|
||||
ConfigDir string
|
||||
}
|
||||
|
||||
func commandError(out []byte, err error) error {
|
||||
if err == nil {
|
||||
return nil
|
||||
|
||||
@@ -22,51 +22,22 @@
|
||||
|
||||
package elevate
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"os/exec"
|
||||
"strings"
|
||||
import "errors"
|
||||
|
||||
"go.probo.inc/probo/pkg/deviceagent/checks"
|
||||
// ErrPrivilegedHelperRequired is returned when a non-root process asks for
|
||||
// elevation on macOS. Browser enrollment must go through the signed
|
||||
// Probo Agent.app XPC helper (installed by the PKG); CLI install/uninstall
|
||||
// require sudo.
|
||||
var ErrPrivilegedHelperRequired = errors.New(
|
||||
"macOS elevation requires the signed Probo Agent.app privileged helper " +
|
||||
"(browser enroll via PKG-installed helper) or sudo " +
|
||||
"(CLI: sudo probo-agent install|uninstall)",
|
||||
)
|
||||
|
||||
func runElevatedInstall(opts InstallOptions, enrollmentToken string) error {
|
||||
parts := []string{
|
||||
shellQuote(opts.ExePath),
|
||||
"install",
|
||||
"--server",
|
||||
shellQuote(opts.ServerURL),
|
||||
"--enrollment-token",
|
||||
shellQuote(enrollmentToken),
|
||||
}
|
||||
if opts.ConfigDir != "" {
|
||||
parts = append(parts, "--dir", shellQuote(opts.ConfigDir))
|
||||
}
|
||||
|
||||
shellCmd := strings.Join(parts, " ")
|
||||
|
||||
script := fmt.Sprintf(
|
||||
`do shell script %s with administrator privileges`,
|
||||
applescriptQuote(shellCmd),
|
||||
)
|
||||
|
||||
candidates := checks.CommandCandidates("osascript")
|
||||
if len(candidates) == 0 {
|
||||
return fmt.Errorf("command %q not available at expected absolute path", "osascript")
|
||||
}
|
||||
|
||||
out, err := exec.Command(candidates[0], "-e", script).CombinedOutput()
|
||||
|
||||
return commandError(out, err)
|
||||
func runElevatedInstall(_ InstallOptions, _ string) error {
|
||||
return ErrPrivilegedHelperRequired
|
||||
}
|
||||
|
||||
func shellQuote(v string) string {
|
||||
return "'" + strings.ReplaceAll(v, "'", `'"'"'`) + "'"
|
||||
}
|
||||
|
||||
func applescriptQuote(v string) string {
|
||||
v = strings.ReplaceAll(v, `\`, `\\`)
|
||||
v = strings.ReplaceAll(v, `"`, `\"`)
|
||||
|
||||
return `"` + v + `"`
|
||||
func runElevatedUninstall(_ UninstallOptions) error {
|
||||
return ErrPrivilegedHelperRequired
|
||||
}
|
||||
|
||||
48
pkg/deviceagent/elevate/elevate_darwin_test.go
Normal file
48
pkg/deviceagent/elevate/elevate_darwin_test.go
Normal file
@@ -0,0 +1,48 @@
|
||||
// Copyright (c) 2026 Probo Inc <hello@probo.com>.
|
||||
//
|
||||
// Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||
// of this software and associated documentation files (the "Software"), to deal
|
||||
// in the Software without restriction, including without limitation the rights
|
||||
// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||
// copies of the Software, and to permit persons to whom the Software is
|
||||
// furnished to do so, subject to the following conditions:
|
||||
//
|
||||
// The above copyright notice and this permission notice shall be included in
|
||||
// all copies or substantial portions of the Software.
|
||||
//
|
||||
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||
// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||
// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
||||
// SOFTWARE.
|
||||
|
||||
//go:build darwin
|
||||
|
||||
package elevate
|
||||
|
||||
import (
|
||||
"testing"
|
||||
|
||||
"github.com/stretchr/testify/require"
|
||||
)
|
||||
|
||||
func TestRunElevatedInstallRequiresPrivilegedHelper(t *testing.T) {
|
||||
t.Parallel()
|
||||
|
||||
err := RunElevatedInstall(
|
||||
"/usr/local/bin/probo-agent",
|
||||
"https://example.com",
|
||||
"token",
|
||||
"/var/lib/probo-agent",
|
||||
)
|
||||
require.ErrorIs(t, err, ErrPrivilegedHelperRequired)
|
||||
}
|
||||
|
||||
func TestRunElevatedUninstallRequiresPrivilegedHelper(t *testing.T) {
|
||||
t.Parallel()
|
||||
|
||||
err := RunElevatedUninstall("/usr/local/bin/probo-agent", "/var/lib/probo-agent")
|
||||
require.ErrorIs(t, err, ErrPrivilegedHelperRequired)
|
||||
}
|
||||
@@ -68,3 +68,36 @@ func runElevatedInstall(opts InstallOptions, enrollmentToken string) error {
|
||||
|
||||
return commandError(out, err)
|
||||
}
|
||||
|
||||
func runElevatedUninstall(opts UninstallOptions) error {
|
||||
args := []string{"uninstall"}
|
||||
if opts.ConfigDir != "" {
|
||||
args = append(args, "--dir", opts.ConfigDir)
|
||||
}
|
||||
|
||||
argList := make([]string, len(args))
|
||||
for i, arg := range args {
|
||||
argList[i] = "'" + escapePowerShellSingleQuoted(arg) + "'"
|
||||
}
|
||||
|
||||
script := fmt.Sprintf(
|
||||
`$p = Start-Process -FilePath %s -ArgumentList @(%s) -Verb RunAs -Wait -PassThru; if ($p.ExitCode -ne 0) { exit $p.ExitCode }`,
|
||||
"'"+escapePowerShellSingleQuoted(opts.ExePath)+"'",
|
||||
strings.Join(argList, ","),
|
||||
)
|
||||
|
||||
candidates := checks.CommandCandidates("powershell.exe")
|
||||
if len(candidates) == 0 {
|
||||
return fmt.Errorf("command %q not available at expected absolute path", "powershell.exe")
|
||||
}
|
||||
|
||||
out, err := exec.Command(
|
||||
candidates[0],
|
||||
"-NoProfile",
|
||||
"-NonInteractive",
|
||||
"-Command",
|
||||
script,
|
||||
).CombinedOutput()
|
||||
|
||||
return commandError(out, err)
|
||||
}
|
||||
|
||||
29
pkg/deviceagent/elevate/uninstall_stub.go
Normal file
29
pkg/deviceagent/elevate/uninstall_stub.go
Normal file
@@ -0,0 +1,29 @@
|
||||
// Copyright (c) 2026 Probo Inc <hello@probo.com>.
|
||||
//
|
||||
// Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||
// of this software and associated documentation files (the "Software"), to deal
|
||||
// in the Software without restriction, including without limitation the rights
|
||||
// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||
// copies of the Software, and to permit persons to whom the Software is
|
||||
// furnished to do so, subject to the following conditions:
|
||||
//
|
||||
// The above copyright notice and this permission notice shall be included in
|
||||
// all copies or substantial portions of the Software.
|
||||
//
|
||||
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||
// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||
// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
||||
// SOFTWARE.
|
||||
|
||||
//go:build !darwin && !windows
|
||||
|
||||
package elevate
|
||||
|
||||
import "errors"
|
||||
|
||||
func RunElevatedUninstall(_ string, _ string) error {
|
||||
return errors.New("elevated uninstall is only supported on macOS and Windows")
|
||||
}
|
||||
34
pkg/deviceagent/elevate/uninstall_stub_test.go
Normal file
34
pkg/deviceagent/elevate/uninstall_stub_test.go
Normal file
@@ -0,0 +1,34 @@
|
||||
// Copyright (c) 2026 Probo Inc <hello@probo.com>.
|
||||
//
|
||||
// Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||
// of this software and associated documentation files (the "Software"), to deal
|
||||
// in the Software without restriction, including without limitation the rights
|
||||
// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||
// copies of the Software, and to permit persons to whom the Software is
|
||||
// furnished to do so, subject to the following conditions:
|
||||
//
|
||||
// The above copyright notice and this permission notice shall be included in
|
||||
// all copies or substantial portions of the Software.
|
||||
//
|
||||
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||
// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||
// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
||||
// SOFTWARE.
|
||||
|
||||
package elevate
|
||||
|
||||
import (
|
||||
"testing"
|
||||
|
||||
"github.com/stretchr/testify/require"
|
||||
)
|
||||
|
||||
func TestRunElevatedUninstallUnsupported(t *testing.T) {
|
||||
t.Parallel()
|
||||
|
||||
err := RunElevatedUninstall("/usr/local/bin/probo-agent", "/var/lib/probo-agent")
|
||||
require.Error(t, err)
|
||||
}
|
||||
32
pkg/deviceagent/elevate/uninstall_supported.go
Normal file
32
pkg/deviceagent/elevate/uninstall_supported.go
Normal file
@@ -0,0 +1,32 @@
|
||||
// Copyright (c) 2026 Probo Inc <hello@probo.com>.
|
||||
//
|
||||
// Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||
// of this software and associated documentation files (the "Software"), to deal
|
||||
// in the Software without restriction, including without limitation the rights
|
||||
// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||
// copies of the Software, and to permit persons to whom the Software is
|
||||
// furnished to do so, subject to the following conditions:
|
||||
//
|
||||
// The above copyright notice and this permission notice shall be included in
|
||||
// all copies or substantial portions of the Software.
|
||||
//
|
||||
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||
// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||
// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
||||
// SOFTWARE.
|
||||
|
||||
//go:build darwin || windows
|
||||
|
||||
package elevate
|
||||
|
||||
func RunElevatedUninstall(exePath string, configDir string) error {
|
||||
return runElevatedUninstall(
|
||||
UninstallOptions{
|
||||
ExePath: exePath,
|
||||
ConfigDir: configDir,
|
||||
},
|
||||
)
|
||||
}
|
||||
Reference in New Issue
Block a user