<?php
+use Friendica\App;
+
require_once('include/salmon.php');
require_once('include/ostatus.php');
require_once('include/crypto.php');
}
-function salmon_post(&$a) {
+function salmon_post(App $a) {
$xml = file_get_contents('php://input');
$r = q("SELECT * FROM `user` WHERE `nickname` = '%s' AND `account_expired` = 0 AND `account_removed` = 0 LIMIT 1",
dbesc($nick)
);
- if(! count($r))
+ if (! dbm::is_result($r)) {
http_status_exit(500);
+ }
$importer = $r[0];
$signed_data = $data . '.' . base64url_encode($type) . '.' . base64url_encode($encoding) . '.' . base64url_encode($alg);
- $compliant_format = str_replace('=','',$signed_data);
+ $compliant_format = str_replace('=', '', $signed_data);
// decode the data
// We should have everything we need now. Let's see if it verifies.
- $verify = rsa_verify($compliant_format,$signature,$pubkey);
+ // Try GNU Social format
+ $verify = rsa_verify($signed_data, $signature, $pubkey);
+ $mode = 1;
- if(! $verify) {
- logger('mod-salmon: message did not verify using protocol. Trying padding hack.');
- $verify = rsa_verify($signed_data,$signature,$pubkey);
+ if (! $verify) {
+ logger('mod-salmon: message did not verify using protocol. Trying compliant format.');
+ $verify = rsa_verify($compliant_format, $signature, $pubkey);
+ $mode = 2;
}
- if(! $verify) {
- logger('mod-salmon: message did not verify using padding. Trying old statusnet hack.');
- $verify = rsa_verify($stnet_signed_data,$signature,$pubkey);
+ if (! $verify) {
+ logger('mod-salmon: message did not verify using padding. Trying old statusnet format.');
+ $verify = rsa_verify($stnet_signed_data, $signature, $pubkey);
+ $mode = 3;
}
- if(! $verify) {
+ if (! $verify) {
logger('mod-salmon: Message did not verify. Discarding.');
http_status_exit(400);
}
- logger('mod-salmon: Message verified.');
+ logger('mod-salmon: Message verified with mode '.$mode);
/*
dbesc(normalise_link($author_link)),
intval($importer['uid'])
);
- if(! count($r)) {
+ 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($result['success']) {
- $r = q("SELECT * FROM `contact` WHERE `network` = '%s' AND ( `url` = '%s' OR `alias` = '%s')
+ $r = q("SELECT * FROM `contact` WHERE `network` = '%s' AND ( `url` = '%s' OR `alias` = '%s')
AND `uid` = %d LIMIT 1",
dbesc(NETWORK_OSTATUS),
dbesc($author_link),
// Have we ignored the person?
// If so we can not accept this post.
- //if((count($r)) && (($r[0]['readonly']) || ($r[0]['rel'] == CONTACT_IS_FOLLOWER) || ($r[0]['blocked']))) {
- if(count($r) && $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']) {
logger('mod-salmon: Ignoring this author.');
http_status_exit(202);
// NOTREACHED
// Placeholder for hub discovery.
$hub = '';
- $contact_rec = ((count($r)) ? $r[0] : null);
+ $contact_rec = ((dbm::is_result($r)) ? $r[0] : null);
ostatus::import($data,$importer,$contact_rec, $hub);