You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2011/05/02 18:32:35 UTC
svn commit: r1098652 - in /incubator/isis/trunk/security/ldap/src:
main/java/org/apache/isis/security/ldap/authentication/
main/java/org/apache/isis/security/ldap/authorization/
test/java/org/apache/isis/security/ldap/authentication/
Author: danhaywood
Date: Mon May 2 16:32:35 2011
New Revision: 1098652
URL: http://svn.apache.org/viewvc?rev=1098652&view=rev
Log:
ISIS-34: tidy up of LDAP security
Modified:
incubator/isis/trunk/security/ldap/src/main/java/org/apache/isis/security/ldap/authentication/LdapAuthenticationConstants.java
incubator/isis/trunk/security/ldap/src/main/java/org/apache/isis/security/ldap/authentication/LdapAuthenticationManagerInstaller.java
incubator/isis/trunk/security/ldap/src/main/java/org/apache/isis/security/ldap/authentication/LdapAuthenticator.java
incubator/isis/trunk/security/ldap/src/main/java/org/apache/isis/security/ldap/authorization/LdapAuthorizationConstants.java
incubator/isis/trunk/security/ldap/src/main/java/org/apache/isis/security/ldap/authorization/LdapAuthorizationManagerInstaller.java
incubator/isis/trunk/security/ldap/src/main/java/org/apache/isis/security/ldap/authorization/LdapAuthorizor.java
incubator/isis/trunk/security/ldap/src/test/java/org/apache/isis/security/ldap/authentication/LdapAuthenticatorTester.java
Modified: incubator/isis/trunk/security/ldap/src/main/java/org/apache/isis/security/ldap/authentication/LdapAuthenticationConstants.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/security/ldap/src/main/java/org/apache/isis/security/ldap/authentication/LdapAuthenticationConstants.java?rev=1098652&r1=1098651&r2=1098652&view=diff
==============================================================================
--- incubator/isis/trunk/security/ldap/src/main/java/org/apache/isis/security/ldap/authentication/LdapAuthenticationConstants.java (original)
+++ incubator/isis/trunk/security/ldap/src/main/java/org/apache/isis/security/ldap/authentication/LdapAuthenticationConstants.java Mon May 2 16:32:35 2011
@@ -17,23 +17,24 @@
* under the License.
*/
+package org.apache.isis.security.ldap.authentication;
-package org.apache.isis.security.ldap.authentication;
-
import org.apache.isis.core.commons.config.ConfigurationConstants;
import org.apache.isis.core.runtime.authentication.AuthenticationManagerInstaller;
-
-public final class LdapAuthenticationConstants {
-
- public static final String ROOT = ConfigurationConstants.ROOT + AuthenticationManagerInstaller.TYPE + "." + LdapAuthenticationManagerInstaller.NAME + ".";
-
- public static final String SERVER_KEY = ROOT + "server";
- public static final String SERVER_DEFAULT = "com.sun.jndi.ldap.LdapCtxFactory";
-
- public static final String LDAPDN_KEY = ROOT + "dn";
-
- public static String FILTER = "(objectclass=organizationalRole)";
-
- private LdapAuthenticationConstants(){}
-
-}
+
+public final class LdapAuthenticationConstants {
+
+ public static final String ROOT = ConfigurationConstants.ROOT + AuthenticationManagerInstaller.TYPE + "."
+ + LdapAuthenticationManagerInstaller.NAME + ".";
+
+ public static final String SERVER_KEY = ROOT + "server";
+ public static final String SERVER_DEFAULT = "com.sun.jndi.ldap.LdapCtxFactory";
+
+ public static final String LDAPDN_KEY = ROOT + "dn";
+
+ public static String FILTER = "(objectclass=organizationalRole)";
+
+ private LdapAuthenticationConstants() {
+ }
+
+}
Modified: incubator/isis/trunk/security/ldap/src/main/java/org/apache/isis/security/ldap/authentication/LdapAuthenticationManagerInstaller.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/security/ldap/src/main/java/org/apache/isis/security/ldap/authentication/LdapAuthenticationManagerInstaller.java?rev=1098652&r1=1098651&r2=1098652&view=diff
==============================================================================
--- incubator/isis/trunk/security/ldap/src/main/java/org/apache/isis/security/ldap/authentication/LdapAuthenticationManagerInstaller.java (original)
+++ incubator/isis/trunk/security/ldap/src/main/java/org/apache/isis/security/ldap/authentication/LdapAuthenticationManagerInstaller.java Mon May 2 16:32:35 2011
@@ -17,25 +17,22 @@
* under the License.
*/
+package org.apache.isis.security.ldap.authentication;
-package org.apache.isis.security.ldap.authentication;
-
import org.apache.isis.core.commons.config.IsisConfiguration;
-import org.apache.isis.core.runtime.authentication.standard.AuthenticationManagerStandardInstallerAbstract;
import org.apache.isis.core.runtime.authentication.standard.Authenticator;
import org.apache.isis.runtimes.dflt.runtime.authentication.AuthenticationManagerStandardInstallerAbstractForDfltRuntime;
-
-
-public class LdapAuthenticationManagerInstaller extends AuthenticationManagerStandardInstallerAbstractForDfltRuntime {
-
- public static String NAME = "ldap";
-
- public LdapAuthenticationManagerInstaller() {
- super(NAME);
- }
-
- @Override
- protected Authenticator createAuthenticator(IsisConfiguration configuration) {
- return new LdapAuthenticator(configuration);
- }
-}
+
+public class LdapAuthenticationManagerInstaller extends AuthenticationManagerStandardInstallerAbstractForDfltRuntime {
+
+ public static String NAME = "ldap";
+
+ public LdapAuthenticationManagerInstaller() {
+ super(NAME);
+ }
+
+ @Override
+ protected Authenticator createAuthenticator(final IsisConfiguration configuration) {
+ return new LdapAuthenticator(configuration);
+ }
+}
Modified: incubator/isis/trunk/security/ldap/src/main/java/org/apache/isis/security/ldap/authentication/LdapAuthenticator.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/security/ldap/src/main/java/org/apache/isis/security/ldap/authentication/LdapAuthenticator.java?rev=1098652&r1=1098651&r2=1098652&view=diff
==============================================================================
--- incubator/isis/trunk/security/ldap/src/main/java/org/apache/isis/security/ldap/authentication/LdapAuthenticator.java (original)
+++ incubator/isis/trunk/security/ldap/src/main/java/org/apache/isis/security/ldap/authentication/LdapAuthenticator.java Mon May 2 16:32:35 2011
@@ -17,7 +17,6 @@
* under the License.
*/
-
package org.apache.isis.security.ldap.authentication;
import java.util.ArrayList;
@@ -33,43 +32,43 @@ import javax.naming.directory.InitialDir
import javax.naming.directory.SearchControls;
import javax.naming.directory.SearchResult;
-import org.apache.log4j.Logger;
-
import org.apache.isis.core.commons.config.IsisConfiguration;
import org.apache.isis.core.commons.ensure.Assert;
import org.apache.isis.core.commons.exceptions.IsisException;
import org.apache.isis.core.runtime.authentication.AuthenticationRequest;
import org.apache.isis.core.runtime.authentication.AuthenticationRequestPassword;
import org.apache.isis.core.runtime.authentication.standard.AuthenticatorAbstract;
-
+import org.apache.log4j.Logger;
public class LdapAuthenticator extends AuthenticatorAbstract {
- private static final Logger LOG = Logger.getLogger(LdapAuthenticator.class);
-
+ private static final Logger LOG = Logger.getLogger(LdapAuthenticator.class);
+
private final String ldapProvider;
private final String ldapDn;
-
+
public LdapAuthenticator(final IsisConfiguration configuration) {
super(configuration);
ldapProvider = getConfiguration().getString(LdapAuthenticationConstants.SERVER_KEY);
ldapDn = getConfiguration().getString(LdapAuthenticationConstants.LDAPDN_KEY);
}
+ @Override
public boolean canAuthenticate(final AuthenticationRequest request) {
return request instanceof AuthenticationRequestPassword;
}
private void setRoles(final DirContext authContext, final AuthenticationRequest request, final String username)
- throws NamingException {
+ throws NamingException {
final List<String> roles = new ArrayList<String>();
final SearchControls controls = new SearchControls();
controls.setSearchScope(SearchControls.SUBTREE_SCOPE);
controls.setReturningAttributes(new String[] { "cn" });
final String name = "uid=" + username + ", " + ldapDn;
- final NamingEnumeration<SearchResult> answer = authContext.search(name, LdapAuthenticationConstants.FILTER, controls);
+ final NamingEnumeration<SearchResult> answer =
+ authContext.search(name, LdapAuthenticationConstants.FILTER, controls);
while (answer.hasMore()) {
- final SearchResult result = (SearchResult) answer.nextElement();
+ final SearchResult result = answer.nextElement();
final String roleName = (String) result.getAttributes().get("cn").get(0);
roles.add(roleName);
LOG.debug("Adding role: " + roleName);
@@ -77,6 +76,7 @@ public class LdapAuthenticator extends A
request.setRoles(roles);
}
+ @Override
public boolean isValid(final AuthenticationRequest request) {
final AuthenticationRequestPassword passwordRequest = (AuthenticationRequestPassword) request;
final String username = passwordRequest.getName();
@@ -88,7 +88,7 @@ public class LdapAuthenticator extends A
final String password = passwordRequest.getPassword();
Assert.assertNotNull(password);
- final Hashtable<String,String> env = new Hashtable<String,String>(4);
+ final Hashtable<String, String> env = new Hashtable<String, String>(4);
env.put(Context.INITIAL_CONTEXT_FACTORY, LdapAuthenticationConstants.SERVER_DEFAULT);
env.put(Context.PROVIDER_URL, ldapProvider);
env.put(Context.SECURITY_PRINCIPAL, "uid=" + username + ", " + ldapDn);
@@ -115,4 +115,3 @@ public class LdapAuthenticator extends A
}
}
-
Modified: incubator/isis/trunk/security/ldap/src/main/java/org/apache/isis/security/ldap/authorization/LdapAuthorizationConstants.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/security/ldap/src/main/java/org/apache/isis/security/ldap/authorization/LdapAuthorizationConstants.java?rev=1098652&r1=1098651&r2=1098652&view=diff
==============================================================================
--- incubator/isis/trunk/security/ldap/src/main/java/org/apache/isis/security/ldap/authorization/LdapAuthorizationConstants.java (original)
+++ incubator/isis/trunk/security/ldap/src/main/java/org/apache/isis/security/ldap/authorization/LdapAuthorizationConstants.java Mon May 2 16:32:35 2011
@@ -17,29 +17,29 @@
* under the License.
*/
+package org.apache.isis.security.ldap.authorization;
-package org.apache.isis.security.ldap.authorization;
-
-import org.apache.isis.security.ldap.authentication.LdapAuthenticationConstants;
import org.apache.isis.core.commons.config.ConfigurationConstants;
import org.apache.isis.core.runtime.authorization.AuthorizationManagerInstaller;
import org.apache.isis.core.runtime.authorization.standard.AuthorizationConstants;
-
-public final class LdapAuthorizationConstants {
-
- private static final String ROOT =
- ConfigurationConstants.ROOT + AuthorizationManagerInstaller.TYPE + "." + LdapAuthorizationManagerInstaller.NAME + ".";
-
- public static final String SERVER_KEY = ROOT + "server";
- public static final String SERVER_DEFAULT = LdapAuthenticationConstants.SERVER_DEFAULT;
-
- public static final String LDAPDN_KEY = ROOT + "dn";
-
- public static final String APP_DN_KEY = ROOT + "application.dn";
-
- public static final String LEARN_KEY = AuthorizationConstants.LEARN;
- public static final boolean LEARN_DEFAULT = AuthorizationConstants.LEARN_DEFAULT;
-
- private LdapAuthorizationConstants() {}
-
-}
+import org.apache.isis.security.ldap.authentication.LdapAuthenticationConstants;
+
+public final class LdapAuthorizationConstants {
+
+ private static final String ROOT = ConfigurationConstants.ROOT + AuthorizationManagerInstaller.TYPE + "."
+ + LdapAuthorizationManagerInstaller.NAME + ".";
+
+ public static final String SERVER_KEY = ROOT + "server";
+ public static final String SERVER_DEFAULT = LdapAuthenticationConstants.SERVER_DEFAULT;
+
+ public static final String LDAPDN_KEY = ROOT + "dn";
+
+ public static final String APP_DN_KEY = ROOT + "application.dn";
+
+ public static final String LEARN_KEY = AuthorizationConstants.LEARN;
+ public static final boolean LEARN_DEFAULT = AuthorizationConstants.LEARN_DEFAULT;
+
+ private LdapAuthorizationConstants() {
+ }
+
+}
Modified: incubator/isis/trunk/security/ldap/src/main/java/org/apache/isis/security/ldap/authorization/LdapAuthorizationManagerInstaller.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/security/ldap/src/main/java/org/apache/isis/security/ldap/authorization/LdapAuthorizationManagerInstaller.java?rev=1098652&r1=1098651&r2=1098652&view=diff
==============================================================================
--- incubator/isis/trunk/security/ldap/src/main/java/org/apache/isis/security/ldap/authorization/LdapAuthorizationManagerInstaller.java (original)
+++ incubator/isis/trunk/security/ldap/src/main/java/org/apache/isis/security/ldap/authorization/LdapAuthorizationManagerInstaller.java Mon May 2 16:32:35 2011
@@ -17,25 +17,23 @@
* under the License.
*/
+package org.apache.isis.security.ldap.authorization;
-package org.apache.isis.security.ldap.authorization;
-
import org.apache.isis.core.commons.config.IsisConfiguration;
import org.apache.isis.core.runtime.authorization.standard.AuthorizationManagerStandardInstallerAbstract;
import org.apache.isis.core.runtime.authorization.standard.Authorizor;
-
-public class LdapAuthorizationManagerInstaller extends
- AuthorizationManagerStandardInstallerAbstract {
-
- public static String NAME = "ldap";
-
- public LdapAuthorizationManagerInstaller() {
- super(NAME);
- }
-
- @Override
- protected Authorizor createAuthorizor(IsisConfiguration configuration) {
- return new LdapAuthorizor(configuration);
- }
-
-}
+
+public class LdapAuthorizationManagerInstaller extends AuthorizationManagerStandardInstallerAbstract {
+
+ public static String NAME = "ldap";
+
+ public LdapAuthorizationManagerInstaller() {
+ super(NAME);
+ }
+
+ @Override
+ protected Authorizor createAuthorizor(final IsisConfiguration configuration) {
+ return new LdapAuthorizor(configuration);
+ }
+
+}
Modified: incubator/isis/trunk/security/ldap/src/main/java/org/apache/isis/security/ldap/authorization/LdapAuthorizor.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/security/ldap/src/main/java/org/apache/isis/security/ldap/authorization/LdapAuthorizor.java?rev=1098652&r1=1098651&r2=1098652&view=diff
==============================================================================
--- incubator/isis/trunk/security/ldap/src/main/java/org/apache/isis/security/ldap/authorization/LdapAuthorizor.java (original)
+++ incubator/isis/trunk/security/ldap/src/main/java/org/apache/isis/security/ldap/authorization/LdapAuthorizor.java Mon May 2 16:32:35 2011
@@ -17,251 +17,256 @@
* under the License.
*/
+package org.apache.isis.security.ldap.authorization;
-package org.apache.isis.security.ldap.authorization;
-
-import java.util.Hashtable;
-
-import javax.naming.AuthenticationException;
-import javax.naming.Context;
-import javax.naming.NameAlreadyBoundException;
-import javax.naming.NameNotFoundException;
-import javax.naming.NamingEnumeration;
-import javax.naming.NamingException;
-import javax.naming.directory.Attribute;
-import javax.naming.directory.Attributes;
-import javax.naming.directory.BasicAttribute;
-import javax.naming.directory.BasicAttributes;
-import javax.naming.directory.DirContext;
-import javax.naming.directory.InitialDirContext;
-import javax.naming.directory.SearchControls;
-import javax.naming.directory.SearchResult;
-
-import org.apache.log4j.Logger;
-import org.apache.isis.applib.Identifier;
+import java.util.Hashtable;
+
+import javax.naming.AuthenticationException;
+import javax.naming.Context;
+import javax.naming.NameAlreadyBoundException;
+import javax.naming.NameNotFoundException;
+import javax.naming.NamingEnumeration;
+import javax.naming.NamingException;
+import javax.naming.directory.Attribute;
+import javax.naming.directory.Attributes;
+import javax.naming.directory.BasicAttribute;
+import javax.naming.directory.BasicAttributes;
+import javax.naming.directory.DirContext;
+import javax.naming.directory.InitialDirContext;
+import javax.naming.directory.SearchControls;
+import javax.naming.directory.SearchResult;
+
+import org.apache.isis.applib.Identifier;
import org.apache.isis.core.commons.config.IsisConfiguration;
import org.apache.isis.core.commons.exceptions.IsisException;
import org.apache.isis.core.runtime.authorization.standard.AuthorizorAbstract;
-
-
-public class LdapAuthorizor extends AuthorizorAbstract {
-
- private static final Logger LOG = Logger.getLogger(LdapAuthorizor.class);
-
- private static final String FILTER = "(&(uniquemember={0}) (|(cn={1}) (cn={2}) (cn={3})))";
- private static final String ACCESS_QUALIFIER_RW = "RW";
-
- private final String ldapProvider;
- @SuppressWarnings("unused")
- private final String ldapDn;
- private final String appDn;
- private final boolean learn;
-
-
- public LdapAuthorizor(final IsisConfiguration configuration) {
- super(configuration);
-
- ldapProvider = getConfiguration().getString(LdapAuthorizationConstants.SERVER_KEY);
- ldapDn = getConfiguration().getString(LdapAuthorizationConstants.LDAPDN_KEY);
- appDn = getConfiguration().getString(LdapAuthorizationConstants.APP_DN_KEY);
- learn = getConfiguration().getBoolean(LdapAuthorizationConstants.LEARN_KEY, LdapAuthorizationConstants.LEARN_DEFAULT);
- }
-
-
- //////////////////////////////////////////////////////////
- // init, shutdown
- //////////////////////////////////////////////////////////
-
- public void init() {
- }
-
- public void shutdown() {
- // do nothing
- }
-
-
- //////////////////////////////////////////////////////////
- // API
- //////////////////////////////////////////////////////////
-
- public boolean isUsableInRole(final String role, final Identifier member) {
- return isAuthorised(role, member, ACCESS_QUALIFIER_RW);
- }
-
- public boolean isVisibleInRole(final String role, final Identifier member) {
- return isAuthorised(role, member, null);
- }
-
- private boolean isAuthorised(final String role, final Identifier member, final String flag) {
-
- final Hashtable<String,String> env = new Hashtable<String,String>(4);
- env.put(Context.INITIAL_CONTEXT_FACTORY, LdapAuthorizationConstants.SERVER_DEFAULT);
- env.put(Context.PROVIDER_URL, ldapProvider);
-
- if (learn) {
- env.put(Context.SECURITY_PRINCIPAL, "uid=admin, ou=system");
- env.put(Context.SECURITY_CREDENTIALS, "secret");
- }
-
- DirContext authContext = null;
- try {
- authContext = new InitialDirContext(env);
- if (learn) {
- return bindNames(authContext, role, member);
- }
- return isPermitted(authContext, role, member, flag);
- } catch (final AuthenticationException e) {
- throw new IsisException("Failed to authorise using LDAP", e);
- } catch (final NameNotFoundException e) {
- // missing class in ldap server - treat as authorisation failure
- LOG.error(e);
- return false;
- } catch (final NamingException e) {
- throw new IsisException("Failed to authorise using LDAP", e);
- } finally {
- try {
- if (authContext != null) {
- authContext.close();
- }
- } catch (final NamingException e) {
- throw new IsisException("Failed to authorise using LDAP", e);
- }
- }
- }
-
- private boolean isPermitted(final DirContext authContext, final String role, final Identifier member, final String flag)
- throws NamingException {
- final String cls = member.toIdentityString(Identifier.CLASS);
- final String name = member.toIdentityString(Identifier.MEMBERNAME_ONLY);
- final String parms = member.toIdentityString(Identifier.PARAMETERS_ONLY);
-
- final Object[] args = new Object[] { role, cls, name, parms };
- final SearchControls controls = new SearchControls();
- controls.setSearchScope(SearchControls.SUBTREE_SCOPE);
- String searchName = buildSearchName(cls, appDn);
- final NamingEnumeration<SearchResult> answer = authContext.search(searchName, FILTER, args, controls);
- while (answer.hasMore()) {
- // if we have a class match must be OK
- // if we have a name match must be OK (parent must be class by definition)
- // but parm matches need to check that parent = name
- final SearchResult result = (SearchResult) answer.nextElement();
- final String cn = (String) result.getAttributes().get("cn").get(0);
- // result.getname gives relative path from class - so if contains 'name' it is parent of parms
- // entry
- if (cn.equals(cls) || cn.equals(name) || ((cn.equals(parms) && result.getName().contains(name)))) {
- // last check if there is a flag attribute
- if (flag != null) {
- final Attribute flagAttribute = result.getAttributes().get("flag");
- if (flagAttribute != null) {
- // since there is a flag need to check is match
- return flag.equalsIgnoreCase((String) flagAttribute.get(0));
- }
- }
- return true;
- }
- }
- return false;
- }
-
- private String buildSearchName(final String cls, final String appDn) {
- final StringBuffer search = new StringBuffer();
- search.append("cn=").append(cls).append(", ").append(appDn);
- String searchName = search.toString();
- return searchName;
- }
-
- private Attributes createCommonAttributes(final String cnName, final String role, final boolean isClass) {
- final Attributes attrs = new BasicAttributes(true); // case-ignore
- final Attribute objclass = new BasicAttribute("objectclass");
- objclass.add("top");
- objclass.add("javaContainer");
- objclass.add("groupOfUniqueNames");
- if (isClass) {
- objclass.add("javaObject");
- }
- final Attribute cn = new BasicAttribute("cn");
- cn.add(cnName);
- final Attribute uniqueMember = new BasicAttribute("uniquemember");
- uniqueMember.add(role);
- if (isClass) {
- final Attribute javaClass = new BasicAttribute("javaclassname");
- javaClass.add(cnName);
- attrs.put(javaClass);
- }
- attrs.put(objclass);
- attrs.put(cn);
- attrs.put(uniqueMember);
- return attrs;
- }
-
- private String createClassBindname(final String cls) {
- final StringBuffer bindName = new StringBuffer();
- bindName.append("cn=").append(cls).append(", ").append(appDn);
- return bindName.toString();
- }
-
- private void bindClass(final DirContext authContext, final String role, final Identifier member) throws NamingException {
- final String cls = member.toIdentityString(Identifier.CLASS);
- final Attributes attrs = createCommonAttributes(cls, role, true);
- try {
- authContext.createSubcontext(createClassBindname(cls), attrs);
- } catch (final NameAlreadyBoundException e) {
- // ignore as this is just debug code
- // and we don't check if this is already bound first
- LOG.debug(e);
- }
- }
-
- private String createNameBindname(final String cls, final String name) {
- final StringBuffer bindName = new StringBuffer();
- bindName.append("cn=").append(name).append(", ");
- bindName.append(createClassBindname(cls));
- return bindName.toString();
- }
-
- private void bindName(final DirContext authContext, final String role, final Identifier member) throws NamingException {
- final String cls = member.toIdentityString(Identifier.CLASS);
- final String name = member.toIdentityString(Identifier.MEMBERNAME_ONLY);
- final Attributes attrs = createCommonAttributes(name, role, false);
- try {
- authContext.createSubcontext(createNameBindname(cls, name), attrs);
- } catch (final NameAlreadyBoundException e) {
- // ignore as this is just debug code
- // and we don't check if this is already bound first
- LOG.debug(e);
- }
- }
-
- private String createParmsBindname(final String cls, final String name, final String parms) {
- final StringBuffer bindName = new StringBuffer();
- bindName.append("cn=").append(parms).append(", ");
- bindName.append(createNameBindname(cls, name));
- return bindName.toString();
- }
-
- private void bindParms(final DirContext authContext, final String role, final Identifier member) throws NamingException {
- final String cls = member.toIdentityString(Identifier.CLASS);
- final String name = member.toIdentityString(Identifier.MEMBERNAME_ONLY);
- // have to escape any commas in parms string or ldap parser is not happy
- final String parms = member.toIdentityString(Identifier.PARAMETERS_ONLY).replace(",", "\\,");
- if (parms.length() == 0) {
- return;
- }
- final Attributes attrs = createCommonAttributes(parms, role, false);
- try {
- authContext.createSubcontext(createParmsBindname(cls, name, parms), attrs);
- } catch (final NameAlreadyBoundException e) {
- // ignore as this is just debug code
- // and we don't check if this is already bound first
- LOG.debug(e);
- }
- }
-
- private boolean bindNames(final DirContext authContext, final String role, final Identifier member) throws NamingException {
- bindClass(authContext, role, member);
- bindName(authContext, role, member);
- bindParms(authContext, role, member);
- return true;
- }
-
-}
+import org.apache.log4j.Logger;
+
+public class LdapAuthorizor extends AuthorizorAbstract {
+
+ private static final Logger LOG = Logger.getLogger(LdapAuthorizor.class);
+
+ private static final String FILTER = "(&(uniquemember={0}) (|(cn={1}) (cn={2}) (cn={3})))";
+ private static final String ACCESS_QUALIFIER_RW = "RW";
+
+ private final String ldapProvider;
+ @SuppressWarnings("unused")
+ private final String ldapDn;
+ private final String appDn;
+ private final boolean learn;
+
+ public LdapAuthorizor(final IsisConfiguration configuration) {
+ super(configuration);
+
+ ldapProvider = getConfiguration().getString(LdapAuthorizationConstants.SERVER_KEY);
+ ldapDn = getConfiguration().getString(LdapAuthorizationConstants.LDAPDN_KEY);
+ appDn = getConfiguration().getString(LdapAuthorizationConstants.APP_DN_KEY);
+ learn =
+ getConfiguration().getBoolean(LdapAuthorizationConstants.LEARN_KEY,
+ LdapAuthorizationConstants.LEARN_DEFAULT);
+ }
+
+ // ////////////////////////////////////////////////////////
+ // init, shutdown
+ // ////////////////////////////////////////////////////////
+
+ @Override
+ public void init() {
+ }
+
+ @Override
+ public void shutdown() {
+ // do nothing
+ }
+
+ // ////////////////////////////////////////////////////////
+ // API
+ // ////////////////////////////////////////////////////////
+
+ @Override
+ public boolean isUsableInRole(final String role, final Identifier member) {
+ return isAuthorised(role, member, ACCESS_QUALIFIER_RW);
+ }
+
+ @Override
+ public boolean isVisibleInRole(final String role, final Identifier member) {
+ return isAuthorised(role, member, null);
+ }
+
+ private boolean isAuthorised(final String role, final Identifier member, final String flag) {
+
+ final Hashtable<String, String> env = new Hashtable<String, String>(4);
+ env.put(Context.INITIAL_CONTEXT_FACTORY, LdapAuthorizationConstants.SERVER_DEFAULT);
+ env.put(Context.PROVIDER_URL, ldapProvider);
+
+ if (learn) {
+ env.put(Context.SECURITY_PRINCIPAL, "uid=admin, ou=system");
+ env.put(Context.SECURITY_CREDENTIALS, "secret");
+ }
+
+ DirContext authContext = null;
+ try {
+ authContext = new InitialDirContext(env);
+ if (learn) {
+ return bindNames(authContext, role, member);
+ }
+ return isPermitted(authContext, role, member, flag);
+ } catch (final AuthenticationException e) {
+ throw new IsisException("Failed to authorise using LDAP", e);
+ } catch (final NameNotFoundException e) {
+ // missing class in ldap server - treat as authorisation failure
+ LOG.error(e);
+ return false;
+ } catch (final NamingException e) {
+ throw new IsisException("Failed to authorise using LDAP", e);
+ } finally {
+ try {
+ if (authContext != null) {
+ authContext.close();
+ }
+ } catch (final NamingException e) {
+ throw new IsisException("Failed to authorise using LDAP", e);
+ }
+ }
+ }
+
+ private boolean isPermitted(final DirContext authContext, final String role, final Identifier member,
+ final String flag) throws NamingException {
+ final String cls = member.toIdentityString(Identifier.CLASS);
+ final String name = member.toIdentityString(Identifier.MEMBERNAME_ONLY);
+ final String parms = member.toIdentityString(Identifier.PARAMETERS_ONLY);
+
+ final Object[] args = new Object[] { role, cls, name, parms };
+ final SearchControls controls = new SearchControls();
+ controls.setSearchScope(SearchControls.SUBTREE_SCOPE);
+ final String searchName = buildSearchName(cls, appDn);
+ final NamingEnumeration<SearchResult> answer = authContext.search(searchName, FILTER, args, controls);
+ while (answer.hasMore()) {
+ // if we have a class match must be OK
+ // if we have a name match must be OK (parent must be class by definition)
+ // but parm matches need to check that parent = name
+ final SearchResult result = answer.nextElement();
+ final String cn = (String) result.getAttributes().get("cn").get(0);
+ // result.getname gives relative path from class - so if contains 'name' it is parent of parms
+ // entry
+ if (cn.equals(cls) || cn.equals(name) || ((cn.equals(parms) && result.getName().contains(name)))) {
+ // last check if there is a flag attribute
+ if (flag != null) {
+ final Attribute flagAttribute = result.getAttributes().get("flag");
+ if (flagAttribute != null) {
+ // since there is a flag need to check is match
+ return flag.equalsIgnoreCase((String) flagAttribute.get(0));
+ }
+ }
+ return true;
+ }
+ }
+ return false;
+ }
+
+ private String buildSearchName(final String cls, final String appDn) {
+ final StringBuffer search = new StringBuffer();
+ search.append("cn=").append(cls).append(", ").append(appDn);
+ final String searchName = search.toString();
+ return searchName;
+ }
+
+ private Attributes createCommonAttributes(final String cnName, final String role, final boolean isClass) {
+ final Attributes attrs = new BasicAttributes(true); // case-ignore
+ final Attribute objclass = new BasicAttribute("objectclass");
+ objclass.add("top");
+ objclass.add("javaContainer");
+ objclass.add("groupOfUniqueNames");
+ if (isClass) {
+ objclass.add("javaObject");
+ }
+ final Attribute cn = new BasicAttribute("cn");
+ cn.add(cnName);
+ final Attribute uniqueMember = new BasicAttribute("uniquemember");
+ uniqueMember.add(role);
+ if (isClass) {
+ final Attribute javaClass = new BasicAttribute("javaclassname");
+ javaClass.add(cnName);
+ attrs.put(javaClass);
+ }
+ attrs.put(objclass);
+ attrs.put(cn);
+ attrs.put(uniqueMember);
+ return attrs;
+ }
+
+ private String createClassBindname(final String cls) {
+ final StringBuffer bindName = new StringBuffer();
+ bindName.append("cn=").append(cls).append(", ").append(appDn);
+ return bindName.toString();
+ }
+
+ private void bindClass(final DirContext authContext, final String role, final Identifier member)
+ throws NamingException {
+ final String cls = member.toIdentityString(Identifier.CLASS);
+ final Attributes attrs = createCommonAttributes(cls, role, true);
+ try {
+ authContext.createSubcontext(createClassBindname(cls), attrs);
+ } catch (final NameAlreadyBoundException e) {
+ // ignore as this is just debug code
+ // and we don't check if this is already bound first
+ LOG.debug(e);
+ }
+ }
+
+ private String createNameBindname(final String cls, final String name) {
+ final StringBuffer bindName = new StringBuffer();
+ bindName.append("cn=").append(name).append(", ");
+ bindName.append(createClassBindname(cls));
+ return bindName.toString();
+ }
+
+ private void bindName(final DirContext authContext, final String role, final Identifier member)
+ throws NamingException {
+ final String cls = member.toIdentityString(Identifier.CLASS);
+ final String name = member.toIdentityString(Identifier.MEMBERNAME_ONLY);
+ final Attributes attrs = createCommonAttributes(name, role, false);
+ try {
+ authContext.createSubcontext(createNameBindname(cls, name), attrs);
+ } catch (final NameAlreadyBoundException e) {
+ // ignore as this is just debug code
+ // and we don't check if this is already bound first
+ LOG.debug(e);
+ }
+ }
+
+ private String createParmsBindname(final String cls, final String name, final String parms) {
+ final StringBuffer bindName = new StringBuffer();
+ bindName.append("cn=").append(parms).append(", ");
+ bindName.append(createNameBindname(cls, name));
+ return bindName.toString();
+ }
+
+ private void bindParms(final DirContext authContext, final String role, final Identifier member)
+ throws NamingException {
+ final String cls = member.toIdentityString(Identifier.CLASS);
+ final String name = member.toIdentityString(Identifier.MEMBERNAME_ONLY);
+ // have to escape any commas in parms string or ldap parser is not happy
+ final String parms = member.toIdentityString(Identifier.PARAMETERS_ONLY).replace(",", "\\,");
+ if (parms.length() == 0) {
+ return;
+ }
+ final Attributes attrs = createCommonAttributes(parms, role, false);
+ try {
+ authContext.createSubcontext(createParmsBindname(cls, name, parms), attrs);
+ } catch (final NameAlreadyBoundException e) {
+ // ignore as this is just debug code
+ // and we don't check if this is already bound first
+ LOG.debug(e);
+ }
+ }
+
+ private boolean bindNames(final DirContext authContext, final String role, final Identifier member)
+ throws NamingException {
+ bindClass(authContext, role, member);
+ bindName(authContext, role, member);
+ bindParms(authContext, role, member);
+ return true;
+ }
+
+}
Modified: incubator/isis/trunk/security/ldap/src/test/java/org/apache/isis/security/ldap/authentication/LdapAuthenticatorTester.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/security/ldap/src/test/java/org/apache/isis/security/ldap/authentication/LdapAuthenticatorTester.java?rev=1098652&r1=1098651&r2=1098652&view=diff
==============================================================================
--- incubator/isis/trunk/security/ldap/src/test/java/org/apache/isis/security/ldap/authentication/LdapAuthenticatorTester.java (original)
+++ incubator/isis/trunk/security/ldap/src/test/java/org/apache/isis/security/ldap/authentication/LdapAuthenticatorTester.java Mon May 2 16:32:35 2011
@@ -17,14 +17,11 @@
* under the License.
*/
-
package org.apache.isis.security.ldap.authentication;
-import org.apache.isis.security.ldap.authentication.LdapAuthenticator;
import org.apache.isis.core.runtime.authentication.AuthenticationRequestPassword;
import org.apache.isis.runtimes.dflt.runtime.system.context.IsisContext;
-
public class LdapAuthenticatorTester {
public static void main(final String[] args) {
@@ -54,4 +51,3 @@ public class LdapAuthenticatorTester {
}
}
-