tobias/radicale
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Start storage hook in own process group

Browse Source 
Prevents terminals from sending SIGINT etc.
This commit is contained in:
Unrud 2020-08-31 13:54:48 +02:00
parent d4af2cd1a6
commit 1e011e7011
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
radicale/storage/multifilesystem/lock.py
View File

@ -54,14 +54,22 @@ class StorageLockMixin:
hook = self.configuration.get("storage", "hook") hook = self.configuration.get("storage", "hook")
if mode == "w" and hook: if mode == "w" and hook:
folder = self.configuration.get("storage", "filesystem_folder") folder = self.configuration.get("storage", "filesystem_folder")
logger.debug("Running hook")
debug = logger.isEnabledFor(logging.DEBUG) debug = logger.isEnabledFor(logging.DEBUG)
p = subprocess.Popen( popen_kwargs = dict(
hook % {"user": shlex.quote(user or "Anonymous")},
stdin=subprocess.DEVNULL, stdin=subprocess.DEVNULL,
stdout=subprocess.PIPE if debug else subprocess.DEVNULL, stdout=subprocess.PIPE if debug else subprocess.DEVNULL,
stderr=subprocess.PIPE if debug else subprocess.DEVNULL, stderr=subprocess.PIPE if debug else subprocess.DEVNULL,
shell=True, universal_newlines=True, cwd=folder) shell=True, universal_newlines=True, cwd=folder)
# Use new process group for child to prevent terminals
# from sending SIGINT etc.
if os.name == "posix":
popen_kwargs["preexec_fn"] = os.setpgrp
elif os.name == "nt":
popen_kwargs["creationflags"] = (
subprocess.CREATE_NEW_PROCESS_GROUP)
command = hook % {"user": shlex.quote(user or "Anonymous")}
logger.debug("Running hook")
p = subprocess.Popen(command, **popen_kwargs)
try: try:
stdout_data, stderr_data = p.communicate() stdout_data, stderr_data = p.communicate()
except BaseException: # e.g. KeyboardInterrupt or SystemExit except BaseException: # e.g. KeyboardInterrupt or SystemExit