Issue #5824 Return only durable mappings before ConstraintSecurityHan…

…dler start Signed-off-by: Jan Bartel <janb@webtide.com>
jetty · Dec 24, 2020 · 39d7083 · 39d7083
1 parent 9d328ce
commit 39d7083
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 6 deletions.
diff --git a/jetty-security/src/main/java/org/eclipse/jetty/security/ConstraintSecurityHandler.java b/jetty-security/src/main/java/org/eclipse/jetty/security/ConstraintSecurityHandler.java
@@ -262,12 +262,19 @@ public static List<ConstraintMapping> createConstraintsWithMappingsForPath(Strin
     }
 
     /**
-     * @return Returns the constraintMappings.
+     * @return only the durable mappings if we are not yet started, otherwise
+     * return both the durables and transients.
      */
     @Override
     public List<ConstraintMapping> getConstraintMappings()
     {
-        return _constraintMappings;
+        //if we've started, then we've processed both the durable and
+        //transient constraint mappings
+        if (isRunning())
+            return _constraintMappings;
+        else
+            //otherwise, we only have durables
+            return _durableConstraintMappings;
     }
 
     @Override

diff --git a/jetty-security/src/test/java/org/eclipse/jetty/security/ConstraintTest.java b/jetty-security/src/test/java/org/eclipse/jetty/security/ConstraintTest.java
@@ -214,9 +214,6 @@ private List<ConstraintMapping> getConstraintMappings()
     @Test
     public void testConstraints() throws Exception
     {
-        //constraint mappings are not available until the server is started.
-        _server.start();
-
         List<ConstraintMapping> mappings = new ArrayList<>(_security.getConstraintMappings());
 
         assertTrue(mappings.get(0).getConstraint().isForbidden());
@@ -256,10 +253,13 @@ public void testDurableConstraints() throws Exception
 
         _server.stop();
 
+        //After a stop, just the durable mappings are left
         mappings = _security.getConstraintMappings();
-        assertThat("after restart", 0, Matchers.equalTo(mappings.size()));
+        assertThat("after stop", getConstraintMappings().size(), Matchers.equalTo(mappings.size()));
 
         _server.start();
+
+        //Verify the constraints are just the durables
         mappings = _security.getConstraintMappings();
         assertThat("after restart", getConstraintMappings().size(), Matchers.equalTo(mappings.size()));
 
@@ -278,6 +278,7 @@ public void testDurableConstraints() throws Exception
         _server.stop();
         _server.start();
 
+        //After a stop, only the durable mappings remain
         mappings = _security.getConstraintMappings();
         assertThat("after addition", getConstraintMappings().size(), Matchers.equalTo(mappings.size()));
     }