TheArchive/tailscale
1
0
Fork 0
mirror of https://github.com/tailscale/tailscale.git synced 2024-11-29 04:55:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

tailcfg: mark CapabilityFileSharingTarget as inter-node

Browse Source 
Signed-off-by: Maisem Ali <maisem@tailscale.com>
This commit is contained in:
Maisem Ali 2022-09-19 10:36:07 -07:00 committed by Maisem Ali
parent d045462dfb
commit 054ef4de56
2 changed files with 21 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
ipn/ipnlocal/local.go
View File

@ -24,7 +24,6 @@
"time" "time"
"go4.org/netipx" "go4.org/netipx"
"golang.org/x/exp/slices"
"tailscale.com/client/tailscale/apitype" "tailscale.com/client/tailscale/apitype"
"tailscale.com/control/controlclient" "tailscale.com/control/controlclient"
"tailscale.com/envknob" "tailscale.com/envknob"
@ -574,6 +573,10 @@ func (b *LocalBackend) WhoIs(ipp netip.AddrPort) (n *tailcfg.Node, u tailcfg.Use
func (b *LocalBackend) PeerCaps(src netip.Addr) []string { func (b *LocalBackend) PeerCaps(src netip.Addr) []string {
b.mu.Lock() b.mu.Lock()
defer b.mu.Unlock() defer b.mu.Unlock()
return b.peerCapsLocked(src)
}
func (b *LocalBackend) peerCapsLocked(src netip.Addr) []string {
if b.netMap == nil { if b.netMap == nil {
return nil return nil
} }
@ -585,9 +588,9 @@ func (b *LocalBackend) PeerCaps(src netip.Addr) []string {
if !a.IsSingleIP() { if !a.IsSingleIP() {
continue continue
} }
dstIP := a.Addr() dst := a.Addr()
if dstIP.BitLen() == src.BitLen() { if dst.BitLen() == src.BitLen() { // match on family
return filt.AppendCaps(nil, src, a.Addr()) return filt.AppendCaps(nil, src, dst)
} }
} }
return nil return nil
@ -3304,13 +3307,15 @@ func (b *LocalBackend) FileTargets() ([]*apitype.FileTarget, error) {
return nil, errors.New("file sharing not enabled by Tailscale admin") return nil, errors.New("file sharing not enabled by Tailscale admin")
} }
for _, p := range nm.Peers { for _, p := range nm.Peers {
if p.User != nm.User && !slices.Contains(p.Capabilities, tailcfg.CapabilityFileSharingTarget) { if len(p.Addresses) == 0 {
continue
}
if p.User != nm.User && b.peerHasCapLocked(p.Addresses[0].Addr(), tailcfg.CapabilityFileSharing) {
continue continue
} }
peerAPI := peerAPIBase(b.netMap, p) peerAPI := peerAPIBase(b.netMap, p)
if peerAPI == "" { if peerAPI == "" {
continue continue
} }
ret = append(ret, &apitype.FileTarget{ ret = append(ret, &apitype.FileTarget{
Node: p, Node: p,
@ -3321,6 +3326,15 @@ func (b *LocalBackend) FileTargets() ([]*apitype.FileTarget, error) {
return ret, nil return ret, nil
} }
func (b *LocalBackend) peerHasCapLocked(addr netip.Addr, wantCap string) bool {
for _, hasCap := range b.peerCapsLocked(addr) {
if hasCap == wantCap {
return true
}
}
return false
}
// SetDNS adds a DNS record for the given domain name & TXT record // SetDNS adds a DNS record for the given domain name & TXT record
// value. // value.
// //

6
tailcfg/tailcfg.go
View File

@ -1589,15 +1589,11 @@ type Oauth2Token struct {
CapabilitySSHRuleIn = "https://tailscale.com/cap/ssh-rule-in" // some SSH rule reach this node CapabilitySSHRuleIn = "https://tailscale.com/cap/ssh-rule-in" // some SSH rule reach this node
CapabilityDataPlaneAuditLogs = "https://tailscale.com/cap/data-plane-audit-logs" // feature enabled CapabilityDataPlaneAuditLogs = "https://tailscale.com/cap/data-plane-audit-logs" // feature enabled
// These are the capabilities that the peer nodes have as listed in // Inter-node capabilities as specified in the MapResponse.PacketFilter[].CapGrants.
// MapResponse.Peers[].Capabilities.
// CapabilityFileSharingTarget grants the current node the ability to send // CapabilityFileSharingTarget grants the current node the ability to send
// files to the peer which has this capability. // files to the peer which has this capability.
CapabilityFileSharingTarget = "https://tailscale.com/cap/file-sharing-target" CapabilityFileSharingTarget = "https://tailscale.com/cap/file-sharing-target"
// Inter-node capabilities as specified in the MapResponse.PacketFilter[].CapGrants.
// CapabilityFileSharingSend grants the ability to receive files from a // CapabilityFileSharingSend grants the ability to receive files from a
// node that's owned by a different user. // node that's owned by a different user.
CapabilityFileSharingSend = "https://tailscale.com/cap/file-send" CapabilityFileSharingSend = "https://tailscale.com/cap/file-send"