Skip to content

Commit bbb21df

Browse files
committed
atom-probe: also honor the shared /etc/atom/dev.enabled marker
The dev-image toolkit is gated by one marker (/etc/atom/dev.enabled); atom-probe now serves when either that or its own probe.enabled is present (or --dev), so a single dev gate covers the whole toolkit. Still refuses on a user image with neither.
1 parent 4ae704e commit bbb21df

1 file changed

Lines changed: 5 additions & 2 deletions

File tree

cmd/atom-probe/main.go

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ import (
4646
const (
4747
defaultAddr = ":2222"
4848
defaultEnable = "/etc/atom/probe.enabled" // baked read-only marker: dev/managed policy allows it
49+
devMarker = "/etc/atom/dev.enabled" // the shared dev-image marker also permits it
4950
certValidYears = 10
5051
)
5152

@@ -136,8 +137,10 @@ func serve(args []string) int {
136137
// Policy gate: never run on a user image. Requires an explicit enable marker
137138
// (managed) or --dev (dev build), AND a token.
138139
if !*dev {
139-
if _, err := os.Stat(*enable); err != nil {
140-
fmt.Fprintf(os.Stderr, "atom-probe: refusing to serve: no %s and no --dev (policy gate)\n", *enable)
140+
_, e1 := os.Stat(*enable)
141+
_, e2 := os.Stat(devMarker)
142+
if e1 != nil && e2 != nil {
143+
fmt.Fprintf(os.Stderr, "atom-probe: refusing to serve: no %s, no %s, and no --dev (policy gate)\n", *enable, devMarker)
141144
return 1
142145
}
143146
}

0 commit comments

Comments
 (0)