X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fpubsub.php;h=a68b222ec4bbbcfd2d876b663c275ea571242fcf;hb=5ebe10d7fc808dc2ed3502b532e6db020928aa1c;hp=2ba1958a25050cbce35e075d04d6081aa5d71907;hpb=4d591c4a074a11bb27f5fe0981a13125d4ef2e02;p=friendica.git diff --git a/mod/pubsub.php b/mod/pubsub.php index 2ba1958a25..a68b222ec4 100644 --- a/mod/pubsub.php +++ b/mod/pubsub.php @@ -1,163 +1,137 @@ argc > 1) ? notags(trim($a->argv[1])) : ''); $contact_id = (($a->argc > 2) ? intval($a->argv[2]) : 0 ); - if($_SERVER['REQUEST_METHOD'] === 'GET') { + if ($_SERVER['REQUEST_METHOD'] === 'GET') { + $hub_mode = notags(trim(defaults($_GET, 'hub_mode', ''))); + $hub_topic = notags(trim(defaults($_GET, 'hub_topic', ''))); + $hub_challenge = notags(trim(defaults($_GET, 'hub_challenge', ''))); + $hub_lease = notags(trim(defaults($_GET, 'hub_lease_seconds', ''))); + $hub_verify = notags(trim(defaults($_GET, 'hub_verify_token', ''))); - $hub_mode = ((x($_GET,'hub_mode')) ? notags(trim($_GET['hub_mode'])) : ''); - $hub_topic = ((x($_GET,'hub_topic')) ? notags(trim($_GET['hub_topic'])) : ''); - $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_verify = ((x($_GET,'hub_verify_token')) ? notags(trim($_GET['hub_verify_token'])) : ''); - - logger('pubsub: Subscription from ' . $_SERVER['REMOTE_ADDR']); - logger('pubsub: data: ' . print_r($_GET,true), LOGGER_DATA); + logger('Subscription from ' . $_SERVER['REMOTE_ADDR'] . ' Mode: ' . $hub_mode . ' Nick: ' . $nick); + logger('Data: ' . print_r($_GET,true), LOGGER_DATA); $subscribe = (($hub_mode === 'subscribe') ? 1 : 0); - $r = q("SELECT * FROM `user` WHERE `nickname` = '%s' AND `account_expired` = 0 AND `account_removed` = 0 LIMIT 1", - dbesc($nick) - ); - if (! dbm::is_result($r)) { - logger('pubsub: local account not found: ' . $nick); + $owner = dba::selectFirst('user', ['uid'], ['nickname' => $nick, 'account_expired' => false, 'account_removed' => false]); + if (!DBM::is_result($owner)) { + logger('Local account not found: ' . $nick); hub_return(false, ''); } + $condition = ['uid' => $owner['uid'], 'id' => $contact_id, 'blocked' => false, 'pending' => false]; - $owner = $r[0]; - - $sql_extra = ((strlen($hub_verify)) ? sprintf(" AND `hub-verify` = '%s' ", dbesc($hub_verify)) : ''); + if (!empty($hub_verify)) { + $condition['hub-verify'] = $hub_verify; + } - $r = q("SELECT * FROM `contact` WHERE `id` = %d AND `uid` = %d - AND `blocked` = 0 AND `pending` = 0 $sql_extra LIMIT 1", - intval($contact_id), - intval($owner['uid']) - ); - if (! dbm::is_result($r)) { - logger('pubsub: contact '.$contact_id.' not found.'); + $contact = dba::selectFirst('contact', ['id', 'poll'], $condition); + if (!DBM::is_result($contact)) { + logger('Contact ' . $contact_id . ' not found.'); hub_return(false, ''); } - if ($hub_topic) - if(! link_compare($hub_topic,$r[0]['poll'])) { - logger('pubsub: hub topic ' . $hub_topic . ' != ' . $r[0]['poll']); - // should abort but let's humour them. - } - - $contact = $r[0]; + if (!empty($hub_topic) && !link_compare($hub_topic, $contact['poll'])) { + logger('Hub topic ' . $hub_topic . ' != ' . $contact['poll']); + hub_return(false, ''); + } // We must initiate an unsubscribe request with a verify_token. // Don't allow outsiders to unsubscribe us. - if($hub_mode === 'unsubscribe') { - if(! strlen($hub_verify)) { - logger('pubsub: bogus unsubscribe'); - hub_return(false, ''); - } - logger('pubsub: unsubscribe success'); + if (($hub_mode === 'unsubscribe') && empty($hub_verify)) { + logger('Bogus unsubscribe'); + hub_return(false, ''); } - if ($hub_mode) - $r = q("UPDATE `contact` SET `subhub` = %d WHERE `id` = %d", - intval($subscribe), - intval($contact['id']) - ); - + if (!empty($hub_mode)) { + dba::update('contact', ['subhub' => $subscribe], ['id' => $contact['id']]); + logger($hub_mode . ' success for contact ' . $contact_id . '.'); + } 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'); - logger('pubsub: feed arrived from ' . $_SERVER['REMOTE_ADDR'] . ' for ' . $a->cmd ); - logger('pubsub: user-agent: ' . $_SERVER['HTTP_USER_AGENT'] ); - logger('pubsub: data: ' . $xml, LOGGER_DATA); - -// if(! stristr($xml,'cmd . ' with user-agent: ' . $_SERVER['HTTP_USER_AGENT']); + logger('Data: ' . $xml, LOGGER_DATA); $nick = (($a->argc > 1) ? notags(trim($a->argv[1])) : ''); $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", - dbesc($nick) - ); - if (! dbm::is_result($r)) { + $importer = dba::selectFirst('user', [], ['nickname' => $nick, 'account_expired' => false, 'account_removed' => false]); + if (!DBM::is_result($importer)) { 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 - 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($contact)) { + $author = OStatus::salmonAuthor($xml, $importer); + if (!empty($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 ' . $author["author-link"] . ' (' . $contact_id . ') for user ' . $nick . " wasn't found - ignored. XML: " . $xml); + hub_post_return(); + } + } - if (! dbm::is_result($r)) { - logger('pubsub: no contact record for "'.$nick.' ('.$contact_id.')" - ignored. '.$xml); + if (!in_array($contact['rel'], [CONTACT_IS_SHARING, CONTACT_IS_FRIEND]) && ($contact['network'] != NETWORK_FEED)) { + logger('Contact ' . $contact['id'] . ' is not expected to share with us - ignored.'); hub_post_return(); } - $contact = $r[0]; - - // 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). - - if($r[0]['network'] === NETWORK_DIASPORA) + // We import feeds from OStatus, Friendica and ATOM/RSS. + /// @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])) { hub_post_return(); + } + logger('Import item for ' . $nick . ' from ' . $contact['nick'] . ' (' . $contact['id'] . ')'); $feedhub = ''; + consume_feed($xml, $importer, $contact, $feedhub); - require_once('include/items.php'); - - consume_feed($xml,$importer,$contact,$feedhub,1,1); - - // do it a second time so that any children find their parents. - - consume_feed($xml,$importer,$contact,$feedhub,1,2); + // 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); + } hub_post_return(); - } - - -