mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-07-28 05:34:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Patch #1603688: ConfigParser.SafeConfigParser now checks values that

Browse source 
are set for invalid interpolation sequences that would lead to errors
on reading back those values.
This commit is contained in:
Georg Brandl 2007-03-13 17:43:32 +00:00
parent a36cde4ccc
commit 92a6baed7b
3 changed files with 27 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

13
Lib/ConfigParser.py
View file

@ -594,7 +594,8 @@ class SafeConfigParser(ConfigParser):
self._interpolate_some(option, L, rawval, section, vars, 1)
return ''.join(L)
_interpvar_match = re.compile(r"%\(([^)]+)\)s").match
_interpvar_re = re.compile(r"%\(([^)]+)\)s")
_badpercent_re = re.compile(r"%[^%]|%$")
def _interpolate_some(self, option, accum, rest, section, map, depth):
if depth > MAX_INTERPOLATION_DEPTH:
@ -613,7 +614,7 @@ class SafeConfigParser(ConfigParser):
accum.append("%")
rest = rest[2:]
elif c == "(":
m = self._interpvar_match(rest)
m = self._interpvar_re.match(rest)
if m is None:
raise InterpolationSyntaxError(option, section,
"bad interpolation variable reference %r" % rest)
@ -638,4 +639,12 @@ class SafeConfigParser(ConfigParser):
"""Set an option. Extend ConfigParser.set: check for string values."""
if not isinstance(value, basestring):
raise TypeError("option values must be strings")
# check for bad percent signs:
# first, replace all "good" interpolations
tmp_value = self._interpvar_re.sub('', value)
# then, check if there's a lone percent sign left
m = self._badpercent_re.search(tmp_value)
if m:
raise ValueError("invalid interpolation syntax in %r at "
"position %d" % (value, m.start()))
ConfigParser.set(self, section, option, value)