cmd/tailscale/cli: add debug set-expire command for testing

Updates tailscale/corp#8811
Updates tailscale/corp#8613

Change-Id: I1c87806ca3ccc5c43e7ddbd6b4d521f73f7d29f1
Signed-off-by: Brad Fitzpatrick <bradfitz@tailscale.com>
pull/7046/head
Brad Fitzpatrick 2 years ago committed by Brad Fitzpatrick
parent 140b9aad5c
commit c8db70fd73

@ -1020,6 +1020,15 @@ func (lc *LocalClient) DebugDERPRegion(ctx context.Context, regionIDOrCode strin
return decodeJSON[*ipnstate.DebugDERPRegionReport](body) return decodeJSON[*ipnstate.DebugDERPRegionReport](body)
} }
// DebugSetExpireIn marks the current node key to expire in d.
//
// This is meant primarily for debug and testing.
func (lc *LocalClient) DebugSetExpireIn(ctx context.Context, d time.Duration) error {
v := url.Values{"expiry": {fmt.Sprint(time.Now().Add(d).Unix())}}
_, err := lc.send(ctx, "POST", "/localapi/v0/set-expiry-sooner?"+v.Encode(), 200, nil)
return err
}
// WatchIPNBus subscribes to the IPN notification bus. It returns a watcher // WatchIPNBus subscribes to the IPN notification bus. It returns a watcher
// once the bus is connected successfully. // once the bus is connected successfully.
// //

@ -166,6 +166,16 @@ var debugCmd = &ffcli.Command{
return fs return fs
})(), })(),
}, },
{
Name: "set-expire",
Exec: runSetExpire,
ShortHelp: "manipulate node key expiry for testing",
FlagSet: (func() *flag.FlagSet {
fs := newFlagSet("set-expire")
fs.DurationVar(&setExpireArgs.in, "in", 0, "if non-zero, set node key to expire this duration from now")
return fs
})(),
},
{ {
Name: "dev-store-set", Name: "dev-store-set",
Exec: runDevStoreSet, Exec: runDevStoreSet,
@ -714,3 +724,14 @@ func runDebugDERP(ctx context.Context, args []string) error {
fmt.Printf("%s\n", must.Get(json.MarshalIndent(st, "", " "))) fmt.Printf("%s\n", must.Get(json.MarshalIndent(st, "", " ")))
return nil return nil
} }
var setExpireArgs struct {
in time.Duration
}
func runSetExpire(ctx context.Context, args []string) error {
if len(args) != 0 || setExpireArgs.in == 0 {
return errors.New("usage --in=<duration>")
}
return localClient.DebugSetExpireIn(ctx, setExpireArgs.in)
}

@ -1065,6 +1065,10 @@ func (h *Handler) serveDERPMap(w http.ResponseWriter, r *http.Request) {
// serveSetExpirySooner sets the expiry date on the current machine, specified // serveSetExpirySooner sets the expiry date on the current machine, specified
// by an `expiry` unix timestamp as POST or query param. // by an `expiry` unix timestamp as POST or query param.
func (h *Handler) serveSetExpirySooner(w http.ResponseWriter, r *http.Request) { func (h *Handler) serveSetExpirySooner(w http.ResponseWriter, r *http.Request) {
if !h.PermitWrite {
http.Error(w, "access denied", http.StatusForbidden)
return
}
if r.Method != "POST" { if r.Method != "POST" {
http.Error(w, "POST required", http.StatusMethodNotAllowed) http.Error(w, "POST required", http.StatusMethodNotAllowed)
return return

Loading…
Cancel
Save