mexon/friendica
1
0
Fork 0
Code Pull requests Activity

Completely reformatted and restructured code, using dba functions now.

Browse source
This commit is contained in:
Michael 2018-03-13 21:03:56 +00:00
parent 4d3b1ae918
commit c20a42c889
1 changed files with 65 additions and 95 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

156
mod/pubsub.php
View file

@ -4,164 +4,134 @@ use Friendica\App;
use Friendica\Database\DBM; use Friendica\Database\DBM;
use Friendica\Protocol\OStatus; use Friendica\Protocol\OStatus;
function hub_return($valid,$body) { require_once('include/security.php');
require_once('include/items.php');
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();
} else { } else {
header($_SERVER["SERVER_PROTOCOL"] . ' 404 ' . 'Not Found'); header($_SERVER["SERVER_PROTOCOL"] . ' 404 Not Found');
killme();
} }
killme();
// NOTREACHED
} }
// when receiving an XML feed, always return OK // when receiving an XML feed, always return OK
function hub_post_return() { function hub_post_return()
{
header($_SERVER["SERVER_PROTOCOL"] . ' 200 ' . 'OK'); header($_SERVER["SERVER_PROTOCOL"] . ' 200 OK');
killme(); killme();
} }
function pubsub_init(App $a)
{
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 = notags(trim(defaults($_GET, 'hub_mode', '')));
$hub_topic = ((x($_GET,'hub_topic')) ? notags(trim($_GET['hub_topic'])) : ''); $hub_topic = notags(trim(defaults($_GET, 'hub_topic', '')));
$hub_challenge = ((x($_GET,'hub_challenge')) ? notags(trim($_GET['hub_challenge'])) : ''); $hub_challenge = notags(trim(defaults($_GET, 'hub_challenge', '')));
$hub_lease = ((x($_GET,'hub_lease_seconds')) ? notags(trim($_GET['hub_lease_seconds'])) : ''); $hub_lease = notags(trim(defaults($_GET, 'hub_lease_seconds', '')));
$hub_verify = ((x($_GET,'hub_verify_token')) ? notags(trim($_GET['hub_verify_token'])) : ''); $hub_verify = notags(trim(defaults($_GET, 'hub_verify_token', '')));
logger('pubsub: Subscription from ' . $_SERVER['REMOTE_ADDR'] . ' Mode: ' . $hub_mode . ' Nick: ' . $nick); logger('Subscription from ' . $_SERVER['REMOTE_ADDR'] . ' Mode: ' . $hub_mode . ' Nick: ' . $nick);
logger('pubsub: data: ' . print_r($_GET,true), LOGGER_DATA); logger('Data: ' . print_r($_GET,true), LOGGER_DATA);
$subscribe = (($hub_mode === 'subscribe') ? 1 : 0); $subscribe = (($hub_mode === 'subscribe') ? 1 : 0);
$r = q("SELECT * FROM `user` WHERE `nickname` = '%s' AND `account_expired` = 0 AND `account_removed` = 0 LIMIT 1", $owner = dba::selectFirst('user', ['uid'], ['nickname' => $nick, 'account_expired' => false, 'account_removed' => false]);
dbesc($nick) if (!DBM::is_result($owner)) {
); logger('Local account not found: ' . $nick);
if (!DBM::is_result($r)) {
logger('pubsub: local account not found: ' . $nick);
hub_return(false, ''); hub_return(false, '');
} }
$condition = ['uid' => $owner['uid'], 'id' => $contact_id, 'blocked' => false, 'pending' => false];
$owner = $r[0];
if (!empty($hub_verify)) { if (!empty($hub_verify)) {
$sql_extra = sprintf(" AND `hub-verify` = '%s' ", dbesc($hub_verify)); $condition['hub-verify'] = $hub_verify;
$log_info = 'hub-verify: ' . $hub_verify;
} else {
$sql_extra = sprintf(" AND `id` = %d ", intval($contact_id));
$log_info = 'contact-id: ' . $contact_id;
} }
$r = q("SELECT * FROM `contact` WHERE `uid` = %d $contact = dba::selectFirst('contact', ['id', 'poll'], $condition);
AND NOT `blocked` AND NOT `pending` $sql_extra LIMIT 1", if (!DBM::is_result($contact)) {
intval($owner['uid']) logger('Contact ' . $contact_id . ' not found.');
);
if (!DBM::is_result($r)) {
logger('pubsub: contact not found. ' . $log_info);
hub_return(false, ''); hub_return(false, '');
} }
if (!empty($hub_topic)) { if (!empty($hub_topic) && !link_compare($hub_topic, $contact['poll'])) {
if (!link_compare($hub_topic,$r[0]['poll'])) { logger('Hub topic ' . $hub_topic . ' != ' . $contact['poll']);
logger('pubsub: hub topic ' . $hub_topic . ' != ' . $r[0]['poll']); hub_return(false, '');
// should abort but let's humour them.
} }
}
$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') && empty($hub_verify)) {
if (!strlen($hub_verify)) { logger('Bogus unsubscribe');
logger('pubsub: bogus unsubscribe');
hub_return(false, ''); hub_return(false, '');
} }
}
if (!empty($hub_mode)) { if (!empty($hub_mode)) {
dba::update('contact', ['subhub' => $subscribe], ['id' => $contact['id']]); dba::update('contact', ['subhub' => $subscribe], ['id' => $contact['id']]);
logger('pubsub: ' . $hub_mode . ' success'); logger($hub_mode . ' success for contact ' . $contact_id . '.');
} }
hub_return(true, $hub_challenge); hub_return(true, $hub_challenge);
} }
} }
require_once('include/security.php'); function pubsub_post(App $a)
{
function pubsub_post(App $a) {
$xml = file_get_contents('php://input'); $xml = file_get_contents('php://input');
logger('pubsub: feed arrived from ' . $_SERVER['REMOTE_ADDR'] . ' for ' . $a->cmd ); logger('Feed arrived from ' . $_SERVER['REMOTE_ADDR'] . ' for ' . $a->cmd . ' with user-agent: ' . $_SERVER['HTTP_USER_AGENT']);
logger('pubsub: user-agent: ' . $_SERVER['HTTP_USER_AGENT'] ); logger('Data: ' . $xml, LOGGER_DATA);
logger('pubsub: data: ' . $xml, LOGGER_DATA);
$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", $importer = dba::selectFirst('user', [], ['nickname' => $nick, 'account_expired' => false, 'account_removed' => false]);
dbesc($nick) if (!DBM::is_result($importer)) {
);
if (!DBM::is_result($r)) {
hub_post_return(); hub_post_return();
} }
$importer = $r[0]; $condition = ['id' => $contact_id, 'uid' => $importer['uid'], 'subhub' => true, 'blocked' => false];
$contact = dba::selectFirst('contact', [], $condition);
$r = q("SELECT * FROM `contact` WHERE `subhub` AND `id` = %d AND `uid` = %d if (!DBM::is_result($contact)) {
AND (`rel` = %d OR `rel` = %d OR network = '%s') AND NOT `blocked` LIMIT 1",
intval($contact_id),
intval($importer['uid']),
intval(CONTACT_IS_SHARING),
intval(CONTACT_IS_FRIEND),
dbesc(NETWORK_FEED)
);
if (!DBM::is_result($r)) {
$author = OStatus::salmonAuthor($xml, $importer); $author = OStatus::salmonAuthor($xml, $importer);
if (!empty($author['contact-id'])) { if (!empty($author['contact-id'])) {
$contact = dba::selectFirst('contact', [], ['id' => $author['contact-id']]); $condition = ['id' => $author['contact-id'], 'uid' => $importer['uid'], 'subhub' => true, 'blocked' => false];
$contact = dba::selectFirst('contact', [], $condition);
logger('No record for ' . $nick .' with contact id ' . $contact_id . ' - using '.$author['contact-id'].' instead.');
}
if (!DBM::is_result($contact)) {
logger('Contact ' . $contact_id . ' for user ' . $nick . " wasn't found - ignored.");
hub_post_return();
}
}
if (!in_array($contact['rel'], [CONTACT_IS_SHARING, CONTACT_IS_FRIEND]) && ($contact['network'] != NETWORK_FEED)) { 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.'); logger('Contact ' . $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];
}
// we have no way to match Diaspora guid's with atom post id's and could get duplicates. // We import feeds from OStatus, Friendica and ATOM/RSS.
// we'll assume that direct delivery is robust (and this is a bad assumption, but the duplicates are messy). /// @todo Check if Friendica posts really arrive here - otherwise we can discard some stuff
if (!in_array($contact['network'], [NETWORK_OSTATUS, NETWORK_DFRN, NETWORK_FEED])) {
if ($r[0]['network'] === NETWORK_DIASPORA) {
hub_post_return(); hub_post_return();
} }
logger('Import item for ' . $nick . ' from ' . $contact['nick'] . ' (' . $contact['id'] . ')');
$feedhub = ''; $feedhub = '';
consume_feed($xml, $importer, $contact, $feedhub);
require_once('include/items.php'); // do it a second time for DFRN so that any children find their parents.
if ($contact['network'] === NETWORK_DFRN) {
consume_feed($xml,$importer,$contact,$feedhub,1,1); consume_feed($xml, $importer, $contact, $feedhub);
}
// do it a second time so that any children find their parents.
consume_feed($xml,$importer,$contact,$feedhub,1,2);
hub_post_return(); hub_post_return();
} }