summaryrefslogtreecommitdiff
path: root/keystoneclient/middleware/s3_token.py
diff options
context:
space:
mode:
authorBrant Knudson <bknudson@us.ibm.com>2015-04-07 19:38:29 +0000
committerBrant Knudson <bknudson@us.ibm.com>2015-04-20 17:33:32 -0500
commit8fa6b6f0b5e95493342ce71489d04f73db2418b8 (patch)
tree8f07cb2c6f7f254c991569f9b5c4a9db0f5c33cc /keystoneclient/middleware/s3_token.py
parent290e39dd19cb822f87472b5b45202fcf3eeaa0dd (diff)
downloadpython-keystoneclient-1.3.1.tar.gz
Fix s3_token middleware parsing insecure option1.3.1
The "insecure" option was being treated as a bool when it was actually provided as a string. The fix is to parse the string to a bool. Closes-Bug: 1411063 Change-Id: Id674f40532215788675c97a8fdfa91d4420347b3
Diffstat (limited to 'keystoneclient/middleware/s3_token.py')
-rw-r--r--keystoneclient/middleware/s3_token.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/keystoneclient/middleware/s3_token.py b/keystoneclient/middleware/s3_token.py
index 7552893..f8d1ce0 100644
--- a/keystoneclient/middleware/s3_token.py
+++ b/keystoneclient/middleware/s3_token.py
@@ -34,6 +34,7 @@ This WSGI component:
import logging
from oslo_serialization import jsonutils
+from oslo_utils import strutils
import requests
import six
from six.moves import urllib
@@ -116,7 +117,7 @@ class S3Token(object):
self.request_uri = '%s://%s:%s' % (auth_protocol, auth_host, auth_port)
# SSL
- insecure = conf.get('insecure', False)
+ insecure = strutils.bool_from_string(conf.get('insecure', False))
cert_file = conf.get('certfile')
key_file = conf.get('keyfile')