From 5078be08017a21d97a3cf3fa2ffe554ad7f3d2c9 Mon Sep 17 00:00:00 2001 From: Prashanth Pai Date: Tue, 8 Mar 2016 15:28:42 +0530 Subject: Don't pass unicode to hmac.new() This issue can be hit when swift3 middleware is in the pipeline. This change is a backport of the following swauth change: https://review.openstack.org/#/c/282191/ Change-Id: I323d3eeaf39e2019f8f8910bc53904ac94208ed2 Signed-off-by: Prashanth Pai Reviewed-on: http://review.gluster.org/13641 Reviewed-by: Thiago da Silva Tested-by: Thiago da Silva --- .../common/middleware/gswauth/swauth/test_middleware.py | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'test') diff --git a/test/unit/common/middleware/gswauth/swauth/test_middleware.py b/test/unit/common/middleware/gswauth/swauth/test_middleware.py index 668f266..67abbe4 100644 --- a/test/unit/common/middleware/gswauth/swauth/test_middleware.py +++ b/test/unit/common/middleware/gswauth/swauth/test_middleware.py @@ -4791,6 +4791,20 @@ class TestAuth(unittest.TestCase): self.assertEquals(resp.environ['swift.authorize'], self.test_auth.denied_response) + def test_s3_creds_unicode(self): + self.test_auth.app = FakeApp(iter([ + ('200 Ok', {}, + json.dumps({"auth": unicode("plaintext:key)"), + "groups": [{'name': "act:usr"}, {'name': "act"}, + {'name': ".admin"}]})), + ('204 Ok', {'X-Container-Meta-Account-Id': 'AUTH_act'}, '')])) + env = \ + {'HTTP_AUTHORIZATION': 'AWS act:user:3yW7oFFWOn+fhHMu7E47RKotL1Q=', + 'PATH_INFO': '/v1/AUTH_act/c1'} + token = 'UFVUCgoKRnJpLCAyNiBGZWIgMjAxNiAwNjo0NT'\ + 'ozNCArMDAwMAovY29udGFpbmVyMw==' + self.assertEqual(self.test_auth.get_groups(env, token), None) + if __name__ == '__main__': unittest.main() -- cgit