0e9ecaa154
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
293 lines
10 KiB
Python
293 lines
10 KiB
Python
# Copyright 2012 OpenStack Foundation
|
|
#
|
|
# 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.
|
|
|
|
import uuid
|
|
|
|
import httpretty
|
|
|
|
from keystoneclient import exceptions
|
|
from keystoneclient.tests.v3 import utils
|
|
from keystoneclient.v3 import users
|
|
|
|
|
|
class UserTests(utils.TestCase, utils.CrudTests):
|
|
def setUp(self):
|
|
super(UserTests, self).setUp()
|
|
self.key = 'user'
|
|
self.collection_key = 'users'
|
|
self.model = users.User
|
|
self.manager = self.client.users
|
|
|
|
def new_ref(self, **kwargs):
|
|
kwargs = super(UserTests, self).new_ref(**kwargs)
|
|
kwargs.setdefault('description', uuid.uuid4().hex)
|
|
kwargs.setdefault('domain_id', uuid.uuid4().hex)
|
|
kwargs.setdefault('enabled', True)
|
|
kwargs.setdefault('name', uuid.uuid4().hex)
|
|
kwargs.setdefault('default_project_id', uuid.uuid4().hex)
|
|
return kwargs
|
|
|
|
@httpretty.activate
|
|
def test_add_user_to_group(self):
|
|
group_id = uuid.uuid4().hex
|
|
ref = self.new_ref()
|
|
self.stub_url(httpretty.PUT,
|
|
['groups', group_id, self.collection_key, ref['id']],
|
|
status=204)
|
|
|
|
self.manager.add_to_group(user=ref['id'], group=group_id)
|
|
self.assertRaises(exceptions.ValidationError,
|
|
self.manager.remove_from_group,
|
|
user=ref['id'],
|
|
group=None)
|
|
|
|
@httpretty.activate
|
|
def test_list_users_in_group(self):
|
|
group_id = uuid.uuid4().hex
|
|
ref_list = [self.new_ref(), self.new_ref()]
|
|
|
|
self.stub_entity(httpretty.GET,
|
|
['groups', group_id, self.collection_key],
|
|
entity=ref_list)
|
|
|
|
returned_list = self.manager.list(group=group_id)
|
|
self.assertEqual(len(ref_list), len(returned_list))
|
|
[self.assertIsInstance(r, self.model) for r in returned_list]
|
|
|
|
@httpretty.activate
|
|
def test_check_user_in_group(self):
|
|
group_id = uuid.uuid4().hex
|
|
ref = self.new_ref()
|
|
|
|
self.stub_url(httpretty.HEAD,
|
|
['groups', group_id, self.collection_key, ref['id']],
|
|
status=204)
|
|
|
|
self.manager.check_in_group(user=ref['id'], group=group_id)
|
|
|
|
self.assertRaises(exceptions.ValidationError,
|
|
self.manager.check_in_group,
|
|
user=ref['id'],
|
|
group=None)
|
|
|
|
@httpretty.activate
|
|
def test_remove_user_from_group(self):
|
|
group_id = uuid.uuid4().hex
|
|
ref = self.new_ref()
|
|
|
|
self.stub_url(httpretty.DELETE,
|
|
['groups', group_id, self.collection_key, ref['id']],
|
|
status=204)
|
|
|
|
self.manager.remove_from_group(user=ref['id'], group=group_id)
|
|
self.assertRaises(exceptions.ValidationError,
|
|
self.manager.remove_from_group,
|
|
user=ref['id'],
|
|
group=None)
|
|
|
|
@httpretty.activate
|
|
def test_create_doesnt_log_password(self):
|
|
password = uuid.uuid4().hex
|
|
ref = self.new_ref()
|
|
|
|
self.stub_entity(httpretty.POST, [self.collection_key],
|
|
status=201, entity=ref)
|
|
|
|
req_ref = ref.copy()
|
|
req_ref.pop('id')
|
|
param_ref = req_ref.copy()
|
|
|
|
param_ref['password'] = password
|
|
params = utils.parameterize(param_ref)
|
|
|
|
self.manager.create(**params)
|
|
|
|
self.assertNotIn(password, self.logger.output)
|
|
|
|
@httpretty.activate
|
|
def test_create_with_project(self):
|
|
# Can create a user with the deprecated project option rather than
|
|
# default_project_id.
|
|
ref = self.new_ref()
|
|
|
|
self.stub_entity(httpretty.POST, [self.collection_key],
|
|
status=201, entity=ref)
|
|
|
|
req_ref = ref.copy()
|
|
req_ref.pop('id')
|
|
param_ref = req_ref.copy()
|
|
# Use deprecated project_id rather than new default_project_id.
|
|
param_ref['project_id'] = param_ref.pop('default_project_id')
|
|
params = utils.parameterize(param_ref)
|
|
|
|
returned = self.manager.create(**params)
|
|
self.assertIsInstance(returned, self.model)
|
|
for attr in ref:
|
|
self.assertEqual(
|
|
getattr(returned, attr),
|
|
ref[attr],
|
|
'Expected different %s' % attr)
|
|
self.assertEntityRequestBodyIs(req_ref)
|
|
|
|
@httpretty.activate
|
|
def test_create_with_project_and_default_project(self):
|
|
# Can create a user with the deprecated project and default_project_id.
|
|
# The backend call should only pass the default_project_id.
|
|
ref = self.new_ref()
|
|
|
|
self.stub_entity(httpretty.POST,
|
|
[self.collection_key],
|
|
status=201, entity=ref)
|
|
|
|
req_ref = ref.copy()
|
|
req_ref.pop('id')
|
|
param_ref = req_ref.copy()
|
|
|
|
# Add the deprecated project_id in the call, the value will be ignored.
|
|
param_ref['project_id'] = 'project'
|
|
params = utils.parameterize(param_ref)
|
|
|
|
returned = self.manager.create(**params)
|
|
self.assertIsInstance(returned, self.model)
|
|
for attr in ref:
|
|
self.assertEqual(
|
|
getattr(returned, attr),
|
|
ref[attr],
|
|
'Expected different %s' % attr)
|
|
self.assertEntityRequestBodyIs(req_ref)
|
|
|
|
@httpretty.activate
|
|
def test_update_doesnt_log_password(self):
|
|
password = uuid.uuid4().hex
|
|
ref = self.new_ref()
|
|
|
|
req_ref = ref.copy()
|
|
req_ref.pop('id')
|
|
param_ref = req_ref.copy()
|
|
|
|
self.stub_entity(httpretty.PATCH,
|
|
[self.collection_key, ref['id']],
|
|
status=200, entity=ref)
|
|
|
|
param_ref['password'] = password
|
|
params = utils.parameterize(param_ref)
|
|
|
|
self.manager.update(ref['id'], **params)
|
|
|
|
self.assertNotIn(password, self.logger.output)
|
|
|
|
@httpretty.activate
|
|
def test_update_with_project(self):
|
|
# Can update a user with the deprecated project option rather than
|
|
# default_project_id.
|
|
ref = self.new_ref()
|
|
req_ref = ref.copy()
|
|
req_ref.pop('id')
|
|
param_ref = req_ref.copy()
|
|
|
|
self.stub_entity(httpretty.PATCH,
|
|
[self.collection_key, ref['id']],
|
|
status=200, entity=ref)
|
|
|
|
# Use deprecated project_id rather than new default_project_id.
|
|
param_ref['project_id'] = param_ref.pop('default_project_id')
|
|
params = utils.parameterize(param_ref)
|
|
|
|
returned = self.manager.update(ref['id'], **params)
|
|
self.assertIsInstance(returned, self.model)
|
|
for attr in ref:
|
|
self.assertEqual(
|
|
getattr(returned, attr),
|
|
ref[attr],
|
|
'Expected different %s' % attr)
|
|
self.assertEntityRequestBodyIs(req_ref)
|
|
|
|
@httpretty.activate
|
|
def test_update_with_project_and_default_project(self, ref=None):
|
|
ref = self.new_ref()
|
|
req_ref = ref.copy()
|
|
req_ref.pop('id')
|
|
param_ref = req_ref.copy()
|
|
|
|
self.stub_entity(httpretty.PATCH,
|
|
[self.collection_key, ref['id']],
|
|
status=200, entity=ref)
|
|
|
|
# Add the deprecated project_id in the call, the value will be ignored.
|
|
param_ref['project_id'] = 'project'
|
|
params = utils.parameterize(param_ref)
|
|
|
|
returned = self.manager.update(ref['id'], **params)
|
|
self.assertIsInstance(returned, self.model)
|
|
for attr in ref:
|
|
self.assertEqual(
|
|
getattr(returned, attr),
|
|
ref[attr],
|
|
'Expected different %s' % attr)
|
|
self.assertEntityRequestBodyIs(req_ref)
|
|
|
|
@httpretty.activate
|
|
def test_update_password(self):
|
|
old_password = uuid.uuid4().hex
|
|
new_password = uuid.uuid4().hex
|
|
|
|
self.stub_url(httpretty.POST,
|
|
[self.collection_key, self.TEST_USER, 'password'])
|
|
self.client.user_id = self.TEST_USER
|
|
self.manager.update_password(old_password, new_password)
|
|
|
|
exp_req_body = {
|
|
'user': {
|
|
'password': new_password, 'original_password': old_password
|
|
}
|
|
}
|
|
|
|
self.assertEqual('/v3/users/test/password',
|
|
httpretty.last_request().path)
|
|
self.assertRequestBodyIs(json=exp_req_body)
|
|
self.assertNotIn(old_password, self.logger.output)
|
|
self.assertNotIn(new_password, self.logger.output)
|
|
|
|
def test_update_password_with_bad_inputs(self):
|
|
old_password = uuid.uuid4().hex
|
|
new_password = uuid.uuid4().hex
|
|
|
|
# users can't unset their password
|
|
self.assertRaises(exceptions.ValidationError,
|
|
self.manager.update_password,
|
|
old_password, None)
|
|
self.assertRaises(exceptions.ValidationError,
|
|
self.manager.update_password,
|
|
old_password, '')
|
|
|
|
# users can't start with empty passwords
|
|
self.assertRaises(exceptions.ValidationError,
|
|
self.manager.update_password,
|
|
None, new_password)
|
|
self.assertRaises(exceptions.ValidationError,
|
|
self.manager.update_password,
|
|
'', new_password)
|
|
|
|
# this wouldn't result in any change anyway
|
|
self.assertRaises(exceptions.ValidationError,
|
|
self.manager.update_password,
|
|
None, None)
|
|
self.assertRaises(exceptions.ValidationError,
|
|
self.manager.update_password,
|
|
'', '')
|
|
password = uuid.uuid4().hex
|
|
self.assertRaises(exceptions.ValidationError,
|
|
self.manager.update_password,
|
|
password, password)
|