MrPetovan/friendica
2
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #4490 from annando/item-enhanced

Browse source 
Enhanced logging for salmon posts
This commit is contained in:
Hypolite Petovan 2018-02-22 09:56:16 -05:00 committed by GitHub
commit 9fc0e02bf9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
mod/salmon.php
View file

@ -17,7 +17,7 @@ function salmon_post(App $a) {
$xml = file_get_contents('php://input'); $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])) : ''); $nick = (($a->argc > 1) ? notags(trim($a->argv[1])) : '');
$mentions = (($a->argc > 2 && $a->argv[2] === 'mention') ? true : false); $mentions = (($a->argc > 2 && $a->argv[2] === 'mention') ? true : false);
@ -46,7 +46,7 @@ function salmon_post(App $a) {
$base = $dom; $base = $dom;
if(! $base) { if(! $base) {
logger('mod-salmon: unable to locate salmon data in xml '); logger('unable to locate salmon data in xml ');
System::httpExit(400); System::httpExit(400);
} }
@ -84,18 +84,18 @@ function salmon_post(App $a) {
$author_link = $author["author-link"]; $author_link = $author["author-link"];
if(! $author_link) { if(! $author_link) {
logger('mod-salmon: Could not retrieve author URI.'); logger('Could not retrieve author URI.');
System::httpExit(400); System::httpExit(400);
} }
// Once we have the author URI, go to the web and try to find their public key // 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); $key = Salmon::getKey($author_link, $keyhash);
if(! $key) { if(! $key) {
logger('mod-salmon: Could not retrieve author key.'); logger('Could not retrieve author key.');
System::httpExit(400); System::httpExit(400);
} }
@ -104,7 +104,7 @@ function salmon_post(App $a) {
$m = base64url_decode($key_info[1]); $m = base64url_decode($key_info[1]);
$e = base64url_decode($key_info[2]); $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); $pubkey = Crypto::meToPem($m, $e);
@ -115,23 +115,23 @@ function salmon_post(App $a) {
$mode = 1; $mode = 1;
if (! $verify) { 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); $verify = Crypto::rsaVerify($compliant_format, $signature, $pubkey);
$mode = 2; $mode = 2;
} }
if (! $verify) { 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); $verify = Crypto::rsaVerify($stnet_signed_data, $signature, $pubkey);
$mode = 3; $mode = 3;
} }
if (! $verify) { if (! $verify) {
logger('mod-salmon: Message did not verify. Discarding.'); logger('Message did not verify. Discarding.');
System::httpExit(400); System::httpExit(400);
} }
logger('mod-salmon: Message verified with mode '.$mode); logger('Message verified with mode '.$mode);
/* /*
@ -151,7 +151,7 @@ function salmon_post(App $a) {
intval($importer['uid']) intval($importer['uid'])
); );
if (! DBM::is_result($r)) { 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')) { if(PConfig::get($importer['uid'],'system','ostatus_autofriend')) {
$result = Contact::createFromProbe($importer['uid'], $author_link); $result = Contact::createFromProbe($importer['uid'], $author_link);
if($result['success']) { if($result['success']) {
@ -171,7 +171,7 @@ function salmon_post(App $a) {
//if((DBM::is_result($r)) && (($r[0]['readonly']) || ($r[0]['rel'] == CONTACT_IS_FOLLOWER) || ($r[0]['blocked']))) { //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']) { if (DBM::is_result($r) && $r[0]['blocked']) {
logger('mod-salmon: Ignoring this author.'); logger('Ignoring this author.');
System::httpExit(202); System::httpExit(202);
// NOTREACHED // NOTREACHED
} }