openstack
/
keystonemiddleware
Code Issues Proposed changes

Merge "Fix DeprecationWarning: invalid escape sequence issues"

This commit is contained in:
Zuul 2020-01-02 18:52:32 +00:00 committed by Gerrit Code Review
parent 62c3eaf093 4d6e9cb162
commit 620f768000
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
keystonemiddleware/auth_token/__init__.py
View File

@ -282,14 +282,14 @@ def _path_matches(request_path, path_pattern):
# The fnmatch module doesn't provide the ability to match * versus **,
# so convert to regex.
token_regex = (r'(?P<tag>{[^}]*})|' # {tag} # nosec
'(?P<wild>\*(?=$|[^\*]))|' # *
'(?P<rec_wild>\*\*)|' # **
'(?P<literal>[^{}\*])') # anything else
r'(?P<wild>\*(?=$|[^\*]))|' # *
r'(?P<rec_wild>\*\*)|' # **
r'(?P<literal>[^{}\*])') # anything else
path_regex = ''
for match in re.finditer(token_regex, path_pattern):
token = match.groupdict()
if token['tag'] or token['wild']:
path_regex += '[^\/]+'
path_regex += r'[^\/]+'
if token['rec_wild']:
path_regex += '.*'
if token['literal']: