Compare commits

...

4 Commits

Author SHA1 Message Date
Scott Kitterman 539d50325b Fix typo in log message 2020-01-15 09:17:53 -05:00
Scott Kitterman 04dd916ab2 Add release date for 1.0.3 2019-11-22 20:40:13 -05:00
Scott Kitterman 34b2edbb50 - Delete own_socketfile to resolve race condition where the permissions
change fails on a Unix socket because it hasn't been created yet (libmilter
   will do this correctly on its own based on umask, the milter doesn't need
   to do it) (LP: #1849712)
2019-10-29 07:34:26 -04:00
Scott Kitterman d117330113 Make error logging more explicit to aid debugging 2019-10-18 23:33:36 -04:00
4 changed files with 10 additions and 15 deletions
+7
View File
@@ -1,3 +1,10 @@
1.0.3 2019-11-22
- Make error logging more explicit to aid debugging
- Delete own_socketfile to resolve race condition where the permissions
change fails on a Unix socket because it hasn't been created yet (libmilter
will do this correctly on its own based on umask, the milter doesn't need
to do it) (LP: #1849712)
1.0.2 2019-10-07 1.0.2 2019-10-07
- Fix startup logging so it provides information at a useful time - Fix startup logging so it provides information at a useful time
- Fix message extraction so that signing in the same pass through the milter - Fix message extraction so that signing in the same pass through the milter
+2 -4
View File
@@ -36,7 +36,6 @@ from dkimpy_milter.util import drop_privileges
from dkimpy_milter.util import setExceptHook from dkimpy_milter.util import setExceptHook
from dkimpy_milter.util import write_pid from dkimpy_milter.util import write_pid
from dkimpy_milter.util import read_keyfile from dkimpy_milter.util import read_keyfile
from dkimpy_milter.util import own_socketfile
from dkimpy_milter.util import fold from dkimpy_milter.util import fold
__version__ = "1.0.1" __version__ = "1.0.1"
@@ -285,7 +284,7 @@ class dkimMilter(Milter.Base):
except Exception as x: except Exception as x:
self.dkim_comment = str(x) self.dkim_comment = str(x)
if milterconfig.get('Syslog'): if milterconfig.get('Syslog'):
syslog.syslog("check_dkim: {0}".format(x)) syslog.syslog("check_dkim: Internal program fault while verifying: {0}".format(x))
try: try:
self.header_i = d.signature_fields.get(b'i') self.header_i = d.signature_fields.get(b'i')
except TypeError as x: except TypeError as x:
@@ -296,7 +295,7 @@ class dkimMilter(Milter.Base):
except Exception as x: except Exception as x:
self.dkim_comment = str(x) self.dkim_comment = str(x)
if milterconfig.get('Syslog'): if milterconfig.get('Syslog'):
syslog.syslog("check_dkim: {0}".format(x)) syslog.syslog("check_dkim: Internal proram fault extracting header a or d: {0}".format(x))
self.header_d = None self.header_d = None
if not self.header_a: if not self.header_a:
self.header_a = 'rsa-sha256' self.header_a = 'rsa-sha256'
@@ -371,7 +370,6 @@ def main():
Milter.set_flags(Milter.CHGHDRS + Milter.ADDHDRS) Milter.set_flags(Milter.CHGHDRS + Milter.ADDHDRS)
miltername = 'dkimpy-filter' miltername = 'dkimpy-filter'
socketname = milterconfig.get('Socket') socketname = milterconfig.get('Socket')
own_socketfile(milterconfig)
drop_privileges(milterconfig) drop_privileges(milterconfig)
sys.stdout.flush() sys.stdout.flush()
if milterconfig.get('Syslog'): if milterconfig.get('Syslog'):
-10
View File
@@ -146,16 +146,6 @@ def write_pid(milterconfig):
return pid return pid
def own_socketfile(milterconfig):
"""If socket is Unix socket, chown to UserID before dropping privileges"""
import os
user, group = user_group(milterconfig.get('UserID'))
if milterconfig.get('Socket')[:1] == '/':
os.chown(milterconfig.get('Socket')[1:], user, group)
if milterconfig.get('Socket')[:6] == "local:":
os.chown(milterconfig.get('Socket')[6:], user, group)
def read_keyfile(milterconfig, keytype): def read_keyfile(milterconfig, keytype):
"""Read private key from file.""" """Read private key from file."""
import syslog import syslog
+1 -1
View File
@@ -30,7 +30,7 @@ except ImportError: # If PyDNS is not installed, prefer dnspython
setup( setup(
name='dkimpy-milter', name='dkimpy-milter',
version='1.0.2', version='1.0.3',
author='Scott Kitterman', author='Scott Kitterman',
author_email='scott@kitterman.com', author_email='scott@kitterman.com',
url='https://launchpad.net/dkimpy-milter', url='https://launchpad.net/dkimpy-milter',