Skip to content

Force refetching source if our cached copy will expire #44

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Force refetching source if our cached copy will expire #44

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
18 changes: 18 additions & 0 deletions src/MetaLoader.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

namespace SimpleSAML\Module\metarefresh;

use DateTimeImmutable;
use Exception;
use SimpleSAML\Configuration;
use SimpleSAML\Logger;
Expand Down Expand Up @@ -388,6 +389,23 @@ private function createContext(array $source): array
if (array_key_exists($source['src'], $this->state)) {
$sourceState = $this->state[$source['src']];

/*
* If an expireAfter value exists, we effectively altered the metadata's validUntil ourselves
* so we may need to refresh the metadata even if the source indicates it has not changed.
*/
if (isset($source['expireAfter']) && isset($sourceState['requested_at'])) {
$requestedAt = (new DateTimeImmutable($sourceState['requested_at']))->getTimestamp();
if ($requestedAt + $source['expireAfter'] <= time() - 3600) { // 1 hour based on default cron tags
Logger::info(sprintf(
'Cached metadata for %s expires soon - forcing refresh even if not changed',
$source['src'],
));
unset($sourceState['last-modified']);
unset($sourceState['etag']);
$rawheader .= 'Cache-Control: max-age=0' . "\r\n";
}
}

if (isset($sourceState['last-modified'])) {
$rawheader .= 'If-Modified-Since: ' . $sourceState['last-modified'] . "\r\n";
}
Expand Down
7 changes: 6 additions & 1 deletion src/MetaRefresh.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ public function runRefresh(string $crontag = null): void
$source['whitelist'] = $whitelist;
}

# Merge global and src specific attributewhitelists: cannot use array_unique for multi-dim.
// Merge global and src specific attributewhitelists: cannot use array_unique for multi-dim.
if (isset($source['attributewhitelist'])) {
$source['attributewhitelist'] = array_merge($source['attributewhitelist'], $attributewhitelist);
} else {
Expand All @@ -123,6 +123,11 @@ public function runRefresh(string $crontag = null): void
$source['conditionalGET'] = $conditionalGET;
}

// make our cache expiry available to the loader if we're conditionally GETting
if ($source['conditionalGET'] && isset($expireAfter)) {
$source['expireAfter'] = $expireAfter;
}

Logger::debug('[metarefresh]: In set [' . $setkey . '] loading source [' . $source['src'] . ']');
$metaloader->loadSource($source);
}
Expand Down
Loading