mirror of
https://github.com/tailscale/tailscale.git
synced 2024-11-29 04:55:31 +00:00
logpolicy: set log target on windows based on a registry key (#1542)
Signed-off-by: Christine Dodrill <xe@tailscale.com>
This commit is contained in:
parent
c19ed37b0f
commit
a480b1baa5
@ -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/pidowner from tailscale.com/ipn/ipnserver
|
||||||
tailscale.com/util/racebuild from tailscale.com/logpolicy
|
tailscale.com/util/racebuild from tailscale.com/logpolicy
|
||||||
tailscale.com/util/systemd from tailscale.com/control/controlclient+
|
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 from tailscale.com/cmd/tailscaled+
|
||||||
tailscale.com/version/distro from tailscale.com/control/controlclient+
|
tailscale.com/version/distro from tailscale.com/control/controlclient+
|
||||||
tailscale.com/wgengine from tailscale.com/cmd/tailscaled+
|
tailscale.com/wgengine from tailscale.com/cmd/tailscaled+
|
||||||
|
@ -24,6 +24,7 @@
|
|||||||
"runtime"
|
"runtime"
|
||||||
"strconv"
|
"strconv"
|
||||||
"strings"
|
"strings"
|
||||||
|
"sync"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"golang.org/x/term"
|
"golang.org/x/term"
|
||||||
@ -37,9 +38,29 @@
|
|||||||
"tailscale.com/smallzstd"
|
"tailscale.com/smallzstd"
|
||||||
"tailscale.com/types/logger"
|
"tailscale.com/types/logger"
|
||||||
"tailscale.com/util/racebuild"
|
"tailscale.com/util/racebuild"
|
||||||
|
"tailscale.com/util/winutil"
|
||||||
"tailscale.com/version"
|
"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.
|
// Config represents an instance of logs in a collection.
|
||||||
type Config struct {
|
type Config struct {
|
||||||
Collection string
|
Collection string
|
||||||
@ -400,7 +421,7 @@ func New(collection string) *Policy {
|
|||||||
HTTPC: &http.Client{Transport: newLogtailTransport(logtail.DefaultHost)},
|
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.")
|
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
|
c.BaseURL = val
|
||||||
u, _ := url.Parse(val)
|
u, _ := url.Parse(val)
|
||||||
|
@ -8,9 +8,14 @@
|
|||||||
package winutil
|
package winutil
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"log"
|
||||||
|
|
||||||
"golang.org/x/sys/windows"
|
"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
|
// GetDesktopPID searches the PID of the process that's running the
|
||||||
// currently active desktop and whether it was found.
|
// currently active desktop and whether it was found.
|
||||||
// Usually the PID will be for explorer.exe.
|
// Usually the PID will be for explorer.exe.
|
||||||
@ -22,3 +27,26 @@ func GetDesktopPID() (pid uint32, ok bool) {
|
|||||||
windows.GetWindowThreadProcessId(hwnd, &pid)
|
windows.GetWindowThreadProcessId(hwnd, &pid)
|
||||||
return pid, pid != 0
|
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
|
||||||
|
}
|
||||||
|
16
util/winutil/winutil_notwindows.go
Normal file
16
util/winutil/winutil_notwindows.go
Normal file
@ -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 }
|
Loading…
Reference in New Issue
Block a user