Skip to content

logs: put borg arguments within quotation marks when they contain special strings #2190

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
m3nu merged 6 commits into from
Apr 28, 2025
Merged

logs: put borg arguments within quotation marks when they contain special strings #2190

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
41014f5
logs: Add borg arguments and shell command approximation
Jan 13, 2025
f13d26e
logs: simpler quotation marks for borg command
Jan 15, 2025
b3e6900
Merge branch 'master' into log-changes
m3nu Apr 17, 2025
d48ad06
Update borg_job.py
goebbe Apr 27, 2025
ff0c8ac
satisfy the lint test
goebbe Apr 27, 2025
aabf24c
change cmd_tmp to cmd_args_to_log
goebbe Apr 27, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 10 additions & 3 deletions src/vorta/borg/borg_job.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -234,9 +234,16 @@ def run(self):
profile=self.params.get('profile_id', None),
)
log_entry.save()
cmd_log_tmp = [s.replace(" ", "\\ ") for s in self.cmd] # escape whitespace - for logs
logger.info('Running command %s', ' '.join(cmd_log_tmp))
del cmd_log_tmp

# logs: put cmd arguments with special strings in quotation marks
quote_strings = [' ', '*', '?', 're:']
cmd_args_to_log = self.cmd[:]
for i, arg in enumerate(cmd_args_to_log):
if any(quotestr in arg for quotestr in quote_strings):
cmd_args_to_log[i] = "'" + arg + "'" # add quotes

logger.info('Running command: %s', ' '.join(cmd_args_to_log))
del cmd_args_to_log

p = Popen(
self.cmd,
Expand Down
Loading