Skip to content

[5.x] Prevent excessive nocache cache growth #9999

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jasonvarga merged 1 commit into from
May 7, 2024
Merged

[5.x] Prevent excessive nocache cache growth #9999

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions src/StaticCaching/NoCache/Session.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@ class Session

protected $url;

private $regionCount = 0;

public function __construct($url)
{
$this->url = $url;
Expand Down Expand Up @@ -55,6 +57,13 @@ public function region(string $key): Region
throw new RegionNotFound($key);
}

public function getRegionId(): string
{
$this->regionCount += 1;

return md5($this->url.$this->regionCount);
}

public function pushRegion($contents, $context, $extension): StringRegion
{
$region = new StringRegion($this, trim($contents), $context, $extension);
Expand Down
4 changes: 1 addition & 3 deletions src/StaticCaching/NoCache/StringRegion.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@

namespace Statamic\StaticCaching\NoCache;

use Statamic\Support\Str;

class StringRegion extends Region
{
protected $content;
Expand All @@ -15,7 +13,7 @@ public function __construct(Session $session, string $content, array $context, s
$this->content = $content;
$this->context = $this->filterContext($context);
$this->extension = $extension;
$this->key = sha1($content.Str::random());
$this->key = sha1($content).$session->getRegionId();
}

public function key(): string
Expand Down
4 changes: 1 addition & 3 deletions src/StaticCaching/NoCache/ViewRegion.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@

namespace Statamic\StaticCaching\NoCache;

use Statamic\Support\Str;

class ViewRegion extends Region
{
protected $view;
Expand All @@ -13,7 +11,7 @@ public function __construct(Session $session, string $view, array $context)
$this->session = $session;
$this->view = $view;
$this->context = $this->filterContext($context);
$this->key = Str::random(32);
$this->key = sha1($view).$session->getRegionId();
}

public function key(): string
Expand Down