TheArchive/tailscale
1
0
Fork 0
mirror of https://github.com/tailscale/tailscale.git synced 2025-04-02 14:32:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

cmd/nginx-auth/nginx-auth: update auth to allow for new domains

Browse Source 
With MagicDNS GA, we are giving every tailnet a tailnet-<hex>.ts.net name.
We will only parse out if legacy domains include beta.tailscale.net; otherwise,
set tailnet to the full domain format going forward.

Signed-off-by: nyghtowl <warrick@tailscale.com>
This commit is contained in:
nyghtowl 2022-08-31 17:44:22 -07:00 committed by Melanie Warrick
parent 9c66dce8e0
commit cfbbcf6d07
1 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
cmd/nginx-auth/nginx-auth.go
View File

@ -75,12 +75,7 @@ func main() {
log.Printf("can't extract tailnet name from hostname %q", info.Node.Name) log.Printf("can't extract tailnet name from hostname %q", info.Node.Name)
return return
} }
tailnet, _, ok = strings.Cut(tailnet, ".beta.tailscale.net") tailnet = strings.TrimSuffix(tailnet, ".beta.tailscale.net")
if !ok {
w.WriteHeader(http.StatusUnauthorized)
log.Printf("can't extract tailnet name from hostname %q", info.Node.Name)
return
}
} }
if expectedTailnet := r.Header.Get("Expected-Tailnet"); expectedTailnet != "" && expectedTailnet != tailnet { if expectedTailnet := r.Header.Get("Expected-Tailnet"); expectedTailnet != "" && expectedTailnet != tailnet {