1.3

新增: 添加跨域白名单的支持。(conf/conf.json. cors_white_list:"127.0.0.1,www.xxx.com");
shibingli · May 17, 2016 · 2751a9c · 2751a9c
1 parent 64c7d20
commit 2751a9c
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 11 deletions.
diff --git a/conf/conf.json b/conf/conf.json
@@ -9,8 +9,7 @@
         "session_timeout": 1800,
         "enable_gzip": true,
         "enable_tls": false,
-        "enable_cors":false,
-        "cors_white_list":"127.0.0.1,127.0.0.1:8080,127.0.0.1:8443,localhost,localhost:8080,localhost:8443",
+        "cors_white_list":"127.0.0.1,127.0.0.1:8080,127.0.0.1:8443,localhost,localhost:8080,localhost:8443,pangu.cloud,www.pangu.cloud",
         "enable_fcgi": false,
         "tls_cert": "ssl_cert.crt",
         "tls_key": "ssl_cert.key",

diff --git a/src/apibox.club/website/console.go b/src/apibox.club/website/console.go
@@ -87,16 +87,12 @@ var upgrader = websocket.Upgrader{
 	ReadBufferSize:  1024,
 	WriteBufferSize: 1024,
 	CheckOrigin: func(r *http.Request) bool {
-
 		// 跨域处理，这里需要做一下安全防护。比如：请求白名单(这里只是简单的做了请求HOST白名单)
-		cors := Conf.Web.EnableCORS
-		if cors {
-			cwl := Conf.Web.CorsWhiteList
-			apibox.Log_Debug("Cors white list:", cwl)
-			for _, v := range strings.Split(cwl, ",") {
-				if strings.EqualFold(strings.TrimSpace(v), r.Host) {
-					return true
-				}
+		cwl := Conf.Web.CorsWhiteList
+		apibox.Log_Debug("Cors white list:", cwl)
+		for _, v := range strings.Split(cwl, ",") {
+			if strings.EqualFold(strings.TrimSpace(v), r.Host) {
+				return true
 			}
 		}
 		return false