clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #3488 from annando/ptobr-no-cache 

Probing via web frontend shouldn't use the cache.
This commit is contained in:
Hypolite Petovan 2017-05-23 17:21:10 -04:00 committed by GitHub
parent 7e3d7ba3a7 07e318e991
commit 471056e989
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
mod/probe.php
View File

@ -1,8 +1,7 @@
<?php <?php
use Friendica\App; use Friendica\App;
use Friendica\Network\Probe;
require_once 'include/probe.php';
function probe_content(App $a) { function probe_content(App $a) {
@ -22,7 +21,7 @@ function probe_content(App $a) {
if (x($_GET, 'addr')) { if (x($_GET, 'addr')) {
$addr = trim($_GET['addr']); $addr = trim($_GET['addr']);
$res = probe_url($addr); $res = Probe::uri($addr, "", 0, false);
$o .= '<pre>'; $o .= '<pre>';
$o .= str_replace("\n", '<br />', print_r($res, true)); $o .= str_replace("\n", '<br />', print_r($res, true));
$o .= '</pre>'; $o .= '</pre>';

10
src/Network/Probe.php
View File

@ -79,6 +79,8 @@ class Probe {
$xrd_timeout = Config::get('system', 'xrd_timeout', 20); $xrd_timeout = Config::get('system', 'xrd_timeout', 20);
$redirects = 0; $redirects = 0;
logger("Probing for ".$host, LOGGER_DEBUG);
$ret = z_fetch_url($ssl_url, false, $redirects, array('timeout' => $xrd_timeout, 'accept_content' => 'application/xrd+xml')); $ret = z_fetch_url($ssl_url, false, $redirects, array('timeout' => $xrd_timeout, 'accept_content' => 'application/xrd+xml'));
if ($ret['errno'] == CURLE_OPERATION_TIMEDOUT) { if ($ret['errno'] == CURLE_OPERATION_TIMEDOUT) {
return false; return false;
@ -101,6 +103,7 @@ class Probe {
$links = xml::element_to_array($xrd); $links = xml::element_to_array($xrd);
if (!isset($links["xrd"]["link"])) { if (!isset($links["xrd"]["link"])) {
logger("No xrd data found for ".$host, LOGGER_DEBUG);
return false; return false;
} }
@ -214,6 +217,7 @@ class Probe {
} }
if (!$lrdd) { if (!$lrdd) {
logger("No lrdd data found for ".$uri, LOGGER_DEBUG);
return array(); return array();
} }
@ -249,6 +253,7 @@ class Probe {
} }
if (!is_array($webfinger["links"])) { if (!is_array($webfinger["links"])) {
logger("No webfinger links found for ".$uri, LOGGER_DEBUG);
return false; return false;
} }
@ -435,6 +440,7 @@ class Probe {
$addr = $uri; $addr = $uri;
} else { } else {
logger("Uri ".$uri." was not detectable", LOGGER_DEBUG);
return false; return false;
} }
@ -544,6 +550,7 @@ class Probe {
$webfinger = json_decode($data, true); $webfinger = json_decode($data, true);
if (!isset($webfinger["links"])) { if (!isset($webfinger["links"])) {
logger("No json webfinger links for ".$url, LOGGER_DEBUG);
return false; return false;
} }
@ -552,6 +559,7 @@ class Probe {
$xrd_arr = xml::element_to_array($xrd); $xrd_arr = xml::element_to_array($xrd);
if (!isset($xrd_arr["xrd"]["link"])) { if (!isset($xrd_arr["xrd"]["link"])) {
logger("No XML webfinger links for ".$url, LOGGER_DEBUG);
return false; return false;
} }
@ -599,11 +607,13 @@ class Probe {
} }
$content = $ret['body']; $content = $ret['body'];
if (!$content) { if (!$content) {
logger("Empty body for ".$noscrape_url, LOGGER_DEBUG);
return false; return false;
} }
$json = json_decode($content, true); $json = json_decode($content, true);
if (!is_array($json)) { if (!is_array($json)) {
logger("No json data for ".$noscrape_url, LOGGER_DEBUG);
return false; return false;
} }