DandelionNStuff/dkimpy-milter-smtputf8
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Handle unix: socket prefix the same as local:

Browse Source 
sendmail's milter.c treats these two declarations the same way, so
what we do for one should also be done for the other.
This commit is contained in:
Daniel Kahn Gillmor
2019-02-21 15:20:02 -05:00
parent bb44f36519
commit a9a6893c89
1 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
dkimpy_milter/util.py
+11 -4
View File
@@ -150,10 +150,17 @@ def own_socketfile(milterconfig):
"""If socket is Unix socket, chown to UserID before dropping privileges""" """If socket is Unix socket, chown to UserID before dropping privileges"""
import os import os
user, group = user_group(milterconfig.get('UserID')) user, group = user_group(milterconfig.get('UserID'))
if milterconfig.get('Socket')[:1] == '/': offset = None
os.chown(milterconfig.get('Socket'), user, group) sockname = milterconfig.get('Socket')
if milterconfig.get('Socket')[:6] == "local:": if sockname[:1] == '/':
os.chown(milterconfig.get('Socket')[6:], user, group) offset = 0
elif sockname[:6] == "local:":
offset = 6
elif sockname[:5] == "unix:":
offset = 5
if offset is not None:
os.chown(sockname[offset:], user, group)
def read_keyfile(milterconfig, keytype): def read_keyfile(milterconfig, keytype):