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

cmd/derper: add /generate_204 endpoint (#5601)

Browse Source 
For captive portal detection.

Signed-off-by: Andrew Dunham <andrew@tailscale.com>
This commit is contained in:
Andrew Dunham 2022-09-12 13:43:50 -04:00 committed by GitHub
parent 16939f0d56
commit eb5939289c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
cmd/derper/derper.go
View File

@ -206,6 +206,7 @@ func main() {
mux.Handle("/robots.txt", http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { mux.Handle("/robots.txt", http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
io.WriteString(w, "User-agent: *\nDisallow: /\n") io.WriteString(w, "User-agent: *\nDisallow: /\n")
})) }))
mux.Handle("/generate_204", http.HandlerFunc(serveNoContent))
debug := tsweb.Debugger(mux) debug := tsweb.Debugger(mux)
debug.KV("TLS hostname", *hostname) debug.KV("TLS hostname", *hostname)
debug.KV("Mesh key", s.HasMeshKey()) debug.KV("Mesh key", s.HasMeshKey())
@ -293,9 +294,12 @@ func main() {
}) })
if *httpPort > -1 { if *httpPort > -1 {
go func() { go func() {
port80mux := http.NewServeMux()
port80mux.HandleFunc("/generate_204", serveNoContent)
port80mux.Handle("/", certManager.HTTPHandler(tsweb.Port80Handler{Main: mux}))
port80srv := &http.Server{ port80srv := &http.Server{
Addr: net.JoinHostPort(listenHost, fmt.Sprintf("%d", *httpPort)), Addr: net.JoinHostPort(listenHost, fmt.Sprintf("%d", *httpPort)),
Handler: certManager.HTTPHandler(tsweb.Port80Handler{Main: mux}), Handler: port80mux,
ErrorLog: quietLogger, ErrorLog: quietLogger,
ReadTimeout: 30 * time.Second, ReadTimeout: 30 * time.Second,
// Crank up WriteTimeout a bit more than usually // Crank up WriteTimeout a bit more than usually
@ -322,6 +326,11 @@ func main() {
} }
} }
// For captive portal detection
func serveNoContent(w http.ResponseWriter, r *http.Request) {
w.WriteHeader(http.StatusNoContent)
}
// probeHandler is the endpoint that js/wasm clients hit to measure // probeHandler is the endpoint that js/wasm clients hit to measure
// DERP latency, since they can't do UDP STUN queries. // DERP latency, since they can't do UDP STUN queries.
func probeHandler(w http.ResponseWriter, r *http.Request) { func probeHandler(w http.ResponseWriter, r *http.Request) {