accept.go: Improve unauthorized origin error message

nhooyr · nhooyr · commit 29251d03c03f · 2021-01-09T08:35:37.000-05:00
Closes #247
diff --git a/accept.go b/accept.go
@@ -215,7 +215,10 @@ func authenticateOrigin(r *http.Request, originHosts []string) error {
 			return nil
 		}
 	}
-	return fmt.Errorf("request Origin %q is not authorized for Host %q", origin, r.Host)
+	if u.Host == "" {
+		return fmt.Errorf("request Origin %q is not a valid URL with a host", origin)
+	}
+	return fmt.Errorf("request Origin %q is not authorized for Host %q", u.Host, r.Host)
 }
 
 func match(pattern, s string) (bool, error) {
diff --git a/accept_test.go b/accept_test.go
@@ -39,7 +39,23 @@ func TestAccept(t *testing.T) {
 		r.Header.Set("Origin", "harhar.com")
 
 		_, err := Accept(w, r, nil)
-		assert.Contains(t, err, `request Origin "harhar.com" is not authorized for Host`)
+		assert.Contains(t, err, `request Origin "harhar.com" is not a valid URL with a host`)
+	})
+
+	// #247
+	t.Run("unauthorizedOriginErrorMessage", func(t *testing.T) {
+		t.Parallel()
+
+		w := httptest.NewRecorder()
+		r := httptest.NewRequest("GET", "/", nil)
+		r.Header.Set("Connection", "Upgrade")
+		r.Header.Set("Upgrade", "websocket")
+		r.Header.Set("Sec-WebSocket-Version", "13")
+		r.Header.Set("Sec-WebSocket-Key", "meow123")
+		r.Header.Set("Origin", "https://harhar.com")
+
+		_, err := Accept(w, r, nil)
+		assert.Contains(t, err, `request Origin "harhar.com" is not authorized for Host "example.com"`)
 	})
 
 	t.Run("badCompression", func(t *testing.T) {

Original file line number	Diff line number	Diff line change
`@@ -215,7 +215,10 @@ func authenticateOrigin(r *http.Request, originHosts []string) error {`
`215`	`215`	`return nil`
`216`	`216`	`}`
`217`	`217`	`}`
`218`		`- return fmt.Errorf("request Origin %q is not authorized for Host %q", origin, r.Host)`
	`218`	`+ if u.Host == "" {`
	`219`	`+ return fmt.Errorf("request Origin %q is not a valid URL with a host", origin)`
	`220`	`+ }`
	`221`	`+ return fmt.Errorf("request Origin %q is not authorized for Host %q", u.Host, r.Host)`
`219`	`222`	`}`
`220`	`223`
`221`	`224`	`func match(pattern, s string) (bool, error) {`