From 99151ae7e32156261dfea196edcf28d628b4218c Mon Sep 17 00:00:00 2001
From: Nathaniel Catchpole <catch@35733.no-reply.drupal.org>
Date: Wed, 9 Mar 2016 10:28:46 +0900
Subject: [PATCH] Issue #2673726 by Jaesin, dawehner: Allow modules to proxy
permissions for other modules
---
core/modules/user/src/PermissionHandler.php | 4 ++--
.../tests/src/Unit/PermissionHandlerTest.php | 19 ++++++++++++++++++-
2 files changed, 20 insertions(+), 3 deletions(-)
diff --git a/core/modules/user/src/PermissionHandler.php b/core/modules/user/src/PermissionHandler.php
index ac6e9bb69485..0e5489e2246b 100644
--- a/core/modules/user/src/PermissionHandler.php
+++ b/core/modules/user/src/PermissionHandler.php
@@ -163,8 +163,8 @@ protected function buildPermissionsYaml() {
$callback_permission += array(
'description' => NULL,
+ 'provider' => $provider,
);
- $callback_permission['provider'] = $provider;
$all_callback_permissions[$name] = $callback_permission;
}
@@ -182,7 +182,7 @@ protected function buildPermissionsYaml() {
}
$permission['title'] = $this->t($permission['title']);
$permission['description'] = isset($permission['description']) ? $this->t($permission['description']) : NULL;
- $permission['provider'] = $provider;
+ $permission['provider'] = !empty($permission['provider']) ? $permission['provider'] : $provider;
}
$all_permissions += $permissions;
diff --git a/core/modules/user/tests/src/Unit/PermissionHandlerTest.php b/core/modules/user/tests/src/Unit/PermissionHandlerTest.php
index e252b494aaa9..6a2b26fb006e 100644
--- a/core/modules/user/tests/src/Unit/PermissionHandlerTest.php
+++ b/core/modules/user/tests/src/Unit/PermissionHandlerTest.php
@@ -113,6 +113,9 @@ public function testBuildPermissionsYaml() {
"'access module b':
title: 'Access B'
description: 'bla bla'
+'access module a via module b':
+ title: 'Access A via B'
+ provider: 'module_a'
");
mkdir($url . '/module_c');
file_put_contents($url . '/module_c/module_c.permissions.yml',
@@ -239,6 +242,7 @@ public function testBuildPermissionsYamlCallback() {
file_put_contents($url . '/module_b/module_b.permissions.yml',
"permission_callbacks:
- 'Drupal\\user\\Tests\\TestPermissionCallbacks::titleDescription'
+ - 'Drupal\\user\\Tests\\TestPermissionCallbacks::titleProvider'
");
mkdir($url . '/module_c');
file_put_contents($url . '/module_c/module_c.permissions.yml',
@@ -271,6 +275,10 @@ public function testBuildPermissionsYamlCallback() {
->with('Drupal\\user\\Tests\\TestPermissionCallbacks::titleDescription')
->willReturn(array(new TestPermissionCallbacks(), 'titleDescription'));
$this->controllerResolver->expects($this->at(2))
+ ->method('getControllerFromDefinition')
+ ->with('Drupal\\user\\Tests\\TestPermissionCallbacks::titleProvider')
+ ->willReturn(array(new TestPermissionCallbacks(), 'titleProvider'));
+ $this->controllerResolver->expects($this->at(3))
->method('getControllerFromDefinition')
->with('Drupal\\user\\Tests\\TestPermissionCallbacks::titleDescriptionRestrictAccess')
->willReturn(array(new TestPermissionCallbacks(), 'titleDescriptionRestrictAccess'));
@@ -351,7 +359,7 @@ public function testPermissionsYamlStaticAndCallback() {
* The actual permissions
*/
protected function assertPermissions(array $actual_permissions) {
- $this->assertCount(3, $actual_permissions);
+ $this->assertCount(4, $actual_permissions);
$this->assertEquals($actual_permissions['access_module_a']['title'], 'single_description');
$this->assertEquals($actual_permissions['access_module_a']['provider'], 'module_a');
$this->assertEquals($actual_permissions['access module b']['title'], 'Access B');
@@ -359,6 +367,7 @@ protected function assertPermissions(array $actual_permissions) {
$this->assertEquals($actual_permissions['access_module_c']['title'], 'Access C');
$this->assertEquals($actual_permissions['access_module_c']['provider'], 'module_c');
$this->assertEquals($actual_permissions['access_module_c']['restrict access'], TRUE);
+ $this->assertEquals($actual_permissions['access module a via module b']['provider'], 'module_a');
}
}
@@ -409,6 +418,14 @@ public function titleDescriptionRestrictAccess() {
);
}
+ public function titleProvider() {
+ return array(
+ 'access module a via module b' => array(
+ 'title' => 'Access A via B',
+ 'provider' => 'module_a',
+ ),
+ );
+ }
}
/**
--
GitLab