diff options
| author | Joram Wilander <jwawilander@gmail.com> | 2017-03-28 04:58:19 -0400 |
|---|---|---|
| committer | George Goldberg <george@gberg.me> | 2017-03-28 09:58:19 +0100 |
| commit | daca0d93f621bcb1daae149c178af0631bcd120a (patch) | |
| tree | 6127936c76dbc6fd20a7377385469980e5bd72e3 /api/websocket.go | |
| parent | ca8b8d1245026672b1a56d256bb8ff3c8bb1bba9 (diff) | |
| download | chat-daca0d93f621bcb1daae149c178af0631bcd120a.tar.gz chat-daca0d93f621bcb1daae149c178af0631bcd120a.tar.bz2 chat-daca0d93f621bcb1daae149c178af0631bcd120a.zip | |
Move WebSocket API to it's own package and add websocket v4 endpoint (#5881)
Diffstat (limited to 'api/websocket.go')
| -rw-r--r-- | api/websocket.go | 16 |
1 files changed, 1 insertions, 15 deletions
diff --git a/api/websocket.go b/api/websocket.go index 2de9abb0a..192513bc0 100644 --- a/api/websocket.go +++ b/api/websocket.go @@ -5,7 +5,6 @@ package api import ( "net/http" - "strings" l4g "github.com/alecthomas/log4go" "github.com/gorilla/websocket" @@ -17,23 +16,10 @@ import ( func InitWebSocket() { l4g.Debug(utils.T("api.web_socket.init.debug")) BaseRoutes.Users.Handle("/websocket", ApiAppHandlerTrustRequester(connect)).Methods("GET") - app.HubStart() -} - -type OriginCheckerProc func(*http.Request) bool - -func OriginChecker(r *http.Request) bool { - origin := r.Header.Get("Origin") - return *utils.Cfg.ServiceSettings.AllowCorsFrom == "*" || strings.Contains(origin, *utils.Cfg.ServiceSettings.AllowCorsFrom) } func connect(c *Context, w http.ResponseWriter, r *http.Request) { - - var originChecker OriginCheckerProc = nil - - if len(*utils.Cfg.ServiceSettings.AllowCorsFrom) > 0 { - originChecker = OriginChecker - } + originChecker := utils.GetOriginChecker(r) upgrader := websocket.Upgrader{ ReadBufferSize: model.SOCKET_MAX_MESSAGE_SIZE_KB, |