From 2a0ced98b56d888f15f77348db2dd2788719df2f Mon Sep 17 00:00:00 2001 From: Keith Wall Date: Tue, 4 Sep 2012 13:19:03 +0000 Subject: QPID-4283: Make web management capable of using external authentication manager. also: * remove test servlets * rename management.html => index.html * allow sasl-auth to be disabled Work of Robbie Gemmell and myself. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1380626 13f79535-47bb-0310-9956-ffa450edef68 --- .../apache/qpid/server/configuration/ServerConfiguration.java | 11 +++++++++++ .../security/auth/manager/ExternalAuthenticationManager.java | 3 ++- 2 files changed, 13 insertions(+), 1 deletion(-) (limited to 'qpid/java/broker/src/main') diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ServerConfiguration.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ServerConfiguration.java index f94bd684e9..de34ed1fad 100644 --- a/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ServerConfiguration.java +++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ServerConfiguration.java @@ -620,6 +620,16 @@ public class ServerConfiguration extends ConfigurationPlugin return getBooleanValue("management.https.basic-auth", true); } + public boolean getHTTPManagementSaslAuthEnabled() + { + return getBooleanValue("management.http.sasl-auth", true); + } + + public boolean getHTTPSManagementSaslAuthEnabled() + { + return getBooleanValue("management.https.sasl-auth", true); + } + public String[] getVirtualHosts() { return _virtualHosts.keySet().toArray(new String[_virtualHosts.size()]); @@ -1053,4 +1063,5 @@ public class ServerConfiguration extends ConfigurationPlugin _qpidHome = path; } + } diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/manager/ExternalAuthenticationManager.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/manager/ExternalAuthenticationManager.java index a1328ca0de..7ca296cc47 100644 --- a/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/manager/ExternalAuthenticationManager.java +++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/manager/ExternalAuthenticationManager.java @@ -29,6 +29,7 @@ import org.apache.log4j.Logger; import org.apache.qpid.server.configuration.plugins.ConfigurationPlugin; import org.apache.qpid.server.configuration.plugins.ConfigurationPluginFactory; import org.apache.qpid.server.security.auth.AuthenticationResult; +import org.apache.qpid.server.security.auth.UsernamePrincipal; import org.apache.qpid.server.security.auth.sasl.external.ExternalSaslServer; public class ExternalAuthenticationManager implements AuthenticationManager @@ -159,7 +160,7 @@ public class ExternalAuthenticationManager implements AuthenticationManager @Override public AuthenticationResult authenticate(String username, String password) { - return new AuthenticationResult(AuthenticationResult.AuthenticationStatus.ERROR); + return new AuthenticationResult(new UsernamePrincipal(username)); } @Override -- cgit v1.2.1