Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2024-11-10 02:22:55 +00:00
Code Issues Projects Releases Packages Wiki Activity

OStatus: Fixed communication issues with deleted contacts

Browse source
This commit is contained in:
Michael 2018-03-13 06:21:44 +00:00
parent 23718aeae3
commit 32ee4ca4b1
4 changed files with 37 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/items.php
View file

@ -290,7 +290,7 @@ function subscribe_to_hub($url, $importer, $contact, $hubmode = 'subscribe') {
return; return;
} }
$push_url = Config::get('system','url') . '/pubsub/' . $r[0]['nickname'] . '/' . $contact['id']; $push_url = System::baseUrl() . '/pubsub/' . $r[0]['nickname'] . '/' . $contact['id'];
// Use a single verify token, even if multiple hubs // Use a single verify token, even if multiple hubs
$verify_token = ((strlen($contact['hub-verify'])) ? $contact['hub-verify'] : random_string()); $verify_token = ((strlen($contact['hub-verify'])) ? $contact['hub-verify'] : random_string());

2
index.php
View file

@ -72,7 +72,7 @@ if (!$install) {
if (Config::get('system', 'force_ssl') && ($a->get_scheme() == "http") if (Config::get('system', 'force_ssl') && ($a->get_scheme() == "http")
&& (intval(Config::get('system', 'ssl_policy')) == SSL_POLICY_FULL) && (intval(Config::get('system', 'ssl_policy')) == SSL_POLICY_FULL)
&& (substr(System::baseUrl(), 0, 8) == "https://") && (substr(System::baseUrl(), 0, 8) == "https://")
) { && ($_SERVER['REQUEST_METHOD'] == 'GET')) {
header("HTTP/1.1 302 Moved Temporarily"); header("HTTP/1.1 302 Moved Temporarily");
header("Location: " . System::baseUrl() . "/" . $a->query_string); header("Location: " . System::baseUrl() . "/" . $a->query_string);
exit(); exit();

57
mod/pubsub.php
View file

@ -2,15 +2,15 @@
use Friendica\App; use Friendica\App;
use Friendica\Database\DBM; use Friendica\Database\DBM;
use Friendica\Protocol\OStatus;
function hub_return($valid,$body) { function hub_return($valid,$body) {
if($valid) { if ($valid) {
header($_SERVER["SERVER_PROTOCOL"] . ' 200 ' . 'OK'); header($_SERVER["SERVER_PROTOCOL"] . ' 200 ' . 'OK');
echo $body; echo $body;
killme(); killme();
} } else {
else {
header($_SERVER["SERVER_PROTOCOL"] . ' 404 ' . 'Not Found'); header($_SERVER["SERVER_PROTOCOL"] . ' 404 ' . 'Not Found');
killme(); killme();
} }
@ -34,15 +34,14 @@ function pubsub_init(App $a) {
$nick = (($a->argc > 1) ? notags(trim($a->argv[1])) : ''); $nick = (($a->argc > 1) ? notags(trim($a->argv[1])) : '');
$contact_id = (($a->argc > 2) ? intval($a->argv[2]) : 0 ); $contact_id = (($a->argc > 2) ? intval($a->argv[2]) : 0 );
if($_SERVER['REQUEST_METHOD'] === 'GET') { if ($_SERVER['REQUEST_METHOD'] === 'GET') {
$hub_mode = ((x($_GET,'hub_mode')) ? notags(trim($_GET['hub_mode'])) : ''); $hub_mode = ((x($_GET,'hub_mode')) ? notags(trim($_GET['hub_mode'])) : '');
$hub_topic = ((x($_GET,'hub_topic')) ? notags(trim($_GET['hub_topic'])) : ''); $hub_topic = ((x($_GET,'hub_topic')) ? notags(trim($_GET['hub_topic'])) : '');
$hub_challenge = ((x($_GET,'hub_challenge')) ? notags(trim($_GET['hub_challenge'])) : ''); $hub_challenge = ((x($_GET,'hub_challenge')) ? notags(trim($_GET['hub_challenge'])) : '');
$hub_lease = ((x($_GET,'hub_lease_seconds')) ? notags(trim($_GET['hub_lease_seconds'])) : ''); $hub_lease = ((x($_GET,'hub_lease_seconds')) ? notags(trim($_GET['hub_lease_seconds'])) : '');
$hub_verify = ((x($_GET,'hub_verify_token')) ? notags(trim($_GET['hub_verify_token'])) : ''); $hub_verify = ((x($_GET,'hub_verify_token')) ? notags(trim($_GET['hub_verify_token'])) : '');
logger('pubsub: Subscription from ' . $_SERVER['REMOTE_ADDR']); logger('pubsub: Subscription from ' . $_SERVER['REMOTE_ADDR'] . ' Mode: ' . $hub_mode . ' Nick: ' . $nick);
logger('pubsub: data: ' . print_r($_GET,true), LOGGER_DATA); logger('pubsub: data: ' . print_r($_GET,true), LOGGER_DATA);
$subscribe = (($hub_mode === 'subscribe') ? 1 : 0); $subscribe = (($hub_mode === 'subscribe') ? 1 : 0);
@ -50,7 +49,7 @@ function pubsub_init(App $a) {
$r = q("SELECT * FROM `user` WHERE `nickname` = '%s' AND `account_expired` = 0 AND `account_removed` = 0 LIMIT 1", $r = q("SELECT * FROM `user` WHERE `nickname` = '%s' AND `account_expired` = 0 AND `account_removed` = 0 LIMIT 1",
dbesc($nick) dbesc($nick)
); );
if (! DBM::is_result($r)) { if (!DBM::is_result($r)) {
logger('pubsub: local account not found: ' . $nick); logger('pubsub: local account not found: ' . $nick);
hub_return(false, ''); hub_return(false, '');
} }
@ -65,36 +64,34 @@ function pubsub_init(App $a) {
intval($contact_id), intval($contact_id),
intval($owner['uid']) intval($owner['uid'])
); );
if (! DBM::is_result($r)) { if (!DBM::is_result($r)) {
logger('pubsub: contact '.$contact_id.' not found.'); logger('pubsub: contact '.$contact_id.' not found.');
hub_return(false, ''); hub_return(false, '');
} }
if ($hub_topic) if ($hub_topic) {
if(! link_compare($hub_topic,$r[0]['poll'])) { if (!link_compare($hub_topic,$r[0]['poll'])) {
logger('pubsub: hub topic ' . $hub_topic . ' != ' . $r[0]['poll']); logger('pubsub: hub topic ' . $hub_topic . ' != ' . $r[0]['poll']);
// should abort but let's humour them. // should abort but let's humour them.
} }
}
$contact = $r[0]; $contact = $r[0];
// We must initiate an unsubscribe request with a verify_token. // We must initiate an unsubscribe request with a verify_token.
// Don't allow outsiders to unsubscribe us. // Don't allow outsiders to unsubscribe us.
if($hub_mode === 'unsubscribe') { if ($hub_mode === 'unsubscribe') {
if(! strlen($hub_verify)) { if (!strlen($hub_verify)) {
logger('pubsub: bogus unsubscribe'); logger('pubsub: bogus unsubscribe');
hub_return(false, ''); hub_return(false, '');
} }
logger('pubsub: unsubscribe success'); logger('pubsub: unsubscribe success');
} }
if ($hub_mode) if ($hub_mode) {
$r = q("UPDATE `contact` SET `subhub` = %d WHERE `id` = %d", dba::update('contact', ['subhub' => $subscribe], ['id' => $contact['id']]);
intval($subscribe), }
intval($contact['id'])
);
hub_return(true, $hub_challenge); hub_return(true, $hub_challenge);
} }
} }
@ -109,18 +106,13 @@ function pubsub_post(App $a) {
logger('pubsub: user-agent: ' . $_SERVER['HTTP_USER_AGENT'] ); logger('pubsub: user-agent: ' . $_SERVER['HTTP_USER_AGENT'] );
logger('pubsub: data: ' . $xml, LOGGER_DATA); logger('pubsub: data: ' . $xml, LOGGER_DATA);
// if(! stristr($xml,'<?xml')) {
// logger('pubsub_post: bad xml');
// hub_post_return();
// }
$nick = (($a->argc > 1) ? notags(trim($a->argv[1])) : ''); $nick = (($a->argc > 1) ? notags(trim($a->argv[1])) : '');
$contact_id = (($a->argc > 2) ? intval($a->argv[2]) : 0 ); $contact_id = (($a->argc > 2) ? intval($a->argv[2]) : 0 );
$r = q("SELECT * FROM `user` WHERE `nickname` = '%s' AND `account_expired` = 0 AND `account_removed` = 0 LIMIT 1", $r = q("SELECT * FROM `user` WHERE `nickname` = '%s' AND `account_expired` = 0 AND `account_removed` = 0 LIMIT 1",
dbesc($nick) dbesc($nick)
); );
if (! DBM::is_result($r)) { if (!DBM::is_result($r)) {
hub_post_return(); hub_post_return();
} }
@ -135,19 +127,26 @@ function pubsub_post(App $a) {
dbesc(NETWORK_FEED) dbesc(NETWORK_FEED)
); );
if (! DBM::is_result($r)) { if (!DBM::is_result($r)) {
logger('pubsub: no contact record for "'.$nick.' ('.$contact_id.')" - ignored. '.$xml); $author = OStatus::salmonAuthor($xml, $importer);
if (!empty($author['contact-id'])) {
$contact = dba::selectFirst('contact', [], ['id' => $author['contact-id']]);
if (!in_array($contact['rel'], [CONTACT_IS_SHARING, CONTACT_IS_FRIEND]) && ($contact['network'] != NETWORK_FEED)) {
logger('Contact ' . $author['contact-id'] . ' is not expected to share with us - ignored.');
hub_post_return(); hub_post_return();
} }
logger('pubsub: no contact record for "'.$nick.' ('.$contact_id.')" - using '.$author['contact-id'].' instead.');
}
} else {
$contact = $r[0]; $contact = $r[0];
}
// we have no way to match Diaspora guid's with atom post id's and could get duplicates. // we have no way to match Diaspora guid's with atom post id's and could get duplicates.
// we'll assume that direct delivery is robust (and this is a bad assumption, but the duplicates are messy). // we'll assume that direct delivery is robust (and this is a bad assumption, but the duplicates are messy).
if($r[0]['network'] === NETWORK_DIASPORA) if ($r[0]['network'] === NETWORK_DIASPORA) {
hub_post_return(); hub_post_return();
}
$feedhub = ''; $feedhub = '';
require_once('include/items.php'); require_once('include/items.php');

9
src/Protocol/OStatus.php
View file

@ -246,14 +246,13 @@ class OStatus
$xpath->registerNamespace('ostatus', NAMESPACE_OSTATUS); $xpath->registerNamespace('ostatus', NAMESPACE_OSTATUS);
$xpath->registerNamespace('statusnet', NAMESPACE_STATUSNET); $xpath->registerNamespace('statusnet', NAMESPACE_STATUSNET);
$entries = $xpath->query('/atom:entry'); $contact = ["id" => 0];
foreach ($entries as $entry) { // Fetch the first author
// fetch the author $authordata = $xpath->query('//author')->item(0);
$author = self::fetchAuthor($xpath, $entry, $importer, $contact, true); $author = self::fetchAuthor($xpath, $authordata, $importer, $contact, true);
return $author; return $author;
} }
}
/** /**
* @brief Read attributes from element * @brief Read attributes from element