LRDD blacklisted URL test

diff --git a/plugins/LRDD/lib/discovery.php b/plugins/LRDD/lib/discovery.php
index c8cf3277e27bcaa9238021bfd9a7d3dfe67e61b5..54e40fe80110980b9d049cbf58e786fc4e3fa789 100644 (file)
--- a/plugins/LRDD/lib/discovery.php
+++ b/plugins/LRDD/lib/discovery.php
@@ -126,7 +126,14 @@ class Discovery
 
                 $xrd->loadString($response->getBody());
                 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) {
+                common_log(LOG_INFO, sprintf('%s: Failed for %s: %s', _ve($class), _ve($uri), _ve($e->getMessage())));
                 continue;
             }
         }

diff --git a/plugins/LRDD/lib/lrddmethod.php b/plugins/LRDD/lib/lrddmethod.php
index ee9a24a5da4cd364e9e340523fe9b2c701f66d17..160c0d73a21d88a2665ee6e75c2fd26d3049881a 100644 (file)
--- a/plugins/LRDD/lib/lrddmethod.php
+++ b/plugins/LRDD/lib/lrddmethod.php
@@ -32,6 +32,9 @@ abstract class LRDDMethod
 
     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();
 
         // GAAHHH, this method sucks! How about we make a better HTTPClient interface?