From 73b91e4ac8fce1afd8f112196c168c428b8815e7 Mon Sep 17 00:00:00 2001 From: Alistair Coles Date: Tue, 7 Jun 2016 18:00:21 +0100 Subject: crypto - remove stale TODOs We do not need to test the contaiher listing etag length before decrypting - if it has crypto-meta it will be decrypted. The Etag value in a response to a ranged GET should be the Etag of the whole object. Change-Id: Ib713a899b5d65d979d51db36cbca809998e87847 --- swift/common/middleware/decrypter.py | 3 --- test/unit/common/middleware/test_decrypter.py | 2 -- 2 files changed, 5 deletions(-) diff --git a/swift/common/middleware/decrypter.py b/swift/common/middleware/decrypter.py index c0c1df6c4..fc3837017 100644 --- a/swift/common/middleware/decrypter.py +++ b/swift/common/middleware/decrypter.py @@ -388,9 +388,6 @@ class DecrypterContContext(BaseDecrypterContext): def decrypt_obj_dict(self, obj_dict, key): ciphertext = obj_dict['hash'] obj_dict['hash'] = self.decrypt_value_with_meta(ciphertext, key) - - # TODO - did we need to use the length to decide to decrypt? - # if etag and (len(etag) > constraints.ETAG_LENGTH): return obj_dict def process_xml_resp(self, key, resp_iter): diff --git a/test/unit/common/middleware/test_decrypter.py b/test/unit/common/middleware/test_decrypter.py index b5d466752..e23303ad5 100644 --- a/test/unit/common/middleware/test_decrypter.py +++ b/test/unit/common/middleware/test_decrypter.py @@ -528,8 +528,6 @@ class TestDecrypterObjectRequests(unittest.TestCase): resp = req.get_response(self.decrypter) self.assertEqual('3456789a', resp.body) self.assertEqual('200 OK', resp.status) - # TODO - how do we validate the range body if etag is for whole? Is - # the test actually faking the correct Etag in response? self.assertEqual(plaintext_etag, resp.headers['Etag']) self.assertEqual('text/plain', resp.headers['Content-Type']) -- cgit v1.2.1