archive
/
tailscale
mirror of https://github.com/tailscale/tailscale/
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

ipn/ipnserver, cmd/hello: do whois over unix socket, not debug http

Browse Source 
Start of a local HTTP API. Not a stable interface yet.
pull/1244/head
Brad Fitzpatrick 4 years ago
parent fe7c3e9c17
commit 006a224f50
2 changed files with 36 additions and 9 deletions
Show Stats Download Patch File Download Diff File

26
cmd/hello/hello.go
Unescape Escape View File

@ -6,6 +6,7 @@
package main // import "tailscale.com/cmd/hello" package main // import "tailscale.com/cmd/hello"
import ( import (
"context"
"encoding/json" "encoding/json"
"flag" "flag"
"fmt" "fmt"
@ -101,16 +102,35 @@ func root(w http.ResponseWriter, r *http.Request) {
}) })
} }
// tsSockClient does HTTP requests to the local tailscaled by dialing
// its Unix socket or whatever type of connection is required on the local
// system.
// TODO(bradfitz): do the macOS dial-the-sandbox dance like cmd/tailscale does.
var tsSockClient = &http.Client{
Transport: &http.Transport{
DialContext: func(ctx context.Context, network, addr string) (net.Conn, error) {
var d net.Dialer
return d.DialContext(ctx, "unix", "/var/run/tailscale/tailscaled.sock")
},
},
}
func whoIs(ip string) (*tailcfg.WhoIsResponse, error) { func whoIs(ip string) (*tailcfg.WhoIsResponse, error) {
res, err := http.Get("http://127.0.0.1:4242/whois?ip=" + url.QueryEscape(ip)) res, err := tsSockClient.Get("http://local-tailscaled.sock/localapi/v0/whois?ip=" + url.QueryEscape(ip))
if err != nil { if err != nil {
return nil, err return nil, err
} }
defer res.Body.Close() defer res.Body.Close()
if res.StatusCode != 200 {
slurp, _ := ioutil.ReadAll(res.Body) slurp, _ := ioutil.ReadAll(res.Body)
if res.StatusCode != 200 {
return nil, fmt.Errorf("HTTP %s: %s", res.Status, slurp) return nil, fmt.Errorf("HTTP %s: %s", res.Status, slurp)
} }
r := new(tailcfg.WhoIsResponse) r := new(tailcfg.WhoIsResponse)
return r, json.NewDecoder(res.Body).Decode(r) if err := json.Unmarshal(slurp, r); err != nil {
if max := 200; len(slurp) > max {
slurp = slurp[:max]
}
return nil, fmt.Errorf("failed to parse JSON WhoIsResponse from %q", slurp)
}
return r, nil
} }

11
ipn/ipnserver/server.go
Unescape Escape View File

@ -119,6 +119,7 @@ type connIdentity struct {
Pid int Pid int
UserID string UserID string
User *user.User User *user.User
IsUnixSock bool
} }
// getConnIdentity returns the localhost TCP connection's identity information // getConnIdentity returns the localhost TCP connection's identity information
@ -127,7 +128,9 @@ type connIdentity struct {
// to be able to map it and couldn't. // to be able to map it and couldn't.
func (s *server) getConnIdentity(c net.Conn) (ci connIdentity, err error) { func (s *server) getConnIdentity(c net.Conn) (ci connIdentity, err error) {
if runtime.GOOS != "windows" { // for now; TODO: expand to other OSes if runtime.GOOS != "windows" { // for now; TODO: expand to other OSes
return connIdentity{Unknown: true}, nil ci = connIdentity{Unknown: true}
_, ci.IsUnixSock = c.(*net.UnixConn)
return ci, nil
} }
la, err := netaddr.ParseIPPort(c.LocalAddr().String()) la, err := netaddr.ParseIPPort(c.LocalAddr().String())
if err != nil { if err != nil {
@ -622,7 +625,7 @@ func Run(ctx context.Context, logf logger.Logf, logid string, getEngine func() (
opts.DebugMux.HandleFunc("/debug/ipn", func(w http.ResponseWriter, r *http.Request) { opts.DebugMux.HandleFunc("/debug/ipn", func(w http.ResponseWriter, r *http.Request) {
serveHTMLStatus(w, b) serveHTMLStatus(w, b)
}) })
opts.DebugMux.Handle("/whois", whoIsHandler{b}) opts.DebugMux.Handle("/localapi/v0/whois", whoIsHandler{b})
} }
server.b = b server.b = b
@ -863,6 +866,10 @@ func (psc *protoSwitchConn) Close() error {
func (s *server) localhostHandler(ci connIdentity) http.Handler { func (s *server) localhostHandler(ci connIdentity) http.Handler {
return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
if ci.IsUnixSock && r.URL.Path == "/localapi/v0/whois" {
whoIsHandler{s.b}.ServeHTTP(w, r)
return
}
if ci.Unknown { if ci.Unknown {
io.WriteString(w, "<html><title>Tailscale</title><body><h1>Tailscale</h1>This is the local Tailscale daemon.") io.WriteString(w, "<html><title>Tailscale</title><body><h1>Tailscale</h1>This is the local Tailscale daemon.")
return return

Write Preview
Loading…
Cancel
Save