diff options
| author | Omer Katz <omer.drow@gmail.com> | 2016-04-28 13:26:28 +0300 |
|---|---|---|
| committer | Omer Katz <omer.drow@gmail.com> | 2016-04-28 13:26:28 +0300 |
| commit | 26c9db82c059d9ed4affe25744bb7ab60cf7c4a5 (patch) | |
| tree | 0f51ec02d539883b298888c6d4566fc34574f29a /oauthlib/common.py | |
| parent | 34e5a07f7be4ae29823cb8129c1177fe3c3d55cf (diff) | |
| parent | e99a15b0bfa1d620623f3a6dc639880503617141 (diff) | |
| download | oauthlib-26c9db82c059d9ed4affe25744bb7ab60cf7c4a5.tar.gz | |
Merge pull request #417 from bjmc/sanitize-logging
Improves sanitizing sensitive data from Request.__repr__
Diffstat (limited to 'oauthlib/common.py')
| -rw-r--r-- | oauthlib/common.py | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/oauthlib/common.py b/oauthlib/common.py index e0e80c8..6b96de8 100644 --- a/oauthlib/common.py +++ b/oauthlib/common.py @@ -36,7 +36,7 @@ UNICODE_ASCII_CHARACTER_SET = ('abcdefghijklmnopqrstuvwxyz' CLIENT_ID_CHARACTER_SET = (r' !"#$%&\'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMN' 'OPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}') -PASSWORD_PATTERN = re.compile(r'password=[^&]+') +SANITIZE_PATTERN = re.compile(r'([^&;]*(?:password|token)[^=]*=)[^&;]+', re.IGNORECASE) INVALID_HEX_PATTERN = re.compile(r'%[^0-9A-Fa-f]|%[0-9A-Fa-f][^0-9A-Fa-f]') always_safe = ('ABCDEFGHIJKLMNOPQRSTUVWXYZ' @@ -414,10 +414,13 @@ class Request(object): def __repr__(self): body = self.body - if body and 'password=' in body: - body = PASSWORD_PATTERN.sub('password=***', body) + headers = self.headers.copy() + if body: + body = SANITIZE_PATTERN.sub('\1<SANITIZED>', body) + if 'Authorization' in headers: + headers['Authorization'] = '<SANITIZED>' return '<oauthlib.Request url="%s", http_method="%s", headers="%s", body="%s">' % ( - self.uri, self.http_method, self.headers, body) + self.uri, self.http_method, headers, body) @property def uri_query(self): |