Index: D:/PROJECTS/ECLIPSE/JETSPEED2/jetspeed-2/components/security/src/test/org/apache/jetspeed/security/spi/ldap/TestLdapSecurityMappingHandler.java
===================================================================
--- D:/PROJECTS/ECLIPSE/JETSPEED2/jetspeed-2/components/security/src/test/org/apache/jetspeed/security/spi/ldap/TestLdapSecurityMappingHandler.java (revision 468102)
+++ D:/PROJECTS/ECLIPSE/JETSPEED2/jetspeed-2/components/security/src/test/org/apache/jetspeed/security/spi/ldap/TestLdapSecurityMappingHandler.java (working copy)
@@ -98,8 +98,6 @@
String fullPathName = new GroupPrincipalImpl(gpUid1).getName();
logger.debug("Group full path name from testGetUserPrincipalsInGroup()[" + fullPathName + "]");
Set userPrincipals = secHandler.getUserPrincipalsInGroup(fullPathName);
- //assertTrue(userPrincipals.contains(new UserPrincipalImpl("uid=" + uid1 + ",ou=People,ou=OrgUnit1")));
- //assertTrue(userPrincipals.contains(new UserPrincipalImpl("uid=" + uid2 + ",ou=People,ou=OrgUnit1")));
assertTrue(userPrincipals.contains(new UserPrincipalImpl(uid1)));
assertTrue(userPrincipals.contains(new UserPrincipalImpl(uid2)));
@@ -215,14 +213,34 @@
secHandler.setRolePrincipalInGroup(gpUid1, ro1.getName());
secHandler.setRolePrincipalInGroup(gpUid1, ro2.getName());
secHandler.setRolePrincipalInGroup(gpUid2, ro1.getName());
+
+ String fullPathName = new RolePrincipalImpl(roleUid1).getName();
+ logger.debug("Role full path name from testGetUserPrincipalsInRole()[" + fullPathName + "]");
+ assertEquals("The group should have 2 roles.", 2, secHandler.getRolePrincipalsInGroup(gpUid1).size());
+ assertEquals("The group should have 1 role.", 1, secHandler.getRolePrincipalsInGroup(gpUid2).size());
+ }
+
+ /**
+ * Adds 2 roles + 1 user to a group and checks their presence in the group.
+ *
+ * @throws Exception
+ */
+ public void testGetRolePrincipalInGroupWithUsersInIt() throws Exception
+ {
+ secHandler.setRolePrincipalInGroup(gpUid1, ro1.getName());
+ secHandler.setRolePrincipalInGroup(gpUid1, ro2.getName());
+ secHandler.setRolePrincipalInGroup(gpUid2, ro1.getName());
+ secHandler.setUserPrincipalInGroup(uid1,gpUid1);
+
String fullPathName = new RolePrincipalImpl(roleUid1).getName();
logger.debug("Role full path name from testGetUserPrincipalsInRole()[" + fullPathName + "]");
assertEquals("The group should have 2 roles.", 2, secHandler.getRolePrincipalsInGroup(gpUid1).size());
assertEquals("The group should have 1 role.", 1, secHandler.getRolePrincipalsInGroup(gpUid2).size());
- }
+ }
+
/**
* Adds 2 users to a group and checks their presence in the group
*
@@ -281,7 +299,6 @@
{
secHandler.setUserPrincipalInRole(uid1, ro1.getName());
secHandler.setUserPrincipalInRole(uid1, ro2.getName());
-
assertEquals("The user should have been in two roles.", 2, secHandler.getRolePrincipals(uid1).size());
secHandler.removeUserPrincipalInRole(uid1, ro1.getName());
@@ -292,7 +309,23 @@
}
+ /**
+ * @throws Exception
+ */
+ public void testRemoveRolePrincipalInGroup() throws Exception
+ {
+ secHandler.setRolePrincipalInGroup(gpUid1, ro1.getName());
+ secHandler.setRolePrincipalInGroup(gpUid1, ro2.getName());
+ assertEquals("The role should have been in two groups.", 2, secHandler.getRolePrincipalsInGroup(gpUid1).size());
+ secHandler.removeRolePrincipalInGroup(gpUid1,ro1.getName());
+ assertEquals("The role should have been in one group.", 1, secHandler.getRolePrincipalsInGroup(gpUid1).size());
+
+ secHandler.removeRolePrincipalInGroup(gpUid1, ro2.getName());
+ assertEquals("The role should have been in 0 roles.", 0, secHandler.getRolePrincipalsInGroup(gpUid1).size());
+ }
+
+
/**
* @throws Exception
*/
Index: D:/PROJECTS/ECLIPSE/JETSPEED2/jetspeed-2/components/security/src/test/org/apache/jetspeed/security/spi/ldap/AbstractLdapTest.java
===================================================================
--- D:/PROJECTS/ECLIPSE/JETSPEED2/jetspeed-2/components/security/src/test/org/apache/jetspeed/security/spi/ldap/AbstractLdapTest.java (revision 468102)
+++ D:/PROJECTS/ECLIPSE/JETSPEED2/jetspeed-2/components/security/src/test/org/apache/jetspeed/security/spi/ldap/AbstractLdapTest.java (working copy)
@@ -49,6 +49,8 @@
*/
public abstract class AbstractLdapTest extends TestCase
{
+ private static final String LDAP_CONFIG = "apacheds/setup3";
+
/** The {@link UserSecurityHandler}. */
UserSecurityHandler userHandler;
@@ -101,6 +103,7 @@
/** The test password. */
protected String password = "fred";
+
/**
* @see junit.framework.TestCase#setUp()
@@ -108,7 +111,7 @@
protected void setUp() throws Exception
{
super.setUp();
- LdapBindingConfig ldapConfig = new LdapBindingConfig("apacheds");
+ LdapBindingConfig ldapConfig = new LdapBindingConfig(LDAP_CONFIG);
ldapCredDao = new LdapUserCredentialDaoImpl(ldapConfig);
ldapPrincipalDao = new LdapUserPrincipalDaoImpl(ldapConfig);
@@ -116,8 +119,6 @@
crHandler = new LdapCredentialHandler(ldapCredDao);
LdapDataHelper.setUserSecurityHandler(userHandler);
LdapDataHelper.setCredentialHandler(crHandler);
-// uid1 = Integer.toString(rand.nextInt());
-// uid2 = Integer.toString(rand.nextInt());
ldapGroupDao = new LdapGroupDaoImpl(ldapConfig);
ldapRoleDao = new LdapRoleDaoImpl(ldapConfig);
@@ -126,11 +127,6 @@
roleHandler = new LdapRoleSecurityHandler(ldapRoleDao);
LdapDataHelper.setGroupSecurityHandler(grHandler);
LdapDataHelper.setRoleSecurityHandler(roleHandler);
-// gpUid1 = Integer.toString(rand.nextInt());
-// gpUid2 = Integer.toString(rand.nextInt());
-//
-// roleUid1 = Integer.toString(rand.nextInt());
-// roleUid2 = Integer.toString(rand.nextInt());
secHandler = new LdapSecurityMappingHandler(ldapPrincipalDao, ldapGroupDao, ldapRoleDao);
}
Index: D:/PROJECTS/ECLIPSE/JETSPEED2/jetspeed-2/components/security/src/test/org/apache/jetspeed/security/spi/ldap/TestLdapRoleSecurityHandler.java
===================================================================
--- D:/PROJECTS/ECLIPSE/JETSPEED2/jetspeed-2/components/security/src/test/org/apache/jetspeed/security/spi/ldap/TestLdapRoleSecurityHandler.java (revision 468102)
+++ D:/PROJECTS/ECLIPSE/JETSPEED2/jetspeed-2/components/security/src/test/org/apache/jetspeed/security/spi/ldap/TestLdapRoleSecurityHandler.java (working copy)
@@ -51,7 +51,6 @@
public void testGetRolePrincipal() throws Exception
{
String fullPath = (new RolePrincipalImpl(roleUid1)).getFullPath();
- //RolePrincipal rolePrincipal = grHandler.getRolePrincipal(fullPath);
RolePrincipal rolePrincipal = roleHandler.getRolePrincipal(roleUid1);
assertNotNull("Role was not found.", rolePrincipal);
assertEquals(roleUid1,rolePrincipal.getName());
Index: D:/PROJECTS/ECLIPSE/JETSPEED2/jetspeed-2/components/security/src/test/JETSPEED-INF/ldap/ldap.properties
===================================================================
--- D:/PROJECTS/ECLIPSE/JETSPEED2/jetspeed-2/components/security/src/test/JETSPEED-INF/ldap/ldap.properties (revision 468102)
+++ D:/PROJECTS/ECLIPSE/JETSPEED2/jetspeed-2/components/security/src/test/JETSPEED-INF/ldap/ldap.properties (working copy)
@@ -1,11 +0,0 @@
-# Ldap Configuration.
-org.apache.jetspeed.ldap.initialContextFactory=com.sun.jndi.ldap.LdapCtxFactory
-org.apache.jetspeed.ldap.ldapServerName=localhost
-org.apache.jetspeed.ldap.ldapServerPort=10389
-org.apache.jetspeed.ldap.rootDn=uid\=admin\,ou\=system
-org.apache.jetspeed.ldap.rootPassword=secret
-org.apache.jetspeed.ldap.rootContext=o\=sevenSeas
-org.apache.jetspeed.ldap.defaultDnSuffix=
-org.apache.jetspeed.ldap.ou.users=people
-org.apache.jetspeed.ldap.ou.groups=groups
-org.apache.jetspeed.ldap.ou.roles=roles
\ No newline at end of file
Index: D:/PROJECTS/ECLIPSE/JETSPEED2/jetspeed-2/components/security/src/test/JETSPEED-INF/directory/config/openldap/security-spi.xml
===================================================================
--- D:/PROJECTS/ECLIPSE/JETSPEED2/jetspeed-2/components/security/src/test/JETSPEED-INF/directory/config/openldap/security-spi.xml (revision 468102)
+++ D:/PROJECTS/ECLIPSE/JETSPEED2/jetspeed-2/components/security/src/test/JETSPEED-INF/directory/config/openldap/security-spi.xml (working copy)
@@ -1,46 +0,0 @@
-
-
-
-
-
-
-
-
- JETSPEED-INF/ojb/security_repository.xml
-
-
-
-
- org.apache.jetspeed.security.spi.SecurityAccess
-
-
-
@@ -80,7 +81,9 @@
{
validateUid(uid);
validatePassword(password);
+ logger.debug("changePassword for " + uid + " with " + password);
String userDn = lookupByUid(uid);
+ logger.debug("userDn = " + userDn);
try
{
setPassword(userDn, password);
@@ -110,12 +113,25 @@
try
{
Hashtable env = this.ctx.getEnvironment();
- String savedPassword = String.valueOf(getPassword(uid));
+ //String savedPassword = String.valueOf(getPassword(uid));
String oldCredential = (String)env.get(Context.SECURITY_CREDENTIALS);
String oldUsername = (String)env.get(Context.SECURITY_PRINCIPAL);
- env.put(Context.SECURITY_PRINCIPAL,"uid=" + uid + "," + getUserFilterBase() + "," + getRootContext());
+
+
+ String principal = getEntryPrefix() + "=" + uid;
+
+ if (!StringUtils.isEmpty(getUserFilterBase()))
+ principal+="," + getUserFilterBase();
+ if (!StringUtils.isEmpty(getRootContext()))
+ principal+="," + getRootContext();
+
+ if (lookupByUid(uid)==null)
+ throw new SecurityException(new KeyedMessage("User " + uid + " not found"));
+
+
+ env.put(Context.SECURITY_PRINCIPAL,principal);
env.put(Context.SECURITY_CREDENTIALS,password);
- InitialContext ctx = new InitialContext(env);
+ new InitialContext(env);
env.put(Context.SECURITY_PRINCIPAL,oldUsername);
env.put(Context.SECURITY_CREDENTIALS,oldCredential);
return true;
@@ -160,10 +176,14 @@
*/
private void setPassword(final String userDn, final String password) throws NamingException
{
+ logger.debug("setPassword userDn = " + userDn);
String rdn = getSubcontextName(userDn);
+ if (!StringUtils.isEmpty(getUserFilterBase()))
+ rdn+="," + getUserFilterBase();
+ logger.debug("setPassword rdn = " + rdn);
Attributes attrs = new BasicAttributes(false);
- attrs.put("userPassword", password);
+ attrs.put(getUserPasswordAttribute(), password);
ctx.modifyAttributes(rdn, DirContext.REPLACE_ATTRIBUTE, attrs);
}
@@ -179,14 +199,14 @@
*/
private char[] getPassword(final NamingEnumeration results, final String uid) throws NamingException
{
- if (!results.hasMore())
+ if (!results.hasMore())
{
throw new NamingException("Could not find any user with uid[" + uid + "]");
}
Attributes userAttributes = getFirstUser(results);
- char[] rawPassword = convertRawPassword(getAttribute(PASSWORD_ATTR_NAME, userAttributes));
+ char[] rawPassword = convertRawPassword(getAttribute(getUserPasswordAttribute(), userAttributes));
return rawPassword;
}
@@ -264,20 +284,8 @@
return answer;
}
- /**
- *
- * A template method that returns the LDAP object class of the concrete DAO.
- *
- *
- * @return A String containing the LDAP object class name.
- */
- protected String getObjectClass()
- {
- return "jetspeed-2-user";
- }
-
protected String getEntryPrefix() {
- return "uid";
+ return this.getUserIdAttribute();
}
protected String getSearchSuffix() {
@@ -291,5 +299,9 @@
protected String[] getObjectClasses() {
return this.getUserObjectClasses();
}
+
+ protected String[] getAttributes() {
+ return this.getUserAttributes();
+ }
}
\ No newline at end of file
Index: D:/PROJECTS/ECLIPSE/JETSPEED2/jetspeed-2/components/security/src/java/org/apache/jetspeed/security/spi/impl/ldap/LdapBindingConfig.java
===================================================================
--- D:/PROJECTS/ECLIPSE/JETSPEED2/jetspeed-2/components/security/src/java/org/apache/jetspeed/security/spi/impl/ldap/LdapBindingConfig.java (revision 468102)
+++ D:/PROJECTS/ECLIPSE/JETSPEED2/jetspeed-2/components/security/src/java/org/apache/jetspeed/security/spi/impl/ldap/LdapBindingConfig.java (working copy)
@@ -40,17 +40,11 @@
private String rootPassword;
private String rootContext;
- private String defaultDnSuffix;
-
private PropertiesConfiguration props = null;
- private String roleFilter;
private String groupFilter;
private String userFilter;
- private String userAuthenticationFiler;
-
- private String roleMembershipAttributes;
private String userRoleMembershipAttributes;
private String groupMembershipAttributes;
@@ -58,23 +52,42 @@
private String defaultSearchBase;
- private String roleFilterBase;
private String groupFilterBase;
private String userFilterBase;
- private String roleIdAttribute;
private String groupIdAttribute;
private String userIdAttribute;
+
+ private String uidAttribute;
+ private String memberShipSearchScope;
- private String[] roleObjectClasses;
-
private String[] groupObjectClasses;
private String[] userObjectClasses;
+ private String groupMembershipForRoleAttributes;
+
+ private String groupUidAttribute;
+ private String userUidAttribute;
+
+ private String[] groupAttributes;
+ private String[] userAttributes;
+
+ private String groupObjectRequiredAttributeClasses;
+
+ private String[] roleObjectClasses;
private String roleGroupMembershipForRoleAttributes;
+ private String[] roleAttributes;
+ private String roleObjectRequiredAttributeClasses;
+ private String roleFilter;
+ private String roleFilterBase;
+ private String roleIdAttribute;
+ private String roleUidAttribute;
+ private String roleMembershipAttributes;
+
+ private String userPasswordAttribute;
- private String groupMembershipForRoleAttributes;
+ private String[] knownAttributes;
/**
* @param factory The initial context factory.
@@ -90,14 +103,12 @@
public LdapBindingConfig(String factory,
String name,
String port,
- String suffix,
String context,
String dn,
String password,
String roleFilter,
String groupFilter,
String userFilter,
- String userAuthenticationFiler,
String roleMembershipAttributes,
String userRoleMembershipAttributes,
String groupMembershipAttributes,
@@ -113,14 +124,25 @@
String userObjectClasses,
String roleIdAttribute,
String groupIdAttribute,
- String userIdAttribute)
+ String userIdAttribute,
+ String uidAttribute,
+ String memberShipSearchScope,
+ String roleUidAttribute,
+ String groupUidAttribute,
+ String userUidAttribute,
+ String roleObjectRequiredAttributeClasses,
+ String groupObjectRequiredAttributeClasses,
+ String userAttributes,
+ String roleAttributes,
+ String groupAttributes,
+ String userPasswordAttribute,
+ String knownAttributes)
{
try
{
initialContextFactory = factory;
ldapServerName = name;
ldapServerPort = port;
- defaultDnSuffix = suffix;
rootContext = context;
rootDn = dn;
rootPassword = password;
@@ -128,7 +150,6 @@
this.roleFilter=roleFilter;
this.groupFilter=groupFilter;
this.userFilter=userFilter;
- this.userAuthenticationFiler=userAuthenticationFiler;
this.roleMembershipAttributes=roleMembershipAttributes;
this.userRoleMembershipAttributes=userRoleMembershipAttributes;
@@ -153,6 +174,26 @@
this.groupIdAttribute=groupIdAttribute;
this.userIdAttribute=userIdAttribute;
+ this.uidAttribute = uidAttribute;
+ this.memberShipSearchScope=memberShipSearchScope;
+
+
+ this.roleUidAttribute=roleUidAttribute;
+ this.groupUidAttribute=groupUidAttribute;
+ this.userUidAttribute=userUidAttribute;
+
+ this.roleObjectRequiredAttributeClasses=roleObjectRequiredAttributeClasses;
+ this.groupObjectRequiredAttributeClasses=groupObjectRequiredAttributeClasses;
+
+ this.roleAttributes=StringUtils.split(roleAttributes,",");
+ this.groupAttributes = StringUtils.split(groupAttributes,",");
+ this.userAttributes = StringUtils.split(userAttributes,",");
+
+ this.userPasswordAttribute = userPasswordAttribute;
+
+ this.knownAttributes = StringUtils.split(knownAttributes,",");
+
+
new InitLdapSchema(this);
}
catch (SecurityException se)
@@ -175,11 +216,10 @@
{
try
{
- props = new PropertiesConfiguration("JETSPEED-INF/ldap/" + ldapType + "/ldap.properties");
+ props = new PropertiesConfiguration("JETSPEED-INF/directory/config/" + ldapType + "/ldap.properties");
initialContextFactory = props.getString("org.apache.jetspeed.ldap.initialContextFactory");
ldapServerName = props.getString("org.apache.jetspeed.ldap.ldapServerName");
ldapServerPort = props.getString("org.apache.jetspeed.ldap.ldapServerPort");
- defaultDnSuffix = props.getString("org.apache.jetspeed.ldap.defaultDnSuffix");
rootContext = props.getString("org.apache.jetspeed.ldap.rootContext");
rootDn = props.getString("org.apache.jetspeed.ldap.rootDn");
rootPassword = props.getString("org.apache.jetspeed.ldap.rootPassword");
@@ -188,8 +228,6 @@
groupFilter=props.getString("org.apache.jetspeed.ldap.GroupFilter");
userFilter=props.getString("org.apache.jetspeed.ldap.UserFilter");
- userAuthenticationFiler=props.getString("org.apache.jetspeed.ldap.UserAuthenticationFiler");
-
roleMembershipAttributes=props.getString("org.apache.jetspeed.ldap.RoleMembershipAttributes");
userRoleMembershipAttributes=props.getString("org.apache.jetspeed.ldap.UserRoleMembershipAttributes");
@@ -199,6 +237,7 @@
groupMembershipForRoleAttributes=props.getString("org.apache.jetspeed.ldap.GroupMembershipForRoleAttributes");
roleGroupMembershipForRoleAttributes=props.getString("org.apache.jetspeed.ldap.RoleGroupMembershipForRoleAttributes");
+
defaultSearchBase=props.getString("org.apache.jetspeed.ldap.DefaultSearchBase");
roleFilterBase=props.getString("org.apache.jetspeed.ldap.RoleFilterBase");
@@ -213,6 +252,23 @@
groupIdAttribute=props.getString("org.apache.jetspeed.ldap.GroupIdAttribute");
userIdAttribute=props.getString("org.apache.jetspeed.ldap.UserIdAttribute");
+ uidAttribute =props.getString("org.apache.jetspeed.ldap.UidAttribute");
+ memberShipSearchScope = props.getString("org.apache.jetspeed.ldap.MemberShipSearchScope");
+
+ this.roleUidAttribute=props.getString("org.apache.jetspeed.ldap.roleUidAttribute");
+ this.groupUidAttribute=props.getString("org.apache.jetspeed.ldap.groupUidAttribute");
+ this.userUidAttribute=props.getString("org.apache.jetspeed.ldap.userUidAttribute");
+
+ this.roleObjectRequiredAttributeClasses=props.getString("org.apache.jetspeed.ldap.roleObjectRequiredAttributeClasses");
+ this.groupObjectRequiredAttributeClasses=props.getString("org.apache.jetspeed.ldap.groupObjectRequiredAttributeClasses");
+
+ this.roleAttributes=StringUtils.split(props.getString("org.apache.jetspeed.ldap.roleAttributes"),",");
+ this.groupAttributes=StringUtils.split(props.getString("org.apache.jetspeed.ldap.groupAttributes"),",");
+ this.userAttributes=StringUtils.split(props.getString("org.apache.jetspeed.ldap.userAttributes"),",");
+ this.userPasswordAttribute=props.getString("org.apache.jetspeed.ldap.userPasswordAttribute");
+
+ this.knownAttributes=StringUtils.split(props.getString("org.apache.jetspeed.ldap.knownAttributes"),",");
+
new InitLdapSchema(this);
}
catch (ConfigurationException ce)
@@ -230,21 +286,6 @@
}
/**
- * @return Returns the defaultDnSuffix.
- */
- public String getDefaultDnSuffix()
- {
- return defaultDnSuffix;
- }
-
- /**
- * @param defaultDnSuffix The defaultDnSuffix to set.
- */
- public void setDefaultDnSuffix(String defaultDnSuffix)
- {
- this.defaultDnSuffix = defaultDnSuffix;
- }
- /**
* @return Returns the initialContextFactory.
*/
public String getInitialContextFactory()
@@ -340,38 +381,6 @@
this.rootPassword = rootPassword;
}
- public String getRoleFilter() {
- return roleFilter;
- }
-
- public void setRoleFilter(String roleFilter) {
- this.roleFilter = roleFilter;
- }
-
- public String getRoleFilterBase() {
- return roleFilterBase;
- }
-
- public void setRoleFilterBase(String roleFilterBase) {
- this.roleFilterBase = roleFilterBase;
- }
-
- public String getRoleMembershipAttributes() {
- return roleMembershipAttributes;
- }
-
- public void setRoleMembershipAttributes(String roleMembershipAttributes) {
- this.roleMembershipAttributes = roleMembershipAttributes;
- }
-
- public String getUserAuthenticationFiler() {
- return userAuthenticationFiler;
- }
-
- public void setUserAuthenticationFiler(String userAuthenticationFiler) {
- this.userAuthenticationFiler = userAuthenticationFiler;
- }
-
public String getUserFilter() {
return userFilter;
}
@@ -445,14 +454,7 @@
this.groupIdAttribute = groupIdAttribute;
}
- public String getRoleIdAttribute() {
- return roleIdAttribute;
- }
- public void setRoleIdAttribute(String roleIdAttribute) {
- this.roleIdAttribute = roleIdAttribute;
- }
-
public String getUserIdAttribute() {
return userIdAttribute;
}
@@ -469,13 +471,7 @@
this.groupObjectClasses = groupObjectClasses;
}
- public String[] getRoleObjectClasses() {
- return roleObjectClasses;
- }
- public void setRoleObjectClasses(String[] roleObjectClasses) {
- this.roleObjectClasses = roleObjectClasses;
- }
public String[] getUserObjectClasses() {
return userObjectClasses;
@@ -485,20 +481,165 @@
this.userObjectClasses = userObjectClasses;
}
- public String getRoleGroupMembershipForRoleAttributes() {
- return this.roleGroupMembershipForRoleAttributes;
- }
public String getGroupMembershipForRoleAttributes() {
return this.groupMembershipForRoleAttributes;
}
+
+
+ public void setGroupMembershipForRoleAttributes(String groupMembershipForRoleAttributes) {
+ this.groupMembershipForRoleAttributes=groupMembershipForRoleAttributes;
+ }
+
+ public String getUidAttribute() {
+ return uidAttribute;
+ }
+
+ public void setUidAttribute(String uidAttribute) {
+ this.uidAttribute = uidAttribute;
+ }
+
+ public String getMemberShipSearchScope() {
+ return memberShipSearchScope;
+ }
+
+ public void setMemberShipSearchScope(String memberShipSearchScope) {
+ this.memberShipSearchScope = memberShipSearchScope;
+ }
+
+ public String getGroupUidAttribute() {
+ return this.groupUidAttribute;
+ }
+
+ public void setGroupUidAttribute(String groupUidAttribute) {
+ this.groupUidAttribute = groupUidAttribute;
+ }
+
+ public String getUserUidAttribute() {
+ return this.userUidAttribute;
+ }
+
+ public void setUserUidAttribute(String userUidAttribute) {
+ this.userUidAttribute = userUidAttribute;
+ }
+
+ public String getGroupObjectRequiredAttributeClasses() {
+ return groupObjectRequiredAttributeClasses;
+ }
+
+ public void setGroupObjectRequiredAttributeClasses(
+ String groupObjectRequiredAttributeClasses) {
+ this.groupObjectRequiredAttributeClasses = groupObjectRequiredAttributeClasses;
+ }
+
+
+
+ public String[] getGroupAttributes() {
+ return groupAttributes;
+ }
+
+ public void setGroupAttributes(String[] groupAttributes) {
+ this.groupAttributes = groupAttributes;
+ }
+
+ public String[] getUserAttributes() {
+ return userAttributes;
+ }
+
+ public void setUserAttributes(String[] userAttributes) {
+ this.userAttributes = userAttributes;
+ }
+
+ public String getRoleObjectRequiredAttributeClasses() {
+ return roleObjectRequiredAttributeClasses;
+ }
+
+ public void setRoleObjectRequiredAttributeClasses(
+ String roleObjectRequiredAttributeClasses) {
+ this.roleObjectRequiredAttributeClasses = roleObjectRequiredAttributeClasses;
+ }
+
+ public String[] getRoleAttributes() {
+ return roleAttributes;
+ }
+
+ public void setRoleAttributes(String[] roleAttributes) {
+ this.roleAttributes = roleAttributes;
+ }
+
+ public String[] getRoleObjectClasses() {
+ return roleObjectClasses;
+ }
+
+ public void setRoleObjectClasses(String[] roleObjectClasses) {
+ this.roleObjectClasses = roleObjectClasses;
+ }
+
+
+ public String getRoleGroupMembershipForRoleAttributes() {
+ return this.roleGroupMembershipForRoleAttributes;
+ }
+
public void setRoleGroupMembershipForRoleAttributes(String roleGroupMembershipForRoleAttributes) {
this.roleGroupMembershipForRoleAttributes=roleGroupMembershipForRoleAttributes;
}
- public void setGroupMembershipForRoleAttributes(String groupMembershipForRoleAttributes) {
- this.groupMembershipForRoleAttributes=groupMembershipForRoleAttributes;
+ public String getRoleFilter() {
+ return roleFilter;
+ }
+
+ public void setRoleFilter(String roleFilter) {
+ this.roleFilter = roleFilter;
+ }
+
+ public String getRoleFilterBase() {
+ return roleFilterBase;
+ }
+
+ public void setRoleFilterBase(String roleFilterBase) {
+ this.roleFilterBase = roleFilterBase;
+ }
+
+ public String getRoleMembershipAttributes() {
+ return roleMembershipAttributes;
+ }
+
+ public void setRoleMembershipAttributes(String roleMembershipAttributes) {
+ this.roleMembershipAttributes = roleMembershipAttributes;
+ }
+
+ public String getRoleUidAttribute() {
+ return this.roleUidAttribute;
+ }
+
+ public void setRoleUidAttribute(String roleUidAttribute) {
+ this.roleUidAttribute = roleUidAttribute;
+ }
+
+
+ public String getRoleIdAttribute() {
+ return roleIdAttribute;
+ }
+
+ public void setRoleIdAttribute(String roleIdAttribute) {
+ this.roleIdAttribute = roleIdAttribute;
+ }
+
+ public String getUserPasswordAttribute() {
+ return userPasswordAttribute;
+ }
+
+ public void setUserPasswordAttribute(String userPasswordAttribute) {
+ this.userPasswordAttribute = userPasswordAttribute;
+ }
+
+ public String[] getKnownAttributes() {
+ return this.knownAttributes;
}
+ public void setKnownAttributes(String[] knownAttributes) {
+ this.knownAttributes = knownAttributes;
+ }
+
}
Index: D:/PROJECTS/ECLIPSE/JETSPEED2/jetspeed-2/components/security/src/java/org/apache/jetspeed/security/spi/impl/ldap/LdapMemberShipDaoImpl.java
===================================================================
--- D:/PROJECTS/ECLIPSE/JETSPEED2/jetspeed-2/components/security/src/java/org/apache/jetspeed/security/spi/impl/ldap/LdapMemberShipDaoImpl.java (revision 468102)
+++ D:/PROJECTS/ECLIPSE/JETSPEED2/jetspeed-2/components/security/src/java/org/apache/jetspeed/security/spi/impl/ldap/LdapMemberShipDaoImpl.java (working copy)
@@ -6,7 +6,6 @@
import java.util.Iterator;
import java.util.List;
-import javax.naming.Name;
import javax.naming.NamingEnumeration;
import javax.naming.NamingException;
import javax.naming.directory.Attribute;
@@ -16,10 +15,8 @@
import javax.naming.directory.DirContext;
import javax.naming.directory.SearchControls;
import javax.naming.directory.SearchResult;
-/* TODO: Java 5 dependency, needs to be resolved for Java 1.4 first before this can be enabled again
-import javax.naming.ldap.LdapName;
-*/
+import org.apache.commons.lang.StringUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.jetspeed.security.SecurityException;
@@ -28,6 +25,9 @@
public class LdapMemberShipDaoImpl extends LdapPrincipalDaoImpl implements LdapMembershipDao {
+ /** The logger. */
+ private static final Log logger = LogFactory.getLog(LdapMemberShipDaoImpl.class);
+
public LdapMemberShipDaoImpl() throws SecurityException {
super();
}
@@ -36,35 +36,28 @@
super(config);
}
- /** The logger. */
- private static final Log logger = LogFactory.getLog(LdapMemberShipDaoImpl.class);
-
/* (non-Javadoc)
* @see org.apache.jetspeed.security.spi.impl.ldap.LdapMembershipDao#searchGroupMemberShipByGroup(java.lang.String, javax.naming.directory.SearchControls)
*/
public String[] searchGroupMemberShipByGroup(final String userPrincipalUid, SearchControls cons) throws NamingException {
- String subfilter = "uid=" + userPrincipalUid + "," + getUserFilterBase() + "," + getRootContext();
- String query = "(&(" + getGroupMembershipAttribute() + "=" + subfilter + ")" + getGroupFilter() + ")";
+ String query = "(&(" + getGroupMembershipAttribute() + "=" + getUserDN(userPrincipalUid) + ")" + getGroupFilter() + ")";
+
if (logger.isDebugEnabled())
{
logger.debug("query[" + query + "]");
}
+
+ cons.setSearchScope(getSearchScope());
+ NamingEnumeration searchResults = ((DirContext) ctx).search(getGroupFilterBase(),query , cons);
-/* TODO: Java 5 dependency, needs to be resolved for Java 1.4 first before this can be enabled again
- Name name = new LdapName(getGroupFilterBase());
- NamingEnumeration searchResults = ((DirContext) ctx).search(name,query , cons);
-*/
List groupPrincipalUids = new ArrayList();
-/*
while (searchResults.hasMore())
{
SearchResult result = (SearchResult) searchResults.next();
Attributes answer = result.getAttributes();
-
groupPrincipalUids.addAll(getAttributes(getAttribute(getGroupIdAttribute(), answer)));
}
-*/
return (String[]) groupPrincipalUids.toArray(new String[groupPrincipalUids.size()]);
}
@@ -79,39 +72,45 @@
{
throw new NamingException("Could not find any user with uid[" + userPrincipalUid + "]");
}
-
- Attributes userAttributes = getFirstUser(searchResults);
- List uids = getAttributes(getAttribute(getUserGroupMembershipAttribute(), userAttributes));
- return (String[]) uids.toArray(new String[uids.size()]);
+
+ Attributes userAttributes = getFirstUser(searchResults);
+ List groupUids = new ArrayList();
+ Attribute attr = getAttribute(getUserGroupMembershipAttribute(), userAttributes);
+ List attrs = getAttributes(attr);
+ Iterator it = attrs.iterator();
+ while(it.hasNext()) {
+ String cnfull = (String)it.next();
+ if(cnfull.toLowerCase().indexOf(getRoleFilterBase().toLowerCase())!=-1) {
+ String cn = extractLdapAttr(cnfull,getRoleUidAttribute());
+ groupUids.add(cn);
+ }
+ }
+ //List uids = getAttributes(getAttribute(getUserGroupMembershipAttribute(), userAttributes),getGroupFilterBase());
+ return (String[]) groupUids.toArray(new String[groupUids.size()]);
}
/* (non-Javadoc)
* @see org.apache.jetspeed.security.spi.impl.ldap.LdapMembershipDao#searchRoleMemberShipByRole(java.lang.String, javax.naming.directory.SearchControls)
*/
public String[] searchRoleMemberShipByRole(final String userPrincipalUid, SearchControls cons) throws NamingException {
- String subfilter = "uid=" + userPrincipalUid + "," + getUserFilterBase() + "," + getRootContext();
- String query = "(&(" + getRoleMembershipAttribute() + "=" + subfilter + ")" + getRoleFilter() + ")";
+
+ String query = "(&(" + getRoleMembershipAttribute() + "=" + getUserDN(userPrincipalUid) + ")" + getRoleFilter() + ")";
if (logger.isDebugEnabled())
{
logger.debug("query[" + query + "]");
}
-/* TODO: Java 5 dependency, needs to be resolved for Java 1.4 first before this can be enabled again
- Name name = new LdapName(getRoleFilterBase()) ;
- NamingEnumeration searchResults = ((DirContext) ctx).search(name,query , cons);
-*/
+ cons.setSearchScope(getSearchScope());
+ NamingEnumeration searchResults = ((DirContext) ctx).search(getRoleFilterBase(),query , cons);
List rolePrincipalUids = new ArrayList();
-/*
while (searchResults.hasMore())
{
SearchResult result = (SearchResult) searchResults.next();
Attributes answer = result.getAttributes();
-
rolePrincipalUids.addAll(getAttributes(getAttribute(getRoleIdAttribute(), answer)));
}
-*/
return (String[]) rolePrincipalUids.toArray(new String[rolePrincipalUids.size()]);
}
@@ -134,37 +133,14 @@
Iterator it = attrs.iterator();
while(it.hasNext()) {
String cnfull = (String)it.next();
- String cn = extractCn(cnfull);
- newAttrs.add(cn);
+ if(cnfull.toLowerCase().indexOf(getRoleFilterBase().toLowerCase())!=-1) {
+ String cn = extractLdapAttr(cnfull,getRoleUidAttribute());
+ newAttrs.add(cn);
+ }
}
- //List uids = getAttributes(attr);
return (String[]) newAttrs.toArray(new String[newAttrs.size()]);
}
-// /**
-// *
-// * Search user by group.
-// *
-// *
-// * @param groupPrincipalUid
-// * @param cons
-// * @return
-// * @throws NamingException A {@link NamingException}.
-// */
-// private NamingEnumeration searchRolesByGroup(final String rolePrincipalUid, SearchControls cons)
-// throws NamingException
-// {
-// String query = "(&(cn=" + (rolePrincipalUid) + ")" + getRoleFilter() + ")";
-//
-// if (logger.isDebugEnabled())
-// {
-// logger.debug("query[" + query + "]");
-// }
-// NamingEnumeration searchResults = ((DirContext) ctx).search("",query , cons);
-//
-// return searchResults;
-// }
-
/* (non-Javadoc)
* @see org.apache.jetspeed.security.spi.impl.ldap.LdapMembershipDao#searchUsersFromGroupByGroup(java.lang.String, javax.naming.directory.SearchControls)
*/
@@ -181,7 +157,8 @@
ArrayList userPrincipalUids=new ArrayList();
- NamingEnumeration results = ((DirContext) ctx).search("",query , cons);
+ cons.setSearchScope(getSearchScope());
+ NamingEnumeration results = ((DirContext) ctx).search(getGroupFilterBase(),query , cons);
while (results.hasMore())
{
@@ -195,9 +172,12 @@
Iterator it = attrs.iterator();
while(it.hasNext()) {
String uidfull = (String)it.next();
- String uid = extractUid(uidfull);
- if (uidfull.indexOf(getUserFilterBase())!=-1)
- newAttrs.add(uid);
+ if (!StringUtils.isEmpty(uidfull)) {
+ if (uidfull.toLowerCase().indexOf(getUserFilterBase().toLowerCase())!=-1) {
+ String uid = extractLdapAttr(uidfull,getUserIdAttribute());
+ newAttrs.add(uid);
+ }
+ }
}
userPrincipalUids.addAll(newAttrs);
}
@@ -211,24 +191,22 @@
throws NamingException
{
- String subfilter = getGroupIdAttribute() + "=" + getGroupFilterBase();
- if (getGroupFilterBase()!=null && !getGroupFilterBase().equals("")) subfilter+="," + getGroupFilterBase();
- subfilter+="," + getRootContext();
- String query = "(&(" + getUserGroupMembershipAttribute() + "=" + subfilter + ")" + getUserFilter() + ")";
+ String query = "(&(" + getUserGroupMembershipAttribute() + "=" + getGroupDN(groupPrincipalUid) + ")" + getUserFilter() + ")";
if (logger.isDebugEnabled())
{
logger.debug("query[" + query + "]");
}
- NamingEnumeration results = ((DirContext) ctx).search("", query, cons);
-
+
+ cons.setSearchScope(getSearchScope());
+ NamingEnumeration results = ((DirContext) ctx).search(getUserFilterBase(),query , cons);
+
ArrayList userPrincipalUids = new ArrayList();
while (results.hasMore())
{
SearchResult result = (SearchResult) results.next();
Attributes answer = result.getAttributes();
-
- userPrincipalUids.addAll(getAttributes(getAttribute("uid", answer)));
+ userPrincipalUids.addAll(getAttributes(getAttribute(getUserIdAttribute(), answer)));
}
return (String[]) userPrincipalUids.toArray(new String[userPrincipalUids.size()]);
}
@@ -236,8 +214,7 @@
public String[] searchRolesFromGroupByGroup(final String groupPrincipalUid,
SearchControls cons) throws NamingException {
- String query = "(&(" + getGroupIdAttribute() + "=" + (groupPrincipalUid) + ")" + getGroupFilter()
- + ")";
+ String query = "(&(" + getGroupIdAttribute() + "=" + (groupPrincipalUid) + ")" + getGroupFilter() + ")";
if (logger.isDebugEnabled()) {
logger.debug("query[" + query + "]");
@@ -245,28 +222,26 @@
ArrayList rolePrincipalUids = new ArrayList();
- NamingEnumeration results = ((DirContext) ctx).search("", query, cons);
+ cons.setSearchScope(getSearchScope());
+ NamingEnumeration results = ((DirContext) ctx).search(getGroupFilterBase(),query , cons);
while (results.hasMore()) {
SearchResult result = (SearchResult) results.next();
Attributes answer = result.getAttributes();
- List newAttrs = new ArrayList();
-
- Attribute userPrincipalUid = getAttribute(
- getGroupMembershipForRoleAttribute(), answer);
- List attrs = getAttributes(userPrincipalUid);
- Iterator it = attrs.iterator();
+ Attribute rolesFromGroup = getAttribute(getGroupMembershipForRoleAttribute(), answer);
+ List roleDNs = getAttributes(rolesFromGroup,getRoleFilterBase());
+ Iterator it = roleDNs.iterator();
while (it.hasNext()) {
- String uidfull = (String) it.next();
- String uid = extractUid(uidfull);
- if (uidfull.indexOf(getRoleFilterBase())!=-1)
- newAttrs.add(uid);
+ String roleDN = (String) it.next();
+ if (!StringUtils.isEmpty(roleDN)) {
+ String roleId = extractLdapAttr(roleDN,getRoleUidAttribute());
+ if (roleId!=null && roleDN.toLowerCase().indexOf(getRoleFilterBase().toLowerCase())!=-1)
+ rolePrincipalUids.add(roleId);
+ }
}
- rolePrincipalUids.addAll(newAttrs);
}
- return (String[]) rolePrincipalUids
- .toArray(new String[rolePrincipalUids.size()]);
+ return (String[]) rolePrincipalUids.toArray(new String[rolePrincipalUids.size()]);
}
/*
@@ -278,29 +253,27 @@
public String[] searchRolesFromGroupByRole(final String groupPrincipalUid,
SearchControls cons) throws NamingException {
- String subfilter = getGroupIdAttribute() + "=" + groupPrincipalUid;
- if (getGroupFilterBase() != null && !getGroupFilterBase().equals(""))
- subfilter += "," + getGroupFilterBase() + "," + getRootContext();
- String query = "(&(" + getRoleGroupMembershipForRoleAttribute() + "="
- + subfilter + ")" + getUserFilter() + ")";
+ String query = "(&(" + getRoleGroupMembershipForRoleAttribute() + "=" + getGroupDN(groupPrincipalUid) + ")" + getRoleFilter() + ")";
+
if (logger.isDebugEnabled()) {
logger.debug("query[" + query + "]");
}
- NamingEnumeration results = ((DirContext) ctx).search("", query, cons);
+
+ cons.setSearchScope(getSearchScope());
+ NamingEnumeration results = ((DirContext) ctx).search(getRoleFilterBase(),query , cons);
- ArrayList userPrincipalUids = new ArrayList();
+ ArrayList rolePrincipalUids = new ArrayList();
while (results.hasMore()) {
SearchResult result = (SearchResult) results.next();
Attributes answer = result.getAttributes();
-
- userPrincipalUids
- .addAll(getAttributes(getAttribute("uid", answer)));
+ rolePrincipalUids.addAll(getAttributes(getAttribute(getRoleIdAttribute(), answer)));
}
- return (String[]) userPrincipalUids
- .toArray(new String[userPrincipalUids.size()]);
- }
+ return (String[]) rolePrincipalUids
+ .toArray(new String[rolePrincipalUids.size()]);
+ }
+
/* (non-Javadoc)
* @see org.apache.jetspeed.security.spi.impl.ldap.LdapMembershipDao#searchUsersFromRoleByRole(java.lang.String, javax.naming.directory.SearchControls)
*/
@@ -316,30 +289,25 @@
}
ArrayList userPrincipalUids=new ArrayList();
-
- NamingEnumeration results = ((DirContext) ctx).search("",query , cons);
+
+ cons.setSearchScope(getSearchScope());
+ NamingEnumeration results = ((DirContext) ctx).search(getRoleFilterBase(),query , cons);
while (results.hasMore())
{
SearchResult result = (SearchResult) results.next();
Attributes answer = result.getAttributes();
- //List cUserPrincipalUid = getAttributes(getAttribute(getRoleMembershipAttribute(), answer));
- //TODO: better implementtion
- List newAttrs = new ArrayList();
-
Attribute userPrincipalUid = getAttribute(getRoleMembershipAttribute(), answer);
List attrs = getAttributes(userPrincipalUid);
Iterator it = attrs.iterator();
while(it.hasNext()) {
String uidfull = (String)it.next();
- String uid = extractUid(uidfull);
- newAttrs.add(uid);
+ if (!StringUtils.isEmpty(uidfull)) {
+ String uid = extractLdapAttr(uidfull,getUserIdAttribute());
+ userPrincipalUids.add(uid);
+ }
}
- userPrincipalUids.addAll(newAttrs);
-
-
- //userPrincipalUids.addAll(cUserPrincipalUid);
}
return (String[]) userPrincipalUids.toArray(new String[userPrincipalUids.size()]);
}
@@ -351,29 +319,25 @@
throws NamingException
{
- //TODO: rename params / vars !!!
- String subfilter = getRoleIdAttribute() + "=" + rolePrincipalUid;
- if (getRoleFilterBase()!=null && !getRoleFilterBase().equals("")) subfilter+="," + getRoleFilterBase();
- subfilter+="," + getRootContext();
- String query = "(&(" + getUserRoleMembershipAttribute() + "=" + subfilter + ")" + getUserFilter() + ")";
+ String query = "(&(" + getUserRoleMembershipAttribute() + "=" + getRoleDN(rolePrincipalUid) + ")" + getUserFilter() + ")";
if (logger.isDebugEnabled())
{
logger.debug("query[" + query + "]");
}
- NamingEnumeration results = ((DirContext) ctx).search("", query, cons);
-
+
+ cons.setSearchScope(getSearchScope());
+ NamingEnumeration results = ((DirContext) ctx).search(getUserFilterBase(),query , cons);
+
ArrayList userPrincipalUids = new ArrayList();
while (results.hasMore())
{
SearchResult result = (SearchResult) results.next();
Attributes answer = result.getAttributes();
-
- userPrincipalUids.addAll(getAttributes(getAttribute("uid", answer)));
+ userPrincipalUids.addAll(getAttributes(getAttribute(getUserIdAttribute(), answer)));
}
return (String[]) userPrincipalUids.toArray(new String[userPrincipalUids.size()]);
}
-
/**
* @param attr
@@ -382,13 +346,27 @@
*/
protected List getAttributes(Attribute attr) throws NamingException
{
+ return getAttributes(attr, null);
+ }
+ /**
+ * @param attr
+ * @return
+ * @throws NamingException
+ */
+ protected List getAttributes(Attribute attr,String filter) throws NamingException
+ {
List uids = new ArrayList();
if (attr != null)
{
Enumeration groupUidEnum = attr.getAll();
while (groupUidEnum.hasMoreElements())
{
- uids.add(groupUidEnum.nextElement());
+ String groupDN = (String)groupUidEnum.nextElement();
+ if (filter==null) {
+ uids.add(groupDN);
+ } else if (filter!=null && groupDN.toLowerCase().indexOf(filter.toLowerCase())!=-1) {
+ uids.add(groupDN);
+ }
}
}
return uids;
@@ -407,13 +385,7 @@
return answer;
}
- protected String getEntryPrefix() {
- return "uid";
- }
- protected String getSearchSuffix() {
- return this.getUserFilter();
- }
/**
*
@@ -440,12 +412,12 @@
}
/**
- * @see org.apache.jetspeed.security.spi.impl.ldap.LdapPrincipalDaoImpl#getDnSuffix()
- */
- protected String getDnSuffix()
- {
- return this.getUserFilterBase();
- }
+ * @see org.apache.jetspeed.security.spi.impl.ldap.LdapPrincipalDaoImpl#getDnSuffix()
+ */
+ protected String getDnSuffix()
+ {
+ return this.getUserFilterBase();
+ }
/**
*
@@ -460,21 +432,36 @@
return new UserPrincipalImpl(principalUid);
}
- private String extractUid(String ldapName) {
- if (ldapName.indexOf(",")!=-1)
- return ldapName.substring(ldapName.indexOf("uid=")+4,ldapName.indexOf(","));
- return ldapName.substring(ldapName.indexOf("uid=")+4,ldapName.length());
+ private String extractLdapAttr(String dn,String ldapAttrName) {
+
+ String dnLowerCase = dn.toLowerCase();
+ String ldapAttrNameLowerCase = ldapAttrName.toLowerCase();
+
+ if (dnLowerCase.indexOf(ldapAttrNameLowerCase + "=")==-1)
+ return null;
+
+ if (dn.indexOf(",")!=-1 && dnLowerCase.indexOf(ldapAttrNameLowerCase + "=")!=-1)
+ return dn.substring(dnLowerCase.indexOf(ldapAttrNameLowerCase)+ldapAttrName.length()+1,dn.indexOf(","));
+ return dn.substring(dnLowerCase.indexOf(ldapAttrNameLowerCase)+ldapAttrName.length()+1,dn.length());
}
-
- private String extractCn(String ldapName) {
- if (ldapName.indexOf(",")!=-1)
- return ldapName.substring(ldapName.indexOf("cn=")+3,ldapName.indexOf(","));
- return ldapName.substring(ldapName.indexOf("cn=")+3,ldapName.length());
- }
-
+
protected String[] getObjectClasses() {
return this.getUserObjectClasses();
}
-
+ protected String getUidAttributeForPrincipal() {
+ return this.getUserUidAttribute();
+ }
+
+ protected String[] getAttributes() {
+ return getUserAttributes();
+ }
+
+ protected String getEntryPrefix() {
+ return "uid";
+ }
+
+ protected String getSearchSuffix() {
+ return this.getUserFilter();
+ }
}
Index: D:/PROJECTS/ECLIPSE/JETSPEED2/jetspeed-2/components/security/src/java/org/apache/jetspeed/security/spi/impl/ldap/LdapGroupDaoImpl.java
===================================================================
--- D:/PROJECTS/ECLIPSE/JETSPEED2/jetspeed-2/components/security/src/java/org/apache/jetspeed/security/spi/impl/ldap/LdapGroupDaoImpl.java (revision 468102)
+++ D:/PROJECTS/ECLIPSE/JETSPEED2/jetspeed-2/components/security/src/java/org/apache/jetspeed/security/spi/impl/ldap/LdapGroupDaoImpl.java (working copy)
@@ -21,6 +21,7 @@
import javax.naming.directory.BasicAttribute;
import javax.naming.directory.BasicAttributes;
+import org.apache.commons.lang.StringUtils;
import org.apache.jetspeed.security.SecurityException;
import org.apache.jetspeed.security.impl.GroupPrincipalImpl;
@@ -77,6 +78,11 @@
classes.add(getObjectClasses()[i]);
attrs.put(classes);
attrs.put(getEntryPrefix(), principalUid);
+ if(!StringUtils.isEmpty(getGroupObjectRequiredAttributeClasses()))
+ attrs.put(getGroupObjectRequiredAttributeClasses(), "");
+ for (int i=0;i
* Replace or delete the user group attribute.
*
@@ -136,21 +123,13 @@
{
validateUid(userPrincipalUid);
validateUid(groupPrincipalUid);
-
- String userDn = "uid=" + userPrincipalUid + "," + getUserFilterBase();
+
try
{
- groupPrincipalUid = getGroupIdAttribute() + "=" + groupPrincipalUid;
-
- if (getGroupFilterBase()!=null && !getGroupFilterBase().equals(""))
- groupPrincipalUid+="," + getGroupFilterBase();
- groupPrincipalUid+="," + getRootContext();
- String rdn = getSubcontextName(userDn);
- Attributes attrs = new BasicAttributes(false);
+ Attributes attrs = new BasicAttributes(false);
+ attrs.put(getUserGroupMembershipAttribute(), getGroupDN(groupPrincipalUid));
- attrs.put(getUserGroupMembershipAttribute(), groupPrincipalUid);
- logger.debug("modifying attrs on " + rdn + " with : " + attrs);
- ctx.modifyAttributes(rdn, operationType, attrs);
+ ctx.modifyAttributes(getUserDN(userPrincipalUid,false), operationType, attrs);
}
catch (NamingException e)
@@ -165,7 +144,7 @@
*/
public void removeGroup(String userPrincipalUid, String groupPrincipalUid) throws SecurityException
{
- if (getUserGroupMembershipAttribute()!=null && !getUserGroupMembershipAttribute().equals(""))
+ if (!StringUtils.isEmpty(getUserGroupMembershipAttribute()))
modifyUserGroupByUser(userPrincipalUid, groupPrincipalUid, DirContext.REMOVE_ATTRIBUTE);
else
modifyUserGroupByGroup(userPrincipalUid, groupPrincipalUid, DirContext.REMOVE_ATTRIBUTE);
@@ -178,7 +157,7 @@
*/
public void addRole(String userPrincipalUid, String rolePrincipalUid) throws SecurityException
{
- if (getUserRoleMembershipAttribute()!=null && !getUserRoleMembershipAttribute().equals(""))
+ if (!StringUtils.isEmpty(getUserRoleMembershipAttribute()))
modifyUserRoleByUser(userPrincipalUid, rolePrincipalUid, DirContext.ADD_ATTRIBUTE);
else
modifyUserRoleByRole(userPrincipalUid, rolePrincipalUid, DirContext.ADD_ATTRIBUTE);
@@ -200,20 +179,13 @@
{
validateUid(userPrincipalUid);
validateUid(rolePrincipalUid);
- String userDn = lookupByUid(userPrincipalUid);
-
+
try
{
- rolePrincipalUid = getRoleIdAttribute() + "=" + rolePrincipalUid;
-
- if (getRoleFilterBase()!=null && !getRoleFilterBase().equals(""))
- rolePrincipalUid+="," + getRoleFilterBase();
- rolePrincipalUid+="," + getRootContext();
- String rdn = getSubcontextName(userDn);
- Attributes attrs = new BasicAttributes(false);
+ Attributes attrs = new BasicAttributes(false);
+ attrs.put(getUserRoleMembershipAttribute(), getRoleDN(rolePrincipalUid));
- attrs.put(getUserRoleMembershipAttribute(), rolePrincipalUid);
- ctx.modifyAttributes(rdn, operationType, attrs);
+ ctx.modifyAttributes(getUserDN(userPrincipalUid,false), operationType, attrs);
}
catch (NamingException e)
{
@@ -237,33 +209,28 @@
{
validateUid(userPrincipalUid);
validateUid(rolePrincipalUid);
- String userDn = "uid=" + userPrincipalUid + "," + getUserFilterBase() + "," + getRootContext();
try
{
- rolePrincipalUid = getRoleIdAttribute() + "=" + rolePrincipalUid;
-
- if (getRoleFilterBase()!=null && !getRoleFilterBase().equals(""))
- rolePrincipalUid+="," + getRoleFilterBase();
-
- String rdn = getSubcontextName(rolePrincipalUid);
Attributes attrs = new BasicAttributes(false);
+ attrs.put(getRoleMembershipAttribute(), getUserDN(userPrincipalUid));
- attrs.put(getRoleMembershipAttribute(), userDn);
- ctx.modifyAttributes(rdn, operationType, attrs);
+ ctx.modifyAttributes(getRoleDN(rolePrincipalUid,false), operationType, attrs);
}
catch (NamingException e)
{
throw new SecurityException(e);
}
}
- /**
+
+
+ /**
* @see org.apache.jetspeed.security.spi.impl.ldap.LdapUserPrincipalDao#removeGroup(java.lang.String,
* java.lang.String)
*/
public void removeRole(String userPrincipalUid, String rolePrincipalUid) throws SecurityException
{
- if (getUserRoleMembershipAttribute()!=null && !getUserRoleMembershipAttribute().equals(""))
+ if (!StringUtils.isEmpty(getUserRoleMembershipAttribute()))
modifyUserRoleByUser(userPrincipalUid, rolePrincipalUid, DirContext.REMOVE_ATTRIBUTE);
else
modifyUserRoleByRole(userPrincipalUid, rolePrincipalUid, DirContext.REMOVE_ATTRIBUTE);
@@ -285,21 +252,17 @@
for (int i=0;i
* Creates a GroupPrincipal object.
@@ -319,7 +282,7 @@
*/
public void addRoleToGroup(String groupPrincipalUid, String rolePrincipalUid) throws SecurityException
{
- if (getRoleGroupMembershipForRoleAttribute()!=null && !getRoleGroupMembershipForRoleAttribute().equals(""))
+ if (!StringUtils.isEmpty(getRoleGroupMembershipForRoleAttribute()))
modifyRoleGroupByRole(groupPrincipalUid, rolePrincipalUid, DirContext.ADD_ATTRIBUTE);
else
modifyRoleGroupByGroup(groupPrincipalUid, rolePrincipalUid, DirContext.ADD_ATTRIBUTE);
@@ -341,19 +304,13 @@
{
validateUid(groupPrincipalUid);
validateUid(rolePrincipalUid);
- String userDn = lookupGroupByUid(groupPrincipalUid);
try
{
- groupPrincipalUid = getGroupIdAttribute() + "=" + groupPrincipalUid;
-
- if (getRoleFilterBase()!=null && !getRoleFilterBase().equals(""))
- rolePrincipalUid+="," + getRoleFilterBase();
-
- String rdn = getSubcontextName(userDn);
+
Attributes attrs = new BasicAttributes(false);
+ attrs.put(getRoleGroupMembershipForRoleAttribute(), getGroupDN(groupPrincipalUid));
- attrs.put(getRoleGroupMembershipForRoleAttribute(), rolePrincipalUid);
- ctx.modifyAttributes(rdn, operationType, attrs);
+ ctx.modifyAttributes(getRoleDN(rolePrincipalUid,false), operationType, attrs);
}
catch (NamingException e)
{
@@ -376,19 +333,12 @@
{
validateUid(groupPrincipalUid);
validateUid(rolePrincipalUid);
- String userDn = lookupGroupByUid(groupPrincipalUid);
try
{
- rolePrincipalUid = getRoleIdAttribute() + "=" + rolePrincipalUid;
-
- if (getRoleFilterBase()!=null && !getRoleFilterBase().equals(""))
- rolePrincipalUid+="," + getRoleFilterBase();
-
- String rdn = getSubcontextName(userDn);
Attributes attrs = new BasicAttributes(false);
+ attrs.put(getGroupMembershipForRoleAttribute(), getRoleDN(rolePrincipalUid));
- attrs.put(getGroupMembershipForRoleAttribute(), rolePrincipalUid);
- ctx.modifyAttributes(rdn, operationType, attrs);
+ ctx.modifyAttributes(getGroupDN(groupPrincipalUid, false), operationType, attrs);
}
catch (NamingException e)
{
@@ -403,49 +353,40 @@
public void removeRoleFromGroup(String groupPrincipalUid, String rolePrincipalUid) throws SecurityException
{
- if (getRoleGroupMembershipForRoleAttribute()!=null && !getRoleGroupMembershipForRoleAttribute().equals(""))
+ if (!StringUtils.isEmpty(getRoleGroupMembershipForRoleAttribute()))
modifyRoleGroupByRole(groupPrincipalUid, rolePrincipalUid, DirContext.REMOVE_ATTRIBUTE);
else
modifyRoleGroupByGroup(groupPrincipalUid, rolePrincipalUid, DirContext.REMOVE_ATTRIBUTE);
}
-
- protected String getEntryPrefix() {
- return this.getUserIdAttribute();
- }
+ /**
+ *
+ * Return the list of group IDs for a particular user
+ *
+ * @param userPrincipalUid
+ * @return the array of group uids asociated with this user
+ * @throws SecurityException
+ */
+ public String[] getGroupUidsForUser(String userPrincipalUid) throws SecurityException
+ {
+ validateUid(userPrincipalUid);
+ SearchControls cons = setSearchControls();
+ try
+ {
+ if (!StringUtils.isEmpty(getUserGroupMembershipAttribute())) {
+ return membership.searchGroupMemberShipByUser(userPrincipalUid,cons);
+ }
+ return membership.searchGroupMemberShipByGroup(userPrincipalUid,cons);
+
+
+ }
+ catch (NamingException e)
+ {
+ throw new SecurityException(e);
+ }
+ }
- protected String getSearchSuffix() {
- return this.getUserFilter();
- }
-
- /**
- *
- * Return the list of group IDs for a particular user
- *
- * @param userPrincipalUid
- * @return the array of group uids asociated with this user
- * @throws SecurityException
- */
- public String[] getGroupUidsForUser(String userPrincipalUid) throws SecurityException
- {
- validateUid(userPrincipalUid);
- SearchControls cons = setSearchControls();
- try
- {
- if (getUserGroupMembershipAttribute()!=null && !getUserGroupMembershipAttribute().equals("")) {
- return membership.searchGroupMemberShipByUser(userPrincipalUid,cons);
- }
- return membership.searchGroupMemberShipByGroup(userPrincipalUid,cons);
-
-
- }
- catch (NamingException e)
- {
- throw new SecurityException(e);
- }
- }
-
/**
*
* Return an array of the roles that belong to a group.
@@ -462,7 +403,7 @@
SearchControls cons = setSearchControls();
try
{
- if (getRoleGroupMembershipForRoleAttribute()!=null && !getRoleGroupMembershipForRoleAttribute().equals("")) {
+ if (!StringUtils.isEmpty(getRoleGroupMembershipForRoleAttribute())) {
return membership.searchRolesFromGroupByRole(groupPrincipalUid,cons);
}
return membership.searchRolesFromGroupByGroup(groupPrincipalUid,cons);
@@ -475,32 +416,32 @@
}
- /**
- *
- * Returns the role IDs for a particular user
- *
- * Looks up the user, and extracts the rolemembership attr (ex : uniquemember)
- *
- * @param userPrincipalUid
- * @return the array of group uids asociated with this user
- * @throws SecurityException
- */
- public String[] getRoleUidsForUser(String userPrincipalUid) throws SecurityException
- {
- validateUid(userPrincipalUid);
- SearchControls cons = setSearchControls();
- try
- {
- if (getUserRoleMembershipAttribute()!=null && !getUserRoleMembershipAttribute().equals("")) {
- return membership.searchRoleMemberShipByUser(userPrincipalUid,cons);
- }
- return membership.searchRoleMemberShipByRole(userPrincipalUid,cons);
- }
- catch (NamingException e)
- {
- throw new SecurityException(e);
- }
- }
+ /**
+ *
+ * Returns the role IDs for a particular user
+ *
+ * Looks up the user, and extracts the rolemembership attr (ex : uniquemember)
+ *
+ * @param userPrincipalUid
+ * @return the array of group uids asociated with this user
+ * @throws SecurityException
+ */
+ public String[] getRoleUidsForUser(String userPrincipalUid) throws SecurityException
+ {
+ validateUid(userPrincipalUid);
+ SearchControls cons = setSearchControls();
+ try
+ {
+ if (!StringUtils.isEmpty(getUserRoleMembershipAttribute())) {
+ return membership.searchRoleMemberShipByUser(userPrincipalUid,cons);
+ }
+ return membership.searchRoleMemberShipByRole(userPrincipalUid,cons);
+ }
+ catch (NamingException e)
+ {
+ throw new SecurityException(e);
+ }
+ }
/**
*
@@ -518,7 +459,7 @@
SearchControls cons = setSearchControls();
try
{
- if (getUserGroupMembershipAttribute()!=null && !getUserGroupMembershipAttribute().equals("")) {
+ if (!StringUtils.isEmpty(getUserGroupMembershipAttribute())) {
return membership.searchUsersFromGroupByUser(groupPrincipalUid,cons);
}
return membership.searchUsersFromGroupByGroup(groupPrincipalUid,cons);
@@ -544,7 +485,7 @@
SearchControls cons = setSearchControls();
try
{
- if (getUserRoleMembershipAttribute()!=null && !getUserRoleMembershipAttribute().equals("")) {
+ if (!StringUtils.isEmpty(getUserRoleMembershipAttribute())) {
return membership.searchUsersFromRoleByUser(rolePrincipalUid,cons);
}
return membership.searchUsersFromRoleByRole(rolePrincipalUid,cons);
@@ -558,4 +499,25 @@
protected String[] getObjectClasses() {
return this.getUserObjectClasses();
}
+
+ protected String[] getAttributes() {
+ return this.getUserAttributes();
+ }
+
+ protected String getUidAttributeForPrincipal() {
+ return this.getUserUidAttribute();
+ }
+
+ protected String getEntryPrefix() {
+ return this.getUserIdAttribute();
+ }
+
+ protected String getSearchSuffix() {
+ return this.getUserFilter();
+ }
+
+ protected String getDnSuffix() {
+ return this.getUserFilterBase();
+ }
+
}
\ No newline at end of file
Index: D:/PROJECTS/ECLIPSE/JETSPEED2/jetspeed-2/components/security/src/java/org/apache/jetspeed/security/spi/impl/ldap/AbstractLdapDao.java
===================================================================
--- D:/PROJECTS/ECLIPSE/JETSPEED2/jetspeed-2/components/security/src/java/org/apache/jetspeed/security/spi/impl/ldap/AbstractLdapDao.java (revision 468102)
+++ D:/PROJECTS/ECLIPSE/JETSPEED2/jetspeed-2/components/security/src/java/org/apache/jetspeed/security/spi/impl/ldap/AbstractLdapDao.java (working copy)
@@ -28,6 +28,8 @@
import javax.naming.ldap.LdapContext;
import org.apache.commons.lang.StringUtils;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.apache.jetspeed.security.InvalidDnException;
import org.apache.jetspeed.security.InvalidPasswordException;
import org.apache.jetspeed.security.InvalidUidException;
@@ -43,6 +45,9 @@
*/
public abstract class AbstractLdapDao
{
+
+ private static final Log logger = LogFactory.getLog(AbstractLdapDao.class);
+
/** The ldap binding configuration. */
private LdapBindingConfig ldapBindingConfig = null;
@@ -167,7 +172,7 @@
protected SearchControls setSearchControls()
{
SearchControls controls = new SearchControls();
- controls.setReturningAttributes(new String[] {"cn","sn","o","uid","ou","objectClass","nsroledn","userPassword","member","uniqueMember"});
+ controls.setReturningAttributes(getKnownAttributes());
controls.setSearchScope(SearchControls.SUBTREE_SCOPE);
controls.setReturningObjFlag(true);
@@ -198,56 +203,56 @@
}
}
- /**
- *
- * Searches the LDAP server for the group with the specified uid attribute.
- *
- *
- * @return the user's DN
- */
- public String lookupGroupByUid(final String uid) throws SecurityException
- {
- validateUid(uid);
+// /**
+// *
+// * Searches the LDAP server for the group with the specified uid attribute.
+// *
+// *
+// * @return the user's DN
+// */
+// public String lookupGroupByUid(final String uid) throws SecurityException
+// {
+// validateUid(uid);
+//
+// try
+// {
+// SearchControls cons = setSearchControls();
+// NamingEnumeration searchResults = searchGroupByWildcardedUid(uid, cons);
+//
+// return getFirstDnForUid(searchResults);
+// }
+// catch (NamingException e)
+// {
+// throw new SecurityException(e);
+// }
+// }
+//
+// /**
+// *
+// * Searches the LDAP server for the role with the specified uid attribute.
+// *
+// *
+// * @return the user's DN
+// */
+// public String lookupRoleByUid(final String uid) throws SecurityException
+// {
+// validateUid(uid);
+//
+// try
+// {
+// SearchControls cons = setSearchControls();
+// NamingEnumeration searchResults = searchRoleByWildcardedUid(uid, cons);
+//
+// return getFirstDnForUid(searchResults);
+// }
+// catch (NamingException e)
+// {
+// throw new SecurityException(e);
+// }
+// }
- try
- {
- SearchControls cons = setSearchControls();
- NamingEnumeration searchResults = searchGroupByWildcardedUid(uid, cons);
-
- return getFirstDnForUid(searchResults);
- }
- catch (NamingException e)
- {
- throw new SecurityException(e);
- }
- }
-
/**
*
- * Searches the LDAP server for the role with the specified uid attribute.
- *
- *
- * @return the user's DN
- */
- public String lookupRoleByUid(final String uid) throws SecurityException
- {
- validateUid(uid);
-
- try
- {
- SearchControls cons = setSearchControls();
- NamingEnumeration searchResults = searchRoleByWildcardedUid(uid, cons);
-
- return getFirstDnForUid(searchResults);
- }
- catch (NamingException e)
- {
- throw new SecurityException(e);
- }
- }
-
- /**
- *
* Gets the first matching user for the given uid.
*
*
@@ -261,15 +266,7 @@
while ((null != searchResults) && searchResults.hasMore())
{
SearchResult searchResult = (SearchResult) searchResults.next();
-
-/* TODO: Java 5 dependency, needs to be resolved for Java 1.4 first before this can be enabled again
- userDn = searchResult.getNameInNamespace();
-*/
-// if (searchResult.getObject() instanceof DirContext)
-// {
-// DirContext userEntry = (DirContext) searchResult.getObject();
-// userDn = userEntry.getNameInNamespace();
-// }
+ userDn = searchResult.getName();
}
return userDn;
}
@@ -303,69 +300,81 @@
protected NamingEnumeration searchByWildcardedUid(final String filter, SearchControls cons) throws NamingException
{
// usa a template method to use users/groups/roles
- String searchFilter = "";
- if (getSearchSuffix()==null || getSearchSuffix().equals("")) {
- searchFilter = "(" + getEntryPrefix() + "=" + (StringUtils.isEmpty(filter) ? "*" : filter) + ")";
+ String query = "";
+ if (StringUtils.isEmpty(getSearchSuffix())) {
+ query = "(" + getEntryPrefix() + "=" + (StringUtils.isEmpty(filter) ? "*" : filter) + ")";
} else {
- searchFilter = "(&(" + getEntryPrefix() + "=" + (StringUtils.isEmpty(filter) ? "*" : filter) + ")" + getSearchSuffix() + ")";
+ query = "(&(" + getEntryPrefix() + "=" + (StringUtils.isEmpty(filter) ? "*" : filter) + ")" + getSearchSuffix() + ")";
}
-
- NamingEnumeration searchResults = ((DirContext) ctx).search(getSearchDomain(), searchFilter, cons);
+ logger.debug("searchByWildCardedUid = " + query);
- return searchResults;
+ cons.setSearchScope(getSearchScope());
+ //TODO: added this here for OpenLDAP (when users are stored in ou=People,o=evenSeas)
+ String searchBase = StringUtils.replace(getSearchDomain(), "," + getRootContext(), "");
+ NamingEnumeration results = ((DirContext) ctx).search(searchBase,query , cons);
+
+ return results;
}
- /**
- *
- * Search uid by wild card.
- *
- *
- * @param filter The filter.
- * @param cons The {@link SearchControls}
- * @return The {@link NamingEnumeration}
- * @throws NamingException Throws a {@link NamingEnumeration}.
- */
- protected NamingEnumeration searchGroupByWildcardedUid(final String filter, SearchControls cons) throws NamingException
- {
- // usa a template method to use users/groups/roles
- String searchFilter = "";
- if (getSearchSuffix()==null || getSearchSuffix().equals("")) {
- searchFilter = "(" + getGroupIdAttribute() + "=" + (StringUtils.isEmpty(filter) ? "*" : filter) + ")";
- } else {
- searchFilter = "(&(" + getGroupIdAttribute() + "=" + (StringUtils.isEmpty(filter) ? "*" : filter) + ")" + getGroupFilter() + ")";
- }
-
- NamingEnumeration searchResults = ((DirContext) ctx).search("", searchFilter, cons);
+// /**
+// *
+// * Search uid by wild card.
+// *
+// *
+// * @param filter The filter.
+// * @param cons The {@link SearchControls}
+// * @return The {@link NamingEnumeration}
+// * @throws NamingException Throws a {@link NamingEnumeration}.
+// */
+// protected NamingEnumeration searchGroupByWildcardedUid(final String filter, SearchControls cons) throws NamingException
+// {
+// // usa a template method to use users/groups/roles
+// String query = "";
+// if (StringUtils.isEmpty(getGroupFilter())) {
+// query = "(" + getGroupIdAttribute() + "=" + (StringUtils.isEmpty(filter) ? "*" : filter) + ")";
+// } else {
+// query = "(&(" + getGroupIdAttribute() + "=" + (StringUtils.isEmpty(filter) ? "*" : filter) + ")" + getGroupFilter() + ")";
+// }
+//
+// String searchBase = "";
+// if (!StringUtils.isEmpty(getGroupFilterBase()))
+// searchBase+=getGroupFilterBase();
+// cons.setSearchScope(getSearchScope());
+// NamingEnumeration results = ((DirContext) ctx).search(searchBase,query , cons);
+//
+// return results;
+// }
+//
+// /**
+// *
+// * Search uid by wild card.
+// *
+// *
+// * @param filter The filter.
+// * @param cons The {@link SearchControls}
+// * @return The {@link NamingEnumeration}
+// * @throws NamingException Throws a {@link NamingEnumeration}.
+// */
+// protected NamingEnumeration searchRoleByWildcardedUid(final String filter, SearchControls cons) throws NamingException
+// {
+// String query = "";
+// if (StringUtils.isEmpty(getRoleFilter())) {
+// query = "(" + getRoleIdAttribute() + "=" + (StringUtils.isEmpty(filter) ? "*" : filter) + ")";
+// } else {
+// query = "(&(" + getRoleIdAttribute() + "=" + (StringUtils.isEmpty(filter) ? "*" : filter) + ")" + getRoleFilter() + ")";
+// }
+//
+// String searchBase = "";
+// if (!StringUtils.isEmpty(getRoleFilterBase()))
+// searchBase+=getRoleFilterBase();
+// cons.setSearchScope(getSearchScope());
+// NamingEnumeration results = ((DirContext) ctx).search(searchBase,query , cons);
+//
+// return results;
+// }
- return searchResults;
- }
-
/**
*
- * Search uid by wild card.
- *
- *
- * @param filter The filter.
- * @param cons The {@link SearchControls}
- * @return The {@link NamingEnumeration}
- * @throws NamingException Throws a {@link NamingEnumeration}.
- */
- protected NamingEnumeration searchRoleByWildcardedUid(final String filter, SearchControls cons) throws NamingException
- {
- //String searchFilter = "(&(uid=" + (StringUtils.isEmpty(filter) ? "*" : filter) + ") (objectclass="+ "jetspeed-2-role" + "))";
- String searchFilter = "";
- if (getRoleFilter()==null || getRoleFilter().equals("")) {
- searchFilter = "(" + getGroupIdAttribute() + "=" + (StringUtils.isEmpty(filter) ? "*" : filter) + ")";
- } else {
- searchFilter = "(&(" + getGroupIdAttribute() + "=" + (StringUtils.isEmpty(filter) ? "*" : filter) + ")" + getRoleFilter() + ")";
- }
- NamingEnumeration searchResults = ((DirContext) ctx).search("", searchFilter, cons);
-
- return searchResults;
- }
-
- /**
- *
* Returns the default Group suffix dn.
*
*
@@ -501,14 +510,7 @@
{
return this.ldapBindingConfig.getUserFilter();
}
-
- /**
- *
- * Returns the default Group suffix dn.
- *
- *
- * @return The defaultDnSuffix.
- */
+
protected String[] getUserObjectClasses()
{
return this.ldapBindingConfig.getUserObjectClasses();
@@ -560,6 +562,64 @@
return this.ldapBindingConfig.getUserIdAttribute();
}
- protected abstract String[] getObjectClasses();
-
+ protected String getUidAttribute()
+ {
+ return this.ldapBindingConfig.getUidAttribute();
+ }
+
+ protected int getSearchScope()
+ {
+ return Integer.parseInt(this.ldapBindingConfig.getMemberShipSearchScope());
+ }
+
+ protected String getRoleUidAttribute()
+ {
+ return this.ldapBindingConfig.getRoleUidAttribute();
+ }
+
+ protected String getGroupUidAttribute()
+ {
+ return this.ldapBindingConfig.getGroupUidAttribute();
+ }
+
+ protected String getUserUidAttribute()
+ {
+ return this.ldapBindingConfig.getUserUidAttribute();
+ }
+
+ protected String getGroupObjectRequiredAttributeClasses()
+ {
+ return this.ldapBindingConfig.getGroupObjectRequiredAttributeClasses();
+ }
+
+ protected String getRoleObjectRequiredAttributeClasses()
+ {
+ return this.ldapBindingConfig.getRoleObjectRequiredAttributeClasses();
+ }
+
+ protected String[] getUserAttributes()
+ {
+ return this.ldapBindingConfig.getUserAttributes();
+ }
+
+ protected String[] getGroupAttributes()
+ {
+ return this.ldapBindingConfig.getGroupAttributes();
+ }
+
+ protected String[] getRoleAttributes()
+ {
+ return this.ldapBindingConfig.getRoleAttributes();
+ }
+
+ protected String getUserPasswordAttribute() {
+ return this.ldapBindingConfig.getUserPasswordAttribute();
+ }
+
+ protected String[] getKnownAttributes() {
+ return this.ldapBindingConfig.getKnownAttributes();
+ }
+
+ protected abstract String[] getObjectClasses();
+ protected abstract String[] getAttributes();
}
\ No newline at end of file
Index: D:/PROJECTS/ECLIPSE/JETSPEED2/jetspeed-2/components/security/src/java/org/apache/jetspeed/security/spi/impl/ldap/LdapPrincipalDaoImpl.java
===================================================================
--- D:/PROJECTS/ECLIPSE/JETSPEED2/jetspeed-2/components/security/src/java/org/apache/jetspeed/security/spi/impl/ldap/LdapPrincipalDaoImpl.java (revision 468102)
+++ D:/PROJECTS/ECLIPSE/JETSPEED2/jetspeed-2/components/security/src/java/org/apache/jetspeed/security/spi/impl/ldap/LdapPrincipalDaoImpl.java (working copy)
@@ -27,6 +27,7 @@
import javax.naming.directory.SearchControls;
import javax.naming.directory.SearchResult;
+import org.apache.commons.lang.StringUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.jetspeed.security.GroupPrincipal;
@@ -98,10 +99,14 @@
public void create(final String principalUid) throws SecurityException
{
Attributes attrs = defineLdapAttributes(principalUid);
+ logger.debug("creating principal with " + attrs);
try
{
- String userDn = getEntryPrefix() + "=" + principalUid;
- if (getDnSuffix()!=null && !getDnSuffix().equals("")) userDn+="," + getDnSuffix();// + ',' + getDefaultSearchBase();
+ String userDn = getEntryPrefix() + "=" + principalUid;
+ if (!StringUtils.isEmpty(getDnSuffix()))
+ userDn+="," + getDnSuffix();
+
+ logger.debug("userDn = " + userDn);
ctx.createSubcontext(userDn, attrs);
if (logger.isDebugEnabled())
@@ -125,6 +130,16 @@
protected abstract String getDnSuffix();
/**
+ *
+ * Builds the dn suffix.
+ *
+ *
+ * @return The dn suffix.
+ */
+ protected abstract String getUidAttributeForPrincipal();
+
+
+ /**
* @see org.apache.jetspeed.security.spi.impl.ldap.LdapPrincipalDao#delete(java.lang.String)
*/
public void delete(final String principalUid) throws SecurityException
@@ -140,6 +155,8 @@
try
{
rdn = getSubcontextName(dn);
+ if(!StringUtils.isEmpty(getSearchDomain()))
+ rdn+="," + getSearchDomain();
ctx.destroySubcontext(rdn);
}
catch (NamingException e)
@@ -261,7 +278,7 @@
{
Attributes atts = searchResult.getAttributes();
- String uid = (String) getAttribute(getEntryPrefix(), atts).getAll().next();
+ String uid = (String) getAttribute(getUidAttributeForPrincipal(), atts).getAll().next();
Principal principal = makePrincipal(uid);
principals.add(principal);
@@ -281,7 +298,7 @@
{
Attribute attr = (Attribute) ae.next();
- if (attr.getID().equals(attributeName))
+ if (attr.getID().equalsIgnoreCase(attributeName))
{
return attr;
}
@@ -291,6 +308,53 @@
protected String getSearchDomain() {
return this.getUserFilterBase();
- }
+ }
+ protected String[] parseAttr(String attr, String replace) {
+ attr = StringUtils.replace(attr, "{u}", replace);
+ return StringUtils.split(attr,"=");
+ }
+
+ protected String getGroupDN(String groupPrincipalUid) {
+ return getGroupDN(groupPrincipalUid,true);
+ }
+
+ protected String getGroupDN(String groupPrincipalUid, boolean includeBaseDN) {
+ String groupDN = getGroupIdAttribute() + "=" + groupPrincipalUid;
+ if (!StringUtils.isEmpty(getGroupFilterBase()))
+ groupDN += "," + getGroupFilterBase();
+ if (includeBaseDN && !StringUtils.isEmpty(getRootContext()))
+ groupDN += "," + getRootContext();
+ return groupDN;
+ }
+
+ protected String getRoleDN(String rolePrincipalUid) {
+ return getRoleDN(rolePrincipalUid,true);
+ }
+
+ protected String getRoleDN(String rolePrincipalUid, boolean includeBaseDN) {
+ String roleDN = getRoleIdAttribute() + "=" + rolePrincipalUid;
+ if (!StringUtils.isEmpty(getRoleFilterBase()))
+ roleDN+="," + getRoleFilterBase();
+ if (includeBaseDN && !StringUtils.isEmpty(getRootContext()))
+ roleDN+="," + getRootContext();
+ return roleDN;
+ }
+
+ protected String getUserDN(String userPrincipalUid) {
+ return getUserDN(userPrincipalUid,true);
+ }
+
+ protected String getUserDN(String userPrincipalUid, boolean includeBaseDN) {
+ String userDN = getUserIdAttribute() + "=" + userPrincipalUid;
+ if (!StringUtils.isEmpty(getUserFilterBase()))
+ userDN += "," + getUserFilterBase();
+ if (includeBaseDN && !StringUtils.isEmpty(getRootContext()))
+ userDN += "," + getRootContext();
+ return userDN;
+ }
+
+
+
+
}
\ No newline at end of file
Index: D:/PROJECTS/ECLIPSE/JETSPEED2/jetspeed-2/components/security/src/java/org/apache/jetspeed/security/spi/impl/ldap/LdapRoleDaoImpl.java
===================================================================
--- D:/PROJECTS/ECLIPSE/JETSPEED2/jetspeed-2/components/security/src/java/org/apache/jetspeed/security/spi/impl/ldap/LdapRoleDaoImpl.java (revision 468102)
+++ D:/PROJECTS/ECLIPSE/JETSPEED2/jetspeed-2/components/security/src/java/org/apache/jetspeed/security/spi/impl/ldap/LdapRoleDaoImpl.java (working copy)
@@ -21,6 +21,7 @@
import javax.naming.directory.BasicAttribute;
import javax.naming.directory.BasicAttributes;
+import org.apache.commons.lang.StringUtils;
import org.apache.jetspeed.security.SecurityException;
import org.apache.jetspeed.security.impl.RolePrincipalImpl;
@@ -76,6 +77,10 @@
classes.add(getObjectClasses()[i]);
attrs.put(classes);
attrs.put(getEntryPrefix(), principalUid);
+ if(!StringUtils.isEmpty(getRoleObjectRequiredAttributeClasses()))
+ attrs.put(getRoleObjectRequiredAttributeClasses(), "");
+ for (int i=0;i
-
@@ -100,21 +99,20 @@
-
-
-
-
-
-
+
+
+
+
+
+
-
-
-
+
+