removed /health from regex pattern for DEVOPS_AUTH_SECURED;

fixed copy/paste mistake in gateway.conf Signed-off-by: Stefan Maute <stefan.maute@bosch-si.com>
eclipse-ditto · Jul 27, 2018 · e7355e9 · e7355e9
1 parent 6899ced
commit e7355e9
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 14 deletions.
diff --git a/...lipse/ditto/services/gateway/endpoints/directives/DevopsBasicAuthenticationDirective.java b/...lipse/ditto/services/gateway/endpoints/directives/DevopsBasicAuthenticationDirective.java
@@ -26,7 +26,7 @@
 import akka.http.javadsl.server.directives.SecurityDirectives;
 
 /**
- * Custom Akka Http directive performing basic auth for 2 realms, {@value #REALM_DEVOPS}.
+ * Custom Akka Http directive performing basic auth for {@value #REALM_DEVOPS} realm.
  */
 public class DevopsBasicAuthenticationDirective {
 

diff --git a/...ndpoints/src/main/java/org/eclipse/ditto/services/gateway/endpoints/routes/RootRoute.java b/...ndpoints/src/main/java/org/eclipse/ditto/services/gateway/endpoints/routes/RootRoute.java
@@ -116,7 +116,6 @@ public final class RootRoute {
      */
     public static final Pattern DEVOPS_AUTH_SECURED = Pattern.compile("(" +
             OverallStatusRoute.PATH_STATUS + "|" +
-            CachingHealthRoute.PATH_HEALTH + "|" +
             DevOpsRoute.PATH_DEVOPS + ").*"
     );
 
@@ -243,16 +242,16 @@ public Route buildRoute() {
                 extractRequestContext(ctx ->
                         route(
                                 statsRoute.buildStatsRoute(correlationId), // /stats
+                                cachingHealthRoute.buildHealthRoute(), // /health
                                 api(ctx, correlationId), // /api
                                 ws(correlationId), // /ws
-                                publicHealth(), // /health
                                 pathPrefixTest(PathMatchers.segment(DEVOPS_AUTH_SECURED), segment ->
-                                        authenticateDevopsBasic(REALM_DEVOPS,
-                                                route(
-                                                        overallStatusRoute.buildStatusRoute(), // /status
-                                                        devopsRoute.buildDevopsRoute(ctx) // /devops
-                                                )
-                                        )
+                                    authenticateDevopsBasic(REALM_DEVOPS,
+                                            route(
+                                                    overallStatusRoute.buildStatusRoute(), // /status
+                                                    devopsRoute.buildDevopsRoute(ctx) // /devops
+                                            )
+                                    )
                                 )
                         )
                 )
@@ -307,10 +306,6 @@ private Route wsAuthentication(final String correlationId, final Function<Author
         return wsAuthenticationDirective.authenticate(correlationId, inner);
     }
 
-    private Route publicHealth() {
-        return cachingHealthRoute.buildHealthRoute();
-    }
-
     /*
      * Describes {@code /api} route.
      *

diff --git a/services/gateway/starter/src/main/resources/gateway.conf b/services/gateway/starter/src/main/resources/gateway.conf
@@ -129,7 +129,7 @@ ditto {
     forcehttps = ${?FORCE_HTTPS}
 
     enablecors = false
-    forcehttps = ${?ENABLE_CORS}
+    enablecors = ${?ENABLE_CORS}
 
     redirect-to-https = false
     redirect-to-https = ${?REDIRECT_TO_HTTPS}