Skip to content

add --tsnet-dir flag #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bradfitz merged 2 commits into from
Nov 18, 2025
Merged

add --tsnet-dir flag #5

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bcfe990
add --tsnet-dir flag
bradfitz Nov 18, 2025
67c49db
trim whitespace from setec secret values
bradfitz Nov 18, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions hallpass.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ var (
secretServer = flag.String("secret-server", "", "setec secret server base URL; if empty, setec is not used")
oauthSecret = flag.String("oauth-secret", keyPath("hallpass-key"), "name of setec secret containing Tailscale OAuth ClientSecret; if --secret-server is empty, ignored and reads from $HOME/keys/hallpass-key")
webhookSecret = flag.String("webhook-secret", keyPath("hallpass-webhook"), "name of setec secret containing the Slack webhook URL; if --secret-server is empty, ignored and reads from $HOME/keys/hallpass-webhook")
configDir = flag.String("tsnet-dir", "", "tsnet server directory; if empty, tsnet uses an automatic config directory based on the binary name")
)

func main() {
Expand All @@ -53,6 +54,7 @@ func main() {

ts := &tsnet.Server{
Hostname: "hallpass",
Dir: *configDir,
}
js := &Server{ts: ts}
if err := ts.Start(); err != nil {
Expand Down Expand Up @@ -105,8 +107,8 @@ func main() {
log.Fatalf("failed to create setec store: %v", err)
}
defer ss.Close()
js.oauthClientSecret = ss.Secret(*oauthSecret)
js.webhookURL = ss.Secret(*webhookSecret)
js.oauthClientSecret = whitespaceTrimmingSecret(ss.Secret(*oauthSecret))
js.webhookURL = whitespaceTrimmingSecret(ss.Secret(*webhookSecret))
} else {
log.Printf("Using secrets from disk")
js.oauthClientSecret = setec.StaticSecret(readFile(*oauthSecret))
Expand All @@ -130,6 +132,10 @@ func main() {
log.Fatal(http.Serve(ln, protect(js)))
}

func whitespaceTrimmingSecret(s setec.Secret) setec.Secret {
return func() []byte { return bytes.TrimSpace(s()) }
}

func keyPath(name string) string {
home, err := os.UserHomeDir()
if err != nil {
Expand Down