Skip to content

add flag 'ts-authkey-file' and env var TS_AUTHKEY_FILE for use with docker secrets #115

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

Open
angelbirth wants to merge 1 commit into
base: main
Choose a base branch
from
Open

add flag 'ts-authkey-file' and env var TS_AUTHKEY_FILE for use with docker secrets #115

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 4 additions & 0 deletions scripts/docker/run.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,10 @@ if [ -n "$TSIDP_LOCAL_PORT" ]; then
ARGS="$ARGS -local-port=$TSIDP_LOCAL_PORT"
fi

if [ -n "$TS_AUTHKEY_FILE" ]; then
ARGS="$ARGS -ts-authkey-file=$TS_AUTHKEY_FILE"
fi

# logging control
if [ -n "$TSIDP_LOG" ]; then
case "$TSIDP_LOG" in
Expand Down
22 changes: 21 additions & 1 deletion tsidp-server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ import (
"net/http"
"os"
"os/signal"
"path/filepath"
"strings"
"time"

Expand All @@ -29,7 +30,6 @@ import (
"tailscale.com/hostinfo"
"tailscale.com/ipn"
"tailscale.com/ipn/ipnstate"

"tailscale.com/tsnet"
"tailscale.com/version"
)
Expand All @@ -51,6 +51,8 @@ var (
// extended debugging information
flagDebugAllRequests = flag.Bool("debug-all-requests", false, "capture and print all HTTP requests and responses")
flagDebugTSNet = flag.Bool("debug-tsnet", false, "enable tsnet.Server logging")

flagAuthKeyFile = flag.String("ts-authkey-file", "", "authkey file")
)

// main initializes and starts the tsidp server
Expand Down Expand Up @@ -127,10 +129,28 @@ func main() {
defer cleanup()
} else {
hostinfo.SetApp("tsidp")
if *flagAuthKeyFile != "" {
f, _ := filepath.Abs(*flagAuthKeyFile)
file, err := os.Open(f)
if err != nil {
slog.Error("error opening auth key file", slog.Any("err", err))
os.Exit(1)
}
authKeyBytes, err := io.ReadAll(file)
if err != nil {
slog.Error("error reading auth key file", slog.Any("err", err))
os.Exit(1)
}
// reuse tsAuthKeyFile variable
*flagAuthKeyFile = string(authKeyBytes)
}
ts := &tsnet.Server{
Hostname: *flagHostname,
Dir: *flagDir,
}
if *flagAuthKeyFile != "" {
ts.AuthKey = *flagAuthKeyFile
}
if *flagDebugTSNet {
ts.Logf = func(format string, args ...any) {
cur := slog.SetLogLoggerLevel(slog.LevelDebug) // force debug if this option is on
Expand Down