<?php
/**
- * @copyright Copyright (C) 2020, Friendica
+ * @copyright Copyright (C) 2010-2021, the Friendica project
*
* @license GNU AGPL version 3 or any later version
*
use Friendica\Core\Protocol;
use Friendica\Database\DBA;
use Friendica\DI;
-use Friendica\Model\Contact;
+use Friendica\Model\GServer;
+use Friendica\Model\Post;
use Friendica\Protocol\ActivityNamespace;
use Friendica\Protocol\OStatus;
use Friendica\Protocol\Salmon;
$xml = Network::postdata();
}
- Logger::log('new salmon ' . $xml, Logger::DATA);
+ Logger::debug('new salmon ' . $xml);
- $nick = (($a->argc > 1) ? Strings::escapeTags(trim($a->argv[1])) : '');
+ $nick = trim(DI::args()->getArgv()[1] ?? '');
- $r = q("SELECT * FROM `user` WHERE `nickname` = '%s' AND `account_expired` = 0 AND `account_removed` = 0 LIMIT 1",
- DBA::escape($nick)
- );
- if (! DBA::isResult($r)) {
+ $importer = DBA::selectFirst('user', [], ['nickname' => $nick, 'account_expired' => false, 'account_removed' => false]);
+ if (! DBA::isResult($importer)) {
throw new \Friendica\Network\HTTPException\InternalServerErrorException();
}
- $importer = $r[0];
-
// parse the xml
$dom = simplexml_load_string($xml,'SimpleXMLElement',0, ActivityNamespace::SALMON_ME);
$base = $dom;
if (empty($base)) {
- Logger::log('unable to locate salmon data in xml ');
+ Logger::notice('unable to locate salmon data in xml');
throw new \Friendica\Network\HTTPException\BadRequestException();
}
// stash away some other stuff for later
$type = $base->data[0]->attributes()->type[0];
- $keyhash = $base->sig[0]->attributes()->keyhash[0];
+ $keyhash = $base->sig[0]->attributes()->keyhash[0] ?? '';
$encoding = $base->encoding;
$alg = $base->alg;
$author_link = $author["author-link"];
if(! $author_link) {
- Logger::log('Could not retrieve author URI.');
+ Logger::notice('Could not retrieve author URI.');
throw new \Friendica\Network\HTTPException\BadRequestException();
}
// Once we have the author URI, go to the web and try to find their public key
- Logger::log('Fetching key for ' . $author_link);
+ Logger::notice('Fetching key for ' . $author_link);
$key = Salmon::getKey($author_link, $keyhash);
if(! $key) {
- Logger::log('Could not retrieve author key.');
+ Logger::notice('Could not retrieve author key.');
throw new \Friendica\Network\HTTPException\BadRequestException();
}
$m = Strings::base64UrlDecode($key_info[1]);
$e = Strings::base64UrlDecode($key_info[2]);
- Logger::log('key details: ' . print_r($key_info,true), Logger::DEBUG);
+ Logger::info('key details', ['info' => $key_info]);
$pubkey = Crypto::meToPem($m, $e);
$mode = 1;
if (! $verify) {
- Logger::log('message did not verify using protocol. Trying compliant format.');
+ Logger::notice('message did not verify using protocol. Trying compliant format.');
$verify = Crypto::rsaVerify($compliant_format, $signature, $pubkey);
$mode = 2;
}
if (! $verify) {
- Logger::log('message did not verify using padding. Trying old statusnet format.');
+ Logger::notice('message did not verify using padding. Trying old statusnet format.');
$verify = Crypto::rsaVerify($stnet_signed_data, $signature, $pubkey);
$mode = 3;
}
if (! $verify) {
- Logger::log('Message did not verify. Discarding.');
+ Logger::notice('Message did not verify. Discarding.');
throw new \Friendica\Network\HTTPException\BadRequestException();
}
- Logger::log('Message verified with mode '.$mode);
+ Logger::notice('Message verified with mode '.$mode);
/*
*
*/
- $r = q("SELECT * FROM `contact` WHERE `network` IN ('%s', '%s')
- AND (`nurl` = '%s' OR `alias` = '%s' OR `alias` = '%s')
- AND `uid` = %d LIMIT 1",
- DBA::escape(Protocol::OSTATUS),
- DBA::escape(Protocol::DFRN),
- DBA::escape(Strings::normaliseLink($author_link)),
- DBA::escape($author_link),
- DBA::escape(Strings::normaliseLink($author_link)),
- intval($importer['uid'])
- );
-
- if (!DBA::isResult($r)) {
- Logger::log('Author ' . $author_link . ' unknown to user ' . $importer['uid'] . '.');
-
- if (DI::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",
- DBA::escape(Protocol::OSTATUS),
- DBA::escape($author_link),
- DBA::escape($author_link),
- intval($importer['uid'])
- );
- }
- }
+ $contact = DBA::selectFirst('contact', [], ["`network` IN (?, ?) AND (`nurl` = ? OR `alias` = ? OR `alias` = ?) AND `uid` = ?",
+ Protocol::OSTATUS, Protocol::DFRN, Strings::normaliseLink($author_link), $author_link, Strings::normaliseLink($author_link), $importer['uid']]);
+
+ if (!empty($contact['gsid'])) {
+ GServer::setProtocol($contact['gsid'], Post\DeliveryData::OSTATUS);
}
// Have we ignored the person?
// If so we can not accept this post.
- //if((DBA::isResult($r)) && (($r[0]['readonly']) || ($r[0]['rel'] == Contact::FOLLOWER) || ($r[0]['blocked']))) {
- if (DBA::isResult($r) && $r[0]['blocked']) {
- Logger::log('Ignoring this author.');
+ if (!empty($contact['blocked'])) {
+ Logger::notice('Ignoring this author.');
throw new \Friendica\Network\HTTPException\AcceptedException();
}
// Placeholder for hub discovery.
$hub = '';
- $contact_rec = ((DBA::isResult($r)) ? $r[0] : []);
+ $contact = $contact ?: [];
- OStatus::import($data, $importer, $contact_rec, $hub);
+ OStatus::import($data, $importer, $contact, $hub);
throw new \Friendica\Network\HTTPException\OKException();
}