summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorChristine Dodrill <xe@tailscale.com>2021-03-18 09:37:26 -0400
committerChristine Dodrill <xe@tailscale.com>2021-03-18 13:12:37 -0400
commit48c40eefd94c1d2347634e88baf357c747f48891 (patch)
treea6264f99eabae874adf263f3d45cbfc416238650
parentaa79a57f6387b29cf329bab896b7cb0e15340fe1 (diff)
downloadtailscale-Xe/log-target-registry-key.tar.xz
tailscale-Xe/log-target-registry-key.zip
logpolicy: set log target on windows based on a registry keyXe/log-target-registry-key
Signed-off-by: Christine Dodrill <xe@tailscale.com>
-rw-r--r--cmd/tailscaled/depaware.txt1
-rw-r--r--logpolicy/logpolicy.go23
-rw-r--r--util/winutil/winutil.go28
-rw-r--r--util/winutil/winutil_notwindows.go16
4 files changed, 67 insertions, 1 deletions
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 @@ import (
"runtime"
"strconv"
"strings"
+ "sync"
"time"
"golang.org/x/term"
@@ -37,9 +38,29 @@ import (
"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 }