2010-10-06 22:46:44 -04:00
|
|
|
<?php
|
2017-11-15 23:09:11 -05:00
|
|
|
/**
|
2020-02-09 10:18:46 -05:00
|
|
|
* @copyright Copyright (C) 2020, Friendica
|
|
|
|
*
|
|
|
|
* @license GNU AGPL version 3 or any later version
|
|
|
|
*
|
|
|
|
* This program is free software: you can redistribute it and/or modify
|
|
|
|
* it under the terms of the GNU Affero General Public License as
|
|
|
|
* published by the Free Software Foundation, either version 3 of the
|
|
|
|
* License, or (at your option) any later version.
|
|
|
|
*
|
|
|
|
* This program is distributed in the hope that it will be useful,
|
|
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
* GNU Affero General Public License for more details.
|
|
|
|
*
|
|
|
|
* You should have received a copy of the GNU Affero General Public License
|
|
|
|
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
|
|
|
*
|
2017-11-15 23:09:11 -05:00
|
|
|
*/
|
2019-10-24 03:06:22 -04:00
|
|
|
|
2017-04-30 00:07:00 -04:00
|
|
|
use Friendica\App;
|
2018-10-29 17:20:46 -04:00
|
|
|
use Friendica\Core\Logger;
|
2018-08-11 16:40:44 -04:00
|
|
|
use Friendica\Core\Protocol;
|
2018-07-21 08:40:21 -04:00
|
|
|
use Friendica\Database\DBA;
|
2020-01-18 10:50:57 -05:00
|
|
|
use Friendica\DI;
|
2018-01-09 09:59:52 -05:00
|
|
|
use Friendica\Model\Contact;
|
2019-10-24 18:34:46 -04:00
|
|
|
use Friendica\Protocol\ActivityNamespace;
|
2017-11-15 23:09:11 -05:00
|
|
|
use Friendica\Protocol\OStatus;
|
2017-12-02 09:32:45 -05:00
|
|
|
use Friendica\Protocol\Salmon;
|
2017-12-30 11:51:49 -05:00
|
|
|
use Friendica\Util\Crypto;
|
2019-07-30 18:26:01 -04:00
|
|
|
use Friendica\Util\Network;
|
2019-10-24 03:06:22 -04:00
|
|
|
use Friendica\Util\Strings;
|
2017-04-30 00:07:00 -04:00
|
|
|
|
2018-03-23 01:08:47 -04:00
|
|
|
function salmon_post(App $a, $xml = '') {
|
2010-10-06 22:46:44 -04:00
|
|
|
|
2018-03-23 01:08:47 -04:00
|
|
|
if (empty($xml)) {
|
2019-07-30 18:26:01 -04:00
|
|
|
$xml = Network::postdata();
|
2018-03-23 01:08:47 -04:00
|
|
|
}
|
2010-10-27 01:09:13 -04:00
|
|
|
|
2018-10-30 09:58:45 -04:00
|
|
|
Logger::log('new salmon ' . $xml, Logger::DATA);
|
2010-10-06 22:46:44 -04:00
|
|
|
|
2018-11-09 13:29:42 -05:00
|
|
|
$nick = (($a->argc > 1) ? Strings::escapeTags(trim($a->argv[1])) : '');
|
2010-10-06 22:46:44 -04:00
|
|
|
|
2020-06-10 10:36:42 -04:00
|
|
|
$importer = DBA::selectFirst('user', [], ['nickname' => $nick, 'account_expired' => false, 'account_removed' => false]);
|
|
|
|
if (! DBA::isResult($importer)) {
|
2019-05-01 23:16:10 -04:00
|
|
|
throw new \Friendica\Network\HTTPException\InternalServerErrorException();
|
2016-12-20 04:10:33 -05:00
|
|
|
}
|
2010-10-06 22:46:44 -04:00
|
|
|
|
2010-10-21 07:53:43 -04:00
|
|
|
// parse the xml
|
|
|
|
|
2019-10-24 18:32:35 -04:00
|
|
|
$dom = simplexml_load_string($xml,'SimpleXMLElement',0, ActivityNamespace::SALMON_ME);
|
2010-10-21 07:53:43 -04:00
|
|
|
|
2018-02-14 00:07:26 -05:00
|
|
|
$base = null;
|
2010-10-21 07:53:43 -04:00
|
|
|
|
2018-02-14 00:07:26 -05:00
|
|
|
// figure out where in the DOM tree our data is hiding
|
2018-09-11 00:10:11 -04:00
|
|
|
if (!empty($dom->provenance->data))
|
2010-10-21 07:53:43 -04:00
|
|
|
$base = $dom->provenance;
|
2018-09-11 00:10:11 -04:00
|
|
|
elseif (!empty($dom->env->data))
|
2010-10-21 07:53:43 -04:00
|
|
|
$base = $dom->env;
|
2018-09-11 00:10:11 -04:00
|
|
|
elseif (!empty($dom->data))
|
2010-10-21 07:53:43 -04:00
|
|
|
$base = $dom;
|
2015-01-20 16:54:25 -05:00
|
|
|
|
2018-09-11 00:10:11 -04:00
|
|
|
if (empty($base)) {
|
2018-10-29 17:20:46 -04:00
|
|
|
Logger::log('unable to locate salmon data in xml ');
|
2019-05-01 23:16:10 -04:00
|
|
|
throw new \Friendica\Network\HTTPException\BadRequestException();
|
2010-10-21 07:53:43 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
// Stash the signature away for now. We have to find their key or it won't be good for anything.
|
|
|
|
|
|
|
|
|
2018-11-08 10:37:08 -05:00
|
|
|
$signature = Strings::base64UrlDecode($base->sig);
|
2010-10-21 18:32:09 -04:00
|
|
|
|
|
|
|
// unpack the data
|
2010-10-21 07:53:43 -04:00
|
|
|
|
2010-10-21 18:32:09 -04:00
|
|
|
// strip whitespace so our data element will return to one big base64 blob
|
2018-01-15 08:05:12 -05:00
|
|
|
$data = str_replace([" ","\t","\r","\n"],["","","",""],$base->data);
|
2010-10-21 18:32:09 -04:00
|
|
|
|
|
|
|
// stash away some other stuff for later
|
|
|
|
|
2010-10-21 07:53:43 -04:00
|
|
|
$type = $base->data[0]->attributes()->type[0];
|
2010-10-21 18:32:09 -04:00
|
|
|
$keyhash = $base->sig[0]->attributes()->keyhash[0];
|
2010-10-21 07:53:43 -04:00
|
|
|
$encoding = $base->encoding;
|
|
|
|
$alg = $base->alg;
|
|
|
|
|
2011-08-05 01:37:45 -04:00
|
|
|
// Salmon magic signatures have evolved and there is no way of knowing ahead of time which
|
|
|
|
// flavour we have. We'll try and verify it regardless.
|
2010-10-21 07:53:43 -04:00
|
|
|
|
2010-10-21 18:32:09 -04:00
|
|
|
$stnet_signed_data = $data;
|
2011-08-05 01:37:45 -04:00
|
|
|
|
2018-11-08 10:37:08 -05:00
|
|
|
$signed_data = $data . '.' . Strings::base64UrlEncode($type) . '.' . Strings::base64UrlEncode($encoding) . '.' . Strings::base64UrlEncode($alg);
|
2010-10-21 18:32:09 -04:00
|
|
|
|
2017-04-19 17:37:00 -04:00
|
|
|
$compliant_format = str_replace('=', '', $signed_data);
|
2011-08-05 01:37:45 -04:00
|
|
|
|
|
|
|
|
2010-10-21 18:32:09 -04:00
|
|
|
// decode the data
|
2018-11-08 10:37:08 -05:00
|
|
|
$data = Strings::base64UrlDecode($data);
|
2010-10-21 07:53:43 -04:00
|
|
|
|
2017-11-15 23:09:11 -05:00
|
|
|
$author = OStatus::salmonAuthor($data, $importer);
|
2015-07-13 02:06:51 -04:00
|
|
|
$author_link = $author["author-link"];
|
2010-10-21 07:53:43 -04:00
|
|
|
|
2017-03-21 12:02:59 -04:00
|
|
|
if(! $author_link) {
|
2018-10-29 17:20:46 -04:00
|
|
|
Logger::log('Could not retrieve author URI.');
|
2019-05-01 23:16:10 -04:00
|
|
|
throw new \Friendica\Network\HTTPException\BadRequestException();
|
2010-10-21 07:53:43 -04:00
|
|
|
}
|
2010-10-06 22:46:44 -04:00
|
|
|
|
2010-10-21 18:32:09 -04:00
|
|
|
// Once we have the author URI, go to the web and try to find their public key
|
2010-10-06 22:46:44 -04:00
|
|
|
|
2018-10-29 17:20:46 -04:00
|
|
|
Logger::log('Fetching key for ' . $author_link);
|
2010-10-06 22:46:44 -04:00
|
|
|
|
2017-12-02 09:32:45 -05:00
|
|
|
$key = Salmon::getKey($author_link, $keyhash);
|
2010-10-21 07:53:43 -04:00
|
|
|
|
2017-03-21 12:02:59 -04:00
|
|
|
if(! $key) {
|
2018-10-29 17:20:46 -04:00
|
|
|
Logger::log('Could not retrieve author key.');
|
2019-05-01 23:16:10 -04:00
|
|
|
throw new \Friendica\Network\HTTPException\BadRequestException();
|
2010-10-21 07:53:43 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
$key_info = explode('.',$key);
|
|
|
|
|
2018-11-08 10:37:08 -05:00
|
|
|
$m = Strings::base64UrlDecode($key_info[1]);
|
|
|
|
$e = Strings::base64UrlDecode($key_info[2]);
|
2010-10-21 18:32:09 -04:00
|
|
|
|
2020-06-29 16:22:00 -04:00
|
|
|
Logger::info('key details', ['info' => $key_info]);
|
2010-10-21 07:53:43 -04:00
|
|
|
|
2017-12-30 11:51:49 -05:00
|
|
|
$pubkey = Crypto::meToPem($m, $e);
|
2010-10-21 07:53:43 -04:00
|
|
|
|
|
|
|
// We should have everything we need now. Let's see if it verifies.
|
|
|
|
|
2017-04-19 17:37:00 -04:00
|
|
|
// Try GNU Social format
|
2017-12-30 11:51:49 -05:00
|
|
|
$verify = Crypto::rsaVerify($signed_data, $signature, $pubkey);
|
2017-04-19 17:37:00 -04:00
|
|
|
$mode = 1;
|
2011-08-05 01:37:45 -04:00
|
|
|
|
2017-04-19 17:37:00 -04:00
|
|
|
if (! $verify) {
|
2018-10-29 17:20:46 -04:00
|
|
|
Logger::log('message did not verify using protocol. Trying compliant format.');
|
2017-12-30 11:51:49 -05:00
|
|
|
$verify = Crypto::rsaVerify($compliant_format, $signature, $pubkey);
|
2017-04-19 17:37:00 -04:00
|
|
|
$mode = 2;
|
2015-07-13 02:06:51 -04:00
|
|
|
}
|
2010-10-21 07:53:43 -04:00
|
|
|
|
2017-04-19 17:37:00 -04:00
|
|
|
if (! $verify) {
|
2018-10-29 17:20:46 -04:00
|
|
|
Logger::log('message did not verify using padding. Trying old statusnet format.');
|
2017-12-30 11:51:49 -05:00
|
|
|
$verify = Crypto::rsaVerify($stnet_signed_data, $signature, $pubkey);
|
2017-04-19 17:37:00 -04:00
|
|
|
$mode = 3;
|
2015-07-13 02:06:51 -04:00
|
|
|
}
|
2010-10-21 18:32:09 -04:00
|
|
|
|
2017-04-19 17:37:00 -04:00
|
|
|
if (! $verify) {
|
2018-10-29 17:20:46 -04:00
|
|
|
Logger::log('Message did not verify. Discarding.');
|
2019-05-01 23:16:10 -04:00
|
|
|
throw new \Friendica\Network\HTTPException\BadRequestException();
|
2010-10-21 07:53:43 -04:00
|
|
|
}
|
|
|
|
|
2018-10-29 17:20:46 -04:00
|
|
|
Logger::log('Message verified with mode '.$mode);
|
2010-10-21 07:53:43 -04:00
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
*
|
|
|
|
* If we reached this point, the message is good. Now let's figure out if the author is allowed to send us stuff.
|
|
|
|
*
|
|
|
|
*/
|
|
|
|
|
2015-07-13 02:06:51 -04:00
|
|
|
$r = q("SELECT * FROM `contact` WHERE `network` IN ('%s', '%s')
|
|
|
|
AND (`nurl` = '%s' OR `alias` = '%s' OR `alias` = '%s')
|
|
|
|
AND `uid` = %d LIMIT 1",
|
2018-08-11 16:40:44 -04:00
|
|
|
DBA::escape(Protocol::OSTATUS),
|
|
|
|
DBA::escape(Protocol::DFRN),
|
2018-11-08 11:28:29 -05:00
|
|
|
DBA::escape(Strings::normaliseLink($author_link)),
|
2018-07-21 09:10:13 -04:00
|
|
|
DBA::escape($author_link),
|
2018-11-08 11:28:29 -05:00
|
|
|
DBA::escape(Strings::normaliseLink($author_link)),
|
2010-10-21 07:53:43 -04:00
|
|
|
intval($importer['uid'])
|
|
|
|
);
|
Cleanups: isResult() more used, readability improved (#5608)
* [diaspora]: Maybe SimpleXMLElement is the right type-hint?
* Changes proposed + pre-renaming:
- pre-renamed $db -> $connection
- added TODOs for not allowing bad method invocations (there is a
BadMethodCallException in SPL)
* If no record is found, below $r[0] will fail with a E_NOTICE and the code
doesn't behave as expected.
* Ops, one more left ...
* Continued:
- added documentation for Contact::updateSslPolicy() method
- added type-hint for $contact of same method
- empty lines added + TODO where the bug origins that $item has no element 'body'
* Added empty lines for better readability
* Cleaned up:
- no more x() (deprecated) usage but empty() instead
- fixed mixing of space/tab indending
- merged else/if block goether in elseif() (lesser nested code blocks)
* Re-fixed DBM -> DBA switch
* Fixes/rewrites:
- use empty()/isset() instead of deprecated x()
- merged 2 nested if() blocks into one
- avoided nested if() block inside else block by rewriting it to elseif()
- $contact_id is an integer, let's test on > 0 here
- added a lot spaces and some empty lines for better readability
* Rewrite:
- moved all CONTACT_* constants from boot.php to Contact class
* CR request:
- renamed Contact::CONTACT_IS_* -> Contact::* ;-)
* Rewrites:
- moved PAGE_* to Friendica\Model\Profile class
- fixed mixure with "Contact::* rewrite"
* Ops, one still there (return is no function)
* Rewrite to Proxy class:
- introduced new Friendica\Network\Proxy class for in exchange of proxy_*()
functions
- moved also all PROXY_* constants there as Proxy::*
- removed now no longer needed mod/proxy.php loading as composer's auto-load
will do this for us
- renamed those proxy_*() functions to better names:
+ proxy_init() -> Proxy::init() (public)
+ proxy_url() -> Proxy::proxifyUrl() (public)
+ proxy_parse_html() -> Proxy::proxifyHtml() (public)
+ proxy_is_local_image() -> Proxy::isLocalImage() (private)
+ proxy_parse_query() -> Proxy::parseQuery() (private)
+ proxy_img_cb() -> Proxy::replaceUrl() (private)
* CR request:
- moved all PAGE_* constants to Friendica\Model\Contact class
- fixed all references of both classes
* Ops, need to set $a here ...
* CR request:
- moved Proxy class to Friendica\Module
- extended BaseModule
* Ops, no need for own instance of $a when self::getApp() is around.
* Proxy-rewrite:
- proxy_url() and proxy_parse_html() are both non-module functions (now
methods)
- so they must be splitted into a seperate class
- also the SIZE_* and DEFAULT_TIME constants are both not relevant to module
* No instances from utility classes
* Fixed error:
- proxify*() is now located in `Friendica\Util\ProxyUtils`
* Moved back to original place, ops? How did they move here? Well, it was not
intended by me.
* Removed duplicate (left-over from split) constants and static array. Thank to
MrPetovan finding it.
* Renamed ProxyUtils -> Proxy and aliased it back to ProxyUtils.
* Rewrite:
- stopped using deprecated NETWORK_* constants, now Protocol::* should be used
- still left them intact for slow/lazy developers ...
* Ops, was added accidentally ...
* Ops, why these wrong moves?
* Ops, one to much (thanks to MrPetovan)
* Ops, wrong moving ...
* moved back to original place ...
* spaces added
* empty lines add for better readability.
* convertered spaces -> tab for code indenting.
* CR request: Add space between if and brace.
* CR requests fixed + move reverted
- ops, src/Module/*.php has been moved to src/Network/ accidentally
- reverted some parts in src/Database/DBA.php as pointed out by Annando
- removed internal TODO items
- added some spaces for better readability
2018-08-24 01:05:49 -04:00
|
|
|
|
|
|
|
if (!DBA::isResult($r)) {
|
2018-10-29 17:20:46 -04:00
|
|
|
Logger::log('Author ' . $author_link . ' unknown to user ' . $importer['uid'] . '.');
|
Cleanups: isResult() more used, readability improved (#5608)
* [diaspora]: Maybe SimpleXMLElement is the right type-hint?
* Changes proposed + pre-renaming:
- pre-renamed $db -> $connection
- added TODOs for not allowing bad method invocations (there is a
BadMethodCallException in SPL)
* If no record is found, below $r[0] will fail with a E_NOTICE and the code
doesn't behave as expected.
* Ops, one more left ...
* Continued:
- added documentation for Contact::updateSslPolicy() method
- added type-hint for $contact of same method
- empty lines added + TODO where the bug origins that $item has no element 'body'
* Added empty lines for better readability
* Cleaned up:
- no more x() (deprecated) usage but empty() instead
- fixed mixing of space/tab indending
- merged else/if block goether in elseif() (lesser nested code blocks)
* Re-fixed DBM -> DBA switch
* Fixes/rewrites:
- use empty()/isset() instead of deprecated x()
- merged 2 nested if() blocks into one
- avoided nested if() block inside else block by rewriting it to elseif()
- $contact_id is an integer, let's test on > 0 here
- added a lot spaces and some empty lines for better readability
* Rewrite:
- moved all CONTACT_* constants from boot.php to Contact class
* CR request:
- renamed Contact::CONTACT_IS_* -> Contact::* ;-)
* Rewrites:
- moved PAGE_* to Friendica\Model\Profile class
- fixed mixure with "Contact::* rewrite"
* Ops, one still there (return is no function)
* Rewrite to Proxy class:
- introduced new Friendica\Network\Proxy class for in exchange of proxy_*()
functions
- moved also all PROXY_* constants there as Proxy::*
- removed now no longer needed mod/proxy.php loading as composer's auto-load
will do this for us
- renamed those proxy_*() functions to better names:
+ proxy_init() -> Proxy::init() (public)
+ proxy_url() -> Proxy::proxifyUrl() (public)
+ proxy_parse_html() -> Proxy::proxifyHtml() (public)
+ proxy_is_local_image() -> Proxy::isLocalImage() (private)
+ proxy_parse_query() -> Proxy::parseQuery() (private)
+ proxy_img_cb() -> Proxy::replaceUrl() (private)
* CR request:
- moved all PAGE_* constants to Friendica\Model\Contact class
- fixed all references of both classes
* Ops, need to set $a here ...
* CR request:
- moved Proxy class to Friendica\Module
- extended BaseModule
* Ops, no need for own instance of $a when self::getApp() is around.
* Proxy-rewrite:
- proxy_url() and proxy_parse_html() are both non-module functions (now
methods)
- so they must be splitted into a seperate class
- also the SIZE_* and DEFAULT_TIME constants are both not relevant to module
* No instances from utility classes
* Fixed error:
- proxify*() is now located in `Friendica\Util\ProxyUtils`
* Moved back to original place, ops? How did they move here? Well, it was not
intended by me.
* Removed duplicate (left-over from split) constants and static array. Thank to
MrPetovan finding it.
* Renamed ProxyUtils -> Proxy and aliased it back to ProxyUtils.
* Rewrite:
- stopped using deprecated NETWORK_* constants, now Protocol::* should be used
- still left them intact for slow/lazy developers ...
* Ops, was added accidentally ...
* Ops, why these wrong moves?
* Ops, one to much (thanks to MrPetovan)
* Ops, wrong moving ...
* moved back to original place ...
* spaces added
* empty lines add for better readability.
* convertered spaces -> tab for code indenting.
* CR request: Add space between if and brace.
* CR requests fixed + move reverted
- ops, src/Module/*.php has been moved to src/Network/ accidentally
- reverted some parts in src/Database/DBA.php as pointed out by Annando
- removed internal TODO items
- added some spaces for better readability
2018-08-24 01:05:49 -04:00
|
|
|
|
2020-01-18 10:50:57 -05:00
|
|
|
if (DI::pConfig()->get($importer['uid'], 'system', 'ostatus_autofriend')) {
|
2020-06-10 10:36:42 -04:00
|
|
|
$result = Contact::createFromProbe($importer, $author_link);
|
Cleanups: isResult() more used, readability improved (#5608)
* [diaspora]: Maybe SimpleXMLElement is the right type-hint?
* Changes proposed + pre-renaming:
- pre-renamed $db -> $connection
- added TODOs for not allowing bad method invocations (there is a
BadMethodCallException in SPL)
* If no record is found, below $r[0] will fail with a E_NOTICE and the code
doesn't behave as expected.
* Ops, one more left ...
* Continued:
- added documentation for Contact::updateSslPolicy() method
- added type-hint for $contact of same method
- empty lines added + TODO where the bug origins that $item has no element 'body'
* Added empty lines for better readability
* Cleaned up:
- no more x() (deprecated) usage but empty() instead
- fixed mixing of space/tab indending
- merged else/if block goether in elseif() (lesser nested code blocks)
* Re-fixed DBM -> DBA switch
* Fixes/rewrites:
- use empty()/isset() instead of deprecated x()
- merged 2 nested if() blocks into one
- avoided nested if() block inside else block by rewriting it to elseif()
- $contact_id is an integer, let's test on > 0 here
- added a lot spaces and some empty lines for better readability
* Rewrite:
- moved all CONTACT_* constants from boot.php to Contact class
* CR request:
- renamed Contact::CONTACT_IS_* -> Contact::* ;-)
* Rewrites:
- moved PAGE_* to Friendica\Model\Profile class
- fixed mixure with "Contact::* rewrite"
* Ops, one still there (return is no function)
* Rewrite to Proxy class:
- introduced new Friendica\Network\Proxy class for in exchange of proxy_*()
functions
- moved also all PROXY_* constants there as Proxy::*
- removed now no longer needed mod/proxy.php loading as composer's auto-load
will do this for us
- renamed those proxy_*() functions to better names:
+ proxy_init() -> Proxy::init() (public)
+ proxy_url() -> Proxy::proxifyUrl() (public)
+ proxy_parse_html() -> Proxy::proxifyHtml() (public)
+ proxy_is_local_image() -> Proxy::isLocalImage() (private)
+ proxy_parse_query() -> Proxy::parseQuery() (private)
+ proxy_img_cb() -> Proxy::replaceUrl() (private)
* CR request:
- moved all PAGE_* constants to Friendica\Model\Contact class
- fixed all references of both classes
* Ops, need to set $a here ...
* CR request:
- moved Proxy class to Friendica\Module
- extended BaseModule
* Ops, no need for own instance of $a when self::getApp() is around.
* Proxy-rewrite:
- proxy_url() and proxy_parse_html() are both non-module functions (now
methods)
- so they must be splitted into a seperate class
- also the SIZE_* and DEFAULT_TIME constants are both not relevant to module
* No instances from utility classes
* Fixed error:
- proxify*() is now located in `Friendica\Util\ProxyUtils`
* Moved back to original place, ops? How did they move here? Well, it was not
intended by me.
* Removed duplicate (left-over from split) constants and static array. Thank to
MrPetovan finding it.
* Renamed ProxyUtils -> Proxy and aliased it back to ProxyUtils.
* Rewrite:
- stopped using deprecated NETWORK_* constants, now Protocol::* should be used
- still left them intact for slow/lazy developers ...
* Ops, was added accidentally ...
* Ops, why these wrong moves?
* Ops, one to much (thanks to MrPetovan)
* Ops, wrong moving ...
* moved back to original place ...
* spaces added
* empty lines add for better readability.
* convertered spaces -> tab for code indenting.
* CR request: Add space between if and brace.
* CR requests fixed + move reverted
- ops, src/Module/*.php has been moved to src/Network/ accidentally
- reverted some parts in src/Database/DBA.php as pointed out by Annando
- removed internal TODO items
- added some spaces for better readability
2018-08-24 01:05:49 -04:00
|
|
|
|
|
|
|
if ($result['success']) {
|
2017-01-09 07:14:55 -05:00
|
|
|
$r = q("SELECT * FROM `contact` WHERE `network` = '%s' AND ( `url` = '%s' OR `alias` = '%s')
|
2012-06-07 23:20:13 -04:00
|
|
|
AND `uid` = %d LIMIT 1",
|
2018-08-11 16:40:44 -04:00
|
|
|
DBA::escape(Protocol::OSTATUS),
|
2018-07-21 09:10:13 -04:00
|
|
|
DBA::escape($author_link),
|
|
|
|
DBA::escape($author_link),
|
2012-06-07 23:20:13 -04:00
|
|
|
intval($importer['uid'])
|
|
|
|
);
|
|
|
|
}
|
|
|
|
}
|
2015-01-20 16:54:25 -05:00
|
|
|
}
|
2011-07-01 20:39:16 -04:00
|
|
|
|
2015-07-13 08:34:28 -04:00
|
|
|
// Have we ignored the person?
|
2011-07-01 20:39:16 -04:00
|
|
|
// If so we can not accept this post.
|
|
|
|
|
2018-07-24 22:53:46 -04:00
|
|
|
//if((DBA::isResult($r)) && (($r[0]['readonly']) || ($r[0]['rel'] == Contact::FOLLOWER) || ($r[0]['blocked']))) {
|
2018-07-21 08:46:04 -04:00
|
|
|
if (DBA::isResult($r) && $r[0]['blocked']) {
|
2018-10-29 17:20:46 -04:00
|
|
|
Logger::log('Ignoring this author.');
|
2019-05-01 23:16:10 -04:00
|
|
|
throw new \Friendica\Network\HTTPException\AcceptedException();
|
2010-10-26 22:01:16 -04:00
|
|
|
}
|
|
|
|
|
2015-07-13 08:34:28 -04:00
|
|
|
// Placeholder for hub discovery.
|
2010-10-21 07:53:43 -04:00
|
|
|
$hub = '';
|
|
|
|
|
2019-01-22 08:53:53 -05:00
|
|
|
$contact_rec = ((DBA::isResult($r)) ? $r[0] : []);
|
2011-01-14 17:56:13 -05:00
|
|
|
|
2017-11-15 23:09:11 -05:00
|
|
|
OStatus::import($data, $importer, $contact_rec, $hub);
|
2010-10-06 22:46:44 -04:00
|
|
|
|
2019-05-01 23:16:10 -04:00
|
|
|
throw new \Friendica\Network\HTTPException\OKException();
|
2010-10-06 22:46:44 -04:00
|
|
|
}
|