gsadmin/spinifex
1
0
Fork 0
mirror of https://github.com/mulgadc/spinifex.git synced 2026-10-19 10:52:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: portToBr uses Output() to skip sudo PAM audit noise

Browse Source 
vpcd.service sets AmbientCapabilities which trips sudo's pam_limits into
emitting 'sudo: unable to send audit message: Operation not permitted'
on stderr. CombinedOutput merged that into stdout and poisoned the
port-to-br result, causing verifyBridgeMode to fail with a bogus bridge
name on service start after reinstall.

Switch to Output() (stdout only) + exec.ExitError.Stderr on error.
This commit is contained in:
joshsiv-mulga
2026-04-24 16:10:55 +10:00
parent c01207b342
commit d509df731a
1 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
spinifex/services/vpcd/vpcd.go
+11 -2
View File
@@ -465,10 +465,19 @@ func detectBridgeMode(externalIface string) string {
// portToBr returns the OVS bridge that owns `port`. Returns "" when the port // portToBr returns the OVS bridge that owns `port`. Returns "" when the port
// is not in OVSDB. Used by the post-detect sanity checks. // is not in OVSDB. Used by the post-detect sanity checks.
//
// Uses Output() (stdout only) because vpcd.service runs with AmbientCapabilities
// set, which causes sudo's PAM to emit "sudo: unable to send audit message"
// warnings on stderr. CombinedOutput would merge those into stdout and poison
// the bridge-name compare.
var portToBr = func(port string) (string, error) { var portToBr = func(port string) (string, error) {
out, err := sudoCommand("ovs-vsctl", "port-to-br", port).CombinedOutput() out, err := sudoCommand("ovs-vsctl", "port-to-br", port).Output()
if err != nil { if err != nil {
return "", fmt.Errorf("ovs-vsctl port-to-br %s: %s: %w", port, strings.TrimSpace(string(out)), err) var stderr string
if exitErr, ok := err.(*exec.ExitError); ok {
stderr = strings.TrimSpace(string(exitErr.Stderr))
}
return "", fmt.Errorf("ovs-vsctl port-to-br %s: %s: %w", port, stderr, err)
} }
return strings.TrimSpace(string(out)), nil return strings.TrimSpace(string(out)), nil
} }