-
Notifications
You must be signed in to change notification settings - Fork 1.9k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Guess the scheme if r.URL.Scheme is unset
It's not expected that the request's URL is fully populated when used on the server-side (it's more of a client-side field), so we shouldn't expect it to be present. In practice, it's only rarely set at all on the server, making mux's `Schemes` matcher tricky to use as it is. This commit adds a test which would have failed before demonstrating the problem, as well as a fix which I think makes `.Schemes` match what users expect.
- Loading branch information
Showing
3 changed files
with
62 additions
and
5 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,46 @@ | ||
// +build go1.9 | ||
|
||
package mux | ||
|
||
import ( | ||
"bytes" | ||
"io/ioutil" | ||
"net/http" | ||
"net/http/httptest" | ||
"testing" | ||
) | ||
|
||
func TestSchemeMatchers(t *testing.T) { | ||
router := NewRouter() | ||
router.HandleFunc("/", func(rw http.ResponseWriter, r *http.Request) { | ||
rw.Write([]byte("hello world")) | ||
}).Schemes("http", "https") | ||
|
||
assertHelloWorldResponse := func(t *testing.T, s *httptest.Server) { | ||
resp, err := s.Client().Get(s.URL) | ||
if err != nil { | ||
t.Fatalf("unexpected error getting from server: %v", err) | ||
} | ||
if resp.StatusCode != 200 { | ||
t.Fatalf("expected a status code of 200, got %v", resp.StatusCode) | ||
} | ||
body, err := ioutil.ReadAll(resp.Body) | ||
if err != nil { | ||
t.Fatalf("unexpected error reading body: %v", err) | ||
} | ||
if !bytes.Equal(body, []byte("hello world")) { | ||
t.Fatalf("response should be hello world, was: %q", string(body)) | ||
} | ||
} | ||
|
||
t.Run("httpServer", func(t *testing.T) { | ||
s := httptest.NewServer(router) | ||
defer s.Close() | ||
assertHelloWorldResponse(t, s) | ||
}) | ||
t.Run("httpsServer", func(t *testing.T) { | ||
s := httptest.NewTLSServer(router) | ||
defer s.Close() | ||
assertHelloWorldResponse(t, s) | ||
}) | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters