codeine-226 /metrics on the server should be with no auth

codeine-cd · Mar 5, 2018 · a1f740f · a1f740f
1 parent 5c6238e
commit a1f740f
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 16 deletions.
diff --git a/pom.xml b/pom.xml
@@ -250,7 +250,6 @@
 			<groupId>javax.servlet</groupId>
 			<artifactId>javax.servlet-api</artifactId>
 			<version>3.1.0</version>
-			<scope>provided</scope>
 		</dependency>
 	</dependencies>
 </project>
diff --git a/src/web_server/codeine/CodeineWebServerBootstrap.java b/src/web_server/codeine/CodeineWebServerBootstrap.java
@@ -145,15 +145,6 @@ private ServletContextHandler createServletContextHandlerSpnego() {
         ServletContextHandler context = new ServletContextHandler(ServletContextHandler.SESSIONS
             | ServletContextHandler.SECURITY);
 
-        Constraint constraint = new Constraint();
-        constraint.setName(Constraint.__SPNEGO_AUTH);
-        constraint.setRoles(config.get().roles());
-        constraint.setAuthenticate(true);
-
-        ConstraintMapping constraintMapping = new ConstraintMapping();
-        constraintMapping.setConstraint(constraint);
-        constraintMapping.setPathSpec("/*");
-
         ConstraintSecurityHandler securityHandler = new ConstraintSecurityHandler() {
             @Override
             public void handle(String pathInContext, Request baseRequest,
@@ -170,6 +161,15 @@ public void handle(String pathInContext, Request baseRequest,
             }
         };
 
+        Constraint constraint = new Constraint();
+        constraint.setName(Constraint.__SPNEGO_AUTH);
+        constraint.setRoles(config.get().roles());
+        constraint.setAuthenticate(true);
+
+        ConstraintMapping constraintMapping = new ConstraintMapping();
+        constraintMapping.setConstraint(constraint);
+        constraintMapping.setPathSpec("/*");
+
         Constraint constraint2 = new Constraint();
         constraint2.setAuthenticate(false);
         constraint2.setName("reporter");
@@ -189,15 +189,13 @@ public void handle(String pathInContext, Request baseRequest,
         Constraint constraint4 = new Constraint();
         constraint4.setAuthenticate(false);
         constraint4.setName("prometheus");
-        constraint4.setRoles(config.get().roles());
         ConstraintMapping constraintMapping4 = new ConstraintMapping();
         constraintMapping4.setConstraint(constraint4);
-        constraintMapping4.setPathSpec(Constants.apiContext(Constants.METRICS_CONTEXT));
+        constraintMapping4.setPathSpec(Constants.METRICS_CONTEXT);
 
-        securityHandler.addConstraintMapping(constraintMapping4);
-        securityHandler.addConstraintMapping(constraintMapping3);
-        securityHandler.addConstraintMapping(constraintMapping2);
-        securityHandler.addConstraintMapping(constraintMapping);
+        securityHandler.setConstraintMappings(Lists
+            .newArrayList(constraintMapping4, constraintMapping3, constraintMapping2,
+                constraintMapping));
         SpnegoLoginService loginService = new SpnegoLoginService(null,
             Constants.getSpnegoPropertiesPath());
         securityHandler.setLoginService(loginService);