Fix the wildfly issue when AuthenticationFilter and UserServlet could…

… return different values for 'authenticationEnabled'
hawtio · Feb 2, 2015 · c63ad45 · c63ad45
1 parent e2e8cb9
commit c63ad45
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/hawtio-system/src/main/java/io/hawt/web/UserServlet.java b/hawtio-system/src/main/java/io/hawt/web/UserServlet.java
@@ -23,6 +23,11 @@ public class UserServlet extends HttpServlet {
     public void init(ServletConfig servletConfig) throws ServletException {
         config = (ConfigManager) servletConfig.getServletContext().getAttribute("ConfigManager");
         this.authenticationEnabled = Boolean.parseBoolean(config.get("authenticationEnabled", "true"));
+
+        // JVM system properties can override always
+        if (System.getProperty(AuthenticationFilter.HAWTIO_AUTHENTICATION_ENABLED) != null) {
+            this.authenticationEnabled = Boolean.getBoolean(AuthenticationFilter.HAWTIO_AUTHENTICATION_ENABLED);
+        }
     }
 
     @Override

diff --git a/hawtio-web/src/main/webapp/app/core/js/keycloakLogin.ts b/hawtio-web/src/main/webapp/app/core/js/keycloakLogin.ts
@@ -6,7 +6,7 @@ module Core {
 
   var log = Logger.get('Keycloak');
 
-  log.setLevel(Logger.DEBUG);
+  // log.setLevel(Logger.DEBUG);
 
   var checkKeycloakEnabled = function(callback: Function) {
     var keycloakEnabledUrl: string = "keycloak/enabled";