Attachment 8116 Details for Bug 34738 – 34739.diff

[patch] 34739.diff

file_34738.txt (text/plain), 2.60 KB, created by Philipp Hahn on 2016-10-17 14:29:01 CEST

(hide)

Description:

Filename:

MIME Type:

Creator: Philipp Hahn

Created: 2016-10-17 14:29:01 CEST

Size: 2.60 KB

patch

obsolete

>diff --git a/branches/ucs-4.1/ucs-4.1-3/management/univention-directory-logger/debian/univention-directory-logger.univention-config-registry-variables b/branches/ucs-4.1/ucs-4.1-3/management/univention-directory-logger/debian/univention-directory-logger.univention-config-registry-variables
>index 6d2f5ff..d7d6e02 100644
>--- a/branches/ucs-4.1/ucs-4.1-3/management/univention-directory-logger/debian/univention-directory-logger.univention-config-registry-variables
>+++ b/branches/ucs-4.1/ucs-4.1-3/management/univention-directory-logger/debian/univention-directory-logger.univention-config-registry-variables
>@@ -9,3 +9,9 @@ Description[de]=Mit Variablen der Form 'ldap/logging/exclude*=DN' kÃ¶nnen Contai
> Description[en]=Variables in the format 'ldap/logging/exclude*=DN' can be used to exclude containers/OUs from the logging.
> Type=str
> Categories=service-ldap
>+
>+[ldap/logging/hash]
>+Description[de]=Legt den Namen des Hash-Algorithmus fest. Standard ist 'md5'.
>+Description[en]=Defines the name of the hash algorithm. Default is 'md5'.
>+Type=str
>+Categories=service-ldap
>diff --git a/branches/ucs-4.1/ucs-4.1-3/management/univention-directory-logger/directory_logger.py b/branches/ucs-4.1/ucs-4.1-3/management/univention-directory-logger/directory_logger.py
>index 8f5cae0..425b2f3 100755
>--- a/branches/ucs-4.1/ucs-4.1-3/management/univention-directory-logger/directory_logger.py
>+++ b/branches/ucs-4.1/ucs-4.1-3/management/univention-directory-logger/directory_logger.py
>@@ -36,7 +36,7 @@ import string
> import time
> import syslog
> import re
>-import md5
>+import hashlib
> import base64
> import grp
> import subprocess
>@@ -67,6 +67,7 @@ preferedGroup = "adm"
> gidNumber = 0  # fallback
> filemode = '0640'
> cleanupDellog = True  # remove missed dellog entries (after reporting about them)
>+digest = listener.configRegistry.get('ldap/logging/hash', 'md5')
> 
> 
> def needsConversion(char):
>@@ -248,7 +249,7 @@ def handler(dn, new_copy, old_copy):
> 			logfile.close()
> 		# 4. calculate nexthash, omitting the final line break to make validation of the
> 		#    record more intituive
>-		nexthash = md5.new(record[:-1]).hexdigest()
>+		nexthash = hashlib.new(digest, record[:-1]).hexdigest()
> 		# 5. cache nexthash (the actual logfile might be logrotated away..)
> 		cachefile.seek(0)
> 		cachefile.write(nexthash)
>@@ -318,7 +319,7 @@ def initialize():
> 			logfile.close()
> 
> 		# 4. calculate initial hash
>-		nexthash = md5.new(record).hexdigest()
>+		nexthash = hashlib.new(digest, record).hexdigest()
> 		# 5. cache nexthash (the actual logfile might be logrotated away..)
> 		cachefile.seek(0)
> 		cachefile.write(nexthash)

Actions: View | Diff

Attachments on bug 34738: 8116