From 5c3c909c8541f26ae09577338d2302bed2a2f3a9 Mon Sep 17 00:00:00 2001 From: Chris Date: Thu, 13 Jul 2017 14:02:33 -0700 Subject: Tweak WebSocket header-processing (#6929) * fix * consolidate code --- app/server.go | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'app/server.go') diff --git a/app/server.go b/app/server.go index a5090a597..a5b2dbda9 100644 --- a/app/server.go +++ b/app/server.go @@ -53,9 +53,8 @@ type CorsWrapper struct { func (cw *CorsWrapper) ServeHTTP(w http.ResponseWriter, r *http.Request) { if len(*utils.Cfg.ServiceSettings.AllowCorsFrom) > 0 { - origin := r.Header.Get("Origin") - if *utils.Cfg.ServiceSettings.AllowCorsFrom == "*" || strings.Contains(*utils.Cfg.ServiceSettings.AllowCorsFrom, origin) { - w.Header().Set("Access-Control-Allow-Origin", origin) + if utils.OriginChecker(r) { + w.Header().Set("Access-Control-Allow-Origin", r.Header.Get("Origin")) if r.Method == "OPTIONS" { w.Header().Set( -- cgit v1.2.3-1-g7c22