You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2015/01/22 11:00:54 UTC
svn commit: r1653797 - in /tomcat/trunk:
java/org/apache/catalina/filters/CorsFilter.java
test/org/apache/catalina/filters/TestCorsFilter.java
test/org/apache/catalina/filters/TesterFilterConfigs.java
Author: markt
Date: Thu Jan 22 10:00:53 2015
New Revision: 1653797
URL: http://svn.apache.org/r1653797
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=57178
Origin values of "null" should be included if "*" is allowed.
This closes #16
Modified:
tomcat/trunk/java/org/apache/catalina/filters/CorsFilter.java
tomcat/trunk/test/org/apache/catalina/filters/TestCorsFilter.java
tomcat/trunk/test/org/apache/catalina/filters/TesterFilterConfigs.java
Modified: tomcat/trunk/java/org/apache/catalina/filters/CorsFilter.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/filters/CorsFilter.java?rev=1653797&r1=1653796&r2=1653797&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/filters/CorsFilter.java (original)
+++ tomcat/trunk/java/org/apache/catalina/filters/CorsFilter.java Thu Jan 22 10:00:53 2015
@@ -800,6 +800,7 @@ public final class CorsFilter implements
* Checks if a given origin is valid or not. Criteria:
* <ul>
* <li>If an encoded character is present in origin, it's not valid.</li>
+ * <li>If origin is "null", it's valid.</li>
* <li>Origin should be a valid {@link URI}</li>
* </ul>
*
@@ -812,6 +813,11 @@ public final class CorsFilter implements
return false;
}
+ // "null" is a valid origin
+ if ("null".equals(origin)) {
+ return true;
+ }
+
URI originURI;
try {
Modified: tomcat/trunk/test/org/apache/catalina/filters/TestCorsFilter.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/filters/TestCorsFilter.java?rev=1653797&r1=1653796&r2=1653797&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/catalina/filters/TestCorsFilter.java (original)
+++ tomcat/trunk/test/org/apache/catalina/filters/TestCorsFilter.java Thu Jan 22 10:00:53 2015
@@ -497,10 +497,10 @@ public class TestCorsFilter {
}
/*
- * Negative test, when a CORS request arrives, with a null origin.
+ * Negative test, when a CORS request arrives, with no origin header.
*/
@Test
- public void testDoFilterNullOrigin() throws IOException, ServletException {
+ public void testDoFilterNoOrigin() throws IOException, ServletException {
TesterHttpServletRequest request = new TesterHttpServletRequest();
request.setMethod("POST");
@@ -536,6 +536,58 @@ public class TestCorsFilter {
response.getStatus());
}
+ /*
+ * A CORS request arrives with a "null" origin which is allowed by default.
+ */
+ @Test
+ public void testDoFilterNullOriginAllowedByDefault() throws IOException,
+ ServletException {
+ TesterHttpServletRequest request = new TesterHttpServletRequest();
+
+ request.setMethod("POST");
+ request.setContentType("text/plain");
+ request.setHeader(CorsFilter.REQUEST_HEADER_ORIGIN, "null");
+ TesterHttpServletResponse response = new TesterHttpServletResponse();
+
+ CorsFilter corsFilter = new CorsFilter();
+ corsFilter.init(TesterFilterConfigs.getDefaultFilterConfig());
+ CorsFilter.CORSRequestType requestType =
+ corsFilter.checkRequestType(request);
+ Assert.assertEquals(CorsFilter.CORSRequestType.SIMPLE, requestType);
+
+ corsFilter.doFilter(request, response, filterChain);
+
+ Assert.assertTrue(((Boolean) request.getAttribute(
+ CorsFilter.HTTP_REQUEST_ATTRIBUTE_IS_CORS_REQUEST)).booleanValue());
+ }
+
+ /*
+ * A CORS request arrives with a "null" origin which is explicitly allowed
+ * by configuration.
+ */
+ @Test
+ public void testDoFilterNullOriginAllowedByConfiguration() throws
+ IOException, ServletException {
+ TesterHttpServletRequest request = new TesterHttpServletRequest();
+
+ request.setMethod("POST");
+ request.setContentType("text/plain");
+ request.setHeader(CorsFilter.REQUEST_HEADER_ORIGIN, "null");
+ TesterHttpServletResponse response = new TesterHttpServletResponse();
+
+ CorsFilter corsFilter = new CorsFilter();
+ corsFilter.init(
+ TesterFilterConfigs.getFilterConfigSpecificOriginNullAllowed());
+ CorsFilter.CORSRequestType requestType =
+ corsFilter.checkRequestType(request);
+ Assert.assertEquals(CorsFilter.CORSRequestType.SIMPLE, requestType);
+
+ corsFilter.doFilter(request, response, filterChain);
+
+ Assert.assertTrue(((Boolean) request.getAttribute(
+ CorsFilter.HTTP_REQUEST_ATTRIBUTE_IS_CORS_REQUEST)).booleanValue());
+ }
+
@Test(expected = ServletException.class)
public void testDoFilterNullRequestNullResponse() throws IOException,
ServletException {
@@ -1034,6 +1086,24 @@ public class TestCorsFilter {
corsFilter.doFilter(request, response, filterChain);
Assert.assertEquals(HttpServletResponse.SC_FORBIDDEN,
response.getStatus());
+ }
+
+ /*
+ * Tests for failure, when the 'null' origin is used, and it's not in the
+ * list of allowed origins.
+ */
+ @Test
+ public void testCheckNullOriginNotAllowed() throws ServletException,
+ IOException {
+ TesterHttpServletRequest request = new TesterHttpServletRequest();
+ TesterHttpServletResponse response = new TesterHttpServletResponse();
+ request.setHeader(CorsFilter.REQUEST_HEADER_ORIGIN, "null");
+ request.setMethod("GET");
+ CorsFilter corsFilter = new CorsFilter();
+ corsFilter.init(TesterFilterConfigs.getSpecificOriginFilterConfig());
+ corsFilter.doFilter(request, response, filterChain);
+ Assert.assertEquals(HttpServletResponse.SC_FORBIDDEN,
+ response.getStatus());
}
/*
Modified: tomcat/trunk/test/org/apache/catalina/filters/TesterFilterConfigs.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/filters/TesterFilterConfigs.java?rev=1653797&r1=1653796&r2=1653797&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/catalina/filters/TesterFilterConfigs.java (original)
+++ tomcat/trunk/test/org/apache/catalina/filters/TesterFilterConfigs.java Thu Jan 22 10:00:53 2015
@@ -106,6 +106,24 @@ public class TesterFilterConfigs {
preflightMaxAge, decorateRequest);
}
+ public static FilterConfig getFilterConfigSpecificOriginNullAllowed() {
+ final String allowedHttpHeaders =
+ CorsFilter.DEFAULT_ALLOWED_HTTP_HEADERS;
+ final String allowedHttpMethods =
+ CorsFilter.DEFAULT_ALLOWED_HTTP_METHODS;
+ final String allowedOrigins = HTTP_TOMCAT_APACHE_ORG + ",null";
+ final String exposedHeaders = CorsFilter.DEFAULT_EXPOSED_HEADERS;
+ final String supportCredentials =
+ CorsFilter.DEFAULT_SUPPORTS_CREDENTIALS;
+ final String preflightMaxAge =
+ CorsFilter.DEFAULT_PREFLIGHT_MAXAGE;
+ final String decorateRequest = CorsFilter.DEFAULT_DECORATE_REQUEST;
+
+ return generateFilterConfig(allowedHttpHeaders, allowedHttpMethods,
+ allowedOrigins, exposedHeaders, supportCredentials,
+ preflightMaxAge, decorateRequest);
+ }
+
public static FilterConfig getFilterConfigWithExposedHeaders() {
final String allowedHttpHeaders =
CorsFilter.DEFAULT_ALLOWED_HTTP_HEADERS;
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org