diff options
| author | Russ Cox <rsc@golang.org> | 2021-08-18 16:01:02 -0400 |
|---|---|---|
| committer | Russ Cox <rsc@golang.org> | 2021-08-18 20:07:38 +0000 |
| commit | b110cf79797aabb28e3f1b6072f00a05223379c2 (patch) | |
| tree | ffb3dafdcbad193af20430392bfce63459245f73 /cmd/golangorg/server.go | |
| parent | 6c6d3e7c40fa86abd6fe6d0dd6ddaf0155d738f6 (diff) | |
| download | go-x-website-b110cf79797aabb28e3f1b6072f00a05223379c2.tar.xz | |
cmd/golangorg: add blog to valid hosts
Also hard-code EnforceHosts behavior.
It was only optional to enable the old tip.golang.org server,
but that code is dead or at least no longer pointed to by DNS.
Hard-coding the EnforceHosts behavior makes for fewer
prod-only test failures.
Change-Id: Ib958b3f088c8175e67708efcd07426b9628b207b
Reviewed-on: https://go-review.googlesource.com/c/website/+/343311
Trust: Russ Cox <rsc@golang.org>
Run-TryBot: Russ Cox <rsc@golang.org>
Reviewed-by: Jamal Carvalho <jamal@golang.org>
TryBot-Result: Go Bot <gobot@golang.org>
Diffstat (limited to 'cmd/golangorg/server.go')
| -rw-r--r-- | cmd/golangorg/server.go | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/cmd/golangorg/server.go b/cmd/golangorg/server.go index 838eab00..f53b1725 100644 --- a/cmd/golangorg/server.go +++ b/cmd/golangorg/server.go @@ -35,7 +35,6 @@ import ( "golang.org/x/website/internal/backport/osfs" "golang.org/x/website/internal/codewalk" "golang.org/x/website/internal/dl" - "golang.org/x/website/internal/env" "golang.org/x/website/internal/gitfs" "golang.org/x/website/internal/history" "golang.org/x/website/internal/memcache" @@ -211,9 +210,7 @@ func NewHandler(contentDir, goroot string) http.Handler { mux.Handle("learn.go.dev/", redirectPrefix("https://go.dev/learn/")) var h http.Handler = mux - if env.EnforceHosts() { - h = hostEnforcerHandler(h) - } + h = hostEnforcerHandler(h) h = hostPathHandler(h) return h } @@ -362,13 +359,15 @@ func fmtHandler(w http.ResponseWriter, r *http.Request) { } var validHosts = map[string]bool{ - "go.dev": true, - "learn.go.dev": true, "golang.org": true, "golang.google.cn": true, + "beta.golang.org": true, + "blog.golang.org": true, "m.golang.org": true, "tip.golang.org": true, - "beta.golang.org": true, + + "go.dev": true, + "learn.go.dev": true, } // hostEnforcerHandler redirects http://foo.golang.org/bar to https://golang.org/bar. |