package org.argeo.osgi.useradmin;
+import static org.argeo.osgi.useradmin.LdifName.dn;
+
import java.io.IOException;
import java.io.InputStream;
import java.util.List;
import java.util.TreeMap;
import javax.naming.InvalidNameException;
+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.ldap.LdapName;
+import javax.naming.ldap.Rdn;
import org.apache.commons.codec.binary.Base64;
import org.apache.commons.io.IOUtils;
class LdifParser {
private final static Log log = LogFactory.getLog(LdifParser.class);
+ protected Attributes addAttributes(SortedMap<LdapName, Attributes> res,
+ int lineNumber, LdapName currentDn, Attributes currentAttributes) {
+ try {
+ Rdn nameRdn = currentDn.getRdn(currentDn.size() - 1);
+ Attribute nameAttr = currentAttributes.get(nameRdn.getType());
+ if (nameAttr == null)
+ currentAttributes.put(nameRdn.getType(), nameRdn.getValue());
+ else if (!nameAttr.get().equals(nameRdn.getValue()))
+ throw new UserDirectoryException("Attribute "
+ + nameAttr.getID() + "=" + nameAttr.get()
+ + " not consistent with DN " + currentDn
+ + " (shortly before line " + lineNumber
+ + " in LDIF file)");
+ Attributes previous = res.put(currentDn, currentAttributes);
+ if (log.isTraceEnabled())
+ log.trace("Added " + currentDn);
+ return previous;
+ } catch (NamingException e) {
+ throw new UserDirectoryException("Cannot add " + currentDn, e);
+ }
+ }
+
+ static void checkDnConsistency() {
+
+ }
+
SortedMap<LdapName, Attributes> read(InputStream in) throws IOException {
SortedMap<LdapName, Attributes> res = new TreeMap<LdapName, Attributes>();
try {
.decodeBase64(cleanValueStr) : cleanValueStr;
// manage DN attributes
- if (attributeId.equals("dn") || isLastLine) {
+ if (attributeId.equals(dn.name()) || isLastLine) {
if (currentDn != null) {
- Attributes previous = res.put(currentDn,
- currentAttributes);
- if (log.isDebugEnabled())
- log.debug("Added " + currentDn);
+ //
+ // ADD
+ //
+ Attributes previous = addAttributes(res,
+ lineNumber, currentDn, currentAttributes);
if (previous != null) {
log.warn("There was already an entry with DN "
+ currentDn
}
}
- if (attributeId.equals("dn"))
+ if (attributeId.equals(dn.name()))
try {
currentDn = new LdapName(
attributeValue.toString());