wamo/gnu-social
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Pass all but two webmention.rocks tests

Browse Source
This commit is contained in:
Stephen Paul Weber 2016-06-10 21:03:16 +00:00
parent 1e9077f529
commit 274e394d8e
1 changed files with 32 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
plugins/Linkback/LinkbackPlugin.php
View File

@ -101,14 +101,28 @@ class LinkbackPlugin extends Plugin
return true; return true;
} }
function unparse_url($parsed_url)
{
$scheme = isset($parsed_url['scheme']) ? $parsed_url['scheme'] . '://' : '';
$host = isset($parsed_url['host']) ? $parsed_url['host'] : '';
$port = isset($parsed_url['port']) ? ':' . $parsed_url['port'] : '';
$user = isset($parsed_url['user']) ? $parsed_url['user'] : '';
$pass = isset($parsed_url['pass']) ? ':' . $parsed_url['pass'] : '';
$pass = ($user || $pass) ? "$pass@" : '';
$path = isset($parsed_url['path']) ? $parsed_url['path'] : '';
$query = isset($parsed_url['query']) ? '?' . $parsed_url['query'] : '';
$fragment = isset($parsed_url['fragment']) ? '#' . $parsed_url['fragment'] : '';
return "$scheme$user$pass$host$port$path$query$fragment";
}
function linkbackUrl($url) function linkbackUrl($url)
{ {
common_log(LOG_DEBUG,"Attempting linkback for " . $url); common_log(LOG_DEBUG,"Attempting linkback for " . $url);
$orig = $url; $orig = $url;
$url = htmlspecialchars_decode($orig); $url = htmlspecialchars_decode($orig);
$scheme = parse_url($url, PHP_URL_SCHEME); $base = parse_url($url);
if (!in_array($scheme, array('http', 'https'))) { if (!in_array($base['scheme'], array('http', 'https'))) {
return $orig; return $orig;
} }
@ -126,13 +140,17 @@ class LinkbackPlugin extends Plugin
return $orig; return $orig;
} }
// XXX: Should handle relative-URI resolution in these detections
$wm = $this->getWebmention($response); $wm = $this->getWebmention($response);
if(!empty($wm)) { if(!is_null($wm)) {
$wm = parse_url($wm);
if(!$wm) $wm = array();
if(!$wm['host']) $wm['host'] = $base['host'];
if(!$wm['scheme']) $wm['scheme'] = $base['scheme'];
if(!$wm['path']) $wm['path'] = $base['path'];
// It is the webmention receiver's job to resolve source // It is the webmention receiver's job to resolve source
// Ref: https://github.com/converspace/webmention/issues/43 // Ref: https://github.com/converspace/webmention/issues/43
$this->webmention($url, $wm); $this->webmention($url, $this->unparse_url($wm));
} else { } else {
$pb = $this->getPingback($response); $pb = $this->getPingback($response);
if (!empty($pb)) { if (!empty($pb)) {
@ -156,26 +174,26 @@ class LinkbackPlugin extends Plugin
$link = $response->getHeader('Link'); $link = $response->getHeader('Link');
if (!is_null($link)) { if (!is_null($link)) {
// XXX: the fetcher gives back a comma-separated string of all Link headers, I hope the parsing works reliably // XXX: the fetcher gives back a comma-separated string of all Link headers, I hope the parsing works reliably
if (preg_match('~<((?:https?://)?[^>]+)>; rel="webmention"~', $link, $match)) { if (preg_match('~<([^>]+)>; rel="?(?:[^" ]* )*(?:http://webmention.org/|webmention)(?: [^" ]*)*"?~', $link, $match)) {
return $match[1];
} elseif (preg_match('~<((?:https?://)?[^>]+)>; rel="http://webmention.org/?"~', $link, $match)) {
return $match[1]; return $match[1];
} }
} }
// FIXME: Do proper DOM traversal // FIXME: Do proper DOM traversal
if(preg_match('/<(?:link|a)[ ]+href="([^"]+)"[ ]+rel="[^" ]* ?webmention ?[^" ]*"[ ]*\/?>/i', $response->getBody(), $match) // Currently fails https://webmention.rocks/test/13, https://webmention.rocks/test/17
|| preg_match('/<(?:link|a)[ ]+rel="[^" ]* ?webmention ?[^" ]*"[ ]+href="([^"]+)"[ ]*\/?>/i', $response->getBody(), $match)) { if(preg_match('~<(?:link|a)[ ]+href="([^"]*)"[ ]+rel="(?:[^" ]* )*(?:http://webmention.org/|webmention)(?: [^" ]*)*"[ ]*/?>~i', $response->getBody(), $match)
return $match[1]; || preg_match('~<(?:link|a)[ ]+rel="(?:[^" ]* )*(?:http://webmention.org/|webmention)(?: [^" ]*)*"[ ]+href="([^"]*)"[ ]*/?>~i', $response->getBody(), $match)) {
} elseif (preg_match('/<(?:link|a)[ ]+href="([^"]+)"[ ]+rel="http:\/\/webmention\.org\/?"[ ]*\/?>/i', $response->getBody(), $match)
|| preg_match('/<(?:link|a)[ ]+rel="http:\/\/webmention\.org\/?"[ ]+href="([^"]+)"[ ]*\/?>/i', $response->getBody(), $match)) {
return $match[1]; return $match[1];
} }
return NULL;
} }
function webmention($url, $endpoint) { function webmention($url, $endpoint) {
$source = $this->notice->getUrl(); $source = $this->notice->getUrl();
common_log(LOG_DEBUG,"Attempting webmention to $endpoint for $url from $source");
$payload = array( $payload = array(
'source' => $source, 'source' => $source,
'target' => $url 'target' => $url