Merge pull request #9212 from annando/nofinalurlfeed
Ignore list for redirects
This commit is contained in:
commit
6b8ea346bc
3 changed files with 40 additions and 2 deletions
|
@ -192,7 +192,7 @@ class HTTPRequest implements IHTTPRequest
|
|||
|
||||
$curlResponse = new CurlResult($url, $s, $curl_info, curl_errno($ch), curl_error($ch));
|
||||
|
||||
if ($curlResponse->isRedirectUrl()) {
|
||||
if (!Network::isRedirectBlocked($url) && $curlResponse->isRedirectUrl()) {
|
||||
$redirects++;
|
||||
$this->logger->notice('Curl redirect.', ['url' => $url, 'to' => $curlResponse->getRedirectUrl()]);
|
||||
@curl_close($ch);
|
||||
|
@ -280,7 +280,7 @@ class HTTPRequest implements IHTTPRequest
|
|||
|
||||
$curlResponse = new CurlResult($url, $s, $curl_info, curl_errno($ch), curl_error($ch));
|
||||
|
||||
if ($curlResponse->isRedirectUrl()) {
|
||||
if (!Network::isRedirectBlocked($url) && $curlResponse->isRedirectUrl()) {
|
||||
$redirects++;
|
||||
$this->logger->info('Post redirect.', ['url' => $url, 'to' => $curlResponse->getRedirectUrl()]);
|
||||
curl_close($ch);
|
||||
|
@ -321,6 +321,11 @@ class HTTPRequest implements IHTTPRequest
|
|||
return $url;
|
||||
}
|
||||
|
||||
if (Network::isRedirectBlocked($url)) {
|
||||
$this->logger->info('Domain should not be redirected.', ['url' => $url]);
|
||||
return $url;
|
||||
}
|
||||
|
||||
$url = Network::stripTrackingQueryParams($url);
|
||||
|
||||
if ($depth > 10) {
|
||||
|
|
|
@ -177,6 +177,35 @@ class Network
|
|||
return false;
|
||||
}
|
||||
|
||||
/**
|
||||
* Checks if the provided url is on the list of domains where redirects are blocked.
|
||||
* Returns true if it is or malformed URL, false if not.
|
||||
*
|
||||
* @param string $url The url to check the domain from
|
||||
*
|
||||
* @return boolean
|
||||
*/
|
||||
public static function isRedirectBlocked(string $url)
|
||||
{
|
||||
$host = @parse_url($url, PHP_URL_HOST);
|
||||
if (!$host) {
|
||||
return false;
|
||||
}
|
||||
|
||||
$no_redirect_list = DI::config()->get('system', 'no_redirect_list', []);
|
||||
if (!$no_redirect_list) {
|
||||
return false;
|
||||
}
|
||||
|
||||
foreach ($no_redirect_list as $no_redirect) {
|
||||
if (fnmatch(strtolower($no_redirect), strtolower($host))) {
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
/**
|
||||
* Check if email address is allowed to register here.
|
||||
*
|
||||
|
|
|
@ -362,6 +362,10 @@ return [
|
|||
// Don't use OEmbed to fetch more information about a link.
|
||||
'no_oembed' => false,
|
||||
|
||||
// no_redirect_list (Array)
|
||||
// List of domains where HTTP redirects should be ignored.
|
||||
'no_redirect_list' => [],
|
||||
|
||||
// no_smilies (Boolean)
|
||||
// Don't show smilies.
|
||||
'no_smilies' => false,
|
||||
|
|
Loading…
Reference in a new issue