Skip to content
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

Bugfix: Infinite recursion sanity checks with more helpful error messages #214

Merged
merged 3 commits into from
Nov 9, 2023
+20 −2
Merged

Bugfix: Infinite recursion sanity checks with more helpful error messages #214

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
88676bf
Infinite recursion protections
nathanbrauer Oct 16, 2023
f650627
Accepting coding standards
nathanbrauer Nov 9, 2023
c3c8bff
MNT Linting
emteknetnz Nov 9, 2023
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
22 changes: 20 additions & 2 deletions src/Controllers/ShareDraftController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,8 @@ class ShareDraftController extends Controller
*/
protected static $isViewingPreview = false;

private array $redirectRecursionIterations = [];

/**
* @return bool
*/
Expand Down Expand Up @@ -172,8 +174,8 @@ private function getRenderedPageByURL(string $url): HTTPResponse
$variables['_SERVER']['HTTP_USER_AGENT'] =
isset($variables['_SERVER']['HTTP_USER_AGENT']) &&
$variables['_SERVER']['HTTP_USER_AGENT']
? $variables['_SERVER']['HTTP_USER_AGENT']
: 'CLI';
? $variables['_SERVER']['HTTP_USER_AGENT']
: 'CLI';

Environment::setVariables($variables);

Expand All @@ -183,6 +185,15 @@ private function getRenderedPageByURL(string $url): HTTPResponse
$response = Director::singleton()->handleRequest($pageRequest);

if ($response->isRedirect()) {
if (in_array($url, $this->redirectRecursionIterations)) {
throw new \Exception("Infinite recursion detected." . $this->getRedirectRecursionIterationsLog($url));
}

$this->redirectRecursionIterations[] = $url;
if (count($this->redirectRecursionIterations) >= 30) {
throw new \Exception("Max redirect recursions reached." . $this->getRedirectRecursionIterationsLog());
}

// The redirect will probably be Absolute URL so just want the path
$newUrl = parse_url($response->getHeader('location') ?? '', PHP_URL_PATH);

Expand All @@ -192,6 +203,13 @@ private function getRenderedPageByURL(string $url): HTTPResponse
return $response;
}

private function getRedirectRecursionIterationsLog(string $appendUrl = ''): string
{
return "\n\nRedirected URLs stack: \n"
. implode("\n", $this->redirectRecursionIterations)
. ($appendUrl ? "\n$appendUrl" : '');
}

/**
* @return DBHTMLText
*/
Expand Down