Author: markt
Date: Fri Mar 4 11:17:06 2011
New Revision: 1077881
URL: http://svn.apache.org/viewvc?rev=1077881&view=rev
Log:
Check web.xml takes precedence over @ServletSecurity
Modified:
tomcat/trunk/test/org/apache/catalina/core/TestStandardWrapper.java
tomcat/trunk/test/webapp-3.0-fragments/WEB-INF/web.xml
Modified: tomcat/trunk/test/org/apache/catalina/core/TestStandardWrapper.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/core/TestStandardWrapper.java?rev=1077881&r1=1077880&r2=1077881&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/catalina/core/TestStandardWrapper.java
(original)
+++ tomcat/trunk/test/org/apache/catalina/core/TestStandardWrapper.java Fri Mar
4 11:17:06 2011
@@ -17,6 +17,7 @@
package org.apache.catalina.core;
+import java.io.File;
import java.io.IOException;
import java.util.ArrayList;
import java.util.HashMap;
@@ -71,6 +72,26 @@ public class TestStandardWrapper extends
doTest(RoleDenyServlet.class.getName(), false, true, false);
}
+ public void testSecurityAnnotationsWebXmlPriority() throws Exception {
+
+ // Setup Tomcat instance
+ Tomcat tomcat = getTomcatInstance();
+
+ File appDir = new File("test/webapp-3.0-fragments");
+ tomcat.addWebapp(null, "", appDir.getAbsolutePath());
+
+ tomcat.start();
+
+ ByteChunk bc = new ByteChunk();
+ int rc;
+ rc = getUrl("http://localhost:"; + getPort() +
+ "/testStandardWrapper/securityAnnotationsWebXmlPriority",
+ bc, null, null);
+
+ assertNull(bc.toString());
+ assertEquals(403, rc);
+ }
+
private void doTest(String servletClassName, boolean usePost,
boolean useRole, boolean expect200) throws Exception {
Modified: tomcat/trunk/test/webapp-3.0-fragments/WEB-INF/web.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/webapp-3.0-fragments/WEB-INF/web.xml?rev=1077881&r1=1077880&r2=1077881&view=diff
==============================================================================
--- tomcat/trunk/test/webapp-3.0-fragments/WEB-INF/web.xml (original)
+++ tomcat/trunk/test/webapp-3.0-fragments/WEB-INF/web.xml Fri Mar 4 11:17:06
2011
@@ -27,4 +27,20 @@
Used as part of the Tomcat unit tests when a full web application is
required.
</description>
+
+ <servlet>
+ <servlet-name>AllowByAnnotation</servlet-name>
+
<servlet-class>org.apache.catalina.core.TestStandardWrapper$SubclassAllowAllServlet</servlet-class>
+ </servlet>
+ <servlet-mapping>
+ <servlet-name>AllowByAnnotation</servlet-name>
+
<url-pattern>/testStandardWrapper/securityAnnotationsWebXmlPriority</url-pattern>
+ </servlet-mapping>
+ <security-constraint>
+ <auth-constraint/>
+ <web-resource-collection>
+
<url-pattern>/testStandardWrapper/securityAnnotationsWebXmlPriority</url-pattern>
+ </web-resource-collection>
+ </security-constraint>
+
</web-app>
\ No newline at end of file
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
