Issue #2063401 by dawehner, damiankloip, tim.plunkett: Replace the default...

Issue #2063401 by dawehner, damiankloip, tim.plunkett: Replace the default _access_checks()(access mode) with ALL instead of ANY.

core/lib/Drupal/Core/Access/AccessManager.php

@@ -227,7 +227,7 @@ public function checkNamedRoute($route_name, array $parameters = array(), Reques
   public function check(Route $route, Request $request) {
     $checks = $route->getOption('_access_checks') ?: array();
 
-    $conjunction = $route->getOption('_access_mode') ?: 'ANY';
+    $conjunction = $route->getOption('_access_mode') ?: 'ALL';
 
     if ($conjunction == 'ALL') {
       return $this->checkAll($checks, $route, $request);

core/modules/block/block.routing.yml

@@ -2,8 +2,6 @@ block.admin_demo:
   path: '/admin/structure/block/demo/{theme}'
   defaults:
     _content: '\Drupal\block\Controller\BlockController::demo'
-  options:
-    _access_mode: 'ALL'
   requirements:
     _access_theme: 'TRUE'
     _permission: 'administer blocks'

core/modules/block/lib/Drupal/block/Routing/RouteSubscriber.php

@@ -48,9 +48,6 @@ public function routes(RouteBuildEvent $event) {
         array(
           '_access_theme' => 'TRUE',
           '_permission' => 'administer blocks',
-        ),
-        array(
-          '_access_mode' => 'ALL',
         )
       );
       $collection->add("block.admin_display_$key", $route);

core/modules/block/lib/Drupal/block/Tests/BlockTestBase.php

@@ -67,12 +67,6 @@ function setUp() {
       'footer',
     );
 
-    $default_theme = variable_get('theme_default', 'stark');
-    $manager = $this->container->get('plugin.manager.block');
-    $instances = config_get_storage_names_with_prefix('plugin.core.block.' . $default_theme);
-    foreach ($instances as $plugin_id) {
-      \Drupal::config($plugin_id)->delete();
-    }
   }
 
   /**

core/modules/book/book.routing.yml

@@ -23,8 +23,6 @@ book.export:
   path: '/book/export/{type}/{node}'
   defaults:
     _controller: '\Drupal\book\Controller\BookController::bookExport'
-  options:
-    _access_mode: 'ALL'
   requirements:
     _permission: 'access printer-friendly version'
     _entity_access: 'node.view'
@@ -33,8 +31,6 @@ book.outline:
   path: '/node/{node}/outline'
   defaults:
     _entity_form: 'node.book_outline'
-  options:
-    _access_mode: 'ALL'
   requirements:
     _permission: 'administer book outlines'
     _entity_access: 'node.view'
@@ -44,8 +40,6 @@ book.admin_edit:
   defaults:
     _form: 'Drupal\book\Form\BookAdminEditForm'
     _title: 'Re-order book pages and change titles'
-  options:
-    _access_mode: 'ALL'
   requirements:
     _permission: 'administer book outlines'
     _entity_access: 'node.view'

core/modules/content_translation/lib/Drupal/content_translation/Routing/ContentTranslationRouteSubscriber.php

@@ -63,6 +63,7 @@ public function routes(RouteBuildEvent $event) {
             '_permission' => 'translate any entity',
           ),
           array(
+            '_access_mode' => 'ANY',
             'parameters' => array(
               'entity' => array(
                 'type' => 'entity:' . $entity_type,
@@ -86,6 +87,7 @@ public function routes(RouteBuildEvent $event) {
             '_access_content_translation_manage' => 'create',
           ),
           array(
+            '_access_mode' => 'ANY',
             'parameters' => array(
               'entity' => array(
                 'type' => 'entity:' . $entity_type,
@@ -107,6 +109,7 @@ public function routes(RouteBuildEvent $event) {
             '_access_content_translation_manage' => 'update',
           ),
           array(
+            '_access_mode' => 'ANY',
             'parameters' => array(
               'entity' => array(
                 'type' => 'entity:' . $entity_type,
@@ -133,6 +136,7 @@ public function routes(RouteBuildEvent $event) {
                 'type' => 'entity:' . $entity_type,
               ),
             ),
+            '_access_mode' => 'ANY',
           )
         );
         $collection->add("content_translation.delete_$entity_type", $route);

core/modules/edit/edit.routing.yml

@@ -16,8 +16,6 @@ edit.field_form:
   path: '/edit/form/{entity_type}/{entity}/{field_name}/{langcode}/{view_mode_id}'
   defaults:
     _controller: '\Drupal\edit\EditController::fieldForm'
-  options:
-    _access_mode: 'ALL'
   requirements:
     _permission: 'access in-place editing'
     _access_edit_entity_field: 'TRUE'
@@ -26,8 +24,6 @@ edit.entity_save:
   path: '/edit/entity/{entity_type}/{entity}'
   defaults:
     _controller: '\Drupal\edit\EditController::entitySave'
-  options:
-    _access_mode: 'ALL'
   requirements:
     _permission: 'access in-place editing'
     _access_edit_entity: 'TRUE'

core/modules/editor/editor.routing.yml

@@ -2,8 +2,6 @@ editor.field_untransformed_text:
   path: '/editor/{entity_type}/{entity}/{field_name}/{langcode}/{view_mode_id}'
   defaults:
     _controller: '\Drupal\editor\EditorController::getUntransformedText'
-  options:
-    _access_mode: 'ALL'
   requirements:
     _permission: 'access in-place editing'
     _access_edit_entity_field: 'TRUE'

core/modules/filter/filter.routing.yml

@@ -39,8 +39,6 @@ filter.admin_disable:
   path: '/admin/config/content/formats/manage/{filter_format}/disable'
   defaults:
     _entity_form: 'filter_format.disable'
-  options:
-     _access_mode: 'ALL'
   requirements:
     _filter_disable_format_access: 'TRUE'
     _permission: 'administer filters'

core/modules/node/node.routing.yml

@@ -25,6 +25,8 @@ node.add_page:
   defaults:
     _title: 'Add page'
     _content: '\Drupal\node\Controller\NodeController::addPage'
+  options:
+    _access_mode: 'ANY'
   requirements:
     _permission: 'administer content types'
     _node_add_access: 'node'

core/modules/rest/lib/Drupal/rest/Plugin/ResourceBase.php

@@ -92,6 +92,8 @@ public function routes() {
         // The HTTP method is a requirement for this route.
         '_method' => $method,
         '_permission' => "restful $lower_method $this->pluginId",
+      ), array(
+        '_access_mode' => 'ANY',
       ));
 
       switch ($method) {

core/modules/search/lib/Drupal/search/Routing/SearchRouteSubscriber.php

@@ -64,10 +64,7 @@ public function routes(RouteBuildEvent $event) {
         '_search_plugin_view_access' => $plugin_id,
         '_permission' => 'search content',
       );
-      $options = array(
-        '_access_mode' => 'ALL',
-      );
-      $route = new Route($path, $defaults, $requirements, $options);
+      $route = new Route($path, $defaults, $requirements);
       $collection->add('search.view_' . $plugin_id, $route);
     }
   }

core/modules/search/search.routing.yml

@@ -19,8 +19,6 @@ search.view:
     _content: '\Drupal\search\Controller\SearchController::searchView'
     plugin_id: NULL
     keys: ''
-  options:
-    _access_mode: 'ALL'
   requirements:
     keys: '.+'
     _permission: 'search content'

core/tests/Drupal/Tests/Core/Access/AccessManagerTest.php

@@ -182,6 +182,13 @@ public function providerTestCheckConjunctions() {
       'condition_two' => AccessCheckInterface::KILL,
       'expected' => FALSE,
     );
+    $access_configurations[] = array(
+      'conjunction' => NULL,
+      'name' => 'test_route_4',
+      'condition_one' => AccessCheckInterface::ALLOW,
+      'condition_two' => AccessCheckInterface::KILL,
+      'expected' => FALSE,
+    );
     $access_configurations[] = array(
       'conjunction' => 'ALL',
       'name' => 'test_route_5',
@@ -189,6 +196,13 @@ public function providerTestCheckConjunctions() {
       'condition_two' => AccessCheckInterface::DENY,
       'expected' => FALSE,
     );
+    $access_configurations[] = array(
+      'conjunction' => NULL,
+      'name' => 'test_route_5',
+      'condition_one' => AccessCheckInterface::ALLOW,
+      'condition_two' => AccessCheckInterface::DENY,
+      'expected' => FALSE,
+    );
     $access_configurations[] = array(
       'conjunction' => 'ALL',
       'name' => 'test_route_6',
@@ -196,6 +210,13 @@ public function providerTestCheckConjunctions() {
       'condition_two' => AccessCheckInterface::DENY,
       'expected' => FALSE,
     );
+    $access_configurations[] = array(
+      'conjunction' => NULL,
+      'name' => 'test_route_6',
+      'condition_one' => AccessCheckInterface::KILL,
+      'condition_two' => AccessCheckInterface::DENY,
+      'expected' => FALSE,
+    );
     $access_configurations[] = array(
       'conjunction' => 'ALL',
       'name' => 'test_route_7',
@@ -203,6 +224,13 @@ public function providerTestCheckConjunctions() {
       'condition_two' => AccessCheckInterface::ALLOW,
       'expected' => TRUE,
     );
+    $access_configurations[] = array(
+      'conjunction' => NULL,
+      'name' => 'test_route_7',
+      'condition_one' => AccessCheckInterface::ALLOW,
+      'condition_two' => AccessCheckInterface::ALLOW,
+      'expected' => TRUE,
+    );
     $access_configurations[] = array(
       'conjunction' => 'ALL',
       'name' => 'test_route_8',
@@ -210,6 +238,13 @@ public function providerTestCheckConjunctions() {
       'condition_two' => AccessCheckInterface::KILL,
       'expected' => FALSE,
     );
+    $access_configurations[] = array(
+      'conjunction' => NULL,
+      'name' => 'test_route_8',
+      'condition_one' => AccessCheckInterface::KILL,
+      'condition_two' => AccessCheckInterface::KILL,
+      'expected' => FALSE,
+    );
     $access_configurations[] = array(
       'conjunction' => 'ALL',
       'name' => 'test_route_9',
@@ -217,6 +252,13 @@ public function providerTestCheckConjunctions() {
       'condition_two' => AccessCheckInterface::DENY,
       'expected' => FALSE,
     );
+    $access_configurations[] = array(
+      'conjunction' => NULL,
+      'name' => 'test_route_9',
+      'condition_one' => AccessCheckInterface::DENY,
+      'condition_two' => AccessCheckInterface::DENY,
+      'expected' => FALSE,
+    );
     $access_configurations[] = array(
       'conjunction' => 'ANY',
       'name' => 'test_route_10',
@@ -282,7 +324,7 @@ public function testCheckConjunctions($conjunction, $name, $condition_one, $cond
       '_access' => static::convertAccessCheckInterfaceToString($condition_one),
       '_test_access' => static::convertAccessCheckInterfaceToString($condition_two),
     );
-    $options = array('_access_mode' => $conjunction);
+    $options = $conjunction ? array('_access_mode' => $conjunction) : array();
     $route = new Route($name, array(), $requirements, $options);
     $route_collection->add($name, $route);