Match an LDIF re-import on the entry's dn
Reported again by the submitter's colleague at LINET after #223 was closed: duplicate checking was implemented for vCard and never for LDIF, so re-importing an address book still leaves a second copy of everything. That was deliberate at the time -- the matching key was an open question I did not want to answer alone -- but the answer had already been given on #174 and I closed the issue without acting on it. The answer, in the submitter's words: an attribute that *can* change is fine, because it will not have changed between two imports minutes apart. An import is not a sync. That makes the `dn` usable -- it is the only identity the file carries, and Mozilla's schema defines no UID -- and it needs no guessing at all, unlike the name-plus-email fallback I had been weighing. So `uidFromDn` derives a namespaced, stable uid from the distinguished name, normalised for the case and spacing two exports of one directory differ in. A card the book already holds under that uid is updated rather than duplicated, merged the way the vCard import merges: what the file carries wins, what it does not mention is left alone. Reported as created and updated, which is the pair that was asked for. Three things worth knowing: Matching is per address book, so two customer directories that each hold a `cn=John Smith` stay two people as long as they are filed separately. Imported into one book they would merge, which is the one way this can be wrong and the reason the escape hatch is worth naming. The look-alike count stays, and now means something narrower: entries that `dn` matching could not catch -- one whose `dn` moved between exports, and anything imported before there was a `dn` to match on. Those are still only counted, never merged. A file holding two entries under one `dn` is malformed, since a directory cannot, and now becomes one card instead of two sharing an identity. FEATURES gains the re-import behaviour for both formats; it documented neither.
This commit is contained in:
@@ -105,3 +105,36 @@ export function parseLdif(text: string): LdifRecord[] {
|
||||
return !change || change === "add";
|
||||
});
|
||||
}
|
||||
|
||||
/**
|
||||
* An identity for an entry, derived from its distinguished name.
|
||||
*
|
||||
* Mozilla's schema has no UID, so a re-import had nothing to be recognised by
|
||||
* and duplicated everything (#223). The `dn` is what the file actually carries,
|
||||
* and it does not need to be a durable identity to answer the only question
|
||||
* being asked of it: have I imported this exact entry before? A migration is
|
||||
* import, notice something wrong, correct the export, import again -- and the
|
||||
* `dn` does not change in the ten minutes between two attempts, which is the
|
||||
* interval that matters. An import is not a sync.
|
||||
*
|
||||
* Namespaced rather than stored raw, because it becomes the card's `uid` and
|
||||
* must not be mistaken for a UID a vCard author meant. The one way this can be
|
||||
* wrong: two directories that both contain `cn=John Smith`, imported into the
|
||||
* *same* address book, are one contact afterwards. Matching is per book, so
|
||||
* filing two directories in two books keeps them apart.
|
||||
*
|
||||
* Normalised for case and for the spacing exporters differ in, which costs
|
||||
* nothing when a file is compared against itself and helps when it is compared
|
||||
* against a differently-produced export of the same directory.
|
||||
*
|
||||
* Null for an entry with no usable `dn`: that entry gets an identity of its own
|
||||
* and duplicates on re-import, as everything did before.
|
||||
*/
|
||||
export function uidFromDn(dn: string): string | null {
|
||||
const normalised = dn
|
||||
.trim()
|
||||
.toLowerCase()
|
||||
.replace(/\s+/g, " ")
|
||||
.replace(/\s*([,=])\s*/g, "$1");
|
||||
return normalised ? `urn:x-ihasmail:ldif:${encodeURIComponent(normalised)}` : null;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user