Update
This commit is contained in:
1 parent
3530afb854
commit
6903fcff27
2146 files changed
+112256
-190703
No files matched your search
+10
-8
@@ -1,4 +1,4 @@
|
||||
// Copyright (c) Tailscale Inc & AUTHORS
|
||||
// Copyright (c) Tailscale Inc & contributors
|
||||
// SPDX-License-Identifier: BSD-3-Clause
|
||||
|
||||
// Package oauthkey registers support for using OAuth client secrets to
|
||||
@@ -19,7 +19,9 @@ import (
|
||||
)
|
||||
|
||||
func init() {
|
||||
feature.Register("oauthkey")
|
||||
if !feature.Register("oauthkey") {
|
||||
return
|
||||
}
|
||||
tailscale.HookResolveAuthKey.Set(resolveAuthKey)
|
||||
}
|
||||
|
||||
@@ -33,15 +35,15 @@ func init() {
|
||||
// false. The "baseURL" defaults to https://api.tailscale.com.
|
||||
// The passed in tags are required, and must be non-empty. These will be
|
||||
// set on the authkey generated by the OAuth2 dance.
|
||||
func resolveAuthKey(ctx context.Context, clientSecret string, tags []string) (string, error) {
|
||||
if !strings.HasPrefix(clientSecret, "tskey-client-") {
|
||||
return clientSecret, nil
|
||||
func resolveAuthKey(ctx context.Context, args tailscale.ResolveAuthKeyArgs) (string, error) {
|
||||
if !strings.HasPrefix(args.AuthKey, "tskey-client-") {
|
||||
return args.AuthKey, nil
|
||||
}
|
||||
if len(tags) == 0 {
|
||||
if len(args.Tags) == 0 {
|
||||
return "", errors.New("oauth authkeys require --advertise-tags")
|
||||
}
|
||||
|
||||
strippedSecret, ephemeral, preauth, baseURL, err := parseOptionalAttributes(clientSecret)
|
||||
strippedSecret, ephemeral, preauth, baseURL, err := parseOptionalAttributes(args.AuthKey)
|
||||
if err != nil {
|
||||
return "", err
|
||||
}
|
||||
@@ -63,7 +65,7 @@ func resolveAuthKey(ctx context.Context, clientSecret string, tags []string) (st
|
||||
Reusable: false,
|
||||
Ephemeral: ephemeral,
|
||||
Preauthorized: preauth,
|
||||
Tags: tags,
|
||||
Tags: args.Tags,
|
||||
},
|
||||
},
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user