openstack/python-ceilometerclient
Code Issues Proposed changes

Merge "Don't expose X-Auth-Token in ceilometer CLI"

Browse Source
This commit is contained in:
Jenkins
2014-07-23 19:47:08 +00:00
committed by Gerrit Code Review
parent ead36aa221 e5048043e2
commit e90c3c4bdd
1 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
ceilometerclient/common/http.py
View File

@@ -14,6 +14,7 @@
# under the License. # under the License.
import copy import copy
import hashlib
import logging import logging
import os import os
import socket import socket
@@ -39,6 +40,7 @@ from ceilometerclient import exc
LOG = logging.getLogger(__name__) LOG = logging.getLogger(__name__)
USER_AGENT = 'python-ceilometerclient' USER_AGENT = 'python-ceilometerclient'
CHUNKSIZE = 1024 * 64 # 64kB CHUNKSIZE = 1024 * 64 # 64kB
SENSITIVE_HEADERS = ('X-Auth-Token',)
class HTTPClient(object): class HTTPClient(object):
@@ -84,11 +86,21 @@ class HTTPClient(object):
except httplib.InvalidURL: except httplib.InvalidURL:
raise exc.InvalidEndpoint() raise exc.InvalidEndpoint()
def safe_header(self, name, value):
if name in SENSITIVE_HEADERS:
# because in python3 byte string handling is ... ug
v = value.encode('utf-8')
h = hashlib.sha1(v)
d = h.hexdigest()
return name, "{SHA1}%s" % d
else:
return name, value
def log_curl_request(self, method, url, kwargs): def log_curl_request(self, method, url, kwargs):
curl = ['curl -i -X %s' % method] curl = ['curl -i -X %s' % method]
for (key, value) in kwargs['headers'].items(): for (key, value) in kwargs['headers'].items():
header = '-H \'%s: %s\'' % (key, value) header = '-H \'%s: %s\'' % self.safe_header(key, value)
curl.append(header) curl.append(header)
conn_params_fmt = [ conn_params_fmt = [