Small fix to allow JAAS based security when hawtio is used within an …

…OSGi container and an embedded Jetty i.e. within pax-web-jetty.
hawtio · Oct 5, 2013 · 7cdc20f · 7cdc20f
1 parent daa48ef
commit 7cdc20f
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/hawtio-web/pom.xml b/hawtio-web/pom.xml
@@ -342,6 +342,8 @@
 
             <!-- fix jgit, and slf4j imports -->
             <Import-Package>
+              org.eclipse.jetty.plus.jaas.spi;resolution:=optional,
+              org.eclipse.jetty.plus.jaas.callback;resolution:=optional,
               org.apache.commons.logging;resolution:=optional,
               org.slf4j;resolution:=optional,
               !org.slf4j.impl,

diff --git a/hawtio-web/src/main/java/io/hawt/system/Authenticator.java b/hawtio-web/src/main/java/io/hawt/system/Authenticator.java
@@ -104,8 +104,10 @@ public void handle(Callback[] callbacks) throws IOException, UnsupportedCallback
                         if (callback instanceof NameCallback) {
                             ((NameCallback)callback).setName(username);
                         } else if (callback instanceof PasswordCallback) {
-                            ((PasswordCallback)callback).setPassword(password.toCharArray());                                } else {
-                            throw new UnsupportedCallbackException(callback);
+                            ((PasswordCallback)callback).setPassword(password.toCharArray());
+                        } else {
+                          LOG.warn("Unsupported callback class [" + callback.getClass().getName() + "]");
+                            // throw new UnsupportedCallbackException(callback);
                         }
                     }
                 }