mexon/friendica
1
0
Fork 0
Code Pull requests Activity

Fix formatting dfrn_poll

Browse source
This commit is contained in:
Hypolite Petovan 2017-12-29 22:12:18 -05:00
parent 6d6d83012c
commit 19878a6397
1 changed files with 153 additions and 169 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

322
mod/dfrn_poll.php
View file

@ -1,4 +1,5 @@
<?php <?php
/** /**
* @file mod/dfrn_poll.php * @file mod/dfrn_poll.php
*/ */
@ -12,16 +13,17 @@ use Friendica\Protocol\OStatus;
require_once 'include/items.php'; require_once 'include/items.php';
require_once 'include/auth.php'; require_once 'include/auth.php';
function dfrn_poll_init(App $a) { function dfrn_poll_init(App $a)
$dfrn_id = ((x($_GET,'dfrn_id')) ? $_GET['dfrn_id'] : ''); {
$type = ((x($_GET,'type')) ? $_GET['type'] : 'data'); $dfrn_id = x($_GET,'dfrn_id') ? $_GET['dfrn_id'] : '';
$last_update = ((x($_GET,'last_update')) ? $_GET['last_update'] : ''); $type = x($_GET,'type') ? $_GET['type'] : 'data';
$destination_url = ((x($_GET,'destination_url')) ? $_GET['destination_url'] : ''); $last_update = x($_GET,'last_update') ? $_GET['last_update'] : '';
$challenge = ((x($_GET,'challenge')) ? $_GET['challenge'] : ''); $destination_url = x($_GET,'destination_url') ? $_GET['destination_url'] : '';
$sec = ((x($_GET,'sec')) ? $_GET['sec'] : ''); $challenge = x($_GET,'challenge') ? $_GET['challenge'] : '';
$dfrn_version = ((x($_GET,'dfrn_version')) ? (float) $_GET['dfrn_version'] : 2.0); $sec = x($_GET,'sec') ? $_GET['sec'] : '';
$perm = ((x($_GET,'perm')) ? $_GET['perm'] : 'r'); $dfrn_version = x($_GET,'dfrn_version') ? (float) $_GET['dfrn_version'] : 2.0;
$quiet = ((x($_GET,'quiet')) ? true : false); $perm = x($_GET,'perm') ? $_GET['perm'] : 'r';
$quiet = x($_GET,'quiet') ? true : false;
// Possibly it is an OStatus compatible server that requests a user feed // Possibly it is an OStatus compatible server that requests a user feed
if (($a->argc > 1) && ($dfrn_id == '') && !strstr($_SERVER["HTTP_USER_AGENT"], 'Friendica')) { if (($a->argc > 1) && ($dfrn_id == '') && !strstr($_SERVER["HTTP_USER_AGENT"], 'Friendica')) {
@ -31,28 +33,28 @@ function dfrn_poll_init(App $a) {
killme(); killme();
} }
$direction = (-1); $direction = -1;
if (strpos($dfrn_id, ':') == 1) {
if(strpos($dfrn_id,':') == 1) { $direction = intval(substr($dfrn_id, 0, 1));
$direction = intval(substr($dfrn_id,0,1)); $dfrn_id = substr($dfrn_id, 2);
$dfrn_id = substr($dfrn_id,2);
} }
$hidewall = false; $hidewall = false;
if(($dfrn_id === '') && (! x($_POST,'dfrn_id'))) { if (($dfrn_id === '') && (!x($_POST, 'dfrn_id'))) {
if((Config::get('system','block_public')) && (! local_user()) && (! remote_user())) { if (Config::get('system', 'block_public') && !local_user() && !remote_user()) {
http_status_exit(403); http_status_exit(403);
} }
$user = ''; $user = '';
if($a->argc > 1) { if ($a->argc > 1) {
$r = q("SELECT `hidewall`,`nickname` FROM `user` WHERE `user`.`nickname` = '%s' LIMIT 1", $r = q("SELECT `hidewall`,`nickname` FROM `user` WHERE `user`.`nickname` = '%s' LIMIT 1",
dbesc($a->argv[1]) dbesc($a->argv[1])
); );
if (!$r) if (!$r) {
http_status_exit(404); http_status_exit(404);
}
$hidewall = ($r[0]['hidewall'] && !local_user()); $hidewall = ($r[0]['hidewall'] && !local_user());
@ -61,16 +63,15 @@ function dfrn_poll_init(App $a) {
logger('dfrn_poll: public feed request from ' . $_SERVER['REMOTE_ADDR'] . ' for ' . $user); logger('dfrn_poll: public feed request from ' . $_SERVER['REMOTE_ADDR'] . ' for ' . $user);
header("Content-type: application/atom+xml"); header("Content-type: application/atom+xml");
echo DFRN::feed('', $user,$last_update, 0, $hidewall); echo DFRN::feed('', $user, $last_update, 0, $hidewall);
killme(); killme();
} }
if(($type === 'profile') && (! strlen($sec))) { if (($type === 'profile') && (!strlen($sec))) {
$sql_extra = ''; $sql_extra = '';
switch($direction) { switch ($direction) {
case (-1): case -1:
$sql_extra = sprintf(" AND ( `dfrn-id` = '%s' OR `issued-id` = '%s' ) ", dbesc($dfrn_id),dbesc($dfrn_id)); $sql_extra = sprintf(" AND ( `dfrn-id` = '%s' OR `issued-id` = '%s' ) ", dbesc($dfrn_id), dbesc($dfrn_id));
$my_id = $dfrn_id; $my_id = $dfrn_id;
break; break;
case 0: case 0:
@ -94,28 +95,29 @@ function dfrn_poll_init(App $a) {
); );
if (DBM::is_result($r)) { if (DBM::is_result($r)) {
$s = fetch_url($r[0]['poll'] . '?dfrn_id=' . $my_id . '&type=profile-check'); $s = fetch_url($r[0]['poll'] . '?dfrn_id=' . $my_id . '&type=profile-check');
logger("dfrn_poll: old profile returns " . $s, LOGGER_DATA); logger("dfrn_poll: old profile returns " . $s, LOGGER_DATA);
if(strlen($s)) { if (strlen($s)) {
$xml = parse_xml_string($s); $xml = parse_xml_string($s);
if((int) $xml->status == 1) { if ((int) $xml->status === 1) {
$_SESSION['authenticated'] = 1; $_SESSION['authenticated'] = 1;
if(! x($_SESSION,'remote')) if (!x($_SESSION, 'remote')) {
$_SESSION['remote'] = array(); $_SESSION['remote'] = array();
}
$_SESSION['remote'][] = array('cid' => $r[0]['id'],'uid' => $r[0]['uid'],'url' => $r[0]['url']); $_SESSION['remote'][] = array('cid' => $r[0]['id'], 'uid' => $r[0]['uid'], 'url' => $r[0]['url']);
$_SESSION['visitor_id'] = $r[0]['id']; $_SESSION['visitor_id'] = $r[0]['id'];
$_SESSION['visitor_home'] = $r[0]['url']; $_SESSION['visitor_home'] = $r[0]['url'];
$_SESSION['visitor_handle'] = $r[0]['addr']; $_SESSION['visitor_handle'] = $r[0]['addr'];
$_SESSION['visitor_visiting'] = $r[0]['uid']; $_SESSION['visitor_visiting'] = $r[0]['uid'];
if(!$quiet) if (!$quiet) {
info( sprintf(t('%1$s welcomes %2$s'), $r[0]['username'] , $r[0]['name']) . EOL); info(sprintf(t('%1$s welcomes %2$s'), $r[0]['username'], $r[0]['name']) . EOL);
}
// Visitors get 1 day session. // Visitors get 1 day session.
$session_id = session_id(); $session_id = session_id();
$expire = time() + 86400; $expire = time() + 86400;
@ -129,53 +131,53 @@ function dfrn_poll_init(App $a) {
goaway((strlen($destination_url)) ? $destination_url : System::baseUrl() . '/profile/' . $profile); goaway((strlen($destination_url)) ? $destination_url : System::baseUrl() . '/profile/' . $profile);
} }
goaway(System::baseUrl()); goaway(System::baseUrl());
} }
if($type === 'profile-check' && $dfrn_version < 2.2 ) { if ($type === 'profile-check' && $dfrn_version < 2.2) {
if ((strlen($challenge)) && (strlen($sec))) {
if((strlen($challenge)) && (strlen($sec))) {
q("DELETE FROM `profile_check` WHERE `expire` < " . intval(time())); q("DELETE FROM `profile_check` WHERE `expire` < " . intval(time()));
$r = q("SELECT * FROM `profile_check` WHERE `sec` = '%s' ORDER BY `expire` DESC LIMIT 1", $r = q("SELECT * FROM `profile_check` WHERE `sec` = '%s' ORDER BY `expire` DESC LIMIT 1",
dbesc($sec) dbesc($sec)
); );
if (! DBM::is_result($r)) { if (!DBM::is_result($r)) {
xml_status(3, 'No ticket'); xml_status(3, 'No ticket');
// NOTREACHED // NOTREACHED
} }
$orig_id = $r[0]['dfrn_id']; $orig_id = $r[0]['dfrn_id'];
if(strpos($orig_id, ':')) if (strpos($orig_id, ':')) {
$orig_id = substr($orig_id,2); $orig_id = substr($orig_id, 2);
}
$c = q("SELECT * FROM `contact` WHERE `id` = %d LIMIT 1", $c = q("SELECT * FROM `contact` WHERE `id` = %d LIMIT 1",
intval($r[0]['cid']) intval($r[0]['cid'])
); );
if (! DBM::is_result($c)) { if (!DBM::is_result($c)) {
xml_status(3, 'No profile'); xml_status(3, 'No profile');
} }
$contact = $c[0]; $contact = $c[0];
$sent_dfrn_id = hex2bin($dfrn_id); $sent_dfrn_id = hex2bin($dfrn_id);
$challenge = hex2bin($challenge); $challenge = hex2bin($challenge);
$final_dfrn_id = ''; $final_dfrn_id = '';
if(($contact['duplex']) && strlen($contact['prvkey'])) { if (($contact['duplex']) && strlen($contact['prvkey'])) {
openssl_private_decrypt($sent_dfrn_id,$final_dfrn_id,$contact['prvkey']); openssl_private_decrypt($sent_dfrn_id, $final_dfrn_id, $contact['prvkey']);
openssl_private_decrypt($challenge,$decoded_challenge,$contact['prvkey']); openssl_private_decrypt($challenge, $decoded_challenge, $contact['prvkey']);
} } else {
else { openssl_public_decrypt($sent_dfrn_id, $final_dfrn_id, $contact['pubkey']);
openssl_public_decrypt($sent_dfrn_id,$final_dfrn_id,$contact['pubkey']); openssl_public_decrypt($challenge, $decoded_challenge, $contact['pubkey']);
openssl_public_decrypt($challenge,$decoded_challenge,$contact['pubkey']);
} }
$final_dfrn_id = substr($final_dfrn_id, 0, strpos($final_dfrn_id, '.')); $final_dfrn_id = substr($final_dfrn_id, 0, strpos($final_dfrn_id, '.'));
if(strpos($final_dfrn_id,':') == 1) if (strpos($final_dfrn_id, ':') == 1) {
$final_dfrn_id = substr($final_dfrn_id,2); $final_dfrn_id = substr($final_dfrn_id, 2);
}
if($final_dfrn_id != $orig_id) { if ($final_dfrn_id != $orig_id) {
logger('profile_check: ' . $final_dfrn_id . ' != ' . $orig_id, LOGGER_DEBUG); logger('profile_check: ' . $final_dfrn_id . ' != ' . $orig_id, LOGGER_DEBUG);
// did not decode properly - cannot trust this site // did not decode properly - cannot trust this site
xml_status(3, 'Bad decryption'); xml_status(3, 'Bad decryption');
@ -185,11 +187,9 @@ function dfrn_poll_init(App $a) {
echo "<?xml version=\"1.0\" encoding=\"UTF-8\"?><dfrn_poll><status>0</status><challenge>$decoded_challenge</challenge><sec>$sec</sec></dfrn_poll>"; echo "<?xml version=\"1.0\" encoding=\"UTF-8\"?><dfrn_poll><status>0</status><challenge>$decoded_challenge</challenge><sec>$sec</sec></dfrn_poll>";
killme(); killme();
// NOTREACHED // NOTREACHED
} } else {
else { // old protocol
// old protocol switch ($direction) {
switch($direction) {
case 1: case 1:
$dfrn_id = '0:' . $dfrn_id; $dfrn_id = '0:' . $dfrn_id;
break; break;
@ -200,7 +200,6 @@ function dfrn_poll_init(App $a) {
break; break;
} }
q("DELETE FROM `profile_check` WHERE `expire` < " . intval(time())); q("DELETE FROM `profile_check` WHERE `expire` < " . intval(time()));
$r = q("SELECT * FROM `profile_check` WHERE `dfrn_id` = '%s' ORDER BY `expire` DESC", $r = q("SELECT * FROM `profile_check` WHERE `dfrn_id` = '%s' ORDER BY `expire` DESC",
dbesc($dfrn_id)); dbesc($dfrn_id));
@ -212,67 +211,65 @@ function dfrn_poll_init(App $a) {
return; // NOTREACHED return; // NOTREACHED
} }
} }
} }
function dfrn_poll_post(App $a)
{
$dfrn_id = x($_POST,'dfrn_id') ? $_POST['dfrn_id'] : '';
$challenge = x($_POST,'challenge') ? $_POST['challenge'] : '';
$url = x($_POST,'url') ? $_POST['url'] : '';
$sec = x($_POST,'sec') ? $_POST['sec'] : '';
$ptype = x($_POST,'type') ? $_POST['type'] : '';
$dfrn_version = x($_POST,'dfrn_version') ? (float) $_POST['dfrn_version'] : 2.0;
$perm = x($_POST,'perm') ? $_POST['perm'] : 'r';
if ($ptype === 'profile-check') {
function dfrn_poll_post(App $a) { if (strlen($challenge) && strlen($sec)) {
$dfrn_id = ((x($_POST,'dfrn_id')) ? $_POST['dfrn_id'] : '');
$challenge = ((x($_POST,'challenge')) ? $_POST['challenge'] : '');
$url = ((x($_POST,'url')) ? $_POST['url'] : '');
$sec = ((x($_POST,'sec')) ? $_POST['sec'] : '');
$ptype = ((x($_POST,'type')) ? $_POST['type'] : '');
$dfrn_version = ((x($_POST,'dfrn_version')) ? (float) $_POST['dfrn_version'] : 2.0);
$perm = ((x($_POST,'perm')) ? $_POST['perm'] : 'r');
if($ptype === 'profile-check') {
if((strlen($challenge)) && (strlen($sec))) {
logger('dfrn_poll: POST: profile-check'); logger('dfrn_poll: POST: profile-check');
q("DELETE FROM `profile_check` WHERE `expire` < " . intval(time())); q("DELETE FROM `profile_check` WHERE `expire` < " . intval(time()));
$r = q("SELECT * FROM `profile_check` WHERE `sec` = '%s' ORDER BY `expire` DESC LIMIT 1", $r = q("SELECT * FROM `profile_check` WHERE `sec` = '%s' ORDER BY `expire` DESC LIMIT 1",
dbesc($sec) dbesc($sec)
); );
if (! DBM::is_result($r)) { if (!DBM::is_result($r)) {
xml_status(3, 'No ticket'); xml_status(3, 'No ticket');
// NOTREACHED // NOTREACHED
} }
$orig_id = $r[0]['dfrn_id']; $orig_id = $r[0]['dfrn_id'];
if(strpos($orig_id, ':')) if (strpos($orig_id, ':')) {
$orig_id = substr($orig_id,2); $orig_id = substr($orig_id, 2);
}
$c = q("SELECT * FROM `contact` WHERE `id` = %d LIMIT 1", $c = q("SELECT * FROM `contact` WHERE `id` = %d LIMIT 1",
intval($r[0]['cid']) intval($r[0]['cid'])
); );
if (! DBM::is_result($c)) { if (!DBM::is_result($c)) {
xml_status(3, 'No profile'); xml_status(3, 'No profile');
} }
$contact = $c[0]; $contact = $c[0];
$sent_dfrn_id = hex2bin($dfrn_id); $sent_dfrn_id = hex2bin($dfrn_id);
$challenge = hex2bin($challenge); $challenge = hex2bin($challenge);
$final_dfrn_id = ''; $final_dfrn_id = '';
if(($contact['duplex']) && strlen($contact['prvkey'])) { if ($contact['duplex'] && strlen($contact['prvkey'])) {
openssl_private_decrypt($sent_dfrn_id,$final_dfrn_id,$contact['prvkey']); openssl_private_decrypt($sent_dfrn_id, $final_dfrn_id, $contact['prvkey']);
openssl_private_decrypt($challenge,$decoded_challenge,$contact['prvkey']); openssl_private_decrypt($challenge, $decoded_challenge, $contact['prvkey']);
} } else {
else { openssl_public_decrypt($sent_dfrn_id, $final_dfrn_id, $contact['pubkey']);
openssl_public_decrypt($sent_dfrn_id,$final_dfrn_id,$contact['pubkey']); openssl_public_decrypt($challenge, $decoded_challenge, $contact['pubkey']);
openssl_public_decrypt($challenge,$decoded_challenge,$contact['pubkey']);
} }
$final_dfrn_id = substr($final_dfrn_id, 0, strpos($final_dfrn_id, '.')); $final_dfrn_id = substr($final_dfrn_id, 0, strpos($final_dfrn_id, '.'));
if(strpos($final_dfrn_id,':') == 1) if (strpos($final_dfrn_id, ':') == 1) {
$final_dfrn_id = substr($final_dfrn_id,2); $final_dfrn_id = substr($final_dfrn_id, 2);
}
if($final_dfrn_id != $orig_id) { if ($final_dfrn_id != $orig_id) {
logger('profile_check: ' . $final_dfrn_id . ' != ' . $orig_id, LOGGER_DEBUG); logger('profile_check: ' . $final_dfrn_id . ' != ' . $orig_id, LOGGER_DEBUG);
// did not decode properly - cannot trust this site // did not decode properly - cannot trust this site
xml_status(3, 'Bad decryption'); xml_status(3, 'Bad decryption');
@ -283,22 +280,20 @@ function dfrn_poll_post(App $a) {
killme(); killme();
// NOTREACHED // NOTREACHED
} }
} }
$direction = (-1); $direction = -1;
if(strpos($dfrn_id,':') == 1) { if (strpos($dfrn_id, ':') == 1) {
$direction = intval(substr($dfrn_id,0,1)); $direction = intval(substr($dfrn_id, 0, 1));
$dfrn_id = substr($dfrn_id,2); $dfrn_id = substr($dfrn_id, 2);
} }
$r = q("SELECT * FROM `challenge` WHERE `dfrn-id` = '%s' AND `challenge` = '%s' LIMIT 1", $r = q("SELECT * FROM `challenge` WHERE `dfrn-id` = '%s' AND `challenge` = '%s' LIMIT 1",
dbesc($dfrn_id), dbesc($dfrn_id),
dbesc($challenge) dbesc($challenge)
); );
if (! DBM::is_result($r)) { if (!DBM::is_result($r)) {
killme(); killme();
} }
@ -312,8 +307,8 @@ function dfrn_poll_post(App $a) {
$sql_extra = ''; $sql_extra = '';
switch($direction) { switch ($direction) {
case (-1): case -1:
$sql_extra = sprintf(" AND `issued-id` = '%s' ", dbesc($dfrn_id)); $sql_extra = sprintf(" AND `issued-id` = '%s' ", dbesc($dfrn_id));
$my_id = $dfrn_id; $my_id = $dfrn_id;
break; break;
@ -330,11 +325,8 @@ function dfrn_poll_post(App $a) {
break; // NOTREACHED break; // NOTREACHED
} }
$r = q("SELECT * FROM `contact` WHERE `blocked` = 0 AND `pending` = 0 $sql_extra LIMIT 1"); $r = q("SELECT * FROM `contact` WHERE `blocked` = 0 AND `pending` = 0 $sql_extra LIMIT 1");
if (!DBM::is_result($r)) {
if (! DBM::is_result($r)) {
killme(); killme();
} }
@ -342,8 +334,7 @@ function dfrn_poll_post(App $a) {
$owner_uid = $r[0]['uid']; $owner_uid = $r[0]['uid'];
$contact_id = $r[0]['id']; $contact_id = $r[0]['id'];
if ($type === 'reputation' && strlen($url)) {
if($type === 'reputation' && strlen($url)) {
$r = q("SELECT * FROM `contact` WHERE `url` = '%s' AND `uid` = %d LIMIT 1", $r = q("SELECT * FROM `contact` WHERE `url` = '%s' AND `uid` = %d LIMIT 1",
dbesc($url), dbesc($url),
intval($owner_uid) intval($owner_uid)
@ -355,7 +346,7 @@ function dfrn_poll_post(App $a) {
$reputation = $r[0]['rating']; $reputation = $r[0]['rating'];
$text = $r[0]['reason']; $text = $r[0]['reason'];
if($r[0]['id'] == $contact_id) { // inquiring about own reputation not allowed if ($r[0]['id'] == $contact_id) { // inquiring about own reputation not allowed
$reputation = 0; $reputation = 0;
$text = ''; $text = '';
} }
@ -370,18 +361,17 @@ function dfrn_poll_post(App $a) {
"; ";
killme(); killme();
// NOTREACHED // NOTREACHED
} } else {
else {
// Update the writable flag if it changed // Update the writable flag if it changed
logger('dfrn_poll: post request feed: ' . print_r($_POST,true),LOGGER_DATA); logger('dfrn_poll: post request feed: ' . print_r($_POST, true), LOGGER_DATA);
if($dfrn_version >= 2.21) { if ($dfrn_version >= 2.21) {
if($perm === 'rw') if ($perm === 'rw') {
$writable = 1; $writable = 1;
else } else {
$writable = 0; $writable = 0;
}
if($writable != $contact['writable']) { if ($writable != $contact['writable']) {
q("UPDATE `contact` SET `writable` = %d WHERE `id` = %d", q("UPDATE `contact` SET `writable` = %d WHERE `id` = %d",
intval($writable), intval($writable),
intval($contact_id) intval($contact_id)
@ -393,29 +383,27 @@ function dfrn_poll_post(App $a) {
$o = DFRN::feed($dfrn_id, $a->argv[1], $last_update, $direction); $o = DFRN::feed($dfrn_id, $a->argv[1], $last_update, $direction);
echo $o; echo $o;
killme(); killme();
} }
} }
function dfrn_poll_content(App $a) { function dfrn_poll_content(App $a)
{
$dfrn_id = x($_GET,'dfrn_id') ? $_GET['dfrn_id'] : '';
$type = x($_GET,'type') ? $_GET['type'] : 'data';
$last_update = x($_GET,'last_update') ? $_GET['last_update'] : '';
$destination_url = x($_GET,'destination_url') ? $_GET['destination_url'] : '';
$sec = x($_GET,'sec') ? $_GET['sec'] : '';
$dfrn_version = x($_GET,'dfrn_version') ? (float) $_GET['dfrn_version'] : 2.0;
$perm = x($_GET,'perm') ? $_GET['perm'] : 'r';
$quiet = x($_GET,'quiet') ? true : false;
$dfrn_id = ((x($_GET,'dfrn_id')) ? $_GET['dfrn_id'] : ''); $direction = -1;
$type = ((x($_GET,'type')) ? $_GET['type'] : 'data'); if (strpos($dfrn_id, ':') == 1) {
$last_update = ((x($_GET,'last_update')) ? $_GET['last_update'] : ''); $direction = intval(substr($dfrn_id, 0, 1));
$destination_url = ((x($_GET,'destination_url')) ? $_GET['destination_url'] : ''); $dfrn_id = substr($dfrn_id, 2);
$sec = ((x($_GET,'sec')) ? $_GET['sec'] : '');
$dfrn_version = ((x($_GET,'dfrn_version')) ? (float) $_GET['dfrn_version'] : 2.0);
$perm = ((x($_GET,'perm')) ? $_GET['perm'] : 'r');
$quiet = ((x($_GET,'quiet')) ? true : false);
$direction = (-1);
if(strpos($dfrn_id,':') == 1) {
$direction = intval(substr($dfrn_id,0,1));
$dfrn_id = substr($dfrn_id,2);
} }
if ($dfrn_id != '') {
if($dfrn_id != '') {
// initial communication from external contact // initial communication from external contact
$hash = random_string(); $hash = random_string();
@ -423,7 +411,7 @@ function dfrn_poll_content(App $a) {
$r = q("DELETE FROM `challenge` WHERE `expire` < " . intval(time())); $r = q("DELETE FROM `challenge` WHERE `expire` < " . intval(time()));
if($type !== 'profile') { if ($type !== 'profile') {
$r = q("INSERT INTO `challenge` ( `challenge`, `dfrn-id`, `expire` , `type`, `last_update` ) $r = q("INSERT INTO `challenge` ( `challenge`, `dfrn-id`, `expire` , `type`, `last_update` )
VALUES( '%s', '%s', '%s', '%s', '%s' ) ", VALUES( '%s', '%s', '%s', '%s', '%s' ) ",
dbesc($hash), dbesc($hash),
@ -433,13 +421,16 @@ function dfrn_poll_content(App $a) {
dbesc($last_update) dbesc($last_update)
); );
} }
$sql_extra = ''; $sql_extra = '';
switch($direction) { switch ($direction) {
case (-1): case -1:
if($type === 'profile') if ($type === 'profile') {
$sql_extra = sprintf(" AND ( `dfrn-id` = '%s' OR `issued-id` = '%s' ) ", dbesc($dfrn_id),dbesc($dfrn_id)); $sql_extra = sprintf(" AND ( `dfrn-id` = '%s' OR `issued-id` = '%s' ) ", dbesc($dfrn_id), dbesc($dfrn_id));
else } else {
$sql_extra = sprintf(" AND `issued-id` = '%s' ", dbesc($dfrn_id)); $sql_extra = sprintf(" AND `issued-id` = '%s' ", dbesc($dfrn_id));
}
$my_id = $dfrn_id; $my_id = $dfrn_id;
break; break;
case 0: case 0:
@ -463,36 +454,30 @@ function dfrn_poll_content(App $a) {
AND `user`.`nickname` = '%s' $sql_extra LIMIT 1", AND `user`.`nickname` = '%s' $sql_extra LIMIT 1",
dbesc($nickname) dbesc($nickname)
); );
if (DBM::is_result($r)) { if (DBM::is_result($r)) {
$challenge = ''; $challenge = '';
$encrypted_id = ''; $encrypted_id = '';
$id_str = $my_id . '.' . mt_rand(1000,9999); $id_str = $my_id . '.' . mt_rand(1000, 9999);
if(($r[0]['duplex'] && strlen($r[0]['pubkey'])) || (! strlen($r[0]['prvkey']))) { if (($r[0]['duplex'] && strlen($r[0]['pubkey'])) || !strlen($r[0]['prvkey'])) {
openssl_public_encrypt($hash,$challenge,$r[0]['pubkey']); openssl_public_encrypt($hash, $challenge, $r[0]['pubkey']);
openssl_public_encrypt($id_str,$encrypted_id,$r[0]['pubkey']); openssl_public_encrypt($id_str, $encrypted_id, $r[0]['pubkey']);
} } else {
else { openssl_private_encrypt($hash, $challenge, $r[0]['prvkey']);
openssl_private_encrypt($hash,$challenge,$r[0]['prvkey']); openssl_private_encrypt($id_str, $encrypted_id, $r[0]['prvkey']);
openssl_private_encrypt($id_str,$encrypted_id,$r[0]['prvkey']);
} }
$challenge = bin2hex($challenge); $challenge = bin2hex($challenge);
$encrypted_id = bin2hex($encrypted_id); $encrypted_id = bin2hex($encrypted_id);
} } else {
else {
$status = 1; $status = 1;
$challenge = ''; $challenge = '';
$encrypted_id = ''; $encrypted_id = '';
} }
if(($type === 'profile') && (strlen($sec))) { if (($type === 'profile') && (strlen($sec))) {
// URL reply // URL reply
if ($dfrn_version < 2.2) {
if($dfrn_version < 2.2) {
$s = fetch_url($r[0]['poll'] $s = fetch_url($r[0]['poll']
. '?dfrn_id=' . $encrypted_id . '?dfrn_id=' . $encrypted_id
. '&type=profile-check' . '&type=profile-check'
@ -500,8 +485,7 @@ function dfrn_poll_content(App $a) {
. '&challenge=' . $challenge . '&challenge=' . $challenge
. '&sec=' . $sec . '&sec=' . $sec
); );
} } else {
else {
$s = post_url($r[0]['poll'], array( $s = post_url($r[0]['poll'], array(
'dfrn_id' => $encrypted_id, 'dfrn_id' => $encrypted_id,
'type' => 'profile-check', 'type' => 'profile-check',
@ -513,7 +497,7 @@ function dfrn_poll_content(App $a) {
$profile = ((DBM::is_result($r) && $r[0]['nickname']) ? $r[0]['nickname'] : $nickname); $profile = ((DBM::is_result($r) && $r[0]['nickname']) ? $r[0]['nickname'] : $nickname);
switch($destination_url) { switch ($destination_url) {
case 'profile': case 'profile':
$dest = System::baseUrl() . '/profile/' . $profile . '?f=&tab=profile'; $dest = System::baseUrl() . '/profile/' . $profile . '?f=&tab=profile';
break; break;
@ -532,26 +516,28 @@ function dfrn_poll_content(App $a) {
logger("dfrn_poll: sec profile: " . $s, LOGGER_DATA); logger("dfrn_poll: sec profile: " . $s, LOGGER_DATA);
if(strlen($s) && strstr($s,'<?xml')) { if (strlen($s) && strstr($s, '<?xml')) {
$xml = parse_xml_string($s); $xml = parse_xml_string($s);
logger('dfrn_poll: profile: parsed xml: ' . print_r($xml,true), LOGGER_DATA); logger('dfrn_poll: profile: parsed xml: ' . print_r($xml, true), LOGGER_DATA);
logger('dfrn_poll: secure profile: challenge: ' . $xml->challenge . ' expecting ' . $hash); logger('dfrn_poll: secure profile: challenge: ' . $xml->challenge . ' expecting ' . $hash);
logger('dfrn_poll: secure profile: sec: ' . $xml->sec . ' expecting ' . $sec); logger('dfrn_poll: secure profile: sec: ' . $xml->sec . ' expecting ' . $sec);
if (((int) $xml->status == 0) && ($xml->challenge == $hash) && ($xml->sec == $sec)) {
if(((int) $xml->status == 0) && ($xml->challenge == $hash) && ($xml->sec == $sec)) {
$_SESSION['authenticated'] = 1; $_SESSION['authenticated'] = 1;
if(! x($_SESSION,'remote')) if (!x($_SESSION, 'remote')) {
$_SESSION['remote'] = array(); $_SESSION['remote'] = array();
$_SESSION['remote'][] = array('cid' => $r[0]['id'],'uid' => $r[0]['uid'],'url' => $r[0]['url']); }
$_SESSION['remote'][] = array('cid' => $r[0]['id'], 'uid' => $r[0]['uid'], 'url' => $r[0]['url']);
$_SESSION['visitor_id'] = $r[0]['id']; $_SESSION['visitor_id'] = $r[0]['id'];
$_SESSION['visitor_home'] = $r[0]['url']; $_SESSION['visitor_home'] = $r[0]['url'];
$_SESSION['visitor_visiting'] = $r[0]['uid']; $_SESSION['visitor_visiting'] = $r[0]['uid'];
if(!$quiet) if (!$quiet) {
info( sprintf(t('%1$s welcomes %2$s'), $r[0]['username'] , $r[0]['name']) . EOL); info(sprintf(t('%1$s welcomes %2$s'), $r[0]['username'], $r[0]['name']) . EOL);
}
// Visitors get 1 day session. // Visitors get 1 day session.
$session_id = session_id(); $session_id = session_id();
$expire = time() + 86400; $expire = time() + 86400;
@ -565,9 +551,7 @@ function dfrn_poll_content(App $a) {
} }
goaway($dest); goaway($dest);
// NOTREACHED // NOTREACHED
} else {
}
else {
// XML reply // XML reply
header("Content-type: text/xml"); header("Content-type: text/xml");
echo '<?xml version="1.0" encoding="UTF-8"?>' . "\r\n" echo '<?xml version="1.0" encoding="UTF-8"?>' . "\r\n"
@ -576,7 +560,7 @@ function dfrn_poll_content(App $a) {
. "\t" . '<dfrn_version>' . DFRN_PROTOCOL_VERSION . '</dfrn_version>' . "\r\n" . "\t" . '<dfrn_version>' . DFRN_PROTOCOL_VERSION . '</dfrn_version>' . "\r\n"
. "\t" . '<dfrn_id>' . $encrypted_id . '</dfrn_id>' . "\r\n" . "\t" . '<dfrn_id>' . $encrypted_id . '</dfrn_id>' . "\r\n"
. "\t" . '<challenge>' . $challenge . '</challenge>' . "\r\n" . "\t" . '<challenge>' . $challenge . '</challenge>' . "\r\n"
. '</dfrn_poll>' . "\r\n" ; . '</dfrn_poll>' . "\r\n";
killme(); killme();
// NOTREACHED // NOTREACHED
} }