X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fsalmon.php;h=22da151cf8e1c93f44d3478fee2c1b0e23c6e129;hb=269221f0133b7961c7df403a44e20420c45c1d44;hp=f42e05deaa76f207848c1e214ad5854fd78c54a6;hpb=2b161108fe6552ef2effb7b300553f0242b2e49e;p=friendica.git diff --git a/mod/salmon.php b/mod/salmon.php index f42e05deaa..22da151cf8 100644 --- a/mod/salmon.php +++ b/mod/salmon.php @@ -1,31 +1,25 @@ = 400) - $err = 'Error'; - if($val >= 200 && $val < 300) - $err = 'OK'; +require_once 'include/items.php'; - logger('mod-salmon returns ' . $val); - header($_SERVER["SERVER_PROTOCOL"] . ' ' . $val . ' ' . $err); - killme(); - -} +function salmon_post(App $a, $xml = '') { -function salmon_post(App $a) { - - $xml = file_get_contents('php://input'); + if (empty($xml)) { + $xml = file_get_contents('php://input'); + } - logger('mod-salmon: new salmon ' . $xml, LOGGER_DATA); + logger('new salmon ' . $xml, LOGGER_DATA); $nick = (($a->argc > 1) ? notags(trim($a->argv[1])) : ''); $mentions = (($a->argc > 2 && $a->argv[2] === 'mention') ? true : false); @@ -33,8 +27,8 @@ function salmon_post(App $a) { $r = q("SELECT * FROM `user` WHERE `nickname` = '%s' AND `account_expired` = 0 AND `account_removed` = 0 LIMIT 1", dbesc($nick) ); - if (! dbm::is_result($r)) { - http_status_exit(500); + if (! DBM::is_result($r)) { + System::httpExit(500); } $importer = $r[0]; @@ -43,8 +37,9 @@ function salmon_post(App $a) { $dom = simplexml_load_string($xml,'SimpleXMLElement',0,NAMESPACE_SALMON_ME); - // figure out where in the DOM tree our data is hiding + $base = null; + // figure out where in the DOM tree our data is hiding if($dom->provenance->data) $base = $dom->provenance; elseif($dom->env->data) @@ -53,8 +48,8 @@ function salmon_post(App $a) { $base = $dom; if(! $base) { - logger('mod-salmon: unable to locate salmon data in xml '); - http_status_exit(400); + logger('unable to locate salmon data in xml '); + System::httpExit(400); } // Stash the signature away for now. We have to find their key or it won't be good for anything. @@ -65,7 +60,7 @@ function salmon_post(App $a) { // unpack the data // strip whitespace so our data element will return to one big base64 blob - $data = str_replace(array(" ","\t","\r","\n"),array("","","",""),$base->data); + $data = str_replace([" ","\t","\r","\n"],["","","",""],$base->data); // stash away some other stuff for later @@ -87,23 +82,23 @@ function salmon_post(App $a) { // decode the data $data = base64url_decode($data); - $author = ostatus::salmon_author($data,$importer); + $author = OStatus::salmonAuthor($data, $importer); $author_link = $author["author-link"]; if(! $author_link) { - logger('mod-salmon: Could not retrieve author URI.'); - http_status_exit(400); + logger('Could not retrieve author URI.'); + System::httpExit(400); } // Once we have the author URI, go to the web and try to find their public key - logger('mod-salmon: Fetching key for ' . $author_link); + logger('Fetching key for ' . $author_link); - $key = get_salmon_key($author_link,$keyhash); + $key = Salmon::getKey($author_link, $keyhash); if(! $key) { - logger('mod-salmon: Could not retrieve author key.'); - http_status_exit(400); + logger('Could not retrieve author key.'); + System::httpExit(400); } $key_info = explode('.',$key); @@ -111,34 +106,34 @@ function salmon_post(App $a) { $m = base64url_decode($key_info[1]); $e = base64url_decode($key_info[2]); - logger('mod-salmon: key details: ' . print_r($key_info,true), LOGGER_DEBUG); + logger('key details: ' . print_r($key_info,true), LOGGER_DEBUG); - $pubkey = metopem($m,$e); + $pubkey = Crypto::meToPem($m, $e); // We should have everything we need now. Let's see if it verifies. // Try GNU Social format - $verify = rsa_verify($signed_data, $signature, $pubkey); + $verify = Crypto::rsaVerify($signed_data, $signature, $pubkey); $mode = 1; if (! $verify) { - logger('mod-salmon: message did not verify using protocol. Trying compliant format.'); - $verify = rsa_verify($compliant_format, $signature, $pubkey); + logger('message did not verify using protocol. Trying compliant format.'); + $verify = Crypto::rsaVerify($compliant_format, $signature, $pubkey); $mode = 2; } if (! $verify) { - logger('mod-salmon: message did not verify using padding. Trying old statusnet format.'); - $verify = rsa_verify($stnet_signed_data, $signature, $pubkey); + logger('message did not verify using padding. Trying old statusnet format.'); + $verify = Crypto::rsaVerify($stnet_signed_data, $signature, $pubkey); $mode = 3; } if (! $verify) { - logger('mod-salmon: Message did not verify. Discarding.'); - http_status_exit(400); + logger('Message did not verify. Discarding.'); + System::httpExit(400); } - logger('mod-salmon: Message verified with mode '.$mode); + logger('Message verified with mode '.$mode); /* @@ -157,10 +152,10 @@ function salmon_post(App $a) { dbesc(normalise_link($author_link)), intval($importer['uid']) ); - if (! dbm::is_result($r)) { - logger('mod-salmon: Author unknown to us.'); - if(get_pconfig($importer['uid'],'system','ostatus_autofriend')) { - $result = new_contact($importer['uid'],$author_link); + if (! DBM::is_result($r)) { + logger('Author ' . $author_link . ' unknown to user ' . $importer['uid'] . '.'); + if(PConfig::get($importer['uid'],'system','ostatus_autofriend')) { + $result = Contact::createFromProbe($importer['uid'], $author_link); if($result['success']) { $r = q("SELECT * FROM `contact` WHERE `network` = '%s' AND ( `url` = '%s' OR `alias` = '%s') AND `uid` = %d LIMIT 1", @@ -176,19 +171,19 @@ function salmon_post(App $a) { // Have we ignored the person? // If so we can not accept this post. - //if((dbm::is_result($r)) && (($r[0]['readonly']) || ($r[0]['rel'] == CONTACT_IS_FOLLOWER) || ($r[0]['blocked']))) { - if (dbm::is_result($r) && $r[0]['blocked']) { - logger('mod-salmon: Ignoring this author.'); - http_status_exit(202); + //if((DBM::is_result($r)) && (($r[0]['readonly']) || ($r[0]['rel'] == CONTACT_IS_FOLLOWER) || ($r[0]['blocked']))) { + if (DBM::is_result($r) && $r[0]['blocked']) { + logger('Ignoring this author.'); + System::httpExit(202); // NOTREACHED } // Placeholder for hub discovery. $hub = ''; - $contact_rec = ((dbm::is_result($r)) ? $r[0] : null); + $contact_rec = ((DBM::is_result($r)) ? $r[0] : null); - ostatus::import($data,$importer,$contact_rec, $hub); + OStatus::import($data, $importer, $contact_rec, $hub); - http_status_exit(200); + System::httpExit(200); }