kevinveenbirkenbach/ldapsm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Catch already exist errors

Browse Source
This commit is contained in:
Kevin Veen-Birkenbach
2025-04-27 16:10:09 +02:00
parent c0d3cb112e
commit 10f703537a
1 changed files with 26 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
main.py
View File

@@ -144,43 +144,49 @@ def main():
prefix = f'{{{idx}}}' prefix = f'{{{idx}}}'
schema_dn = f"cn={prefix}{args.schema_name},{base_dn}" schema_dn = f"cn={prefix}{args.schema_name},{base_dn}"
# Add/update AttributeTypes
# Add/update AttributeTypes # Add/update AttributeTypes
for atdef in args.attribute_type: for atdef in args.attribute_type:
encoded = atdef.encode()
try: try:
result = conn.search_s(schema_dn, ldap.SCOPE_BASE, attrlist=['olcAttributeTypes']) result = conn.search_s(schema_dn, ldap.SCOPE_BASE,
attrlist=['olcAttributeTypes'])
existing = result[0][1].get('olcAttributeTypes', []) existing = result[0][1].get('olcAttributeTypes', [])
encoded = atdef.encode()
if encoded in existing: if encoded in existing:
print(f"ℹ️ AttributeType already present: {atdef}") print(f"ℹ️ AttributeType already exists, replacing: {atdef}")
# Replace the existing value
conn.modify_s(schema_dn, [
(ldap.MOD_REPLACE, 'olcAttributeTypes', [encoded])
])
print(f"🔄 Replaced AttributeType: {atdef}")
else: else:
conn.modify_s(schema_dn, [(ldap.MOD_ADD, 'olcAttributeTypes', [encoded])]) conn.modify_s(schema_dn, [
(ldap.MOD_ADD, 'olcAttributeTypes', [encoded])
])
print(f"➕ Added AttributeType: {atdef}") print(f"➕ Added AttributeType: {atdef}")
except ldap.LDAPError as e: except ldap.LDAPError as e:
info = getattr(e, 'info', '') or str(e) print(f"❌ LDAP error for AttributeType '{atdef}': {e}", file=sys.stderr)
if 'Duplicate attributeType' in info:
print(f"ℹ️ Duplicate AttributeType skipped: {atdef}")
else:
print(f"❌ Error adding AttributeType '{atdef}': {e}", file=sys.stderr)
sys.exit(1)
# Add/update ObjectClasses # Add/update ObjectClasses
for ocdef in args.object_class: for ocdef in args.object_class:
encoded = ocdef.encode()
try: try:
result = conn.search_s(schema_dn, ldap.SCOPE_BASE, attrlist=['olcObjectClasses']) result = conn.search_s(schema_dn, ldap.SCOPE_BASE,
attrlist=['olcObjectClasses'])
existing = result[0][1].get('olcObjectClasses', []) existing = result[0][1].get('olcObjectClasses', [])
encoded = ocdef.encode()
if encoded in existing: if encoded in existing:
print(f"ℹ️ ObjectClass already present: {ocdef}") print(f"ℹ️ ObjectClass already exists, replacing: {ocdef}")
conn.modify_s(schema_dn, [
(ldap.MOD_REPLACE, 'olcObjectClasses', [encoded])
])
print(f"🔄 Replaced ObjectClass: {ocdef}")
else: else:
conn.modify_s(schema_dn, [(ldap.MOD_ADD, 'olcObjectClasses', [encoded])]) conn.modify_s(schema_dn, [
(ldap.MOD_ADD, 'olcObjectClasses', [encoded])
])
print(f"➕ Added ObjectClass: {ocdef}") print(f"➕ Added ObjectClass: {ocdef}")
except ldap.LDAPError as e: except ldap.LDAPError as e:
info = getattr(e, 'info', '') or str(e) print(f"❌ LDAP error for ObjectClass '{ocdef}': {e}", file=sys.stderr)
if 'Duplicate objectClass' in info:
print(f"ℹ️ Duplicate ObjectClass skipped: {ocdef}")
else:
print(f"❌ Error adding ObjectClass '{ocdef}': {e}", file=sys.stderr)
sys.exit(1)
conn.unbind_s() conn.unbind_s()