Merge pull request #46 from Snawoot/unixmode

Unixmode

config_examples/mta-sts-daemon.yml.sqlite_unixsock

@@ -1,4 +1,5 @@
 path: "/var/run/mta-sts.sock"
+mode: 0666
 shutdown_timeout: 20
 cache:
   type: sqlite

man/mta-sts-daemon.yml.5.adoc

@@ -22,6 +22,8 @@ The file is in YAML syntax with the following elements:
 
 *path*: (_str_) daemon UNIX socket bind address (path). If specified, *host* and *port* are ignored and UNIX socket is bound instead of TCP.
 
+*mode*: (_int_) file mode for daemon UNIX socket. If not specified default filemode is used. This option has effect only when UNIX socket is used. If file mode specified in octal form (most common case), it has to be prepended with leading zero. Example: 0666
+
 *reuse_port*: (_bool_) allow multiple instances to share same port (available on Unix, Windows)
 
 *cache_grace*: (_float_) age of cache entries in seconds which do not require policy refresh and update. Default: 60

postfix_mta_sts_resolver/responder.py

@@ -26,6 +26,7 @@ def __init__(self, cfg, loop):
         if cfg.get('path') is not None:
             self._unix = True
             self._path = cfg['path']
+            self._sockmode = cfg.get('mode')
         else:
             self._unix = False
             self._host = cfg['host']
@@ -63,6 +64,8 @@ def done_cb(task, fut):
 
         if self._unix:
             self._server = await asyncio.start_unix_server(_spawn, path=self._path)
+            if self._sockmode is not None:
+                os.chmod(self._path, self._sockmode)
         else:
             if self._reuse_port: # pragma: no cover
                 if sys.platform in ('win32', 'cygwin'):

postfix_mta_sts_resolver/utils.py

@@ -65,6 +65,7 @@ def setup_logger(name, verbosity, handler):
 
 def enable_uvloop():  # pragma: no cover
     try:
+        # pylint: disable=import-outside-toplevel
         import uvloop
         asyncio.set_event_loop_policy(uvloop.EventLoopPolicy())
     except ImportError:

tests/test_responder.py

@@ -2,6 +2,7 @@
 import asyncio
 import itertools
 import socket
+import os
 
 import pynetstring
 import pytest
@@ -28,7 +29,7 @@ async def responder(event_loop):
 @async_generator
 async def unix_responder(event_loop):
     import postfix_mta_sts_resolver.utils as utils
-    cfg = utils.populate_cfg_defaults({'path': '/tmp/mta-sts.sock'})
+    cfg = utils.populate_cfg_defaults({'path': '/tmp/mta-sts.sock', 'mode': 0o666})
     cfg["zones"]["test2"] = cfg["default_zone"]
     resp = STSSocketmapResponder(cfg, event_loop)
     await resp.start()
@@ -65,6 +66,7 @@ async def test_responder(responder, params):
 async def test_unix_responder(unix_responder, params):
     (request, response), bufsize = params
     resp, path = unix_responder
+    assert os.stat(path).st_mode & 0o777 == 0o666
     decoder = pynetstring.Decoder()
     reader, writer = await asyncio.open_unix_connection(path)
     try: