Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2024-12-22 22:00:16 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #14267 from mexon/mat/permanent-redirect

Browse source 
Update feed URL after permanent redirect
This commit is contained in:
Michael Vogel 2024-07-03 09:33:10 +02:00 committed by GitHub
commit 491a5cab53
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 63 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/Model/Contact.php
View file

@ -2445,6 +2445,19 @@ class Contact
}
}
/**
* Updates the poll URL of a contact. This is the right function to call if there is a redirect.
*
* @param integer $id contact id
* @param string $url The new URL to use for polling
*
* @throws \Exception
*/
public static function updatePollUrl(int $id, string $url)
{
self::update(['poll', $url], ['id' => $id]);
}
/**
* Helper function for "updateFromProbe". Updates personal and public contact
*

10
src/Network/HTTPClient/Capability/ICanHandleHttpResponses.php
View file

@ -90,10 +90,20 @@ interface ICanHandleHttpResponses
public function getUrl(): string;
/**
* If the request was redirected to another URL, gets the final URL requested
* @return string
*/
public function getRedirectUrl(): string;
/**
* If the request was redirected to another URL, indicates if the redirect is permanent.
* If the request was not redirected, returns false.
* If the request was redirected multiple times, returns true only if all of the redirects were permanent.
*
* @return bool True if the redirect is permanent
*/
public function redirectIsPermanent(): bool;
/**
* Getter for body
*

16
src/Network/HTTPClient/Response/CurlResult.php
View file

@ -81,6 +81,11 @@ class CurlResult implements ICanHandleHttpResponses
*/
private $isRedirectUrl;
/**
* @var boolean true if the URL has a permanent redirect
*/
private $redirectIsPermanent;
/**
* @var boolean true if the curl request timed out
*/
@ -197,7 +202,7 @@ class CurlResult implements ICanHandleHttpResponses
$this->redirectUrl = $this->info['url'];
}
if ($this->returnCode == 301 || $this->returnCode == 302 || $this->returnCode == 303 || $this->returnCode == 307) {
if ($this->returnCode == 301 || $this->returnCode == 302 || $this->returnCode == 303 || $this->returnCode == 307 || $this->returnCode == 308) {
$redirect_parts = parse_url($this->info['redirect_url'] ?? '');
if (empty($redirect_parts)) {
$redirect_parts = [];
@ -224,10 +229,11 @@ class CurlResult implements ICanHandleHttpResponses
}
$this->redirectUrl = (string)Uri::fromParts((array)$redirect_parts);
$this->isRedirectUrl = true;
$this->redirectIsPermanent = $this->returnCode == 301 || $this->returnCode == 308;
} else {
$this->isRedirectUrl = false;
$this->redirectIsPermanent = false;
}
}
@ -340,6 +346,12 @@ class CurlResult implements ICanHandleHttpResponses
return $this->isRedirectUrl;
}
/** {@inheritDoc} */
public function redirectIsPermanent(): bool
{
return $this->redirectIsPermanent;
}
/** {@inheritDoc} */
public function getErrorNumber(): int
{

15
src/Network/HTTPClient/Response/GuzzleResponse.php
View file

@ -52,6 +52,8 @@ class GuzzleResponse extends Response implements ICanHandleHttpResponses, Respon
private $redirectUrl = '';
/** @var bool */
private $isRedirectUrl = false;
/** @var bool */
private $redirectIsPermanent = false;
public function __construct(ResponseInterface $response, string $url, $errorNumber = 0, $error = '')
{
@ -91,6 +93,13 @@ class GuzzleResponse extends Response implements ICanHandleHttpResponses, Respon
if (count($headersRedirect) > 0) {
$this->redirectUrl = end($headersRedirect);
$this->isRedirectUrl = true;
$this->redirectIsPermanent = true;
foreach (($response->getHeader(RedirectMiddleware::STATUS_HISTORY_HEADER) ?? []) as $history) {
if (preg_match('/30(2|3|4|7)/', $history)) {
$this->redirectIsPermanent = false;
}
}
}
}
@ -145,6 +154,12 @@ class GuzzleResponse extends Response implements ICanHandleHttpResponses, Respon
return $this->isRedirectUrl;
}
/** {@inheritDoc} */
public function redirectIsPermanent(): bool
{
return $this->redirectIsPermanent;
}
/** {@inheritDoc} */
public function getErrorNumber(): int
{

11
src/Worker/OnePoll.php
View file

@ -167,12 +167,23 @@ class OnePoll
$cookiejar = tempnam(System::getTempPath(), 'cookiejar-onepoll-');
$curlResult = DI::httpClient()->get($contact['poll'], HttpClientAccept::FEED_XML, [HttpClientOptions::COOKIEJAR => $cookiejar, HttpClientOptions::REQUEST => HttpClientRequest::FEEDFETCHER]);
unlink($cookiejar);
Logger::debug('Polled feed', ['url' => $contact['poll'], 'http-code' => $curlResult->getReturnCode(), 'redirect-url' => $curlResult->getRedirectUrl()]);
if ($curlResult->isTimeout()) {
Logger::notice('Polling timed out', ['id' => $contact['id'], 'url' => $contact['poll']]);
return false;
}
if ($curlResult->redirectIsPermanent()) {
Logger::notice('Poll address permanently changed', [
'id' => $contact['id'],
'uid' => $contact['uid'],
'old' => $contact['poll'],
'new' => $curlResult->getRedirectUrl(),
]);
$success = Contact::updatePollUrl($contact['id'], $curlResult->getRedirectUrl());
}
$xml = $curlResult->getBodyString();
if (empty($xml)) {
Logger::notice('Empty content', ['id' => $contact['id'], 'url' => $contact['poll']]);