diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-03-30 17:24:07 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-03-30 17:24:07 +0000 |
| commit | b504814cfe2beb2bbc5925879e7796fe7dcb5091 (patch) | |
| tree | 0b4fc07c4dd9f99e1e8cc2ba92b1d50f127e5c15 | |
| parent | 9cf91c951ed74e245693ca1f1b3df8965484dc94 (diff) | |
| parent | 7c053df8e37906c95dc78222a33f4ec91712774e (diff) | |
| download | keystone-b504814cfe2beb2bbc5925879e7796fe7dcb5091.tar.gz keystone-b504814cfe2beb2bbc5925879e7796fe7dcb5091.tar.xz keystone-b504814cfe2beb2bbc5925879e7796fe7dcb5091.zip | |
Merge "Raise keystone.exception for HTTP 401 (bug 962563)"
| -rw-r--r-- | keystone/contrib/s3/core.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/keystone/contrib/s3/core.py b/keystone/contrib/s3/core.py index 5d55c206..4b4b2b6c 100644 --- a/keystone/contrib/s3/core.py +++ b/keystone/contrib/s3/core.py @@ -25,6 +25,7 @@ import hmac from hashlib import sha1 from keystone import config +from keystone import exception from keystone.common import utils from keystone.common import wsgi from keystone.contrib import ec2 @@ -49,4 +50,4 @@ class S3Controller(ec2.Ec2Controller): signed = base64.encodestring(hmac.new(key, msg, sha1).digest()).strip() if not utils.auth_str_equal(credentials['signature'], signed): - raise Exception('Not Authorized') + raise exception.Unauthorized() |