diff --git a/cmd/derper/mesh.go b/cmd/derper/mesh.go
index 670d3f5e8..b442d1b36 100644
--- a/cmd/derper/mesh.go
+++ b/cmd/derper/mesh.go
@@ -5,6 +5,7 @@
package main
import (
+ "context"
"errors"
"fmt"
"log"
@@ -40,6 +41,6 @@ func startMeshWithHost(s *derp.Server, host string) error {
c.MeshKey = s.MeshKey()
add := func(k key.Public) { s.AddPacketForwarder(k, c) }
remove := func(k key.Public) { s.RemovePacketForwarder(k, c) }
- go c.RunWatchConnectionLoop(s.PublicKey(), add, remove)
+ go c.RunWatchConnectionLoop(context.Background(), s.PublicKey(), logf, add, remove)
return nil
}
diff --git a/cmd/hello/hello.go b/cmd/hello/hello.go
index bd4145144..c31ccb703 100644
--- a/cmd/hello/hello.go
+++ b/cmd/hello/hello.go
@@ -16,6 +16,8 @@ import (
"net"
"net/http"
"net/url"
+ "os"
+ "strconv"
"strings"
"tailscale.com/safesocket"
@@ -25,10 +27,24 @@ import (
var (
httpAddr = flag.String("http", ":80", "address to run an HTTP server on, or empty for none")
httpsAddr = flag.String("https", ":443", "address to run an HTTPS server on, or empty for none")
+ testIP = flag.String("test-ip", "", "if non-empty, look up IP and exit before running a server")
)
func main() {
flag.Parse()
+ if *testIP != "" {
+ res, err := whoIs(*testIP)
+ if err != nil {
+ log.Fatal(err)
+ }
+ e := json.NewEncoder(os.Stdout)
+ e.SetIndent("", "\t")
+ e.Encode(res)
+ return
+ }
+ if !devMode() {
+ tmpl = template.Must(template.New("home").Parse(slurpHTML()))
+ }
http.HandleFunc("/", root)
log.Printf("Starting hello server.")
@@ -61,13 +77,24 @@ func slurpHTML() string {
return string(slurp)
}
-var tmpl = template.Must(template.New("home").Parse(slurpHTML()))
+func devMode() bool { return *httpsAddr == "" && *httpAddr != "" }
+
+func getTmpl() (*template.Template, error) {
+ if devMode() {
+ return template.New("home").Parse(slurpHTML())
+ }
+ return tmpl, nil
+}
+
+var tmpl *template.Template // not used in dev mode, initialized by main after flag parse
type tmplData struct {
- DisplayName string // "Foo Barberson"
- LoginName string // "foo@bar.com"
- MachineName string // "imac5k"
- IP string // "100.2.3.4"
+ DisplayName string // "Foo Barberson"
+ LoginName string // "foo@bar.com"
+ ProfilePicURL string // "https://..."
+ MachineName string // "imac5k"
+ MachineOS string // "Linux"
+ IP string // "100.2.3.4"
}
func root(w http.ResponseWriter, r *http.Request) {
@@ -88,19 +115,51 @@ func root(w http.ResponseWriter, r *http.Request) {
http.Error(w, "no remote addr", 500)
return
}
- who, err := whoIs(ip)
+ tmpl, err := getTmpl()
if err != nil {
- log.Printf("whois(%q) error: %v", ip, err)
- http.Error(w, "Your Tailscale works, but we failed to look you up.", 500)
+ w.Header().Set("Content-Type", "text/plain")
+ http.Error(w, "template error: "+err.Error(), 500)
return
}
+
+ who, err := whoIs(ip)
+ var data tmplData
+ if err != nil {
+ if devMode() {
+ log.Printf("warning: using fake data in dev mode due to whois lookup error: %v", err)
+ data = tmplData{
+ DisplayName: "Taily Scalerson",
+ LoginName: "taily@scaler.son",
+ ProfilePicURL: "https://placekitten.com/200/200",
+ MachineName: "scaled",
+ MachineOS: "Linux",
+ IP: "100.1.2.3",
+ }
+ } else {
+ log.Printf("whois(%q) error: %v", ip, err)
+ http.Error(w, "Your Tailscale works, but we failed to look you up.", 500)
+ return
+ }
+ } else {
+ data = tmplData{
+ DisplayName: who.UserProfile.DisplayName,
+ LoginName: who.UserProfile.LoginName,
+ ProfilePicURL: who.UserProfile.ProfilePicURL,
+ MachineName: firstLabel(who.Node.ComputedName),
+ MachineOS: who.Node.Hostinfo.OS,
+ IP: ip,
+ }
+ }
w.Header().Set("Content-Type", "text/html; charset=utf-8")
- tmpl.Execute(w, tmplData{
- DisplayName: who.UserProfile.DisplayName,
- LoginName: who.UserProfile.LoginName,
- MachineName: who.Node.ComputedName,
- IP: ip,
- })
+ tmpl.Execute(w, data)
+}
+
+// firstLabel s up until the first period, if any.
+func firstLabel(s string) string {
+ if i := strings.Index(s, "."); i != -1 {
+ return s[:i]
+ }
+ return s
}
// tsSockClient does HTTP requests to the local Tailscale daemon.
@@ -108,13 +167,28 @@ func root(w http.ResponseWriter, r *http.Request) {
var tsSockClient = &http.Client{
Transport: &http.Transport{
DialContext: func(ctx context.Context, network, addr string) (net.Conn, error) {
+ // On macOS, when dialing from non-sandboxed program to sandboxed GUI running
+ // a TCP server on a random port, find the random port. For HTTP connections,
+ // we don't send the token. It gets added in an HTTP Basic-Auth header.
+ if port, _, err := safesocket.LocalTCPPortAndToken(); err == nil {
+ var d net.Dialer
+ return d.DialContext(ctx, "tcp", "localhost:"+strconv.Itoa(port))
+ }
return safesocket.ConnectDefault()
},
},
}
func whoIs(ip string) (*tailcfg.WhoIsResponse, error) {
- res, err := tsSockClient.Get("http://local-tailscaled.sock/localapi/v0/whois?ip=" + url.QueryEscape(ip))
+ ctx := context.Background()
+ req, err := http.NewRequestWithContext(ctx, "GET", "http://local-tailscaled.sock/localapi/v0/whois?ip="+url.QueryEscape(ip), nil)
+ if err != nil {
+ return nil, err
+ }
+ if _, token, err := safesocket.LocalTCPPortAndToken(); err == nil {
+ req.SetBasicAuth("", token)
+ }
+ res, err := tsSockClient.Do(req)
if err != nil {
return nil, err
}
diff --git a/cmd/hello/hello.tmpl.html b/cmd/hello/hello.tmpl.html
index bf43b65ac..ce64a615f 100644
--- a/cmd/hello/hello.tmpl.html
+++ b/cmd/hello/hello.tmpl.html
@@ -1,17 +1,436 @@
-
-
- Hello from Tailscale
-
-
- Hello!
-
- Hello {{.DisplayName}} ({{.LoginName}}) from {{.MachineName}} ({{.IP}}).
-
-
- Your Tailscale is working!
-
-
- Welcome to Tailscale.
-
-
+
+
+
+
+
+ Hello from Tailscale
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ with .DisplayName }}
+
{{.}}
+ {{ end }}
+ {{.LoginName}}
+
+
+
+
+
+
{{.MachineName}}
+
+
{{.IP}}
+
+