Issue #3239514 by kevin.dutra, Nixou, caesius, gbeezus: Private files access... (b4acaa26) · Commits · project / r4032login

src/EventSubscriber/R4032LoginSubscriber.php

+10 −4

Changes for src/EventSubscriber/R4032LoginSubscriber.php: 10 added lines, 4 removed lines.
Original line number	Diff line number	Diff line
		@@ -192,10 +192,16 @@ class R4032LoginSubscriber extends HttpExceptionSubscriberBase {

		// Add caching dependencies so the cache of the redirection will be
		// updated when necessary.
		$cacheMetadata = new CacheableMetadata();
		$cacheMetadata->addCacheTags(['4xx-response']);
		$cacheMetadata->addCacheableDependency($config);
		$response->addCacheableDependency($cacheMetadata);
		$cacheableMetadata = new CacheableMetadata();
		// Add original 403 response cache metadata.
		$cacheableMetadata->addCacheableDependency($event->getThrowable());
		// We still need to add the client error tag manually since the core
		// wil not recognize our redirection as an error.
		$cacheableMetadata->addCacheTags(['4xx-response']);
		// Add our config cache metadata.
		$cacheableMetadata->addCacheableDependency($config);
		// Attach cache metadata to the response.
		$response->addCacheableDependency($cacheableMetadata);

		$event->setResponse($response);
		}

tests/src/Functional/RedirectCacheTest.php

+37 −24

Changes for tests/src/Functional/RedirectCacheTest.php: 37 added lines, 24 removed lines.
Original line number	Diff line number	Diff line
		@@ -22,30 +22,27 @@ class RedirectCacheTest extends BrowserTestBase {
		protected $defaultTheme = 'stark';

		/**
		* Modules to enable.
		*
		* @var array
		* {@inheritdoc}
		*/
		protected static $modules = [
		'file',
		'node',
		'page_cache',
		'r4032login',
		];

		/**
		* The node used for tests.
		* An unpublished node used for tests.
		*
		* @var \Drupal\node\NodeInterface
		*/
		protected $node;
		protected $unpublishedNode;

		/**
		* The file used for tests.
		* An published node used for tests.
		*
		* @var \Drupal\file\FileInterface
		* @var \Drupal\node\NodeInterface
		*/
		protected $file;
		protected $publishedNode;

		/**
		* {@inheritdoc}
		@@ -64,15 +61,26 @@ class RedirectCacheTest extends BrowserTestBase {
		$this->createFileField('field_text_file', 'node', 'page', ['uri_scheme' => 'private']);

		// Create an unpublished node with a private file to test.
		$this->node = $this->drupalCreateNode();
		$this->unpublishedNode = $this->drupalCreateNode();
		file_put_contents('private://test.txt', 'test');
		$this->file = File::create([
		$file = File::create([
		'uri' => 'private://test.txt',
		'filename' => 'test.txt',
		]);
		$this->file->save();
		$this->node->set('field_text_file', $this->file->id());
		$this->node->setUnpublished()->save();
		$file->save();
		$this->unpublishedNode->set('field_text_file', $file->id());
		$this->unpublishedNode->setUnpublished()->save();

		// Create a published node with a private file to test.
		$this->publishedNode = $this->drupalCreateNode();
		file_put_contents('private://test2.txt', 'test2');
		$file = File::create([
		'uri' => 'private://test2.txt',
		'filename' => 'test2.txt',
		]);
		$file->save();
		$this->publishedNode->set('field_text_file', $file->id());
		$this->publishedNode->setPublished()->save();
		}

		/**
		@@ -82,15 +90,16 @@ class RedirectCacheTest extends BrowserTestBase {
		*/
		public function testNodeRedirectCache() {
		// Assert there is the redirection since the node is not published.
		$this->drupalGet('node/' . $this->node->id());
		$this->drupalGet('node/' . $this->unpublishedNode->id());
		$this->assertSession()->addressEquals('user/login');

		// Publish the node.
		$this->node->setPublished()->save();
		$this->unpublishedNode->setPublished()->save();
		$newlyPublishedNode = $this->unpublishedNode;

		// Assert there is not the redirection since the node is published.
		$this->drupalGet('node/' . $this->node->id());
		$this->assertSession()->addressEquals('node/' . $this->node->id());
		$this->drupalGet('node/' . $newlyPublishedNode->id());
		$this->assertSession()->addressEquals('node/' . $newlyPublishedNode->id());
		}

		/**
		@@ -100,16 +109,20 @@ class RedirectCacheTest extends BrowserTestBase {
		*/
		public function testPrivateFileRedirectCache() {
		// Assert there is the redirection since the node is not published.
		$this->drupalGet(file_create_url($this->file->getFileUri()));
		$this->drupalGet(file_create_url($this->unpublishedNode->field_text_file->entity->getFileUri()));
		$this->assertSession()->addressEquals('user/login');

		// Assert there is not the redirection for an already published node file.
		$this->drupalGet(file_create_url($this->publishedNode->field_text_file->entity->getFileUri()));
		$this->assertSession()->addressEquals(file_create_url($this->publishedNode->field_text_file->entity->getFileUri()));

		// Publish the node.
		$this->node->setPublished()->save();
		$this->unpublishedNode->setPublished()->save();
		$newlyPublishedNode = $this->unpublishedNode;

		// Assert there is not the redirection since the node is published.
		$this->drupalGet(file_create_url($this->file->getFileUri()));
		$this->assertSession()
		->addressEquals(file_create_url($this->file->getFileUri()));
		// Assert there is not the redirection since the node is now published.
		$this->drupalGet(file_create_url($newlyPublishedNode->field_text_file->entity->getFileUri()));
		$this->assertSession()->addressEquals(file_create_url($newlyPublishedNode->field_text_file->entity->getFileUri()));
		}

		}