GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

LRDD blacklisted URL test

Browse Source
This commit is contained in:
Mikael Nordfeldth 2017-04-26 23:21:13 +02:00
parent bb76af4f65
commit ea6d8b8bde
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
plugins/LRDD/lib/discovery.php
View File

@ -140,6 +140,11 @@ class Discovery
$xrd->loadString($response->getBody(), $type); $xrd->loadString($response->getBody(), $type);
return $xrd; return $xrd;
} catch (ClientException $e) {
if ($e->getCode() === 403) {
common_log(LOG_INFO, sprintf('%s: Aborting discovery on URL %s: %s', _ve($class), _ve($uri), _ve($e->getMessage())));
break;
}
} catch (Exception $e) { } catch (Exception $e) {
common_log(LOG_INFO, sprintf('%s: Failed for %s: %s', _ve($class), _ve($uri), _ve($e->getMessage()))); common_log(LOG_INFO, sprintf('%s: Failed for %s: %s', _ve($class), _ve($uri), _ve($e->getMessage())));
continue; continue;

3
plugins/LRDD/lib/lrddmethod.php
View File

@ -32,6 +32,9 @@ abstract class LRDDMethod
protected function fetchUrl($url, $method=HTTPClient::METHOD_GET) protected function fetchUrl($url, $method=HTTPClient::METHOD_GET)
{ {
// If we have a blacklist enabled, let's check against it
Event::handle('UrlBlacklistTest', array($url));
$client = new HTTPClient(); $client = new HTTPClient();
// GAAHHH, this method sucks! How about we make a better HTTPClient interface? // GAAHHH, this method sucks! How about we make a better HTTPClient interface?