
Add the ability to turn off logging from the session object and then handle logging of auth requests within their own sections. This is a very simplistic ability to completely disable logging. Logging more filtered debugging can be added later. This new ability is utilized in this patch to prevent logging of requests that include passwords. This covers authenticate, password change, and user update requests that include passwords. SecurityImpact Change-Id: I3dabb94ab047e86b8730e73416c1a1c333688489 Closes-Bug: #1004114 Closes-Bug: #1327019
66 lines
2.3 KiB
Python
66 lines
2.3 KiB
Python
# Licensed under the Apache License, Version 2.0 (the "License"); you may
|
|
# not use this file except in compliance with the License. You may obtain
|
|
# a copy of the License at
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
|
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
|
# License for the specific language governing permissions and limitations
|
|
# under the License.
|
|
|
|
from keystoneclient import base
|
|
from keystoneclient import utils
|
|
|
|
|
|
class Token(base.Resource):
|
|
def __repr__(self):
|
|
return "<Token %s>" % self._info
|
|
|
|
@property
|
|
def id(self):
|
|
return self._info['token']['id']
|
|
|
|
@property
|
|
def expires(self):
|
|
return self._info['token']['expires']
|
|
|
|
@property
|
|
def tenant(self):
|
|
return self._info['token'].get('tenant')
|
|
|
|
|
|
class TokenManager(base.Manager):
|
|
resource_class = Token
|
|
|
|
@utils.positional(enforcement=utils.positional.WARN)
|
|
def authenticate(self, username=None, tenant_id=None, tenant_name=None,
|
|
password=None, token=None, return_raw=False):
|
|
if token:
|
|
params = {"auth": {"token": {"id": token}}}
|
|
elif username and password:
|
|
params = {"auth": {"passwordCredentials": {"username": username,
|
|
"password": password}}}
|
|
else:
|
|
raise ValueError('A username and password or token is required.')
|
|
if tenant_id:
|
|
params['auth']['tenantId'] = tenant_id
|
|
elif tenant_name:
|
|
params['auth']['tenantName'] = tenant_name
|
|
reset = 0
|
|
if self.api.management_url is None:
|
|
reset = 1
|
|
self.api.management_url = self.api.auth_url
|
|
token_ref = self._create('/tokens', params, "access",
|
|
return_raw=return_raw, log=False)
|
|
if reset:
|
|
self.api.management_url = None
|
|
return token_ref
|
|
|
|
def delete(self, token):
|
|
return self._delete("/tokens/%s" % base.getid(token))
|
|
|
|
def endpoints(self, token):
|
|
return self._get("/tokens/%s/endpoints" % base.getid(token), "token")
|