jenkins-bot has submitted this change and it was merged.
Change subject: Remove storing passwords in test API cache
......................................................................
Remove storing passwords in test API cache
- remove password cache entries if they exist
- do not create new password cache entries
Change-Id: I8d01edd1a6fdbfc6ec91ff98ed9f70201ef3261b
---
M tests/__init__.py
1 file changed, 29 insertions(+), 0 deletions(-)
Approvals:
Merlijn van Deen: Looks good to me, approved
jenkins-bot: Verified
diff --git a/tests/__init__.py b/tests/__init__.py
index a9b675e..3ac2361 100644
--- a/tests/__init__.py
+++ b/tests/__init__.py
@@ -13,6 +13,9 @@
class TestRequest(CachedRequest):
+
+ """Add caching to every Request except logins."""
+
def __init__(self, *args, **kwargs):
super(TestRequest, self).__init__(0, *args, **kwargs)
@@ -22,8 +25,34 @@
return path
def _expired(self, dt):
+ """Never invalidate cached data."""
return False
+ def _load_cache(self):
+ """Return whether the cache can be used."""
+ if not super(TestRequest, self)._load_cache():
+ return False
+
+ if 'lgpassword' in self._uniquedescriptionstr():
+ self._delete_cache()
+ self._data = None
+ return False
+
+ return True
+
+ def _delete_cache(self):
+ """Delete cached response if it exists."""
+ self._load_cache()
+ if self._cachetime:
+ os.remove(self._cachefile_path())
+
+ def _write_cache(self, data):
+ """Write data except login details."""
+ if 'lgpassword' in self._uniquedescriptionstr():
+ return
+
+ return super(TestRequest, self)._write_cache(data)
+
def patch_request():
global original_expired
--
To view, visit
https://gerrit.wikimedia.org/r/140631
To unsubscribe, visit
https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I8d01edd1a6fdbfc6ec91ff98ed9f70201ef3261b
Gerrit-PatchSet: 2
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: John Vandenberg <jayvdb(a)gmail.com>
Gerrit-Reviewer: Ladsgroup <ladsgroup(a)gmail.com>
Gerrit-Reviewer: Merlijn van Deen <valhallasw(a)arctus.nl>
Gerrit-Reviewer: Mpaa <mpaa.wiki(a)gmail.com>
Gerrit-Reviewer: Nullzero <nullzero.free(a)gmail.com>
Gerrit-Reviewer: Whym <whym(a)whym.org>
Gerrit-Reviewer: Withoutaname <drevitchi(a)gmail.com>
Gerrit-Reviewer: devunt <devunt(a)gmail.com>
Gerrit-Reviewer: jenkins-bot <>