Formatting changes

Author: torque59

java/ql/src/Security/CWE/CWE-346/UnvalidatedCors.java

@@ -12,9 +12,7 @@
 import org.apache.commons.lang3.StringUtils;
 
 public class CorsFilter implements Filter {
-    public void init(FilterConfig filterConfig) throws ServletException {
-        // init
-    }
+    public void init(FilterConfig filterConfig) throws ServletException {}
 
     public void doFilter(ServletRequest req, ServletResponse res,
             FilterChain chain) throws IOException, ServletException {
@@ -23,7 +21,7 @@ public void doFilter(ServletRequest req, ServletResponse res,
         String url = request.getHeader("Origin");
 
         if (!StringUtils.isEmpty(url)) {
-            String val = response.getHeader("Access-Control-Allow-Origin");
+            String val = response.getHeader("Access-Control-Allow-Origin"); // BAD -> User controlled CORS header.
 
             if (StringUtils.isEmpty(val)) {
                 response.addHeader("Access-Control-Allow-Origin", url);
@@ -34,7 +32,5 @@ public void doFilter(ServletRequest req, ServletResponse res,
         chain.doFilter(req, res);
     }
 
-    public void destroy() {
-        // destroy
-    }
+    public void destroy() {}
 }

java/ql/src/Security/CWE/CWE-346/UnvalidatedCors.ql

@@ -28,7 +28,7 @@ predicate checkAccessControlAllowOriginHeader(Expr expr) {
 }
 
 class CorsOriginConfig extends TaintTracking::Configuration {
-  CorsOriginConfig() { this = "CORSOriginConfig" }
+  CorsOriginConfig() { this = "CorsOriginConfig" }
 
   override predicate isSource(DataFlow::Node source) { source instanceof RemoteFlowSource }
 

java/ql/test/query-tests/security/CWE-346/UnvalidatedCors.expected

@@ -1,7 +1,7 @@
 edges
-| UnvalidatedCors.java:34:22:34:48 | getHeader(...) : String | UnvalidatedCors.java:40:67:40:69 | url |
+| UnvalidatedCors.java:21:22:21:48 | getHeader(...) : String | UnvalidatedCors.java:27:67:27:69 | url |
 nodes
-| UnvalidatedCors.java:34:22:34:48 | getHeader(...) : String | semmle.label | getHeader(...) : String |
-| UnvalidatedCors.java:40:67:40:69 | url | semmle.label | url |
+| UnvalidatedCors.java:21:22:21:48 | getHeader(...) : String | semmle.label | getHeader(...) : String |
+| UnvalidatedCors.java:27:67:27:69 | url | semmle.label | url |
 #select
-| UnvalidatedCors.java:40:67:40:69 | url | UnvalidatedCors.java:34:22:34:48 | getHeader(...) : String | UnvalidatedCors.java:40:67:40:69 | url | Cors header is being set using user controlled value $@. | UnvalidatedCors.java:34:22:34:48 | getHeader(...) | user-provided value |
+| UnvalidatedCors.java:27:67:27:69 | url | UnvalidatedCors.java:21:22:21:48 | getHeader(...) : String | UnvalidatedCors.java:27:67:27:69 | url | Cors header is being set using user controlled value $@. | UnvalidatedCors.java:21:22:21:48 | getHeader(...) | user-provided value |

java/ql/test/query-tests/security/CWE-346/UnvalidatedCors.java

@@ -1,5 +1,3 @@
-package com.mossle.core.servlet;
-
 import java.io.IOException;
 
 import javax.servlet.Filter;
@@ -13,19 +11,8 @@
 
 import org.apache.commons.lang3.StringUtils;
 
-/**
- * <pre>
- * <script>
- *   $(function () {
- *     $.ajaxSetup({crossDomain: true, xhrFields: {withCredentials: true}});
- *   });
- * </script>
- * </pre>
- */
 public class UnvalidatedCors implements Filter {
-    public void init(FilterConfig filterConfig) throws ServletException {
-        // init
-    }
+    public void init(FilterConfig filterConfig) throws ServletException {}
 
     public void doFilter(ServletRequest req, ServletResponse res,
             FilterChain chain) throws IOException, ServletException {
@@ -45,8 +32,6 @@ public void doFilter(ServletRequest req, ServletResponse res,
         chain.doFilter(req, res);
     }
 
-    public void destroy() {
-        // destroy
-    }
+    public void destroy() {}
 }