Skip to content
This repository has been archived by the owner on Apr 16, 2024. It is now read-only.

Fix missing modify timestamp #11

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix missing modify timestamp #11

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f6dea71
fix_missing_modifyTimestamp
May 18, 2020
ac01873
prefer if/else over try/except
Jun 9, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 12 additions & 3 deletions src/opendkim-manage
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1208,7 +1208,7 @@ class Manager(object):
search_filter="(&(objectClass=DKIM)(DKIMSelector={0}))".format(
selector),
attrs=['DKIMSelector', 'DKIMDomain', 'DKIMActive',
'modifyTimestamp'])
'modifyTimestamp', 'createTimestamp'])
if len(list_of_results) == 0:
print(_c("WARN: Selector '{0}' does not exist".format(
selector), "cyan"), file=sys.stderr)
Expand All @@ -1219,8 +1219,17 @@ class Manager(object):
dn = ldap_object[0]
# Get the modifyTimestamp attribute. If an object was rotated,
# its timestamp was changed. We compare this to delete-delay.
modify_timestamp = self.convert_ldaptime_to_datetime(
ldap_object[1]['modifyTimestamp'][0])

# not with OpenLDAP, but modifyTimestamp may be unset
# see https://tools.ietf.org/html/rfc2252#section-5.1.2
# assuming, createTimestamp is always present
if "modifyTimestamp" in ldap_object[1]:
modify_timestamp = self.convert_ldaptime_to_datetime(
ldap_object[1]['modifyTimestamp'][0])
else:
modify_timestamp = self.convert_ldaptime_to_datetime(
ldap_object[1]['createTimestamp'][0])

time_delta = datetime.timedelta(days=GlobalCfg.delete_delay)

if not cmd.config.force_delete:
Expand Down