Changeset 315708 in indico for indico/web/http_api/cache.py

Timestamp:

08/23/11 15:38:51 (21 months ago)

Author:

Jose Benito <jose.benito.gonzalez@…>

Branches:

master, hello-world-walkthrough, ipv6, v0.98-series, v0.98.2, v0.98.3, v0.98b2, v0.99, 051b2622c51afb171a1dedb46a0df4fbb0cbd02e, 0da0c1403bae8e51d8229f460181c71b9e6dda72

Children:

fcdc60

Parents:

1ea4c5

git-author:

Adrian Moennich <jerome.ernst.monnich@…> (05/12/11 14:06:08)

git-committer:

Jose Benito <jose.benito.gonzalez@…> (08/23/11 15:38:51)

Message:

[IMP] Improve URL format for caching/signing

• in both cases the query strign is sorted
• the signature is now passed via &signature=...
• the timestamp is included as &timestamp=...
• the cache key now uses SHA-256 instead of hash()

File:

• indico/web/http_api/cache.py (modified) (2 diffs)

indico/web/http_api/cache.py

@@ -20 +20 @@
 from MaKaC.common.cache import MultiLevelCacheEntry, MultiLevelCache
 import datetime
+import hashlib
 import time
 import os
@@ -51 +52 @@
         return ['requests']
 
-    def _generateKey(self, path, qdata):
-        queryHash = hash(frozenset((key, frozenset(values)) for key, values in qdata.iteritems()))
-        return '.'.join(map(str, (hash(path), queryHash)))
+    def cacheObject(self, key, obj):
+        key = hashlib.sha256(key).hexdigest()
+        return super(RequestCache, self).cacheObject(key, obj)
 
-    def cacheObject(self, path, qdata, obj):
-        return super(RequestCache, self).cacheObject(self._generateKey(path, qdata), obj)
-
-    def loadObject(self, path, qdata):
-        return super(RequestCache, self).loadObject(self._generateKey(path, qdata))
+    def loadObject(self, key):
+        key = hashlib.sha256(key).hexdigest()
+        return super(RequestCache, self).loadObject(key)
 
     def isDirty(self, path, object):