package org.argeo.cms.internal.kernel;
import java.security.PrivilegedAction;
+import java.text.SimpleDateFormat;
+import java.util.Date;
import java.util.HashSet;
import java.util.Set;
* Make sure each user has a home directory available in the default workspace.
*/
class HomeRepository extends JcrRepositoryWrapper implements KernelConstants {
+
/** The home base path. */
private String homeBasePath = KernelConstants.DEFAULT_HOME_BASE_PATH;
+ private String usersBasePath = KernelConstants.DEFAULT_USERS_BASE_PATH;
private String groupsBasePath = KernelConstants.DEFAULT_GROUPS_BASE_PATH;
private Set<String> checkedUsers = new HashSet<String>();
+ private SimpleDateFormat usersDatePath = new SimpleDateFormat("YYYY/MM");
+
public HomeRepository(Repository repository) {
super(repository);
putDescriptor(NodeConstants.CN, NodeConstants.HOME);
try {
Node userHome = NodeUtils.getUserHome(session, username);
if (userHome == null) {
- String homePath = generateUserPath(homeBasePath, username);
+ String homePath = generateUserPath(username);
if (session.itemExists(homePath))// duplicate user id
userHome = session.getNode(homePath).getParent().addNode(JcrUtils.lastPathElement(homePath));
else
}
/** Generate path for a new user home */
- private String generateUserPath(String base, String username) {
+ private String generateUserPath(String username) {
LdapName dn;
try {
dn = new LdapName(username);
}
String userId = dn.getRdn(dn.size() - 1).getValue().toString();
int atIndex = userId.indexOf('@');
- if (atIndex > 0) {
- String domain = userId.substring(0, atIndex);
- String name = userId.substring(atIndex + 1);
- return base + '/' + domain + '/' + name;
- } else if (atIndex == 0 || atIndex == (userId.length() - 1)) {
- throw new CmsException("Unsupported username " + userId);
+ if (atIndex < 0) {
+ return homeBasePath + '/' + userId;
} else {
- return base + '/' + userId;
+ return usersBasePath + '/' + usersDatePath.format(new Date()) + '/' + userId;
}
+ // if (atIndex > 0) {
+ // String domain = userId.substring(0, atIndex);
+ // String name = userId.substring(atIndex + 1);
+ // return base + '/' + domain + '/' + name;
+ // } else if (atIndex == 0 || atIndex == (userId.length() - 1)) {
+ // throw new CmsException("Unsupported username " + userId);
+ // } else {
+ // return base + '/' + userId;
+ // }
}
public void createWorkgroup(LdapName dn) {
}
try {
// TODO enhance transformation of cn to a valid node name
- String relPath = cn.replaceAll("[^a-zA-Z0-9]", "_");
+ // String relPath = cn.replaceAll("[^a-zA-Z0-9]", "_");
+ String relPath = JcrUtils.replaceInvalidChars(cn);
newWorkgroup = JcrUtils.mkdirs(adminSession.getNode(groupsBasePath), relPath, NodeType.NT_UNSTRUCTURED);
newWorkgroup.addMixin(NodeTypes.NODE_GROUP_HOME);
newWorkgroup.setProperty(NodeNames.LDAP_CN, cn);