Author: macbean
Date: Fri Nov 28 13:13:06 2014
New Revision: 1642291
URL: http://svn.apache.org/r1642291
Log:
QPID-6246: [Java Broker] Introduce PreferencesSupportingAuthenticationProvider
managed interface
Added:
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/PreferencesSupportingAuthenticationProvider.java
- copied, changed from r1642290,
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/ExternalAuthenticationManager.java
Modified:
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/ConfigModelPasswordManagingAuthenticationProvider.java
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/ExternalAuthenticationManager.java
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/ExternalAuthenticationManagerImpl.java
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/KerberosAuthenticationManager.java
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/PrincipalDatabaseAuthenticationManager.java
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/SimpleAuthenticationManager.java
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/SimpleLDAPAuthenticationManager.java
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/SimpleLDAPAuthenticationManagerImpl.java
Copied:
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/PreferencesSupportingAuthenticationProvider.java
(from r1642290,
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/ExternalAuthenticationManager.java)
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/PreferencesSupportingAuthenticationProvider.java?p2=qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/PreferencesSupportingAuthenticationProvider.java&p1=qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/ExternalAuthenticationManager.java&r1=1642290&r2=1642291&rev=1642291&view=diff
==============================================================================
---
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/ExternalAuthenticationManager.java
(original)
+++
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/PreferencesSupportingAuthenticationProvider.java
Fri Nov 28 13:13:06 2014
@@ -1,5 +1,4 @@
/*
- *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -16,20 +15,22 @@
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
*/
-package org.apache.qpid.server.security.auth.manager;
-import org.apache.qpid.server.model.AuthenticationProvider;
-import org.apache.qpid.server.model.ManagedAttribute;
-import org.apache.qpid.server.model.ManagedObject;
+package org.apache.qpid.server.model;
-@ManagedObject( category = false, type = "External" )
-public interface ExternalAuthenticationManager<T extends
ExternalAuthenticationManager<T>> extends AuthenticationProvider<T>
+@ManagedAnnotation
+public interface PreferencesSupportingAuthenticationProvider extends
ManagedInterface
{
- String PROVIDER_TYPE = "External";
- String ATTRIBUTE_USE_FULL_DN = "useFullDN";
+ /**
+ * Returns the preferences provider associated with this authentication
provider
+ * @return PreferencesProvider
+ */
+ PreferencesProvider<?> getPreferencesProvider();
- @ManagedAttribute( description = "Use the full DN as the Username")
- boolean getUseFullDN();
+ /**
+ * Sets the preferences provider
+ * @param preferencesProvider
+ */
+ void setPreferencesProvider(PreferencesProvider<?> preferencesProvider);
}
Modified:
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/ConfigModelPasswordManagingAuthenticationProvider.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/ConfigModelPasswordManagingAuthenticationProvider.java?rev=1642291&r1=1642290&r2=1642291&view=diff
==============================================================================
---
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/ConfigModelPasswordManagingAuthenticationProvider.java
(original)
+++
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/ConfigModelPasswordManagingAuthenticationProvider.java
Fri Nov 28 13:13:06 2014
@@ -37,6 +37,7 @@ import org.apache.qpid.server.configurat
import org.apache.qpid.server.model.Broker;
import org.apache.qpid.server.model.ConfiguredObject;
import
org.apache.qpid.server.model.PasswordCredentialManagingAuthenticationProvider;
+import
org.apache.qpid.server.model.PreferencesSupportingAuthenticationProvider;
import org.apache.qpid.server.model.User;
import org.apache.qpid.server.security.SecurityManager;
import org.apache.qpid.server.security.access.Operation;
@@ -45,7 +46,7 @@ import org.apache.qpid.server.security.a
public abstract class ConfigModelPasswordManagingAuthenticationProvider<X
extends ConfigModelPasswordManagingAuthenticationProvider<X>>
extends AbstractAuthenticationManager<X>
- implements PasswordCredentialManagingAuthenticationProvider<X>
+ implements PasswordCredentialManagingAuthenticationProvider<X>,
PreferencesSupportingAuthenticationProvider
{
static final Charset ASCII = Charset.forName("ASCII");
protected Map<String, ManagedUser> _users = new ConcurrentHashMap<>();
Modified:
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/ExternalAuthenticationManager.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/ExternalAuthenticationManager.java?rev=1642291&r1=1642290&r2=1642291&view=diff
==============================================================================
---
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/ExternalAuthenticationManager.java
(original)
+++
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/ExternalAuthenticationManager.java
Fri Nov 28 13:13:06 2014
@@ -23,9 +23,10 @@ package org.apache.qpid.server.security.
import org.apache.qpid.server.model.AuthenticationProvider;
import org.apache.qpid.server.model.ManagedAttribute;
import org.apache.qpid.server.model.ManagedObject;
+import
org.apache.qpid.server.model.PreferencesSupportingAuthenticationProvider;
@ManagedObject( category = false, type = "External" )
-public interface ExternalAuthenticationManager<T extends
ExternalAuthenticationManager<T>> extends AuthenticationProvider<T>
+public interface ExternalAuthenticationManager<T extends
ExternalAuthenticationManager<T>> extends AuthenticationProvider<T>,
PreferencesSupportingAuthenticationProvider
{
String PROVIDER_TYPE = "External";
String ATTRIBUTE_USE_FULL_DN = "useFullDN";
Modified:
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/ExternalAuthenticationManagerImpl.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/ExternalAuthenticationManagerImpl.java?rev=1642291&r1=1642290&r2=1642291&view=diff
==============================================================================
---
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/ExternalAuthenticationManagerImpl.java
(original)
+++
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/ExternalAuthenticationManagerImpl.java
Fri Nov 28 13:13:06 2014
@@ -28,7 +28,9 @@ import javax.security.sasl.SaslServer;
import org.apache.qpid.server.model.Broker;
import org.apache.qpid.server.model.ManagedAttributeField;
+import org.apache.qpid.server.model.ManagedObject;
import org.apache.qpid.server.model.ManagedObjectFactoryConstructor;
+import
org.apache.qpid.server.model.PreferencesSupportingAuthenticationProvider;
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;
Modified:
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/KerberosAuthenticationManager.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/KerberosAuthenticationManager.java?rev=1642291&r1=1642290&r2=1642291&view=diff
==============================================================================
---
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/KerberosAuthenticationManager.java
(original)
+++
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/KerberosAuthenticationManager.java
Fri Nov 28 13:13:06 2014
@@ -36,11 +36,12 @@ import javax.security.sasl.SaslServer;
import org.apache.qpid.server.model.Broker;
import org.apache.qpid.server.model.ManagedObject;
import org.apache.qpid.server.model.ManagedObjectFactoryConstructor;
+import
org.apache.qpid.server.model.PreferencesSupportingAuthenticationProvider;
import org.apache.qpid.server.security.auth.AuthenticationResult;
import org.apache.qpid.server.security.auth.UsernamePrincipal;
@ManagedObject( category = false, type = "Kerberos" )
-public class KerberosAuthenticationManager extends
AbstractAuthenticationManager<KerberosAuthenticationManager>
+public class KerberosAuthenticationManager extends
AbstractAuthenticationManager<KerberosAuthenticationManager> implements
PreferencesSupportingAuthenticationProvider
{
public static final String PROVIDER_TYPE = "Kerberos";
private static final String GSSAPI_MECHANISM = "GSSAPI";
Modified:
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/PrincipalDatabaseAuthenticationManager.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/PrincipalDatabaseAuthenticationManager.java?rev=1642291&r1=1642290&r2=1642291&view=diff
==============================================================================
---
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/PrincipalDatabaseAuthenticationManager.java
(original)
+++
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/PrincipalDatabaseAuthenticationManager.java
Fri Nov 28 13:13:06 2014
@@ -47,6 +47,7 @@ import org.apache.qpid.server.model.Conf
import org.apache.qpid.server.model.ExternalFileBasedAuthenticationManager;
import org.apache.qpid.server.model.ManagedAttributeField;
import org.apache.qpid.server.model.PreferencesProvider;
+import
org.apache.qpid.server.model.PreferencesSupportingAuthenticationProvider;
import org.apache.qpid.server.model.State;
import org.apache.qpid.server.model.StateTransition;
import org.apache.qpid.server.model.User;
@@ -58,7 +59,7 @@ import org.apache.qpid.server.security.a
public abstract class PrincipalDatabaseAuthenticationManager<T extends
PrincipalDatabaseAuthenticationManager<T>>
extends AbstractAuthenticationManager<T>
- implements ExternalFileBasedAuthenticationManager<T>
+ implements ExternalFileBasedAuthenticationManager<T>,
PreferencesSupportingAuthenticationProvider
{
private static final Logger LOGGER =
Logger.getLogger(PrincipalDatabaseAuthenticationManager.class);
Modified:
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/SimpleAuthenticationManager.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/SimpleAuthenticationManager.java?rev=1642291&r1=1642290&r2=1642291&view=diff
==============================================================================
---
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/SimpleAuthenticationManager.java
(original)
+++
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/SimpleAuthenticationManager.java
Fri Nov 28 13:13:06 2014
@@ -41,13 +41,14 @@ import org.apache.log4j.Logger;
import org.apache.qpid.server.model.Broker;
import org.apache.qpid.server.model.ManagedObject;
+import
org.apache.qpid.server.model.PreferencesSupportingAuthenticationProvider;
import org.apache.qpid.server.security.auth.AuthenticationResult;
import org.apache.qpid.server.security.auth.UsernamePrincipal;
import org.apache.qpid.server.security.auth.sasl.plain.PlainPasswordCallback;
import org.apache.qpid.server.security.auth.sasl.plain.PlainSaslServer;
@ManagedObject( category = false, type = "Simple", register = false )
-public class SimpleAuthenticationManager extends
AbstractAuthenticationManager<SimpleAuthenticationManager>
+public class SimpleAuthenticationManager extends
AbstractAuthenticationManager<SimpleAuthenticationManager> implements
PreferencesSupportingAuthenticationProvider
{
private static final Logger _logger =
Logger.getLogger(SimpleAuthenticationManager.class);
Modified:
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/SimpleLDAPAuthenticationManager.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/SimpleLDAPAuthenticationManager.java?rev=1642291&r1=1642290&r2=1642291&view=diff
==============================================================================
---
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/SimpleLDAPAuthenticationManager.java
(original)
+++
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/SimpleLDAPAuthenticationManager.java
Fri Nov 28 13:13:06 2014
@@ -24,10 +24,11 @@ import org.apache.qpid.server.model.Auth
import org.apache.qpid.server.model.ManagedAttribute;
import org.apache.qpid.server.model.ManagedContextDefault;
import org.apache.qpid.server.model.ManagedObject;
+import
org.apache.qpid.server.model.PreferencesSupportingAuthenticationProvider;
import org.apache.qpid.server.model.TrustStore;
@ManagedObject( category = false, type = "SimpleLDAP" )
-public interface SimpleLDAPAuthenticationManager<X extends
SimpleLDAPAuthenticationManager<X>> extends AuthenticationProvider<X>
+public interface SimpleLDAPAuthenticationManager<X extends
SimpleLDAPAuthenticationManager<X>> extends AuthenticationProvider<X>,
PreferencesSupportingAuthenticationProvider
{
String PROVIDER_TYPE = "SimpleLDAP";
String PROVIDER_URL = "providerUrl";
Modified:
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/SimpleLDAPAuthenticationManagerImpl.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/SimpleLDAPAuthenticationManagerImpl.java?rev=1642291&r1=1642290&r2=1642291&view=diff
==============================================================================
---
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/SimpleLDAPAuthenticationManagerImpl.java
(original)
+++
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/SimpleLDAPAuthenticationManagerImpl.java
Fri Nov 28 13:13:06 2014
@@ -55,7 +55,9 @@ import org.apache.qpid.server.configurat
import org.apache.qpid.server.model.Broker;
import org.apache.qpid.server.model.ConfiguredObject;
import org.apache.qpid.server.model.ManagedAttributeField;
+import org.apache.qpid.server.model.ManagedObject;
import org.apache.qpid.server.model.ManagedObjectFactoryConstructor;
+import
org.apache.qpid.server.model.PreferencesSupportingAuthenticationProvider;
import org.apache.qpid.server.model.TrustStore;
import org.apache.qpid.server.security.auth.AuthenticationResult;
import
org.apache.qpid.server.security.auth.AuthenticationResult.AuthenticationStatus;
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
