webnet/tailscale
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

ipn/ipnlocal: use ServerConfig views internally

Browse Source 
Updates tailscale/corp#7515

Change-Id: Ica2bc44b92d281d5ce16cee55b7ca51c7910145c
Signed-off-by: Brad Fitzpatrick <bradfitz@tailscale.com>
This commit is contained in:
Brad Fitzpatrick
2022-11-09 13:15:59 -08:00
committed by Brad Fitzpatrick
parent 4de643b714
commit 4bccc02413
2 changed files with 27 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ipn/ipnlocal/serve.go
+15 -9
View File
@@ -38,9 +38,11 @@ func (b *LocalBackend) HandleInterceptedTCPConn(c net.Conn) {
hs.ServeTLS(netutil.NewOneConnListener(c, nil), "", "")
}
func (b *LocalBackend) getServeHandler(r *http.Request) (_ *ipn.HTTPHandler, ok bool) {
func (b *LocalBackend) getServeHandler(r *http.Request) (_ ipn.HTTPHandlerView, ok bool) {
var z ipn.HTTPHandlerView // zero value
if r.TLS == nil {
return nil, false
return z, false
}
sni := r.TLS.ServerName
@@ -50,17 +52,21 @@ func (b *LocalBackend) getServeHandler(r *http.Request) (_ *ipn.HTTPHandler, ok
b.mu.Lock()
defer b.mu.Unlock()
wsc, ok := b.serveConfig.Web[key]
if !b.serveConfig.Valid() {
return z, false
}
wsc, ok := b.serveConfig.Web().GetOk(key)
if !ok {
return nil, false
return z, false
}
path := r.URL.Path
for {
if h, ok := wsc.Handlers[path]; ok {
if h, ok := wsc.Handlers().GetOk(path); ok {
return h, true
}
if path == "/" {
return nil, false
return z, false
}
path = pathpkg.Dir(path)
}
@@ -72,16 +78,16 @@ func (b *LocalBackend) serveWebHandler(w http.ResponseWriter, r *http.Request) {
http.NotFound(w, r)
return
}
if s := h.Text; s != "" {
if s := h.Text(); s != "" {
w.Header().Set("Content-Type", "text/plain; charset=utf-8")
io.WriteString(w, s)
return
}
if v := h.Path; v != "" {
if v := h.Path(); v != "" {
io.WriteString(w, "TODO(bradfitz): serve file")
return
}
if v := h.Proxy; v != "" {
if v := h.Proxy(); v != "" {
io.WriteString(w, "TODO(bradfitz): proxy")
return
}