diff options
| author | Jesse Wilson <jessewilson@google.com> | 2010-10-16 08:58:17 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-10-16 08:58:17 -0700 |
| commit | bdd331840a37ca37136f6c030ad557750372d53f (patch) | |
| tree | 62a234876563ce7cb6de7909437dee068639e40a /src | |
| parent | 597d5137ae740427f4af4921abd04f826600c7e7 (diff) | |
| parent | d5b79c970e9c5cb22603663d8fcb0c5e49dd4371 (diff) | |
| download | external_apache-http-bdd331840a37ca37136f6c030ad557750372d53f.zip external_apache-http-bdd331840a37ca37136f6c030ad557750372d53f.tar.gz external_apache-http-bdd331840a37ca37136f6c030ad557750372d53f.tar.bz2 | |
am d5b79c97: am 9f7b511f: Don\'t leak sensitive information when logging cookies.
Merge commit 'd5b79c970e9c5cb22603663d8fcb0c5e49dd4371'
* commit 'd5b79c970e9c5cb22603663d8fcb0c5e49dd4371':
Don't leak sensitive information when logging cookies.
Diffstat (limited to 'src')
| -rw-r--r-- | src/org/apache/http/client/protocol/ResponseProcessCookies.java | 24 |
1 files changed, 21 insertions, 3 deletions
diff --git a/src/org/apache/http/client/protocol/ResponseProcessCookies.java b/src/org/apache/http/client/protocol/ResponseProcessCookies.java index 0689e93..5b76550 100644 --- a/src/org/apache/http/client/protocol/ResponseProcessCookies.java +++ b/src/org/apache/http/client/protocol/ResponseProcessCookies.java @@ -124,13 +124,17 @@ public class ResponseProcessCookies implements HttpResponseInterceptor { cookieStore.addCookie(cookie); if (this.log.isDebugEnabled()) { + // BEGIN android-changed this.log.debug("Cookie accepted: \"" - + cookie + "\". "); + + cookieToString(cookie) + "\". "); + // END android-changed } } catch (MalformedCookieException ex) { if (this.log.isWarnEnabled()) { + // BEGIN android-changed this.log.warn("Cookie rejected: \"" - + cookie + "\". " + ex.getMessage()); + + cookieToString(cookie) + "\". " + ex.getMessage()); + // END android-changed } } } @@ -142,5 +146,19 @@ public class ResponseProcessCookies implements HttpResponseInterceptor { } } } - + + // BEGIN android-added + /** + * Don't log the cookie's value; that's potentially sensitive information. + */ + private String cookieToString(Cookie cookie) { + return cookie.getClass().getSimpleName() + + "[version=" + cookie.getVersion() + + ",name=" + cookie.getName() + + ",domain=" + cookie.getDomain() + + ",path=" + cookie.getPath() + + ",expiry=" + cookie.getExpiryDate() + + "]"; + } + // END android-added } |