TheArchive/tailscale
1
0
Fork 0
mirror of https://github.com/tailscale/tailscale.git synced 2025-04-21 06:01:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

ipn/ipnlocal: rename/document peerapi stuff a bit, pass self identity

Browse Source 
So handlers can vary based on whether owner of peer matches owner of
local node.

Signed-off-by: Brad Fitzpatrick <bradfitz@tailscale.com>
This commit is contained in:
Brad Fitzpatrick 2021-03-26 21:24:02 -07:00
parent 44d9929208
commit f26dfd054a
2 changed files with 25 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ipn/ipnlocal/local.go
View File

@ -1448,6 +1448,10 @@ func (b *LocalBackend) initPeerAPIListener() {
} }
b.peerAPIListeners = nil b.peerAPIListeners = nil
if len(b.netMap.Addresses) == 0 || b.netMap.SelfNode == nil {
return
}
var tunName string var tunName string
if ge, ok := b.e.(wgengine.InternalsGetter); ok { if ge, ok := b.e.(wgengine.InternalsGetter); ok {
tunDev, _ := ge.GetInternals() tunDev, _ := ge.GetInternals()
@ -1461,8 +1465,9 @@ func (b *LocalBackend) initPeerAPIListener() {
continue continue
} }
pln := &peerAPIListener{ pln := &peerAPIListener{
ln: ln, ln: ln,
lb: b, lb: b,
selfNode: b.netMap.SelfNode,
} }
pln.urlStr = "http://" + net.JoinHostPort(a.IP.String(), strconv.Itoa(pln.Port())) pln.urlStr = "http://" + net.JoinHostPort(a.IP.String(), strconv.Itoa(pln.Port()))

28
ipn/ipnlocal/peerapi.go
View File

@ -67,9 +67,10 @@ func peerAPIListen(ip netaddr.IP, ifState *interfaces.State, tunIfName string) (
} }
type peerAPIListener struct { type peerAPIListener struct {
ln net.Listener ln net.Listener
lb *LocalBackend lb *LocalBackend
urlStr string urlStr string
selfNode *tailcfg.Node
} }
func (pln *peerAPIListener) Port() int { func (pln *peerAPIListener) Port() int {
@ -110,14 +111,15 @@ func (pln *peerAPIListener) serve() {
c.Close() c.Close()
continue continue
} }
pas := &peerAPIServer{ h := &peerAPIHandler{
isSelf: pln.selfNode.User == peerNode.User,
remoteAddr: ipp, remoteAddr: ipp,
peerNode: peerNode, peerNode: peerNode,
peerUser: peerUser, peerUser: peerUser,
lb: pln.lb, lb: pln.lb,
} }
httpServer := &http.Server{ httpServer := &http.Server{
Handler: pas, Handler: h,
} }
go httpServer.Serve(&oneConnListener{Listener: pln.ln, conn: c}) go httpServer.Serve(&oneConnListener{Listener: pln.ln, conn: c})
} }
@ -141,19 +143,25 @@ func (l *oneConnListener) Accept() (c net.Conn, err error) {
func (l *oneConnListener) Close() error { return nil } func (l *oneConnListener) Close() error { return nil }
type peerAPIServer struct { // peerAPIHandler serves the Peer API for a source specific client.
type peerAPIHandler struct {
remoteAddr netaddr.IPPort remoteAddr netaddr.IPPort
peerNode *tailcfg.Node isSelf bool // whether peerNode is owned by same user as this node
peerUser tailcfg.UserProfile peerNode *tailcfg.Node // peerNode is who's making the request
peerUser tailcfg.UserProfile // profile of peerNode
lb *LocalBackend lb *LocalBackend
} }
func (s *peerAPIServer) ServeHTTP(w http.ResponseWriter, r *http.Request) { func (h *peerAPIHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
who := h.peerUser.DisplayName
fmt.Fprintf(w, `<html> fmt.Fprintf(w, `<html>
<meta name="viewport" content="width=device-width, initial-scale=1"> <meta name="viewport" content="width=device-width, initial-scale=1">
<body> <body>
<h1>Hello, %s (%v)</h1> <h1>Hello, %s (%v)</h1>
This is my Tailscale device. Your device is %v. This is my Tailscale device. Your device is %v.
`, html.EscapeString(s.peerUser.DisplayName), s.remoteAddr.IP, html.EscapeString(s.peerNode.ComputedName)) `, html.EscapeString(who), h.remoteAddr.IP, html.EscapeString(h.peerNode.ComputedName))
if h.isSelf {
fmt.Fprintf(w, "<p>You are the owner of this node.\n")
}
} }