diff options
Diffstat (limited to 'swift/common')
| -rw-r--r-- | swift/common/middleware/proxy_logging.py | 6 | ||||
| -rw-r--r-- | swift/common/utils/__init__.py | 9 |
2 files changed, 11 insertions, 4 deletions
diff --git a/swift/common/middleware/proxy_logging.py b/swift/common/middleware/proxy_logging.py index d89343479..3cf2aee62 100644 --- a/swift/common/middleware/proxy_logging.py +++ b/swift/common/middleware/proxy_logging.py @@ -78,7 +78,7 @@ from swift.common.middleware.catch_errors import enforce_byte_count from swift.common.swob import Request from swift.common.utils import (get_logger, get_remote_client, config_true_value, reiterate, - close_if_possible, + close_if_possible, cap_length, InputProxy, list_from_csv, get_policy_index, split_path, StrAnonymizer, StrFormatTime, LogStringFormatter) @@ -200,9 +200,7 @@ class ProxyLoggingMiddleware(object): env['swift.proxy_access_log_made'] = True def obscure_sensitive(self, value): - if value and len(value) > self.reveal_sensitive_prefix: - return value[:self.reveal_sensitive_prefix] + '...' - return value + return cap_length(value, self.reveal_sensitive_prefix) def obscure_req(self, req): for header in get_sensitive_headers(): diff --git a/swift/common/utils/__init__.py b/swift/common/utils/__init__.py index 596b888cc..ef6b0180e 100644 --- a/swift/common/utils/__init__.py +++ b/swift/common/utils/__init__.py @@ -5717,6 +5717,15 @@ def strict_b64decode(value, allow_line_breaks=False): raise ValueError +def cap_length(value, max_length): + if value and len(value) > max_length: + if isinstance(value, bytes): + return value[:max_length] + b'...' + else: + return value[:max_length] + '...' + return value + + MD5_BLOCK_READ_BYTES = 4096 |