From: markt <markt@13f79535-47bb-0310-9956-ffa450edef68>
Date: Fri, 4 Mar 2011 11:23:43 +0000 (+0000)
Subject: Check metadata-complete=true leads to @ServletSecurity being ignored
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=7bd857380f0d90303f3e04c014ae671060b23f6a;p=tomcat7.0

Check metadata-complete=true leads to @ServletSecurity being ignored

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1077883 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/test/org/apache/catalina/core/TestStandardWrapper.java b/test/org/apache/catalina/core/TestStandardWrapper.java
index e199a50f4..4293eb8e4 100644
--- a/test/org/apache/catalina/core/TestStandardWrapper.java
+++ b/test/org/apache/catalina/core/TestStandardWrapper.java
@@ -92,6 +92,26 @@ public class TestStandardWrapper extends TomcatBaseTest {
         assertEquals(403, rc);
     }
 
+    public void testSecurityAnnotationsMetaDataPriority() throws Exception {
+
+        // Setup Tomcat instance
+        Tomcat tomcat = getTomcatInstance();
+        
+        File appDir = new File("test/webapp-3.0");
+        tomcat.addWebapp(null, "", appDir.getAbsolutePath());
+        
+        tomcat.start();
+        
+        ByteChunk bc = new ByteChunk();
+        int rc;
+        rc = getUrl("http://localhost:" + getPort() +
+                "/testStandardWrapper/securityAnnotationsMetaDataPriority",
+                bc, null, null);
+        
+        assertEquals("OK", bc.toString());
+        assertEquals(200, rc);
+    }
+
     private void doTest(String servletClassName, boolean usePost,
             boolean useRole, boolean expect200) throws Exception {
 
diff --git a/test/webapp-3.0/WEB-INF/web.xml b/test/webapp-3.0/WEB-INF/web.xml
index 634d39086..c67fc9d92 100644
--- a/test/webapp-3.0/WEB-INF/web.xml
+++ b/test/webapp-3.0/WEB-INF/web.xml
@@ -103,4 +103,14 @@
       <url-pattern>/bug49nnn/bug49726b.jsp</url-pattern>
     </jsp-property-group>
   </jsp-config>
+  
+  <servlet>
+    <servlet-name>DenyByAnnotation</servlet-name>
+    <servlet-class>org.apache.catalina.core.TestStandardWrapper$DenyAllServlet</servlet-class>
+  </servlet>
+  <servlet-mapping>
+    <servlet-name>DenyByAnnotation</servlet-name>
+    <url-pattern>/testStandardWrapper/securityAnnotationsMetaDataPriority</url-pattern>  
+  </servlet-mapping>
+
 </web-app>
\ No newline at end of file