X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fpubsub.php;h=beb73b4e2c4ce53a9ed5a6fcaf3ea56108e2040c;hb=36769d77eba0bc90cff6942ba55b00047cb25a2b;hp=1b69cc5f935db2658d9257bbca6511f640ea89f8;hpb=0b2d85891e651bab2c3ddd0c7396d557a052dd18;p=friendica.git diff --git a/mod/pubsub.php b/mod/pubsub.php index 1b69cc5f93..beb73b4e2c 100644 --- a/mod/pubsub.php +++ b/mod/pubsub.php @@ -1,7 +1,7 @@ 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') { - $hub_mode = notags(trim($_GET['hub_mode'])); - $hub_topic = notags(trim($_GET['hub_topic'])); - $hub_challenge = notags(trim($_GET['hub_challenge'])); - $hub_lease = notags(trim($_GET['hub_lease_seconds'])); - $hub_verify = notags(trim($_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'])) : ''); - $debugging = get_config('system','debugging'); - if($debugging) { - file_put_contents('pubsub.out', 'Pubsubhubbub subscription called from ' . $_SERVER['REMOTE_ADDR'] . ' at ' . datetime_convert() . "\n" . print_r($_GET,true), FILE_APPEND); - } + logger('pubsub: Subscription from ' . $_SERVER['REMOTE_ADDR']); + logger('pubsub: data: ' . print_r($_GET,true), LOGGER_DATA); $subscribe = (($hub_mode === 'subscribe') ? 1 : 0); - $r = q("SELECT * FROM `user` WHERE `nickname` = '%s' LIMIT 1", + $r = q("SELECT * FROM `user` WHERE `nickname` = '%s' AND `account_expired` = 0 AND `account_removed` = 0 LIMIT 1", dbesc($nick) ); - if(! count($r)) + if(! count($r)) { + logger('pubsub: local account not found: ' . $nick); hub_return(false, ''); + } $owner = $r[0]; $sql_extra = ((strlen($hub_verify)) ? sprintf(" AND `hub-verify` = '%s' ", dbesc($hub_verify)) : ''); - $r = q("SELECT * FROM `contact` WHERE `poll` = '%s' AND `id` = %d AND `uid` = %d AND `blocked` = 0 $sql_extra LIMIT 1", - dbesc($hub_topic), + $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(! count($r)) + if(! count($r)) { + logger('pubsub: 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]; // We must initiate an unsubscribe request with a verify_token. // Don't allow outsiders to unsubscribe us. - if(($hub_mode === 'unsubscribe') && (! strlen($hub_verify))) - hub_return(false, ''); + if($hub_mode === 'unsubscribe') { + if(! strlen($hub_verify)) { + logger('pubsub: bogus unsubscribe'); + hub_return(false, ''); + } + logger('pubsub: unsubscribe success'); + } - $r = q("UPDATE `contact` SET `subhub` = %d WHERE `id` = %d LIMIT 1", - intval($subscribe), - intval($contact['id']) - ); + if ($hub_mode) + $r = q("UPDATE `contact` SET `subhub` = %d WHERE `id` = %d", + intval($subscribe), + intval($contact['id']) + ); hub_return(true, $hub_challenge); - } } @@ -89,15 +102,19 @@ function pubsub_post(&$a) { $xml = file_get_contents('php://input'); - $debugging = get_config('system','debugging'); - $remote_host = 'Pubsub feed arrived from ' . $_SERVER['REMOTE_ADDR'] . ' at ' . datetime_convert() . ' for ' . $a->cmd . "\n\n"; - if($debugging) - file_put_contents('pubsub.out', $remote_host . $xml, FILE_APPEND); + 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,'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' LIMIT 1", + $r = q("SELECT * FROM `user` WHERE `nickname` = '%s' AND `account_expired` = 0 AND `account_removed` = 0 LIMIT 1", dbesc($nick) ); if(! count($r)) @@ -105,20 +122,37 @@ function pubsub_post(&$a) { $importer = $r[0]; - $r = q("SELECT * FROM `contact` WHERE `subhub` = 1 AND `id` = %d AND `uid` = %d AND `blocked` = 0 AND `readonly` = 0 LIMIT 1", + $r = q("SELECT * FROM `contact` WHERE `subhub` = 1 AND `id` = %d AND `uid` = %d + AND ( `rel` = %d OR `rel` = %d OR network = '%s' ) AND `blocked` = 0 AND `readonly` = 0 LIMIT 1", intval($contact_id), - intval($importer['uid']) + intval($importer['uid']), + intval(CONTACT_IS_SHARING), + intval(CONTACT_IS_FRIEND), + dbesc(NETWORK_FEED) ); - if(! count($r)) + + if(! count($r)) { + logger('pubsub: no contact record for "'.$nick.' ('.$contact_id.')" - ignored. '.$xml); 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) + hub_post_return(); + $feedhub = ''; require_once('include/items.php'); - consume_feed($xml,$importer,$contact,$feedhub); + 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); hub_post_return();