Commit c56ef893fb
Verified · cmc
Layout: unified · split
internal/httpd/routes.go +5
| @@ -263,6 +263,11 @@ func (s *Server) unmatched(mux *http.ServeMux) http.HandlerFunc { | |||
| 263 | // The fallback itself is registered at "/", so a miss | 263 | // The fallback itself is registered at "/", so a miss |
| 264 | // reports that pattern; a real route reports its own. | 264 | // reports that pattern; a real route reports its own. |
| 265 | if _, pattern := mux.Handler(trimmed); pattern != "" && pattern != "/" { | 265 | if _, pattern := mux.Handler(trimmed); pattern != "" && pattern != "/" { |
| 266 | // net/http fills Scheme and Host from an | ||
| 267 | // absolute-form request line, which RFC 7230 | ||
| 268 | // requires a server to accept; carrying them | ||
| 269 | // into Location sends the reader off-site. | ||
| 270 | u.Scheme, u.Host, u.User = "", "", nil | ||
| 266 | http.Redirect(w, r, u.String(), http.StatusMovedPermanently) | 271 | http.Redirect(w, r, u.String(), http.StatusMovedPermanently) |
| 267 | return | 272 | return |
| 268 | } | 273 | } |
internal/httpd/trailingslash_test.go +18
| @@ -1,6 +1,7 @@ | |||
| 1 | package httpd | 1 | package httpd |
| 2 | 2 | ||
| 3 | import ( | 3 | import ( |
| 4 | "bufio" | ||
| 4 | "net/http" | 5 | "net/http" |
| 5 | "net/http/httptest" | 6 | "net/http/httptest" |
| 6 | "strings" | 7 | "strings" |
| @@ -37,6 +38,23 @@ func TestTrailingSlashRedirects(t *testing.T) { | |||
| 37 | t.Errorf("%s: Location %q leaves the site", p, loc) | 38 | t.Errorf("%s: Location %q leaves the site", p, loc) |
| 38 | } | 39 | } |
| 39 | } | 40 | } |
| 41 | // An absolute-form request line, which RFC 7230 requires a server to | ||
| 42 | // accept, fills URL.Scheme and URL.Host. Neither may reach Location. | ||
| 43 | // ReadRequest also takes Host from the URL; it is pinned back to the | ||
| 44 | // site so this stays a test of the forge handler rather than of the | ||
| 45 | // pages router. | ||
| 46 | raw := "GET http://evil.example/cmc/ HTTP/1.1\r\nHost: forge.test\r\n\r\n" | ||
| 47 | abs, err := http.ReadRequest(bufio.NewReader(strings.NewReader(raw))) | ||
| 48 | if err != nil { | ||
| 49 | t.Fatal(err) | ||
| 50 | } | ||
| 51 | abs.Host = "forge.test" | ||
| 52 | aw := httptest.NewRecorder() | ||
| 53 | h.ServeHTTP(aw, abs) | ||
| 54 | if loc := aw.Header().Get("Location"); loc != "/cmc" { | ||
| 55 | t.Errorf("absolute-form request: Location %q, want %q", loc, "/cmc") | ||
| 56 | } | ||
| 57 | |||
| 40 | r := httptest.NewRequest("POST", "/cmc/", nil) | 58 | r := httptest.NewRequest("POST", "/cmc/", nil) |
| 41 | r.Host = "forge.test" | 59 | r.Host = "forge.test" |
| 42 | w := httptest.NewRecorder() | 60 | w := httptest.NewRecorder() |