Merge "Update service policies for system reader"

keystone/common/policies/service.py

@@ -10,25 +10,49 @@
 # 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_service = policy.DeprecatedRule(
+    name=base.IDENTITY % 'get_service',
+    check_str=base.RULE_ADMIN_REQUIRED
+)
+deprecated_list_service = policy.DeprecatedRule(
+    name=base.IDENTITY % 'list_services',
+    check_str=base.RULE_ADMIN_REQUIRED
+)
+
+DEPRECATED_REASON = """
+As of the Stein release, the service 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 service API.
+"""
+
 service_policies = [
     policy.DocumentedRuleDefault(
         name=base.IDENTITY % 'get_service',
-        check_str=base.RULE_ADMIN_REQUIRED,
+        check_str=base.SYSTEM_READER,
         scope_types=['system'],
         description='Show service details.',
         operations=[{'path': '/v3/services/{service_id}',
-                     'method': 'GET'}]),
+                     'method': 'GET'}],
+        deprecated_rule=deprecated_get_service,
+        deprecated_reason=DEPRECATED_REASON,
+        deprecated_since=versionutils.deprecated.STEIN),
     policy.DocumentedRuleDefault(
         name=base.IDENTITY % 'list_services',
-        check_str=base.RULE_ADMIN_REQUIRED,
+        check_str=base.SYSTEM_READER,
         scope_types=['system'],
         description='List services.',
         operations=[{'path': '/v3/services',
-                     'method': 'GET'}]),
+                     'method': 'GET'}],
+        deprecated_rule=deprecated_list_service,
+        deprecated_reason=DEPRECATED_REASON,
+        deprecated_since=versionutils.deprecated.STEIN),
     policy.DocumentedRuleDefault(
         name=base.IDENTITY % 'create_service',
         check_str=base.RULE_ADMIN_REQUIRED,

keystone/tests/unit/protection/v3/test_services.py

@@ -0,0 +1,119 @@
+#    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 SystemReaderTests(base_classes.TestCaseWithBootstrap,
+                        common_auth.AuthTestMixin):
+
+    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_services(self):
+        create = {
+            'service': {
+                'type': uuid.uuid4().hex,
+                'name': uuid.uuid4().hex,
+            }
+        }
+
+        with self.test_client() as c:
+            c.post(
+                '/v3/services', json=create, headers=self.headers,
+                expected_status_code=http_client.FORBIDDEN
+            )
+
+    def test_user_cannot_update_services(self):
+        service = unit.new_service_ref()
+        service = PROVIDERS.catalog_api.create_service(service['id'], service)
+
+        update = {'service': {'description': uuid.uuid4().hex}}
+
+        with self.test_client() as c:
+            c.patch(
+                '/v3/services/%s' % service['id'], json=update,
+                headers=self.headers,
+                expected_status_code=http_client.FORBIDDEN
+            )
+
+    def test_user_can_list_services(self):
+        expected_service_ids = []
+        for _ in range(2):
+            s = unit.new_service_ref()
+            service = PROVIDERS.catalog_api.create_service(s['id'], s)
+            expected_service_ids.append(service['id'])
+
+        with self.test_client() as c:
+            r = c.get('/v3/services', headers=self.headers)
+
+            actual_service_ids = []
+            for service in r.json['services']:
+                actual_service_ids.append(service['id'])
+
+            for service_id in expected_service_ids:
+                self.assertIn(service_id, actual_service_ids)
+
+    def test_user_can_get_a_service(self):
+        service = unit.new_service_ref()
+        service = PROVIDERS.catalog_api.create_service(service['id'], service)
+
+        with self.test_client() as c:
+            r = c.get('/v3/services/%s' % service['id'], headers=self.headers)
+            self.assertEqual(r.json['service']['id'], service['id'])
+
+    def test_user_cannot_delete_services(self):
+        service = unit.new_service_ref()
+        service = PROVIDERS.catalog_api.create_service(service['id'], service)
+
+        with self.test_client() as c:
+            c.delete(
+                '/v3/services/%s' % service['id'], headers=self.headers,
+                expected_status_code=http_client.FORBIDDEN
+            )