openstack/cinder
Code Issues Proposed changes

Hitachi and OEM: masking REST API token on log

Browse Source 
This patch masks the REST API token on log file for security reason.

Closes-Bug: #2040966
Change-Id: I5dd0e51e618094ff442308a93466e36d55e4f267
This commit is contained in:
Atsushi Kawai 2024-07-03 16:53:37 +09:00
parent bf3973eb52
commit 06c3e1aca3
2 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
cinder/volume/drivers/hitachi/hbsd_rest_api.py
View File

@ -280,7 +280,6 @@ class RestApiClient():
} }
return req return req
@volume_utils.trace
def _request(self, method, url, params=None, body=None, def _request(self, method, url, params=None, body=None,
async_=False, **kwargs): async_=False, **kwargs):
"""Transmit the request to REST API server.""" """Transmit the request to REST API server."""
@ -526,6 +525,7 @@ class RestApiClient():
def get_my_session(self): def get_my_session(self):
return getattr(self, 'session', None) return getattr(self, 'session', None)
@volume_utils.trace
def _login(self, do_raise=True): def _login(self, do_raise=True):
"""Establishes a session and manages the session.""" """Establishes a session and manages the session."""
url = '%(url)s/sessions' % { url = '%(url)s/sessions' % {
@ -598,16 +598,19 @@ class RestApiClient():
self.conf.hitachi_rest_keep_session_loop_interval) self.conf.hitachi_rest_keep_session_loop_interval)
LOG.debug('enter_keep_session') LOG.debug('enter_keep_session')
@volume_utils.trace
def _get_object(self, url, params=None, **kwargs): def _get_object(self, url, params=None, **kwargs):
"""Transmit a GET request that appointed object ID.""" """Transmit a GET request that appointed object ID."""
rsp = self._request("GET", url, params=params, **kwargs)[0] rsp = self._request("GET", url, params=params, **kwargs)[0]
return rsp if rsp else None return rsp if rsp else None
@volume_utils.trace
def _get_objects(self, url, params=None, **kwargs): def _get_objects(self, url, params=None, **kwargs):
"""Transmit a GET request.""" """Transmit a GET request."""
rsp = self._request("GET", url, params=params, **kwargs)[0] rsp = self._request("GET", url, params=params, **kwargs)[0]
return rsp.get("data") if rsp else None return rsp.get("data") if rsp else None
@volume_utils.trace
def _add_object(self, url, body, **kwargs): def _add_object(self, url, body, **kwargs):
"""Transmit a POST request.""" """Transmit a POST request."""
rsp, errobj = self._request( rsp, errobj = self._request(
@ -619,11 +622,13 @@ class RestApiClient():
return resources[0].split('/')[-1], errobj return resources[0].split('/')[-1], errobj
return None, errobj return None, errobj
@volume_utils.trace
def _delete_object(self, url, params=None, body=None, **kwargs): def _delete_object(self, url, params=None, body=None, **kwargs):
"""Transmit a DELETE request.""" """Transmit a DELETE request."""
self._request("DELETE", url, params=params, body=body, async_=True, self._request("DELETE", url, params=params, body=body, async_=True,
**kwargs) **kwargs)
@volume_utils.trace
def _invoke(self, url, body=None, **kwargs): def _invoke(self, url, body=None, **kwargs):
"""Transmit a PUT request.""" """Transmit a PUT request."""
self._request("PUT", url, body=body, async_=True, **kwargs) self._request("PUT", url, body=body, async_=True, **kwargs)

14
releasenotes/notes/hitachi-fix-output-token-c9eb15423e05c5b9.yaml Normal file
View File

@ -0,0 +1,14 @@
---
fixes:
- |
Hitachi driver `bug #2040966
<https://bugs.launchpad.net/cinder/+bug/2040966>`_:
Mask a token for REST API session.
- |
NEC V driver `bug #2040966
<https://bugs.launchpad.net/cinder/+bug/2040966>`_:
Mask a token for REST API session.
- |
HPE XP driver `bug #2040966
<https://bugs.launchpad.net/cinder/+bug/2040966>`_:
Mask a token for REST API session.