diff core/modules/block_content/src/BlockContentAccessControlHandler.php @ 4:a9cd425dd02b

Update, including to Drupal core 8.6.10

--- a/core/modules/block_content/src/BlockContentAccessControlHandler.php	Thu Feb 28 11:14:44 2019 +0000
+++ b/core/modules/block_content/src/BlockContentAccessControlHandler.php	Thu Feb 28 13:11:55 2019 +0000
@@ -2,27 +2,87 @@
 
 namespace Drupal\block_content;
 
+use Drupal\block_content\Access\DependentAccessInterface;
+use Drupal\block_content\Event\BlockContentGetDependencyEvent;
 use Drupal\Core\Access\AccessResult;
+use Drupal\Core\Entity\EntityHandlerInterface;
 use Drupal\Core\Entity\EntityInterface;
 use Drupal\Core\Entity\EntityAccessControlHandler;
+use Drupal\Core\Entity\EntityTypeInterface;
 use Drupal\Core\Session\AccountInterface;
+use Symfony\Component\DependencyInjection\ContainerInterface;
+use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 
 /**
  * Defines the access control handler for the custom block entity type.
  *
  * @see \Drupal\block_content\Entity\BlockContent
  */
-class BlockContentAccessControlHandler extends EntityAccessControlHandler {
+class BlockContentAccessControlHandler extends EntityAccessControlHandler implements EntityHandlerInterface {
+
+  /**
+   * The event dispatcher.
+   *
+   * @var \Symfony\Component\EventDispatcher\EventDispatcherInterface
+   */
+  protected $eventDispatcher;
+
+  /**
+   * BlockContentAccessControlHandler constructor.
+   *
+   * @param \Drupal\Core\Entity\EntityTypeInterface $entity_type
+   *   The entity type.
+   * @param \Symfony\Component\EventDispatcher\EventDispatcherInterface $dispatcher
+   *   The event dispatcher.
+   */
+  public function __construct(EntityTypeInterface $entity_type, EventDispatcherInterface $dispatcher) {
+    parent::__construct($entity_type);
+    $this->eventDispatcher = $dispatcher;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public static function createInstance(ContainerInterface $container, EntityTypeInterface $entity_type) {
+    return new static(
+      $entity_type,
+      $container->get('event_dispatcher')
+    );
+  }
 
   /**
    * {@inheritdoc}
    */
   protected function checkAccess(EntityInterface $entity, $operation, AccountInterface $account) {
     if ($operation === 'view') {
-      return AccessResult::allowedIf($entity->isPublished())->addCacheableDependency($entity)
+      $access = AccessResult::allowedIf($entity->isPublished())
         ->orIf(AccessResult::allowedIfHasPermission($account, 'administer blocks'));
     }
-    return parent::checkAccess($entity, $operation, $account);
+    else {
+      $access = parent::checkAccess($entity, $operation, $account);
+    }
+    // Add the entity as a cacheable dependency because access will at least be
+    // determined by whether the block is reusable.
+    $access->addCacheableDependency($entity);
+    /** @var \Drupal\block_content\BlockContentInterface $entity */
+    if ($entity->isReusable() === FALSE) {
+      if (!$entity instanceof DependentAccessInterface) {
+        throw new \LogicException("Non-reusable block entities must implement \Drupal\block_content\Access\DependentAccessInterface for access control.");
+      }
+      $dependency = $entity->getAccessDependency();
+      if (empty($dependency)) {
+        // If an access dependency has not been set let modules set one.
+        $event = new BlockContentGetDependencyEvent($entity);
+        $this->eventDispatcher->dispatch(BlockContentEvents::BLOCK_CONTENT_GET_DEPENDENCY, $event);
+        $dependency = $event->getAccessDependency();
+        if (empty($dependency)) {
+          return AccessResult::forbidden("Non-reusable blocks must set an access dependency for access control.");
+        }
+      }
+      /** @var \Drupal\Core\Entity\EntityInterface $dependency */
+      $access = $access->andIf($dependency->access($operation, $account, TRUE));
+    }
+    return $access;
   }
 
 }