*/
use Friendica\App;
use Friendica\Core\PConfig;
+use Friendica\Core\System;
use Friendica\Database\DBM;
use Friendica\Model\Contact;
use Friendica\Protocol\OStatus;
use Friendica\Protocol\Salmon;
use Friendica\Util\Crypto;
-use Friendica\Util\Network;
require_once 'include/items.php';
-function salmon_return($val) {
+function salmon_post(App $a, $xml = '') {
- if($val >= 400)
- $err = 'Error';
- if($val >= 200 && $val < 300)
- $err = 'OK';
-
- logger('mod-salmon returns ' . $val);
- header($_SERVER["SERVER_PROTOCOL"] . ' ' . $val . ' ' . $err);
- killme();
-
-}
-
-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);
dbesc($nick)
);
if (! DBM::is_result($r)) {
- Network::httpStatusExit(500);
+ System::httpExit(500);
}
$importer = $r[0];
$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)
$base = $dom;
if(! $base) {
- logger('mod-salmon: unable to locate salmon data in xml ');
- Network::httpStatusExit(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.
$author_link = $author["author-link"];
if(! $author_link) {
- logger('mod-salmon: Could not retrieve author URI.');
- Network::httpStatusExit(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 = Salmon::getKey($author_link, $keyhash);
if(! $key) {
- logger('mod-salmon: Could not retrieve author key.');
- Network::httpStatusExit(400);
+ logger('Could not retrieve author key.');
+ System::httpExit(400);
}
$key_info = explode('.',$key);
$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 = Crypto::meToPem($m, $e);
$mode = 1;
if (! $verify) {
- logger('mod-salmon: message did not verify using protocol. Trying compliant format.');
+ 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.');
+ 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.');
- Network::httpStatusExit(400);
+ logger('Message did not verify. Discarding.');
+ System::httpExit(400);
}
- logger('mod-salmon: Message verified with mode '.$mode);
+ logger('Message verified with mode '.$mode);
/*
intval($importer['uid'])
);
if (! DBM::is_result($r)) {
- logger('mod-salmon: Author unknown to us.');
+ 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']) {
//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.');
- Network::httpStatusExit(202);
+ logger('Ignoring this author.');
+ System::httpExit(202);
// NOTREACHED
}
OStatus::import($data, $importer, $contact_rec, $hub);
- Network::httpStatusExit(200);
+ System::httpExit(200);
}