aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rwxr-xr-xinclude/items.php34
-rw-r--r--include/network.php44
-rw-r--r--include/salmon.php201
-rw-r--r--mod/webfinger.php31
-rw-r--r--version.inc2
-rw-r--r--view/tpl/magicsig.tpl9
6 files changed, 293 insertions, 28 deletions
diff --git a/include/items.php b/include/items.php
index 9163016e1..d12989707 100755
--- a/include/items.php
+++ b/include/items.php
@@ -2091,6 +2091,10 @@ function get_atom_elements($feed, $item, &$author) {
$res['obj_type'] = $child[NAMESPACE_ACTIVITY]['obj_type'][0]['data'];
$obj['type'] = $child[NAMESPACE_ACTIVITY]['obj_type'][0]['data'];
}
+ if($child[NAMESPACE_ACTIVITY]['object-type'][0]['data']) {
+ $res['obj_type'] = $child[NAMESPACE_ACTIVITY]['object-type'][0]['data'];
+ $obj['type'] = $child[NAMESPACE_ACTIVITY]['object-type'][0]['data'];
+ }
if(x($child[SIMPLEPIE_NAMESPACE_ATOM_10], 'id') && $child[SIMPLEPIE_NAMESPACE_ATOM_10]['id'][0]['data'])
$obj['id'] = $child[SIMPLEPIE_NAMESPACE_ATOM_10]['id'][0]['data'];
if(x($child[SIMPLEPIE_NAMESPACE_ATOM_10], 'link') && $child[SIMPLEPIE_NAMESPACE_ATOM_10]['link'])
@@ -2124,6 +2128,10 @@ function get_atom_elements($feed, $item, &$author) {
$res['tgt_type'] = $child[NAMESPACE_ACTIVITY]['obj_type'][0]['data'];
$obj['type'] = $child[NAMESPACE_ACTIVITY]['obj_type'][0]['data'];
}
+ if($child[NAMESPACE_ACTIVITY]['object-type'][0]['data']) {
+ $res['tgt_type'] = $child[NAMESPACE_ACTIVITY]['object-type'][0]['data'];
+ $obj['type'] = $child[NAMESPACE_ACTIVITY]['object-type'][0]['data'];
+ }
if(x($child[SIMPLEPIE_NAMESPACE_ATOM_10], 'id') && $child[SIMPLEPIE_NAMESPACE_ATOM_10]['id'][0]['data'])
$obj['id'] = $child[SIMPLEPIE_NAMESPACE_ATOM_10]['id'][0]['data'];
if(x($child[SIMPLEPIE_NAMESPACE_ATOM_10], 'link') && $child[SIMPLEPIE_NAMESPACE_ATOM_10]['link'])
@@ -2162,26 +2170,27 @@ function get_atom_elements($feed, $item, &$author) {
}
function encode_rel_links($links) {
- $o = '';
+ $o = array();
if(! ((is_array($links)) && (count($links))))
return $o;
foreach($links as $link) {
- $o .= '<link ';
+ $l = array();
if($link['attribs']['']['rel'])
- $o .= 'rel="' . $link['attribs']['']['rel'] . '" ';
+ $l['rel'] = $link['attribs']['']['rel'];
if($link['attribs']['']['type'])
- $o .= 'type="' . $link['attribs']['']['type'] . '" ';
+ $l['type'] = $link['attribs']['']['type'];
if($link['attribs']['']['href'])
- $o .= 'href="' . $link['attribs']['']['href'] . '" ';
+ $l['href'] = $link['attribs']['']['href'];
if( (x($link['attribs'],NAMESPACE_MEDIA)) && $link['attribs'][NAMESPACE_MEDIA]['width'])
- $o .= 'media:width="' . $link['attribs'][NAMESPACE_MEDIA]['width'] . '" ';
+ $l['width'] = $link['attribs'][NAMESPACE_MEDIA]['width'];
if( (x($link['attribs'],NAMESPACE_MEDIA)) && $link['attribs'][NAMESPACE_MEDIA]['height'])
- $o .= 'media:height="' . $link['attribs'][NAMESPACE_MEDIA]['height'] . '" ';
- $o .= ' />' . "\n" ;
- }
+ $l['height'] = $link['attribs'][NAMESPACE_MEDIA]['height'];
- return xmlify($o);
+ if($l)
+ $o[] = $l;
+ }
+ return $o;
}
/**
@@ -4039,6 +4048,11 @@ function process_salmon_feed($xml, $importer) {
$datarray = get_atom_elements($feed,$item,$ret['author']);
+ // reset policies which are restricted by default for RSS connections
+ // This item is likely coming from GNU-social via salmon and allows public interaction
+ $datarray['public_policy'] = '';
+ $datarray['comment_policy'] = '';
+
$ret['item'] = $datarray;
}
}
diff --git a/include/network.php b/include/network.php
index 93fd836f8..7399b4526 100644
--- a/include/network.php
+++ b/include/network.php
@@ -1288,12 +1288,23 @@ LSIeXnd14lQYK/uxW/8cTFjcmddsKxeXysoQxbSa9VdDK+KkpZdgYXYrTTofXs6v+
function webfinger_rfc7033($webbie,$zot = false) {
- if(! strpos($webbie,'@'))
- return false;
- $lhs = substr($webbie,0,strpos($webbie,'@'));
- $rhs = substr($webbie,strpos($webbie,'@')+1);
-
- $resource = 'acct:' . $webbie;
+ if(strpos($webbie,'@')) {
+ $lhs = substr($webbie,0,strpos($webbie,'@'));
+ $rhs = substr($webbie,strpos($webbie,'@')+1);
+ $resource = 'acct:' . $webbie;
+ }
+ else {
+ $m = parse_url($webbie);
+ if($m) {
+ if($m['scheme'] !== 'https')
+ return false;
+ $rhs = $m['host'] . (($m['port']) ? ':' . $m['port'] : '');
+ $resource = urlencode($webbie);
+ }
+ else
+ return false;
+ }
+ logger('fetching url from resource: ' . $rhs . ':' . $webbie);
$s = z_fetch_url('https://' . $rhs . '/.well-known/webfinger?f=&resource=' . $resource . (($zot) ? '&zot=1' : ''));
@@ -1455,8 +1466,25 @@ function scrape_vcard($url) {
if(attribute_contains($item->getAttribute('class'), 'vcard')) {
$level2 = $item->getElementsByTagName('*');
foreach($level2 as $x) {
+ if(attribute_contains($x->getAttribute('id'),'pod_location'))
+ $ret['pod_location'] = $x->textContent;
if(attribute_contains($x->getAttribute('class'),'fn'))
$ret['fn'] = $x->textContent;
+ if(attribute_contains($x->getAttribute('class'),'uid'))
+ $ret['uid'] = $x->textContent;
+ if(attribute_contains($x->getAttribute('class'),'nickname'))
+ $ret['nick'] = $x->textContent;
+ if(attribute_contains($x->getAttribute('class'),'searchable'))
+ $ret['searchable'] = $x->textContent;
+ if(attribute_contains($x->getAttribute('class'),'key'))
+ $ret['public_key'] = $x->textContent;
+ if(attribute_contains($x->getAttribute('class'),'given_name'))
+ $ret['given_name'] = $x->textContent;
+ if(attribute_contains($x->getAttribute('class'),'family_name'))
+ $ret['family_name'] = $x->textContent;
+ if(attribute_contains($x->getAttribute('class'),'url'))
+ $ret['url'] = $x->textContent;
+
if((attribute_contains($x->getAttribute('class'),'photo'))
|| (attribute_contains($x->getAttribute('class'),'avatar'))) {
$size = intval($x->getAttribute('width'));
@@ -1465,10 +1493,6 @@ function scrape_vcard($url) {
$largest_photo = $size;
}
}
- if((attribute_contains($x->getAttribute('class'),'nickname'))
- || (attribute_contains($x->getAttribute('class'),'uid'))) {
- $ret['nick'] = $x->textContent;
- }
}
}
}
diff --git a/include/salmon.php b/include/salmon.php
new file mode 100644
index 000000000..e1895ab75
--- /dev/null
+++ b/include/salmon.php
@@ -0,0 +1,201 @@
+<?php
+
+require_once('include/crypto.php');
+
+function get_salmon_key($uri,$keyhash) {
+ $ret = array();
+
+ logger('Fetching salmon key for ' . $uri, LOGGER_DEBUG, LOG_INFO);
+
+ $x = webfinger_rfc7033($uri,true);
+
+ logger('webfinger returns: ' . print_r($x,true), LOGGER_DATA, LOG_DEBUG);
+
+ if($x && array_key_exists('links',$x) && $x['links']) {
+ foreach($x['links'] as $link) {
+ if(array_key_exists('rel',$link) && $link['rel'] === 'magic-public-key') {
+ $ret[] = $link['href'];
+ }
+ }
+ }
+
+ else {
+ $arr = old_webfinger($uri);
+
+ logger('old webfinger returns: ' . print_r($arr,true), LOGGER_DATA, LOG_DEBUG);
+
+ if(is_array($arr)) {
+ foreach($arr as $a) {
+ if($a['@attributes']['rel'] === 'magic-public-key') {
+ $ret[] = $a['@attributes']['href'];
+ }
+ }
+ }
+ else {
+ return '';
+ }
+ }
+
+ // We have found at least one key URL
+ // If it's inline, parse it - otherwise get the key
+
+ if(count($ret)) {
+ for($x = 0; $x < count($ret); $x ++) {
+ if(substr($ret[$x],0,5) === 'data:') {
+ if(strstr($ret[$x],','))
+ $ret[$x] = substr($ret[$x],strpos($ret[$x],',')+1);
+ else
+ $ret[$x] = substr($ret[$x],5);
+ }
+ else
+ $ret[$x] = fetch_url($ret[$x]);
+ }
+ }
+
+
+ logger('Key located: ' . print_r($ret,true), LOGGER_DEBUG, LOG_INFO);
+
+ if(count($ret) == 1) {
+
+ // We only found one one key so we don't care if the hash matches.
+ // If it's the wrong key we'll find out soon enough because
+ // message verification will fail. This also covers some older
+ // software which don't supply a keyhash. As long as they only
+ // have one key we'll be right.
+
+ return $ret[0];
+ }
+ else {
+ foreach($ret as $a) {
+ $hash = base64url_encode(hash('sha256',$a));
+ if($hash == $keyhash)
+ return $a;
+ }
+ }
+
+ return '';
+}
+
+
+
+function slapper($owner,$url,$slap) {
+
+ // does contact have a salmon endpoint?
+
+ if(! strlen($url))
+ return;
+
+
+ if(! $owner['channel_prvkey']) {
+ logger(sprintf("channel '%s' (%d) does not have a salmon private key. Send failed.",
+ $owner['channel_address'],$owner['channel_id']));
+ return;
+ }
+
+ logger('slapper called for ' .$url . '. Data: ' . $slap, LOGGER_DATA, LOG_DEBUG);
+
+ // create a magic envelope
+
+ $data = base64url_encode($slap);
+ $data_type = 'application/atom+xml';
+ $encoding = 'base64url';
+ $algorithm = 'RSA-SHA256';
+ $keyhash = base64url_encode(hash('sha256',salmon_key($owner['channel_pubkey'])),true);
+
+ // precomputed base64url encoding of data_type, encoding, algorithm concatenated with periods
+
+ $precomputed = '.YXBwbGljYXRpb24vYXRvbSt4bWw=.YmFzZTY0dXJs.UlNBLVNIQTI1Ng==';
+
+ $signature = base64url_encode(rsa_sign(str_replace('=','',$data . $precomputed),$owner['channel_prvkey']));
+
+ $signature2 = base64url_encode(rsa_sign($data . $precomputed,$owner['channel_prvkey']));
+
+ $signature3 = base64url_encode(rsa_sign($data,$owner['channel_prvkey']));
+
+ $salmon_tpl = get_markup_template('magicsig.tpl');
+
+ $salmon = replace_macros($salmon_tpl,array(
+ '$data' => $data,
+ '$encoding' => $encoding,
+ '$algorithm' => $algorithm,
+ '$keyhash' => $keyhash,
+ '$signature' => $signature
+ ));
+
+ // slap them
+
+ $redirects = 0;
+
+ $ret = z_post_url($url,$salmon, $redirects, array('headers' => array(
+ 'Content-type: application/magic-envelope+xml',
+ 'Content-length: ' . strlen($salmon))
+ ));
+
+
+ $return_code = $ret['return_code'];
+
+ // check for success, e.g. 2xx
+
+ if($return_code > 299) {
+
+ logger('compliant salmon failed. Falling back to status.net hack2');
+
+ // Entirely likely that their salmon implementation is
+ // non-compliant. Let's try once more, this time only signing
+ // the data, without stripping '=' chars
+
+ $salmon = replace_macros($salmon_tpl,array(
+ '$data' => $data,
+ '$encoding' => $encoding,
+ '$algorithm' => $algorithm,
+ '$keyhash' => $keyhash,
+ '$signature' => $signature2
+ ));
+
+ $redirects = 0;
+
+ $ret = z_post_url($url,$salmon, $redirects, array('headers' => array(
+ 'Content-type: application/magic-envelope+xml',
+ 'Content-length: ' . strlen($salmon))
+ ));
+
+
+ $return_code = $ret['return_code'];
+
+ if($return_code > 299) {
+
+ logger('compliant salmon failed. Falling back to status.net hack3');
+
+ // Entirely likely that their salmon implementation is
+ // non-compliant. Let's try once more, this time only signing
+ // the data, without the precomputed blob
+
+ $salmon = replace_macros($salmon_tpl,array(
+ '$data' => $data,
+ '$encoding' => $encoding,
+ '$algorithm' => $algorithm,
+ '$keyhash' => $keyhash,
+ '$signature' => $signature3
+ ));
+
+ $redirects = 0;
+
+ $ret = z_post_url($url,$salmon, $redirects, array('headers' => array(
+ 'Content-type: application/magic-envelope+xml',
+ 'Content-length: ' . strlen($salmon))
+ ));
+
+
+ $return_code = $ret['return_code'];
+ }
+ }
+ logger('slapper for ' . $url . ' returned ' . $return_code);
+
+ if(! $return_code)
+ return(-1);
+ if(($return_code == 503) && (stristr($ret['header'],'retry-after')))
+ return(-1);
+
+ return ((($return_code >= 200) && ($return_code < 300)) ? 0 : 1);
+}
+
diff --git a/mod/webfinger.php b/mod/webfinger.php
index 74bfc3ce5..e35767338 100644
--- a/mod/webfinger.php
+++ b/mod/webfinger.php
@@ -4,6 +4,7 @@
function webfinger_content(&$a) {
+
$o .= '<h3>Webfinger Diagnostic</h3>';
$o .= '<form action="webfinger" method="get">';
@@ -11,18 +12,34 @@ function webfinger_content(&$a) {
$o .= '<input type="submit" name="submit" value="Submit" /></form>';
$o .= '<br /><br />';
-
+
+ $old = false;
if(x($_GET,'addr')) {
$addr = trim($_GET['addr']);
- if(strpos($addr,'@') !== false) {
+// if(strpos($addr,'@') !== false) {
$res = webfinger_rfc7033($addr,true);
- if(! $res)
+ if(! $res) {
$res = old_webfinger($addr);
+ $old = true;
+ }
+// }
+// else {
+// if(function_exists('lrdd'))
+// $res = lrdd($addr);
+// }
+
+ if($res && $old) {
+ foreach($res as $r) {
+ if($r['@attributes']['rel'] === 'http://microformats.org/profile/hcard') {
+ $hcard = unamp($r['@attributes']['href']);
+ require_once('library/HTML5/Parser.php');
+ $res['vcard'] = scrape_vcard($hcard);
+ break;
+ }
+ }
}
- else {
- if(function_exists('lrdd'))
- $res = lrdd($addr);
- }
+
+
$o .= '<pre>';
$o .= str_replace("\n",'<br />',print_r($res,true));
$o .= '</pre>';
diff --git a/version.inc b/version.inc
index 435a0e60c..5ade25348 100644
--- a/version.inc
+++ b/version.inc
@@ -1 +1 @@
-2016-03-13.1334H
+2016-03-15.1336H
diff --git a/view/tpl/magicsig.tpl b/view/tpl/magicsig.tpl
new file mode 100644
index 000000000..78d8bbbd3
--- /dev/null
+++ b/view/tpl/magicsig.tpl
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<me:env xmlns:me="http://salmon-protocol.org/ns/magic-env">
+<me:data type="application/atom+xml">
+{{$data}}
+</me:data>
+<me:encoding>{{$encoding}}</me:encoding>
+<me:alg>{{$algorithm}}</me:alg>
+<me:sig key_id="{{$keyhash}}">{{$signature}}</me:sig>
+</me:env>
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-12 23:34:21 +0000