Browse Source

Update idp policies for system reader

The idp policies were not taking the default roles work we did
last release into account. This commit changes the default policies
to rely on the ``reader`` role for get and list idps. Subsequent
patches will incorporate:

 - system member test coverage
 - system admin functionality
 - domain users test coverage
 - project users test coverage

 Related-Bug: 1804517
 Related-Bug: 1804516

Change-Id: I18c041846010cd985a4bd40aaac011354345fcfa
tags/15.0.0.0rc1
Lance Bragstad 1 year ago
parent
commit
27bf50d127
2 changed files with 152 additions and 4 deletions
  1. +28
    -4
      keystone/common/policies/identity_provider.py
  2. +124
    -0
      keystone/tests/unit/protection/v3/test_identity_providers.py

+ 28
- 4
keystone/common/policies/identity_provider.py View File

@@ -10,10 +10,28 @@
# License for the specific language governing permissions and limitations
# under the License.

from oslo_log import versionutils
from oslo_policy import policy

from keystone.common.policies import base

deprecated_get_idp = policy.DeprecatedRule(
name=base.IDENTITY % 'get_identity_providers',
check_str=base.RULE_ADMIN_REQUIRED
)
deprecated_list_idp = policy.DeprecatedRule(
name=base.IDENTITY % 'list_identity_providers',
check_str=base.RULE_ADMIN_REQUIRED
)

DEPRECATED_REASON = """
As of the Stein release, the identity provider API now understands default
roles and system-scoped tokens, making the API more granular by default without
compromising security. The new policy defaults account for these changes
automatically. Be sure to take these new defaults into consideration if you are
relying on overrides in your deployment for the identity provider API.
"""

identity_provider_policies = [
policy.DocumentedRuleDefault(
name=base.IDENTITY % 'create_identity_provider',
@@ -30,7 +48,7 @@ identity_provider_policies = [
'method': 'PUT'}]),
policy.DocumentedRuleDefault(
name=base.IDENTITY % 'list_identity_providers',
check_str=base.RULE_ADMIN_REQUIRED,
check_str=base.SYSTEM_READER,
scope_types=['system'],
description='List identity providers.',
operations=[
@@ -42,11 +60,14 @@ identity_provider_policies = [
'path': '/v3/OS-FEDERATION/identity_providers',
'method': 'HEAD'
}
]
],
deprecated_rule=deprecated_list_idp,
deprecated_reason=DEPRECATED_REASON,
deprecated_since=versionutils.deprecated.STEIN
),
policy.DocumentedRuleDefault(
name=base.IDENTITY % 'get_identity_provider',
check_str=base.RULE_ADMIN_REQUIRED,
check_str=base.SYSTEM_READER,
scope_types=['system'],
description='Get identity provider.',
operations=[
@@ -58,7 +79,10 @@ identity_provider_policies = [
'path': '/v3/OS-FEDERATION/identity_providers/{idp_id}',
'method': 'HEAD'
}
]
],
deprecated_rule=deprecated_get_idp,
deprecated_reason=DEPRECATED_REASON,
deprecated_since=versionutils.deprecated.STEIN
),
policy.DocumentedRuleDefault(
name=base.IDENTITY % 'update_identity_provider',

+ 124
- 0
keystone/tests/unit/protection/v3/test_identity_providers.py View File

@@ -0,0 +1,124 @@
# 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

from six.moves import http_client

from keystone.common import provider_api
import keystone.conf
from keystone.tests.common import auth as common_auth
from keystone.tests import unit
from keystone.tests.unit import base_classes
from keystone.tests.unit import ksfixtures

CONF = keystone.conf.CONF
PROVIDERS = provider_api.ProviderAPIs


class _SystemUserIdentityProviderTests(object):
"""Common default functionality for all system users."""

def test_user_can_list_identity_providers(self):
expected_idp_ids = []
idp = PROVIDERS.federation_api.create_idp(
uuid.uuid4().hex, unit.new_identity_provider_ref()
)
expected_idp_ids.append(idp['id'])

with self.test_client() as c:
r = c.get(
'/v3/OS-FEDERATION/identity_providers', headers=self.headers
)

for idp in r.json['identity_providers']:
self.assertIn(idp['id'], expected_idp_ids)

def test_user_can_get_an_identity_provider(self):
idp = PROVIDERS.federation_api.create_idp(
uuid.uuid4().hex, unit.new_identity_provider_ref()
)

with self.test_client() as c:
c.get(
'/v3/OS-FEDERATION/identity_providers/%s' % idp['id'],
headers=self.headers
)


class SystemReaderTests(base_classes.TestCaseWithBootstrap,
common_auth.AuthTestMixin,
_SystemUserIdentityProviderTests):

def setUp(self):
super(SystemReaderTests, self).setUp()
self.loadapp()
self.useFixture(ksfixtures.Policy(self.config_fixture))
self.config_fixture.config(group='oslo_policy', enforce_scope=True)

system_reader = unit.new_user_ref(
domain_id=CONF.identity.default_domain_id
)
self.user_id = PROVIDERS.identity_api.create_user(
system_reader
)['id']
PROVIDERS.assignment_api.create_system_grant_for_user(
self.user_id, self.bootstrapper.reader_role_id
)

auth = self.build_authentication_request(
user_id=self.user_id, password=system_reader['password'],
system=True
)

# Grab a token using the persona we're testing and prepare headers
# for requests we'll be making in the tests.
with self.test_client() as c:
r = c.post('/v3/auth/tokens', json=auth)
self.token_id = r.headers['X-Subject-Token']
self.headers = {'X-Auth-Token': self.token_id}

def test_user_cannot_create_identity_providers(self):
create = {'identity_provider': {'remote_ids': [uuid.uuid4().hex]}}

with self.test_client() as c:
c.put(
'/v3/OS-FEDERATION/identity_providers/%s' % uuid.uuid4().hex,
json=create, headers=self.headers,
expected_status_code=http_client.FORBIDDEN
)

def test_user_cannot_update_identity_providers(self):
idp = PROVIDERS.federation_api.create_idp(
uuid.uuid4().hex, unit.new_identity_provider_ref()
)

update = {'identity_provider': {'enabled': False}}

with self.test_client() as c:
c.patch(
'/v3/OS-FEDERATION/identity_providers/%s' % idp['id'],
json=update, headers=self.headers,
expected_status_code=http_client.FORBIDDEN
)

def test_user_cannot_delete_identity_providers(self):
idp = PROVIDERS.federation_api.create_idp(
uuid.uuid4().hex, unit.new_identity_provider_ref()
)

with self.test_client() as c:
c.delete(
'/v3/OS-FEDERATION/identity_providers/%s' % idp['id'],
headers=self.headers,
expected_status_code=http_client.FORBIDDEN
)

Loading…
Cancel
Save