From a480b1baa54a836bcb06f1badbe24e8b0fbead93 Mon Sep 17 00:00:00 2001 From: Christine Dodrill Date: Thu, 18 Mar 2021 13:23:56 -0400 Subject: [PATCH] logpolicy: set log target on windows based on a registry key (#1542) Signed-off-by: Christine Dodrill --- cmd/tailscaled/depaware.txt | 1 + logpolicy/logpolicy.go | 23 ++++++++++++++++++++++- util/winutil/winutil.go | 28 ++++++++++++++++++++++++++++ util/winutil/winutil_notwindows.go | 16 ++++++++++++++++ 4 files changed, 67 insertions(+), 1 deletion(-) create mode 100644 util/winutil/winutil_notwindows.go diff --git a/cmd/tailscaled/depaware.txt b/cmd/tailscaled/depaware.txt index 13a13a8cb..c9cd378e5 100644 --- a/cmd/tailscaled/depaware.txt +++ b/cmd/tailscaled/depaware.txt @@ -130,6 +130,7 @@ tailscale.com/cmd/tailscaled dependencies: (generated by github.com/tailscale/de tailscale.com/util/pidowner from tailscale.com/ipn/ipnserver tailscale.com/util/racebuild from tailscale.com/logpolicy tailscale.com/util/systemd from tailscale.com/control/controlclient+ + tailscale.com/util/winutil from tailscale.com/logpolicy tailscale.com/version from tailscale.com/cmd/tailscaled+ tailscale.com/version/distro from tailscale.com/control/controlclient+ tailscale.com/wgengine from tailscale.com/cmd/tailscaled+ diff --git a/logpolicy/logpolicy.go b/logpolicy/logpolicy.go index add1874a6..d6f78cbd7 100644 --- a/logpolicy/logpolicy.go +++ b/logpolicy/logpolicy.go @@ -24,6 +24,7 @@ "runtime" "strconv" "strings" + "sync" "time" "golang.org/x/term" @@ -37,9 +38,29 @@ "tailscale.com/smallzstd" "tailscale.com/types/logger" "tailscale.com/util/racebuild" + "tailscale.com/util/winutil" "tailscale.com/version" ) +var getLogTargetOnce struct { + sync.Once + v string // URL of logs server, or empty for default +} + +func getLogTarget() string { + getLogTargetOnce.Do(func() { + if val, ok := os.LookupEnv("TS_LOG_TARGET"); ok { + getLogTargetOnce.v = val + } else { + if runtime.GOOS == "windows" { + getLogTargetOnce.v = winutil.GetRegString("LogTarget", "") + } + } + }) + + return getLogTargetOnce.v +} + // Config represents an instance of logs in a collection. type Config struct { Collection string @@ -400,7 +421,7 @@ func New(collection string) *Policy { HTTPC: &http.Client{Transport: newLogtailTransport(logtail.DefaultHost)}, } - if val, ok := os.LookupEnv("TS_LOG_TARGET"); ok { + if val := getLogTarget(); val != "" { log.Println("You have enabled a non-default log target. Doing without being told to by Tailscale staff or your network administrator will make getting support difficult.") c.BaseURL = val u, _ := url.Parse(val) diff --git a/util/winutil/winutil.go b/util/winutil/winutil.go index de53d854b..db06fe16d 100644 --- a/util/winutil/winutil.go +++ b/util/winutil/winutil.go @@ -8,9 +8,14 @@ package winutil import ( + "log" + "golang.org/x/sys/windows" + "golang.org/x/sys/windows/registry" ) +const RegBase = `SOFTWARE\Tailscale IPN` + // GetDesktopPID searches the PID of the process that's running the // currently active desktop and whether it was found. // Usually the PID will be for explorer.exe. @@ -22,3 +27,26 @@ func GetDesktopPID() (pid uint32, ok bool) { windows.GetWindowThreadProcessId(hwnd, &pid) return pid, pid != 0 } + +// GetRegString looks up a registry path in our local machine path, or returns +// the given default if it can't. +// +// This function will only work on GOOS=windows. Trying to run it on any other +// OS will always return the default value. +func GetRegString(name, defval string) string { + key, err := registry.OpenKey(registry.LOCAL_MACHINE, RegBase, registry.READ) + if err != nil { + log.Printf("registry.OpenKey(%v): %v", RegBase, err) + return defval + } + defer key.Close() + + val, _, err := key.GetStringValue(name) + if err != nil { + if err != registry.ErrNotExist { + log.Printf("registry.GetStringValue(%v): %v", name, err) + } + return defval + } + return val +} diff --git a/util/winutil/winutil_notwindows.go b/util/winutil/winutil_notwindows.go new file mode 100644 index 000000000..56857fc53 --- /dev/null +++ b/util/winutil/winutil_notwindows.go @@ -0,0 +1,16 @@ +// Copyright (c) 2021 Tailscale Inc & AUTHORS All rights reserved. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. + +// +build !windows + +package winutil + +const RegBase = `` + +// GetRegString looks up a registry path in our local machine path, or returns +// the given default if it can't. +// +// This function will only work on GOOS=windows. Trying to run it on any other +// OS will always return the default value. +func GetRegString(name, defval string) string { return defval }