mirror of
https://github.com/tailscale/tailscale.git
synced 2024-11-29 04:55:31 +00:00
tailcfg: add views for SSHRule and SSHPrincipal
Signed-off-by: Maisem Ali <maisem@tailscale.com>
This commit is contained in:
parent
7c671b0220
commit
fa2fbaf3aa
@ -4,7 +4,7 @@
|
|||||||
|
|
||||||
package tailcfg
|
package tailcfg
|
||||||
|
|
||||||
//go:generate go run tailscale.com/cmd/viewer --type=User,Node,Hostinfo,NetInfo,Login,DNSConfig,RegisterResponse,DERPRegion,DERPMap,DERPNode --clonefunc
|
//go:generate go run tailscale.com/cmd/viewer --type=User,Node,Hostinfo,NetInfo,Login,DNSConfig,RegisterResponse,DERPRegion,DERPMap,DERPNode,SSHRule,SSHPrincipal --clonefunc
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"encoding/hex"
|
"encoding/hex"
|
||||||
|
@ -326,9 +326,67 @@ func (src *DERPNode) Clone() *DERPNode {
|
|||||||
STUNTestIP string
|
STUNTestIP string
|
||||||
}{})
|
}{})
|
||||||
|
|
||||||
|
// Clone makes a deep copy of SSHRule.
|
||||||
|
// The result aliases no memory with the original.
|
||||||
|
func (src *SSHRule) Clone() *SSHRule {
|
||||||
|
if src == nil {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
dst := new(SSHRule)
|
||||||
|
*dst = *src
|
||||||
|
if dst.RuleExpires != nil {
|
||||||
|
dst.RuleExpires = new(time.Time)
|
||||||
|
*dst.RuleExpires = *src.RuleExpires
|
||||||
|
}
|
||||||
|
dst.Principals = make([]*SSHPrincipal, len(src.Principals))
|
||||||
|
for i := range dst.Principals {
|
||||||
|
dst.Principals[i] = src.Principals[i].Clone()
|
||||||
|
}
|
||||||
|
if dst.SSHUsers != nil {
|
||||||
|
dst.SSHUsers = map[string]string{}
|
||||||
|
for k, v := range src.SSHUsers {
|
||||||
|
dst.SSHUsers[k] = v
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if dst.Action != nil {
|
||||||
|
dst.Action = new(SSHAction)
|
||||||
|
*dst.Action = *src.Action
|
||||||
|
}
|
||||||
|
return dst
|
||||||
|
}
|
||||||
|
|
||||||
|
// A compilation failure here means this code must be regenerated, with the command at the top of this file.
|
||||||
|
var _SSHRuleCloneNeedsRegeneration = SSHRule(struct {
|
||||||
|
RuleExpires *time.Time
|
||||||
|
Principals []*SSHPrincipal
|
||||||
|
SSHUsers map[string]string
|
||||||
|
Action *SSHAction
|
||||||
|
}{})
|
||||||
|
|
||||||
|
// Clone makes a deep copy of SSHPrincipal.
|
||||||
|
// The result aliases no memory with the original.
|
||||||
|
func (src *SSHPrincipal) Clone() *SSHPrincipal {
|
||||||
|
if src == nil {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
dst := new(SSHPrincipal)
|
||||||
|
*dst = *src
|
||||||
|
dst.PubKeys = append(src.PubKeys[:0:0], src.PubKeys...)
|
||||||
|
return dst
|
||||||
|
}
|
||||||
|
|
||||||
|
// A compilation failure here means this code must be regenerated, with the command at the top of this file.
|
||||||
|
var _SSHPrincipalCloneNeedsRegeneration = SSHPrincipal(struct {
|
||||||
|
Node StableNodeID
|
||||||
|
NodeIP string
|
||||||
|
UserLogin string
|
||||||
|
Any bool
|
||||||
|
PubKeys []string
|
||||||
|
}{})
|
||||||
|
|
||||||
// Clone duplicates src into dst and reports whether it succeeded.
|
// Clone duplicates src into dst and reports whether it succeeded.
|
||||||
// To succeed, <src, dst> must be of types <*T, *T> or <*T, **T>,
|
// To succeed, <src, dst> must be of types <*T, *T> or <*T, **T>,
|
||||||
// where T is one of User,Node,Hostinfo,NetInfo,Login,DNSConfig,RegisterResponse,DERPRegion,DERPMap,DERPNode.
|
// where T is one of User,Node,Hostinfo,NetInfo,Login,DNSConfig,RegisterResponse,DERPRegion,DERPMap,DERPNode,SSHRule,SSHPrincipal.
|
||||||
func Clone(dst, src any) bool {
|
func Clone(dst, src any) bool {
|
||||||
switch src := src.(type) {
|
switch src := src.(type) {
|
||||||
case *User:
|
case *User:
|
||||||
@ -421,6 +479,24 @@ func Clone(dst, src any) bool {
|
|||||||
*dst = src.Clone()
|
*dst = src.Clone()
|
||||||
return true
|
return true
|
||||||
}
|
}
|
||||||
|
case *SSHRule:
|
||||||
|
switch dst := dst.(type) {
|
||||||
|
case *SSHRule:
|
||||||
|
*dst = *src.Clone()
|
||||||
|
return true
|
||||||
|
case **SSHRule:
|
||||||
|
*dst = src.Clone()
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
case *SSHPrincipal:
|
||||||
|
switch dst := dst.(type) {
|
||||||
|
case *SSHPrincipal:
|
||||||
|
*dst = *src.Clone()
|
||||||
|
return true
|
||||||
|
case **SSHPrincipal:
|
||||||
|
*dst = src.Clone()
|
||||||
|
return true
|
||||||
|
}
|
||||||
}
|
}
|
||||||
return false
|
return false
|
||||||
}
|
}
|
||||||
|
@ -19,7 +19,7 @@
|
|||||||
"tailscale.com/types/views"
|
"tailscale.com/types/views"
|
||||||
)
|
)
|
||||||
|
|
||||||
//go:generate go run tailscale.com/cmd/cloner -clonefunc=true -type=User,Node,Hostinfo,NetInfo,Login,DNSConfig,RegisterResponse,DERPRegion,DERPMap,DERPNode
|
//go:generate go run tailscale.com/cmd/cloner -clonefunc=true -type=User,Node,Hostinfo,NetInfo,Login,DNSConfig,RegisterResponse,DERPRegion,DERPMap,DERPNode,SSHRule,SSHPrincipal
|
||||||
|
|
||||||
// View returns a readonly view of User.
|
// View returns a readonly view of User.
|
||||||
func (p *User) View() UserView {
|
func (p *User) View() UserView {
|
||||||
@ -763,3 +763,137 @@ func (v DERPNodeView) STUNTestIP() string { return v.ж.STUNTestIP }
|
|||||||
InsecureForTests bool
|
InsecureForTests bool
|
||||||
STUNTestIP string
|
STUNTestIP string
|
||||||
}{})
|
}{})
|
||||||
|
|
||||||
|
// View returns a readonly view of SSHRule.
|
||||||
|
func (p *SSHRule) View() SSHRuleView {
|
||||||
|
return SSHRuleView{ж: p}
|
||||||
|
}
|
||||||
|
|
||||||
|
// SSHRuleView provides a read-only view over SSHRule.
|
||||||
|
//
|
||||||
|
// Its methods should only be called if `Valid()` returns true.
|
||||||
|
type SSHRuleView struct {
|
||||||
|
// ж is the underlying mutable value, named with a hard-to-type
|
||||||
|
// character that looks pointy like a pointer.
|
||||||
|
// It is named distinctively to make you think of how dangerous it is to escape
|
||||||
|
// to callers. You must not let callers be able to mutate it.
|
||||||
|
ж *SSHRule
|
||||||
|
}
|
||||||
|
|
||||||
|
// Valid reports whether underlying value is non-nil.
|
||||||
|
func (v SSHRuleView) Valid() bool { return v.ж != nil }
|
||||||
|
|
||||||
|
// AsStruct returns a clone of the underlying value which aliases no memory with
|
||||||
|
// the original.
|
||||||
|
func (v SSHRuleView) AsStruct() *SSHRule {
|
||||||
|
if v.ж == nil {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
return v.ж.Clone()
|
||||||
|
}
|
||||||
|
|
||||||
|
func (v SSHRuleView) MarshalJSON() ([]byte, error) { return json.Marshal(v.ж) }
|
||||||
|
|
||||||
|
func (v *SSHRuleView) UnmarshalJSON(b []byte) error {
|
||||||
|
if v.ж != nil {
|
||||||
|
return errors.New("already initialized")
|
||||||
|
}
|
||||||
|
if len(b) == 0 {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
var x SSHRule
|
||||||
|
if err := json.Unmarshal(b, &x); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
v.ж = &x
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (v SSHRuleView) RuleExpires() *time.Time {
|
||||||
|
if v.ж.RuleExpires == nil {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
x := *v.ж.RuleExpires
|
||||||
|
return &x
|
||||||
|
}
|
||||||
|
|
||||||
|
func (v SSHRuleView) Principals() views.SliceView[*SSHPrincipal, SSHPrincipalView] {
|
||||||
|
return views.SliceOfViews[*SSHPrincipal, SSHPrincipalView](v.ж.Principals)
|
||||||
|
}
|
||||||
|
|
||||||
|
func (v SSHRuleView) SSHUsers() views.Map[string, string] { return views.MapOf(v.ж.SSHUsers) }
|
||||||
|
func (v SSHRuleView) Action() *SSHAction {
|
||||||
|
if v.ж.Action == nil {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
x := *v.ж.Action
|
||||||
|
return &x
|
||||||
|
}
|
||||||
|
|
||||||
|
// A compilation failure here means this code must be regenerated, with the command at the top of this file.
|
||||||
|
var _SSHRuleViewNeedsRegeneration = SSHRule(struct {
|
||||||
|
RuleExpires *time.Time
|
||||||
|
Principals []*SSHPrincipal
|
||||||
|
SSHUsers map[string]string
|
||||||
|
Action *SSHAction
|
||||||
|
}{})
|
||||||
|
|
||||||
|
// View returns a readonly view of SSHPrincipal.
|
||||||
|
func (p *SSHPrincipal) View() SSHPrincipalView {
|
||||||
|
return SSHPrincipalView{ж: p}
|
||||||
|
}
|
||||||
|
|
||||||
|
// SSHPrincipalView provides a read-only view over SSHPrincipal.
|
||||||
|
//
|
||||||
|
// Its methods should only be called if `Valid()` returns true.
|
||||||
|
type SSHPrincipalView struct {
|
||||||
|
// ж is the underlying mutable value, named with a hard-to-type
|
||||||
|
// character that looks pointy like a pointer.
|
||||||
|
// It is named distinctively to make you think of how dangerous it is to escape
|
||||||
|
// to callers. You must not let callers be able to mutate it.
|
||||||
|
ж *SSHPrincipal
|
||||||
|
}
|
||||||
|
|
||||||
|
// Valid reports whether underlying value is non-nil.
|
||||||
|
func (v SSHPrincipalView) Valid() bool { return v.ж != nil }
|
||||||
|
|
||||||
|
// AsStruct returns a clone of the underlying value which aliases no memory with
|
||||||
|
// the original.
|
||||||
|
func (v SSHPrincipalView) AsStruct() *SSHPrincipal {
|
||||||
|
if v.ж == nil {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
return v.ж.Clone()
|
||||||
|
}
|
||||||
|
|
||||||
|
func (v SSHPrincipalView) MarshalJSON() ([]byte, error) { return json.Marshal(v.ж) }
|
||||||
|
|
||||||
|
func (v *SSHPrincipalView) UnmarshalJSON(b []byte) error {
|
||||||
|
if v.ж != nil {
|
||||||
|
return errors.New("already initialized")
|
||||||
|
}
|
||||||
|
if len(b) == 0 {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
var x SSHPrincipal
|
||||||
|
if err := json.Unmarshal(b, &x); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
v.ж = &x
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (v SSHPrincipalView) Node() StableNodeID { return v.ж.Node }
|
||||||
|
func (v SSHPrincipalView) NodeIP() string { return v.ж.NodeIP }
|
||||||
|
func (v SSHPrincipalView) UserLogin() string { return v.ж.UserLogin }
|
||||||
|
func (v SSHPrincipalView) Any() bool { return v.ж.Any }
|
||||||
|
func (v SSHPrincipalView) PubKeys() views.Slice[string] { return views.SliceOf(v.ж.PubKeys) }
|
||||||
|
|
||||||
|
// A compilation failure here means this code must be regenerated, with the command at the top of this file.
|
||||||
|
var _SSHPrincipalViewNeedsRegeneration = SSHPrincipal(struct {
|
||||||
|
Node StableNodeID
|
||||||
|
NodeIP string
|
||||||
|
UserLogin string
|
||||||
|
Any bool
|
||||||
|
PubKeys []string
|
||||||
|
}{})
|
||||||
|
Loading…
Reference in New Issue
Block a user