upstream/borgbackup
1
0
Fork 0
mirror of https://github.com/borgbackup/borg.git synced 2026-03-18 00:26:13 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

format_line: whitelist instead of checking against blacklist

Browse source
This commit is contained in:
Marian Beermann 2017-04-05 12:19:56 +02:00
parent 707316b0ea
commit cc24fa2064
1 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/borg/helpers.py
View file

@ -787,12 +787,10 @@ def format_line(format, data):
for _, key, _, conversion in Formatter().parse(format):
if not key:
continue
if '.' in key or '__' in key or conversion:
if conversion or key not in data:
raise InvalidPlaceholder(key, format)
try:
return format.format(**data)
except KeyError as ke:
raise InvalidPlaceholder(ke.args[0], format)
return format.format_map(data)
except Exception as e:
raise PlaceholderError(format, data, e.__class__.__name__, str(e))