From 3c7fe5fc1b3435a399f1e5fde20708f947d9acb0 Mon Sep 17 00:00:00 2001 From: Michael Date: Tue, 10 Sep 2019 20:06:07 +0000 Subject: [PATCH 1/2] Issue 7610-2: Read the "hide" status for non DFRN profiles --- src/Network/Probe.php | 68 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 68 insertions(+) diff --git a/src/Network/Probe.php b/src/Network/Probe.php index 15235c7c26..ee8c686676 100644 --- a/src/Network/Probe.php +++ b/src/Network/Probe.php @@ -394,6 +394,10 @@ class Probe $data['network'] = Protocol::PHANTOM; } + if (empty($data['hide']) && ($data['network'] != Protocol::DFRN)) { + $data['hide'] = self::getHideStatus($data['url']); + } + $data = self::rearrangeData($data); // Only store into the cache if the value seems to be valid @@ -404,6 +408,70 @@ class Probe return $data; } + + /** + * Fetches the "hide" status from the profile + * + * @param string $url URL of the profile + * + * @return boolean "hide" status + */ + private static function getHideStatus($url) + { + $curlResult = Network::curl($url); + if (!$curlResult->isSuccess()) { + return false; + } + + // If the file is too large then exit + if (defaults($curlResult->getInfo(), 'download_content_length', 0) > 1000000) { + return false; + } + + // If it isn't a HTML file then exit + if (($curlResult->getContentType() != '') && !strstr(strtolower($curlResult->getContentType()), 'html')) { + return false; + } + + $body = $curlResult->getBody(); + + $doc = new DOMDocument(); + @$doc->loadHTML($body); + + $xpath = new DOMXPath($doc); + + $list = $xpath->query('//meta[@name]'); + foreach ($list as $node) { + $meta_tag = []; + if ($node->attributes->length) { + foreach ($node->attributes as $attribute) { + $meta_tag[$attribute->name] = $attribute->value; + } + } + + if (empty($meta_tag['content'])) { + continue; + } + + $content = strtolower(trim($meta_tag['content'])); + + switch (strtolower(trim($meta_tag['name']))) { + case 'dfrn-global-visibility': + if ($content == 'false') { + return true; + } + break; + case 'robots': + if (strpos($content, 'noindex') !== false) { + return true; + } + break; + } + } + + return false; + } + /** * @brief Checks if a profile url should be OStatus but only provides partial information * From a733a00ea9c5c5be90010c0b2b1d8cb158b55bd2 Mon Sep 17 00:00:00 2001 From: Michael Date: Tue, 10 Sep 2019 20:20:34 +0000 Subject: [PATCH 2/2] Detect the hide status when it hadn't been detected before --- src/Network/Probe.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Network/Probe.php b/src/Network/Probe.php index ee8c686676..1b1d0cee32 100644 --- a/src/Network/Probe.php +++ b/src/Network/Probe.php @@ -394,7 +394,7 @@ class Probe $data['network'] = Protocol::PHANTOM; } - if (empty($data['hide']) && ($data['network'] != Protocol::DFRN)) { + if (!isset($data['hide']) && in_array($data['network'], Protocol::FEDERATED)) { $data['hide'] = self::getHideStatus($data['url']); }