Avoid setting null for Access-Control-Allow-Origin

kelnos · kelnos · commit 8b18590e0a6b · 2018-12-29T15:25:21.000-08:00
diff --git a/socket-io/src/main/java/com/codeminders/socketio/server/transport/XHRTransportConnection.java b/socket-io/src/main/java/com/codeminders/socketio/server/transport/XHRTransportConnection.java
@@ -53,7 +53,12 @@ public void handle(HttpRequest request, HttpResponse response) throws IOExceptio
 
         if(getConfig().getBoolean(ALLOW_ALL_ORIGINS, false))
         {
-            response.setHeader("Access-Control-Allow-Origin", request.getHeader("Origin"));
+            String origin = request.getHeader("Origin");
+            if (origin == null)
+            {
+                origin = "*";
+            }
+            response.setHeader("Access-Control-Allow-Origin", origin);
             response.setHeader("Access-Control-Allow-Credentials", "true");
         }
         else

Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,12 @@ public void handle(HttpRequest request, HttpResponse response) throws IOExceptio`
`53`	`53`
`54`	`54`	`if(getConfig().getBoolean(ALLOW_ALL_ORIGINS, false))`
`55`	`55`	`{`
`56`		`- response.setHeader("Access-Control-Allow-Origin", request.getHeader("Origin"));`
	`56`	`+ String origin = request.getHeader("Origin");`
	`57`	`+ if (origin == null)`
	`58`	`+ {`
	`59`	`+ origin = "*";`
	`60`	`+ }`
	`61`	`+ response.setHeader("Access-Control-Allow-Origin", origin);`
`57`	`62`	`response.setHeader("Access-Control-Allow-Credentials", "true");`
`58`	`63`	`}`
`59`	`64`	`else`