mirror of
https://github.com/tailscale/tailscale.git
synced 2025-02-20 11:58:39 +00:00
cmd/tailscaled,*: add start of configuration file support
Updates #1412 Co-authored-by: Maisem Ali <maisem@tailscale.com> Change-Id: I38d559c1784d09fc804f521986c9b4b548718f7d Signed-off-by: Brad Fitzpatrick <bradfitz@tailscale.com>
This commit is contained in:
parent
71271e41d6
commit
18bd98d35b
@ -40,3 +40,12 @@ type SetPushDeviceTokenRequest struct {
|
|||||||
// PushDeviceToken is the iOS/macOS APNs device token (and any future Android equivalent).
|
// PushDeviceToken is the iOS/macOS APNs device token (and any future Android equivalent).
|
||||||
PushDeviceToken string
|
PushDeviceToken string
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// ReloadConfigResponse is the response to a LocalAPI reload-config request.
|
||||||
|
//
|
||||||
|
// There are three possible outcomes: (false, "") if no config mode in use,
|
||||||
|
// (true, "") on success, or (false, "error message") on failure.
|
||||||
|
type ReloadConfigResponse struct {
|
||||||
|
Reloaded bool // whether the config was reloaded
|
||||||
|
Err string // any error message
|
||||||
|
}
|
||||||
|
@ -1244,6 +1244,25 @@ func (lc *LocalClient) ProfileStatus(ctx context.Context) (current ipn.LoginProf
|
|||||||
return current, all, err
|
return current, all, err
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// ReloadConfig reloads the config file, if possible.
|
||||||
|
func (lc *LocalClient) ReloadConfig(ctx context.Context) (ok bool, err error) {
|
||||||
|
body, err := lc.send(ctx, "POST", "/localapi/v0/reload-config", 200, nil)
|
||||||
|
if err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
res, err := decodeJSON[apitype.ReloadConfigResponse](body)
|
||||||
|
if err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
if err != nil {
|
||||||
|
return false, err
|
||||||
|
}
|
||||||
|
if res.Err != "" {
|
||||||
|
return false, errors.New(res.Err)
|
||||||
|
}
|
||||||
|
return res.Reloaded, nil
|
||||||
|
}
|
||||||
|
|
||||||
// SwitchToEmptyProfile creates and switches to a new unnamed profile. The new
|
// SwitchToEmptyProfile creates and switches to a new unnamed profile. The new
|
||||||
// profile is not assigned an ID until it is persisted after a successful login.
|
// profile is not assigned an ID until it is persisted after a successful login.
|
||||||
// In order to login to the new profile, the user must call LoginInteractive.
|
// In order to login to the new profile, the user must call LoginInteractive.
|
||||||
|
@ -149,6 +149,12 @@ var debugCmd = &ffcli.Command{
|
|||||||
Exec: localAPIAction("force-netmap-update"),
|
Exec: localAPIAction("force-netmap-update"),
|
||||||
ShortHelp: "force a full no-op netmap update (for load testing)",
|
ShortHelp: "force a full no-op netmap update (for load testing)",
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
// TODO(bradfitz,maisem): eventually promote this out of debug
|
||||||
|
Name: "reload-config",
|
||||||
|
Exec: reloadConfig,
|
||||||
|
ShortHelp: "reload config",
|
||||||
|
},
|
||||||
{
|
{
|
||||||
Name: "control-knobs",
|
Name: "control-knobs",
|
||||||
Exec: debugControlKnobs,
|
Exec: debugControlKnobs,
|
||||||
@ -451,6 +457,20 @@ func localAPIAction(action string) func(context.Context, []string) error {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func reloadConfig(ctx context.Context, args []string) error {
|
||||||
|
ok, err := localClient.ReloadConfig(ctx)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
if ok {
|
||||||
|
printf("config reloaded\n")
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
printf("config mode not in use\n")
|
||||||
|
os.Exit(1)
|
||||||
|
panic("unreachable")
|
||||||
|
}
|
||||||
|
|
||||||
func runEnv(ctx context.Context, args []string) error {
|
func runEnv(ctx context.Context, args []string) error {
|
||||||
for _, e := range os.Environ() {
|
for _, e := range os.Environ() {
|
||||||
outln(e)
|
outln(e)
|
||||||
|
@ -148,6 +148,7 @@ tailscale.com/cmd/tailscaled dependencies: (generated by github.com/tailscale/de
|
|||||||
github.com/tailscale/goupnp/scpd from github.com/tailscale/goupnp
|
github.com/tailscale/goupnp/scpd from github.com/tailscale/goupnp
|
||||||
github.com/tailscale/goupnp/soap from github.com/tailscale/goupnp+
|
github.com/tailscale/goupnp/soap from github.com/tailscale/goupnp+
|
||||||
github.com/tailscale/goupnp/ssdp from github.com/tailscale/goupnp
|
github.com/tailscale/goupnp/ssdp from github.com/tailscale/goupnp
|
||||||
|
github.com/tailscale/hujson from tailscale.com/ipn/conffile
|
||||||
L 💣 github.com/tailscale/netlink from tailscale.com/wgengine/router+
|
L 💣 github.com/tailscale/netlink from tailscale.com/wgengine/router+
|
||||||
💣 github.com/tailscale/wireguard-go/conn from github.com/tailscale/wireguard-go/device+
|
💣 github.com/tailscale/wireguard-go/conn from github.com/tailscale/wireguard-go/device+
|
||||||
W 💣 github.com/tailscale/wireguard-go/conn/winrio from github.com/tailscale/wireguard-go/conn
|
W 💣 github.com/tailscale/wireguard-go/conn/winrio from github.com/tailscale/wireguard-go/conn
|
||||||
@ -239,6 +240,7 @@ tailscale.com/cmd/tailscaled dependencies: (generated by github.com/tailscale/de
|
|||||||
tailscale.com/health/healthmsg from tailscale.com/ipn/ipnlocal
|
tailscale.com/health/healthmsg from tailscale.com/ipn/ipnlocal
|
||||||
tailscale.com/hostinfo from tailscale.com/control/controlclient+
|
tailscale.com/hostinfo from tailscale.com/control/controlclient+
|
||||||
tailscale.com/ipn from tailscale.com/ipn/ipnlocal+
|
tailscale.com/ipn from tailscale.com/ipn/ipnlocal+
|
||||||
|
tailscale.com/ipn/conffile from tailscale.com/cmd/tailscaled+
|
||||||
💣 tailscale.com/ipn/ipnauth from tailscale.com/ipn/ipnlocal+
|
💣 tailscale.com/ipn/ipnauth from tailscale.com/ipn/ipnlocal+
|
||||||
tailscale.com/ipn/ipnlocal from tailscale.com/ssh/tailssh+
|
tailscale.com/ipn/ipnlocal from tailscale.com/ssh/tailssh+
|
||||||
tailscale.com/ipn/ipnserver from tailscale.com/cmd/tailscaled
|
tailscale.com/ipn/ipnserver from tailscale.com/cmd/tailscaled
|
||||||
|
@ -32,6 +32,7 @@ import (
|
|||||||
"tailscale.com/cmd/tailscaled/childproc"
|
"tailscale.com/cmd/tailscaled/childproc"
|
||||||
"tailscale.com/control/controlclient"
|
"tailscale.com/control/controlclient"
|
||||||
"tailscale.com/envknob"
|
"tailscale.com/envknob"
|
||||||
|
"tailscale.com/ipn/conffile"
|
||||||
"tailscale.com/ipn/ipnlocal"
|
"tailscale.com/ipn/ipnlocal"
|
||||||
"tailscale.com/ipn/ipnserver"
|
"tailscale.com/ipn/ipnserver"
|
||||||
"tailscale.com/ipn/store"
|
"tailscale.com/ipn/store"
|
||||||
@ -127,6 +128,7 @@ var args struct {
|
|||||||
tunname string
|
tunname string
|
||||||
|
|
||||||
cleanup bool
|
cleanup bool
|
||||||
|
confFile string
|
||||||
debug string
|
debug string
|
||||||
port uint16
|
port uint16
|
||||||
statepath string
|
statepath string
|
||||||
@ -172,6 +174,7 @@ func main() {
|
|||||||
flag.StringVar(&args.birdSocketPath, "bird-socket", "", "path of the bird unix socket")
|
flag.StringVar(&args.birdSocketPath, "bird-socket", "", "path of the bird unix socket")
|
||||||
flag.BoolVar(&printVersion, "version", false, "print version information and exit")
|
flag.BoolVar(&printVersion, "version", false, "print version information and exit")
|
||||||
flag.BoolVar(&args.disableLogs, "no-logs-no-support", false, "disable log uploads; this also disables any technical support")
|
flag.BoolVar(&args.disableLogs, "no-logs-no-support", false, "disable log uploads; this also disables any technical support")
|
||||||
|
flag.StringVar(&args.confFile, "config", "", "path to config file")
|
||||||
|
|
||||||
if len(os.Args) > 0 && filepath.Base(os.Args[0]) == "tailscale" && beCLI != nil {
|
if len(os.Args) > 0 && filepath.Base(os.Args[0]) == "tailscale" && beCLI != nil {
|
||||||
beCLI()
|
beCLI()
|
||||||
@ -339,6 +342,17 @@ func run() error {
|
|||||||
|
|
||||||
sys := new(tsd.System)
|
sys := new(tsd.System)
|
||||||
|
|
||||||
|
// Parse config, if specified, to fail early if it's invalid.
|
||||||
|
var conf *conffile.Config
|
||||||
|
if args.confFile != "" {
|
||||||
|
var err error
|
||||||
|
conf, err = conffile.Load(args.confFile)
|
||||||
|
if err != nil {
|
||||||
|
return fmt.Errorf("error reading config file: %w", err)
|
||||||
|
}
|
||||||
|
sys.InitialConfig = conf
|
||||||
|
}
|
||||||
|
|
||||||
netMon, err := netmon.New(func(format string, args ...any) {
|
netMon, err := netmon.New(func(format string, args ...any) {
|
||||||
logf(format, args...)
|
logf(format, args...)
|
||||||
})
|
})
|
||||||
|
122
ipn/conf.go
Normal file
122
ipn/conf.go
Normal file
@ -0,0 +1,122 @@
|
|||||||
|
// Copyright (c) Tailscale Inc & AUTHORS
|
||||||
|
// SPDX-License-Identifier: BSD-3-Clause
|
||||||
|
|
||||||
|
package ipn
|
||||||
|
|
||||||
|
import (
|
||||||
|
"net/netip"
|
||||||
|
|
||||||
|
"tailscale.com/tailcfg"
|
||||||
|
"tailscale.com/types/opt"
|
||||||
|
"tailscale.com/types/preftype"
|
||||||
|
)
|
||||||
|
|
||||||
|
// ConfigVAlpha is the config file format for the "alpha0" version.
|
||||||
|
type ConfigVAlpha struct {
|
||||||
|
Locked opt.Bool `json:",omitempty"` // whether the config is locked from being changed by 'tailscale set'; it defaults to true
|
||||||
|
|
||||||
|
ServerURL *string `json:",omitempty"` // defaults to https://controlplane.tailscale.com
|
||||||
|
AuthKey *string `json:",omitempty"` // as needed if NeedsLogin. either key or path to a file (if it contains a slash)
|
||||||
|
Enabled opt.Bool `json:",omitempty"` // wantRunning; empty string defaults to true
|
||||||
|
|
||||||
|
OperatorUser *string `json:",omitempty"` // local user name who is allowed to operate tailscaled without being root or using sudo
|
||||||
|
Hostname *string `json:",omitempty"`
|
||||||
|
|
||||||
|
AcceptDNS opt.Bool `json:"acceptDNS,omitempty"` // --accept-dns
|
||||||
|
AcceptRoutes opt.Bool `json:"acceptRoutes,omitempty"`
|
||||||
|
|
||||||
|
ExitNode *string `json:"exitNode,omitempty"` // IP, StableID, or MagicDNS base name
|
||||||
|
AllowLANWhileUsingExitNode opt.Bool `json:"allowLANWhileUsingExitNode,omitempty"`
|
||||||
|
|
||||||
|
AdvertiseRoutes []netip.Prefix `json:",omitempty"`
|
||||||
|
DisableSNAT opt.Bool `json:",omitempty"`
|
||||||
|
|
||||||
|
NetfilterMode *string `json:",omitempty"` // "on", "off", "nodivert"
|
||||||
|
|
||||||
|
PostureChecking opt.Bool `json:",omitempty"`
|
||||||
|
RunSSHServer opt.Bool `json:",omitempty"` // Tailscale SSH
|
||||||
|
ShieldsUp opt.Bool `json:",omitempty"`
|
||||||
|
AutoUpdate *AutoUpdatePrefs `json:",omitempty"`
|
||||||
|
ServeConfigTemp *ServeConfig `json:",omitempty"` // TODO(bradfitz,maisem): make separate stable type for this
|
||||||
|
|
||||||
|
// TODO(bradfitz,maisem): future something like:
|
||||||
|
// Profile map[string]*Config // keyed by alice@gmail.com, corp.com (TailnetSID)
|
||||||
|
}
|
||||||
|
|
||||||
|
func (c *ConfigVAlpha) ToPrefs() (MaskedPrefs, error) {
|
||||||
|
var mp MaskedPrefs
|
||||||
|
if c == nil {
|
||||||
|
return mp, nil
|
||||||
|
}
|
||||||
|
if c.ServerURL != nil {
|
||||||
|
mp.ControlURL = *c.ServerURL
|
||||||
|
mp.ControlURLSet = true
|
||||||
|
}
|
||||||
|
if c.Enabled != "" {
|
||||||
|
mp.WantRunning = c.Enabled.EqualBool(true)
|
||||||
|
mp.WantRunningSet = true
|
||||||
|
}
|
||||||
|
if c.OperatorUser != nil {
|
||||||
|
mp.OperatorUser = *c.OperatorUser
|
||||||
|
mp.OperatorUserSet = true
|
||||||
|
}
|
||||||
|
if c.Hostname != nil {
|
||||||
|
mp.Hostname = *c.Hostname
|
||||||
|
mp.HostnameSet = true
|
||||||
|
}
|
||||||
|
if c.AcceptDNS != "" {
|
||||||
|
mp.CorpDNS = c.AcceptDNS.EqualBool(true)
|
||||||
|
mp.CorpDNSSet = true
|
||||||
|
}
|
||||||
|
if c.AcceptRoutes != "" {
|
||||||
|
mp.RouteAll = c.AcceptRoutes.EqualBool(true)
|
||||||
|
mp.RouteAllSet = true
|
||||||
|
}
|
||||||
|
if c.ExitNode != nil {
|
||||||
|
ip, err := netip.ParseAddr(*c.ExitNode)
|
||||||
|
if err == nil {
|
||||||
|
mp.ExitNodeIP = ip
|
||||||
|
mp.ExitNodeIPSet = true
|
||||||
|
} else {
|
||||||
|
mp.ExitNodeID = tailcfg.StableNodeID(*c.ExitNode)
|
||||||
|
mp.ExitNodeIDSet = true
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if c.AllowLANWhileUsingExitNode != "" {
|
||||||
|
mp.ExitNodeAllowLANAccess = c.AllowLANWhileUsingExitNode.EqualBool(true)
|
||||||
|
mp.ExitNodeAllowLANAccessSet = true
|
||||||
|
}
|
||||||
|
if c.AdvertiseRoutes != nil {
|
||||||
|
mp.AdvertiseRoutes = c.AdvertiseRoutes
|
||||||
|
mp.AdvertiseRoutesSet = true
|
||||||
|
}
|
||||||
|
if c.DisableSNAT != "" {
|
||||||
|
mp.NoSNAT = c.DisableSNAT.EqualBool(true)
|
||||||
|
mp.NoSNAT = true
|
||||||
|
}
|
||||||
|
if c.NetfilterMode != nil {
|
||||||
|
m, err := preftype.ParseNetfilterMode(*c.NetfilterMode)
|
||||||
|
if err != nil {
|
||||||
|
return mp, err
|
||||||
|
}
|
||||||
|
mp.NetfilterMode = m
|
||||||
|
mp.NetfilterModeSet = true
|
||||||
|
}
|
||||||
|
if c.PostureChecking != "" {
|
||||||
|
mp.PostureChecking = c.PostureChecking.EqualBool(true)
|
||||||
|
mp.PostureCheckingSet = true
|
||||||
|
}
|
||||||
|
if c.RunSSHServer != "" {
|
||||||
|
mp.RunSSH = c.RunSSHServer.EqualBool(true)
|
||||||
|
mp.RunSSHSet = true
|
||||||
|
}
|
||||||
|
if c.ShieldsUp != "" {
|
||||||
|
mp.ShieldsUp = c.ShieldsUp.EqualBool(true)
|
||||||
|
mp.ShieldsUpSet = true
|
||||||
|
}
|
||||||
|
if c.AutoUpdate != nil {
|
||||||
|
mp.AutoUpdate = *c.AutoUpdate
|
||||||
|
mp.AutoUpdateSet = true
|
||||||
|
}
|
||||||
|
return mp, nil
|
||||||
|
}
|
66
ipn/conffile/conffile.go
Normal file
66
ipn/conffile/conffile.go
Normal file
@ -0,0 +1,66 @@
|
|||||||
|
// Copyright (c) Tailscale Inc & AUTHORS
|
||||||
|
// SPDX-License-Identifier: BSD-3-Clause
|
||||||
|
|
||||||
|
// Package conffile contains code to load, manipulate, and access config file
|
||||||
|
// settings.
|
||||||
|
package conffile
|
||||||
|
|
||||||
|
import (
|
||||||
|
"encoding/json"
|
||||||
|
"fmt"
|
||||||
|
"os"
|
||||||
|
|
||||||
|
"github.com/tailscale/hujson"
|
||||||
|
"tailscale.com/ipn"
|
||||||
|
)
|
||||||
|
|
||||||
|
// Config describes a config file
|
||||||
|
type Config struct {
|
||||||
|
Path string // disk path of HuJSON
|
||||||
|
Raw []byte // raw bytes from disk, in HuJSON form
|
||||||
|
Std []byte // standardized JSON form
|
||||||
|
Version string // "alpha0" for now
|
||||||
|
|
||||||
|
// Parsed is the parsed config, converted from its on-disk version to the
|
||||||
|
// latest known format.
|
||||||
|
//
|
||||||
|
// As of 2023-10-15 there is exactly one format ("alpha0") so this is both
|
||||||
|
// the on-disk format and the in-memory upgraded format.
|
||||||
|
Parsed ipn.ConfigVAlpha
|
||||||
|
}
|
||||||
|
|
||||||
|
// Load reads and parses the config file at the provided path on disk.
|
||||||
|
func Load(path string) (*Config, error) {
|
||||||
|
var c Config
|
||||||
|
c.Path = path
|
||||||
|
|
||||||
|
var err error
|
||||||
|
c.Raw, err = os.ReadFile(path)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
c.Std, err = hujson.Standardize(c.Raw)
|
||||||
|
if err != nil {
|
||||||
|
return nil, fmt.Errorf("error parsing config file %s HuJSON/JSON: %w", path, err)
|
||||||
|
}
|
||||||
|
var ver struct {
|
||||||
|
Version string `json:"version"`
|
||||||
|
}
|
||||||
|
if err := json.Unmarshal(c.Std, &ver); err != nil {
|
||||||
|
return nil, fmt.Errorf("error parsing config file %s: %w", path, err)
|
||||||
|
}
|
||||||
|
switch ver.Version {
|
||||||
|
case "":
|
||||||
|
return nil, fmt.Errorf("error parsing config file %s: no \"version\" field defined", path)
|
||||||
|
case "alpha0":
|
||||||
|
default:
|
||||||
|
return nil, fmt.Errorf("error parsing config file %s: unsupported \"version\" value %q; want \"alpha0\" for now", path, ver.Version)
|
||||||
|
}
|
||||||
|
c.Version = ver.Version
|
||||||
|
|
||||||
|
err = json.Unmarshal(c.Std, &c.Parsed)
|
||||||
|
if err != nil {
|
||||||
|
return nil, fmt.Errorf("error parsing config file %s: %w", path, err)
|
||||||
|
}
|
||||||
|
return &c, nil
|
||||||
|
}
|
@ -44,6 +44,7 @@ import (
|
|||||||
"tailscale.com/health/healthmsg"
|
"tailscale.com/health/healthmsg"
|
||||||
"tailscale.com/hostinfo"
|
"tailscale.com/hostinfo"
|
||||||
"tailscale.com/ipn"
|
"tailscale.com/ipn"
|
||||||
|
"tailscale.com/ipn/conffile"
|
||||||
"tailscale.com/ipn/ipnauth"
|
"tailscale.com/ipn/ipnauth"
|
||||||
"tailscale.com/ipn/ipnstate"
|
"tailscale.com/ipn/ipnstate"
|
||||||
"tailscale.com/ipn/policy"
|
"tailscale.com/ipn/policy"
|
||||||
@ -198,7 +199,8 @@ type LocalBackend struct {
|
|||||||
|
|
||||||
// The mutex protects the following elements.
|
// The mutex protects the following elements.
|
||||||
mu sync.Mutex
|
mu sync.Mutex
|
||||||
pm *profileManager // mu guards access
|
conf *conffile.Config // latest parsed config, or nil if not in declarative mode
|
||||||
|
pm *profileManager // mu guards access
|
||||||
filterHash deephash.Sum
|
filterHash deephash.Sum
|
||||||
httpTestClient *http.Client // for controlclient. nil by default, used by tests.
|
httpTestClient *http.Client // for controlclient. nil by default, used by tests.
|
||||||
ccGen clientGen // function for producing controlclient; lazily populated
|
ccGen clientGen // function for producing controlclient; lazily populated
|
||||||
@ -340,6 +342,7 @@ func NewLocalBackend(logf logger.Logf, logID logid.PublicID, sys *tsd.System, lo
|
|||||||
keyLogf: logger.LogOnChange(logf, 5*time.Minute, clock.Now),
|
keyLogf: logger.LogOnChange(logf, 5*time.Minute, clock.Now),
|
||||||
statsLogf: logger.LogOnChange(logf, 5*time.Minute, clock.Now),
|
statsLogf: logger.LogOnChange(logf, 5*time.Minute, clock.Now),
|
||||||
sys: sys,
|
sys: sys,
|
||||||
|
conf: sys.InitialConfig,
|
||||||
e: e,
|
e: e,
|
||||||
dialer: dialer,
|
dialer: dialer,
|
||||||
store: store,
|
store: store,
|
||||||
@ -518,6 +521,25 @@ func (b *LocalBackend) SetDirectFileDoFinalRename(v bool) {
|
|||||||
b.directFileDoFinalRename = v
|
b.directFileDoFinalRename = v
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// ReloadCOnfig reloads the backend's config from disk.
|
||||||
|
//
|
||||||
|
// It returns (false, nil) if not running in declarative mode, (true, nil) on
|
||||||
|
// success, or (false, error) on failure.
|
||||||
|
func (b *LocalBackend) ReloadConfig() (ok bool, err error) {
|
||||||
|
b.mu.Lock()
|
||||||
|
defer b.mu.Unlock()
|
||||||
|
if b.conf == nil {
|
||||||
|
return false, nil
|
||||||
|
}
|
||||||
|
conf, err := conffile.Load(b.conf.Path)
|
||||||
|
if err != nil {
|
||||||
|
return false, err
|
||||||
|
}
|
||||||
|
b.conf = conf
|
||||||
|
// TODO(bradfitz): apply things
|
||||||
|
return true, nil
|
||||||
|
}
|
||||||
|
|
||||||
// pauseOrResumeControlClientLocked pauses b.cc if there is no network available
|
// pauseOrResumeControlClientLocked pauses b.cc if there is no network available
|
||||||
// or if the LocalBackend is in Stopped state with a valid NetMap. In all other
|
// or if the LocalBackend is in Stopped state with a valid NetMap. In all other
|
||||||
// cases, it unpauses it. It is a no-op if b.cc is nil.
|
// cases, it unpauses it. It is a no-op if b.cc is nil.
|
||||||
|
@ -96,6 +96,7 @@ var handler = map[string]localAPIHandler{
|
|||||||
"ping": (*Handler).servePing,
|
"ping": (*Handler).servePing,
|
||||||
"prefs": (*Handler).servePrefs,
|
"prefs": (*Handler).servePrefs,
|
||||||
"pprof": (*Handler).servePprof,
|
"pprof": (*Handler).servePprof,
|
||||||
|
"reload-config": (*Handler).reloadConfig,
|
||||||
"reset-auth": (*Handler).serveResetAuth,
|
"reset-auth": (*Handler).serveResetAuth,
|
||||||
"serve-config": (*Handler).serveServeConfig,
|
"serve-config": (*Handler).serveServeConfig,
|
||||||
"set-dns": (*Handler).serveSetDNS,
|
"set-dns": (*Handler).serveSetDNS,
|
||||||
@ -838,6 +839,26 @@ func (h *Handler) servePprof(w http.ResponseWriter, r *http.Request) {
|
|||||||
servePprofFunc(w, r)
|
servePprofFunc(w, r)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (h *Handler) reloadConfig(w http.ResponseWriter, r *http.Request) {
|
||||||
|
if !h.PermitWrite {
|
||||||
|
http.Error(w, "access denied", http.StatusForbidden)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
if r.Method != httpm.POST {
|
||||||
|
http.Error(w, "use POST", http.StatusMethodNotAllowed)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
ok, err := h.b.ReloadConfig()
|
||||||
|
var res apitype.ReloadConfigResponse
|
||||||
|
res.Reloaded = ok
|
||||||
|
if err != nil {
|
||||||
|
res.Err = err.Error()
|
||||||
|
return
|
||||||
|
}
|
||||||
|
w.Header().Set("Content-Type", "application/json")
|
||||||
|
json.NewEncoder(w).Encode(&res)
|
||||||
|
}
|
||||||
|
|
||||||
func (h *Handler) serveResetAuth(w http.ResponseWriter, r *http.Request) {
|
func (h *Handler) serveResetAuth(w http.ResponseWriter, r *http.Request) {
|
||||||
if !h.PermitWrite {
|
if !h.PermitWrite {
|
||||||
http.Error(w, "reset-auth modify access denied", http.StatusForbidden)
|
http.Error(w, "reset-auth modify access denied", http.StatusForbidden)
|
||||||
|
@ -23,6 +23,7 @@ import (
|
|||||||
|
|
||||||
"tailscale.com/control/controlknobs"
|
"tailscale.com/control/controlknobs"
|
||||||
"tailscale.com/ipn"
|
"tailscale.com/ipn"
|
||||||
|
"tailscale.com/ipn/conffile"
|
||||||
"tailscale.com/net/dns"
|
"tailscale.com/net/dns"
|
||||||
"tailscale.com/net/netmon"
|
"tailscale.com/net/netmon"
|
||||||
"tailscale.com/net/tsdial"
|
"tailscale.com/net/tsdial"
|
||||||
@ -47,6 +48,12 @@ type System struct {
|
|||||||
StateStore SubSystem[ipn.StateStore]
|
StateStore SubSystem[ipn.StateStore]
|
||||||
Netstack SubSystem[NetstackImpl] // actually a *netstack.Impl
|
Netstack SubSystem[NetstackImpl] // actually a *netstack.Impl
|
||||||
|
|
||||||
|
// InitialConfig is initial server config, if any.
|
||||||
|
// It is nil if the node is not in declarative mode.
|
||||||
|
// This value is never updated after startup.
|
||||||
|
// LocalBackend tracks the current config after any reloads.
|
||||||
|
InitialConfig *conffile.Config
|
||||||
|
|
||||||
// onlyNetstack is whether the Tun value is a fake TUN device
|
// onlyNetstack is whether the Tun value is a fake TUN device
|
||||||
// and we're using netstack for everything.
|
// and we're using netstack for everything.
|
||||||
onlyNetstack bool
|
onlyNetstack bool
|
||||||
|
@ -16,6 +16,7 @@ import (
|
|||||||
_ "tailscale.com/derp/derphttp"
|
_ "tailscale.com/derp/derphttp"
|
||||||
_ "tailscale.com/envknob"
|
_ "tailscale.com/envknob"
|
||||||
_ "tailscale.com/ipn"
|
_ "tailscale.com/ipn"
|
||||||
|
_ "tailscale.com/ipn/conffile"
|
||||||
_ "tailscale.com/ipn/ipnlocal"
|
_ "tailscale.com/ipn/ipnlocal"
|
||||||
_ "tailscale.com/ipn/ipnserver"
|
_ "tailscale.com/ipn/ipnserver"
|
||||||
_ "tailscale.com/ipn/store"
|
_ "tailscale.com/ipn/store"
|
||||||
|
@ -16,6 +16,7 @@ import (
|
|||||||
_ "tailscale.com/derp/derphttp"
|
_ "tailscale.com/derp/derphttp"
|
||||||
_ "tailscale.com/envknob"
|
_ "tailscale.com/envknob"
|
||||||
_ "tailscale.com/ipn"
|
_ "tailscale.com/ipn"
|
||||||
|
_ "tailscale.com/ipn/conffile"
|
||||||
_ "tailscale.com/ipn/ipnlocal"
|
_ "tailscale.com/ipn/ipnlocal"
|
||||||
_ "tailscale.com/ipn/ipnserver"
|
_ "tailscale.com/ipn/ipnserver"
|
||||||
_ "tailscale.com/ipn/store"
|
_ "tailscale.com/ipn/store"
|
||||||
|
@ -16,6 +16,7 @@ import (
|
|||||||
_ "tailscale.com/derp/derphttp"
|
_ "tailscale.com/derp/derphttp"
|
||||||
_ "tailscale.com/envknob"
|
_ "tailscale.com/envknob"
|
||||||
_ "tailscale.com/ipn"
|
_ "tailscale.com/ipn"
|
||||||
|
_ "tailscale.com/ipn/conffile"
|
||||||
_ "tailscale.com/ipn/ipnlocal"
|
_ "tailscale.com/ipn/ipnlocal"
|
||||||
_ "tailscale.com/ipn/ipnserver"
|
_ "tailscale.com/ipn/ipnserver"
|
||||||
_ "tailscale.com/ipn/store"
|
_ "tailscale.com/ipn/store"
|
||||||
|
@ -16,6 +16,7 @@ import (
|
|||||||
_ "tailscale.com/derp/derphttp"
|
_ "tailscale.com/derp/derphttp"
|
||||||
_ "tailscale.com/envknob"
|
_ "tailscale.com/envknob"
|
||||||
_ "tailscale.com/ipn"
|
_ "tailscale.com/ipn"
|
||||||
|
_ "tailscale.com/ipn/conffile"
|
||||||
_ "tailscale.com/ipn/ipnlocal"
|
_ "tailscale.com/ipn/ipnlocal"
|
||||||
_ "tailscale.com/ipn/ipnserver"
|
_ "tailscale.com/ipn/ipnserver"
|
||||||
_ "tailscale.com/ipn/store"
|
_ "tailscale.com/ipn/store"
|
||||||
|
@ -23,6 +23,7 @@ import (
|
|||||||
_ "tailscale.com/derp/derphttp"
|
_ "tailscale.com/derp/derphttp"
|
||||||
_ "tailscale.com/envknob"
|
_ "tailscale.com/envknob"
|
||||||
_ "tailscale.com/ipn"
|
_ "tailscale.com/ipn"
|
||||||
|
_ "tailscale.com/ipn/conffile"
|
||||||
_ "tailscale.com/ipn/ipnlocal"
|
_ "tailscale.com/ipn/ipnlocal"
|
||||||
_ "tailscale.com/ipn/ipnserver"
|
_ "tailscale.com/ipn/ipnserver"
|
||||||
_ "tailscale.com/ipn/store"
|
_ "tailscale.com/ipn/store"
|
||||||
|
@ -5,6 +5,8 @@
|
|||||||
// preferences.
|
// preferences.
|
||||||
package preftype
|
package preftype
|
||||||
|
|
||||||
|
import "fmt"
|
||||||
|
|
||||||
// NetfilterMode is the firewall management mode to use when
|
// NetfilterMode is the firewall management mode to use when
|
||||||
// programming the Linux network stack.
|
// programming the Linux network stack.
|
||||||
type NetfilterMode int
|
type NetfilterMode int
|
||||||
@ -17,6 +19,19 @@ const (
|
|||||||
NetfilterOn NetfilterMode = 2 // manage tailscale chains and call them from main chains
|
NetfilterOn NetfilterMode = 2 // manage tailscale chains and call them from main chains
|
||||||
)
|
)
|
||||||
|
|
||||||
|
func ParseNetfilterMode(s string) (NetfilterMode, error) {
|
||||||
|
switch s {
|
||||||
|
case "off":
|
||||||
|
return NetfilterOff, nil
|
||||||
|
case "nodivert":
|
||||||
|
return NetfilterNoDivert, nil
|
||||||
|
case "on":
|
||||||
|
return NetfilterOn, nil
|
||||||
|
default:
|
||||||
|
return NetfilterOff, fmt.Errorf("unknown netfilter mode %q", s)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
func (m NetfilterMode) String() string {
|
func (m NetfilterMode) String() string {
|
||||||
switch m {
|
switch m {
|
||||||
case NetfilterOff:
|
case NetfilterOff:
|
||||||
|
Loading…
x
Reference in New Issue
Block a user