added http(s) support for origin

igm · May 14, 2014 · 6ed5e37 · 6ed5e37
1 parent 41cec30
commit 6ed5e37
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/sockjs/websocket.go b/sockjs/websocket.go
@@ -9,7 +9,8 @@ import (
 )
 
 func (h *handler) sockjsWebsocket(rw http.ResponseWriter, req *http.Request) {
-	if req.Header.Get("Origin") != "http://"+req.Host {
+	origin := req.Header.Get("Origin")
+	if origin != "http://"+req.Host && origin != "https://"+req.Host {
 		http.Error(rw, "Origin not allowed", 403)
 		return
 	}

diff --git a/sockjs/websocket_test.go b/sockjs/websocket_test.go
@@ -15,7 +15,7 @@ func TestHandler_WebSocketHandshakeError(t *testing.T) {
 	server := httptest.NewServer(http.HandlerFunc(h.sockjsWebsocket))
 	defer server.Close()
 	req, _ := http.NewRequest("GET", server.URL, nil)
-	req.Header.Set("origin", server.URL)
+	req.Header.Set("origin", "https"+server.URL[4:])
 	resp, _ := http.DefaultClient.Do(req)
 	if resp.StatusCode != http.StatusBadRequest {
 		t.Errorf("Unexpected response code, got '%d', expected '%d'", resp.StatusCode, http.StatusBadRequest)