netinvent/npbackup
1
1
Fork 0
mirror of https://github.com/netinvent/npbackup.git synced 2025-11-10 06:01:39 +08:00
Code Issues Projects Releases Packages Wiki Activity

Sanitize pidfile filenames

Browse source
This commit is contained in:
deajan 2025-06-12 14:35:40 +02:00
parent 19a04b1f9e
commit 7179342ef5
1 changed files with 16 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
npbackup/pidfile_ng.py
View file

@ -26,11 +26,22 @@ class PIDFile(object):
self._check_full_commandline = check_full_commandline self._check_full_commandline = check_full_commandline
self._file = str(filename) self._file = str(filename)
if not self._check_full_commandline: if not self._check_full_commandline:
self._process_name = self._process_name[0] self._process_name = self.sanitize(self._process_name[0])
else: else:
self._file = "{}-{}".format(self._file, self._process_name) self._process_name = "-".join(self._process_name)
self._file = "{}-{}".format(self._file, self.sanitize(self._process_name))
if identifier: if identifier:
self._file = "{}-{}".format(self._file, identifier) self._file = "{}-{}".format(self._file, self.sanitize(identifier))
print(self._file)
@staticmethod
def sanitize(filename: str) -> str:
"""
Sanitizes the filename by replacing slashes and backslashes with dots.
This is useful to ensure that the filename is valid across different filesystems.
"""
return "".join(x for x in filename if x.isalnum())
@property @property
def is_running(self) -> bool: def is_running(self) -> bool:
@ -49,8 +60,8 @@ class PIDFile(object):
try: try:
cmd1 = psutil.Process(pid).cmdline() cmd1 = psutil.Process(pid).cmdline()
if not self._check_full_commandline: if not self._check_full_commandline:
cmd1 = cmd1[0] cmd1 = self.sanitize(cmd1[0])
return cmd1 == self._process_name return cmd1 == self.sanitize("-".join(self._process_name))
except psutil.AccessDenied: except psutil.AccessDenied:
return False return False