X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fdfrn_poll.php;h=bacfe9b94d9465ea6b07e5bd6c984189b8addb24;hb=a41b4c6e6726b1158a8d05f37c1630d67e462fe5;hp=a85351c8c7e254e4804ad037d3b9b446f71bf9b4;hpb=cd61b46009c52c20b56931f26a05e70bd13ae740;p=friendica.git
diff --git a/mod/dfrn_poll.php b/mod/dfrn_poll.php
index a85351c8c7..bacfe9b94d 100644
--- a/mod/dfrn_poll.php
+++ b/mod/dfrn_poll.php
@@ -1,43 +1,44 @@
argc > 1)) {
- $o = get_feed_for($a, '*', $a->argv[1],$last_update);
+ if(($dfrn_id === '') && (! x($_POST,'dfrn_id')) && ($a->argc > 1)) {
+ logger('dfrn_poll: public feed request from ' . $_SERVER['REMOTE_ADDR'] );
+ header("Content-type: application/atom+xml");
+ $o = get_feed_for($a, '', $a->argv[1],$last_update);
echo $o;
killme();
}
- if((x($type)) && ($type == 'profile')) {
+ if(($type === 'profile') && (! strlen($sec))) {
$sql_extra = '';
switch($direction) {
case (-1):
- $sql_extra = sprintf(" AND `dfrn-id` = '%s' ", dbesc($dfrn_id));
+ $sql_extra = sprintf(" AND ( `dfrn-id` = '%s' OR `issued-id` = '%s' ) ", dbesc($dfrn_id),dbesc($dfrn_id));
$my_id = $dfrn_id;
break;
case 0:
@@ -53,14 +54,19 @@ function dfrn_poll_init(&$a) {
break; // NOTREACHED
}
- $r = q("SELECT `contact`.*, `user`.`nickname`
+ $r = q("SELECT `contact`.*, `user`.`username`, `user`.`nickname`
FROM `contact` LEFT JOIN `user` ON `contact`.`uid` = `user`.`uid`
- WHERE `contact`.`blocked` = 0 AND `contact`.`pending` = 0 $sql_extra LIMIT 1");
+ WHERE `contact`.`blocked` = 0 AND `contact`.`pending` = 0
+ AND `user`.`nickname` = '%s' $sql_extra LIMIT 1",
+ dbesc($a->argv[1])
+ );
if(count($r)) {
$s = fetch_url($r[0]['poll'] . '?dfrn_id=' . $my_id . '&type=profile-check');
+ logger("dfrn_poll: old profile returns " . $s, LOGGER_DATA);
+
if(strlen($s)) {
$xml = simplexml_load_string($s);
@@ -68,7 +74,8 @@ function dfrn_poll_init(&$a) {
if((int) $xml->status == 1) {
$_SESSION['authenticated'] = 1;
$_SESSION['visitor_id'] = $r[0]['id'];
- notice( t('Hi ') . $r[0]['name'] . EOL);
+ $_SESSION['visitor_home'] = $r[0]['url'];
+ notice( sprintf(t('%s welcomes %s'), $r[0]['username'] , $r[0]['name']) . EOL);
// Visitors get 1 day session.
$session_id = session_id();
$expire = time() + 86400;
@@ -85,44 +92,102 @@ function dfrn_poll_init(&$a) {
}
- if((x($type)) && ($type == 'profile-check')) {
+ if($type === 'profile-check') {
- switch($direction) {
- case 1:
- $dfrn_id = '0:' . $dfrn_id;
- break;
- case 0:
- $dfrn_id = '1:' . $dfrn_id;
- break;
- default:
- break;
+ if((strlen($challenge)) && (strlen($sec))) {
+
+ q("DELETE FROM `profile_check` WHERE `expire` < " . intval(time()));
+ $r = q("SELECT * FROM `profile_check` WHERE `sec` = '%s' ORDER BY `expire` DESC LIMIT 1",
+ dbesc($sec)
+ );
+ if(! count($r)) {
+ xml_status(3, 'No ticket');
+ // NOTREACHED
+ }
+ $orig_id = $r[0]['dfrn_id'];
+ if(strpos($orig_id, ':'))
+ $orig_id = substr($orig_id,2);
+
+ $c = q("SELECT * FROM `contact` WHERE `id` = %d LIMIT 1",
+ intval($r[0]['cid'])
+ );
+ if(! count($c)) {
+ xml_status(3, 'No profile');
+ }
+ $contact = $c[0];
+
+ $sent_dfrn_id = hex2bin($dfrn_id);
+ $challenge = hex2bin($challenge);
+
+ $final_dfrn_id = '';
+
+ if(($contact['duplex']) && strlen($contact['prvkey'])) {
+ openssl_private_decrypt($sent_dfrn_id,$final_dfrn_id,$contact['prvkey']);
+ openssl_private_decrypt($challenge,$decoded_challenge,$contact['prvkey']);
+ }
+ else {
+ openssl_public_decrypt($sent_dfrn_id,$final_dfrn_id,$contact['pubkey']);
+ openssl_public_decrypt($challenge,$decoded_challenge,$contact['pubkey']);
+ }
+
+ $final_dfrn_id = substr($final_dfrn_id, 0, strpos($final_dfrn_id, '.'));
+
+ if(strpos($final_dfrn_id,':') == 1)
+ $final_dfrn_id = substr($final_dfrn_id,2);
+
+ if($final_dfrn_id != $orig_id) {
+ logger('profile_check: ' . $final_dfrn_id . ' != ' . $orig_id, LOGGER_DEBUG);
+ // did not decode properly - cannot trust this site
+ xml_status(3, 'Bad decryption');
+ }
+
+ header("Content-type: text/xml");
+ echo "0$decoded_challenge$sec";
+ killme();
+ // NOTREACHED
}
- q("DELETE FROM `profile_check` WHERE `expire` < " . intval(time()));
- $r = q("SELECT * FROM `profile_check` WHERE `dfrn_id` = '%s' ORDER BY `expire` DESC",
- dbesc($dfrn_id));
- if(count($r)) {
- xml_status(1);
+ else {
+ // old protocol
+
+ switch($direction) {
+ case 1:
+ $dfrn_id = '0:' . $dfrn_id;
+ break;
+ case 0:
+ $dfrn_id = '1:' . $dfrn_id;
+ break;
+ default:
+ break;
+ }
+
+
+ q("DELETE FROM `profile_check` WHERE `expire` < " . intval(time()));
+ $r = q("SELECT * FROM `profile_check` WHERE `dfrn_id` = '%s' ORDER BY `expire` DESC",
+ dbesc($dfrn_id));
+ if(count($r)) {
+ xml_status(1);
+ return; // NOTREACHED
+ }
+ xml_status(0);
return; // NOTREACHED
}
- xml_status(0);
- return; // NOTREACHED
}
-
}
function dfrn_poll_post(&$a) {
- $dfrn_id = $_POST['dfrn_id'];
- $challenge = $_POST['challenge'];
- $url = $_POST['url'];
+ $dfrn_id = ((x($_POST,'dfrn_id')) ? $_POST['dfrn_id'] : '');
+ $challenge = ((x($_POST,'challenge')) ? $_POST['challenge'] : '');
+ $url = ((x($_POST,'url')) ? $_POST['url'] : '');
+ $dfrn_version = ((x($_POST,'dfrn_version')) ? (float) $_POST['dfrn_version'] : 2.0);
- $direction = (-1);
+ $direction = (-1);
if(strpos($dfrn_id,':') == 1) {
$direction = intval(substr($dfrn_id,0,1));
- $dfrn_id = substr($dfrn_id,2);
+ $dfrn_id = substr($dfrn_id,2);
}
@@ -173,7 +238,7 @@ function dfrn_poll_post(&$a) {
$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",
dbesc($url),
intval($owner_uid)
@@ -199,9 +264,10 @@ function dfrn_poll_post(&$a) {
";
killme();
- return; // NOTREACHED
+ // NOTREACHED
}
else {
+ header("Content-type: application/atom+xml");
$o = get_feed_for($a,$dfrn_id, $a->argv[1], $last_update, $direction);
echo $o;
killme();
@@ -211,16 +277,12 @@ function dfrn_poll_post(&$a) {
function dfrn_poll_content(&$a) {
-
- $dfrn_id = '';
- $type = 'data';
-
- if(x($_GET,'dfrn_id'))
- $dfrn_id = $_GET['dfrn_id'];
- if(x($_GET,'type'))
- $type = $_GET['type'];
- if(x($_GET,'last_update'))
- $last_update = $_GET['last_update'];
+ $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);
$direction = (-1);
if(strpos($dfrn_id,':') == 1) {
@@ -237,20 +299,23 @@ function dfrn_poll_content(&$a) {
$r = q("DELETE FROM `challenge` WHERE `expire` < " . intval(time()));
- $r = q("INSERT INTO `challenge` ( `challenge`, `dfrn-id`, `expire` , `type`, `last_update` )
- VALUES( '%s', '%s', '%s', '%s', '%s' ) ",
- dbesc($hash),
- dbesc($dfrn_id),
- intval(time() + 60 ),
- dbesc($type),
- dbesc($last_update)
- );
-
-
+ if($type !== 'profile') {
+ $r = q("INSERT INTO `challenge` ( `challenge`, `dfrn-id`, `expire` , `type`, `last_update` )
+ VALUES( '%s', '%s', '%s', '%s', '%s' ) ",
+ dbesc($hash),
+ dbesc($dfrn_id),
+ intval(time() + 60 ),
+ dbesc($type),
+ dbesc($last_update)
+ );
+ }
$sql_extra = '';
switch($direction) {
case (-1):
- $sql_extra = sprintf(" AND `issued-id` = '%s' ", dbesc($dfrn_id));
+ if($type === 'profile')
+ $sql_extra = sprintf(" AND ( `dfrn-id` = '%s' OR `issued-id` = '%s' ) ", dbesc($dfrn_id),dbesc($dfrn_id));
+ else
+ $sql_extra = sprintf(" AND `issued-id` = '%s' ", dbesc($dfrn_id));
$my_id = $dfrn_id;
break;
case 0:
@@ -266,10 +331,12 @@ function dfrn_poll_content(&$a) {
break; // NOTREACHED
}
-
-
-
- $r = q("SELECT * FROM `contact` WHERE `blocked` = 0 AND `pending` = 0 $sql_extra LIMIT 1");
+ $r = q("SELECT `contact`.*, `user`.`username`, `user`.`nickname`
+ FROM `contact` LEFT JOIN `user` ON `contact`.`uid` = `user`.`uid`
+ WHERE `contact`.`blocked` = 0 AND `contact`.`pending` = 0
+ AND `user`.`nickname` = '%s' $sql_extra LIMIT 1",
+ dbesc($a->argv[1])
+ );
if(count($r)) {
@@ -277,7 +344,6 @@ function dfrn_poll_content(&$a) {
$encrypted_id = '';
$id_str = $my_id . '.' . mt_rand(1000,9999);
-
if($r[0]['duplex'] && strlen($r[0]['pubkey'])) {
openssl_public_encrypt($hash,$challenge,$r[0]['pubkey']);
openssl_public_encrypt($id_str,$encrypted_id,$r[0]['pubkey']);
@@ -292,12 +358,66 @@ function dfrn_poll_content(&$a) {
}
else {
$status = 1;
+ $challenge = '';
+ $encrypted_id = '';
}
- echo '' .$status . '2.0' . $encrypted_id . ''
- . '' . $challenge . '' . "\r\n" ;
- session_write_close();
- exit;
+ if(($type === 'profile') && (strlen($sec))) {
+ // URL reply
+
+ $s = fetch_url($r[0]['poll']
+ . '?dfrn_id=' . $encrypted_id
+ . '&type=profile-check'
+ . '&dfrn_version=' . DFRN_PROTOCOL_VERSION
+ . '&challenge=' . $challenge
+ . '&sec=' . $sec
+ );
+
+ logger("dfrn_poll: sec profile: " . $s, LOGGER_DATA);
+
+ if(strlen($s) && strstr($s,'challenge . ' expecting ' . $hash);
+ logger('dfrn_poll: secure profile: sec: ' . $xml->sec . ' expecting ' . $sec);
+
+
+ if(((int) $xml->status == 0) && ($xml->challenge == $hash) && ($xml->sec == $sec)) {
+ $_SESSION['authenticated'] = 1;
+ $_SESSION['visitor_id'] = $r[0]['id'];
+ $_SESSION['visitor_home'] = $r[0]['url'];
+ notice( sprintf(t('%s welcomes %s'), $r[0]['username'] , $r[0]['name']) . EOL);
+ // Visitors get 1 day session.
+ $session_id = session_id();
+ $expire = time() + 86400;
+ q("UPDATE `session` SET `expire` = '%s' WHERE `sid` = '%s' LIMIT 1",
+ dbesc($expire),
+ dbesc($session_id)
+ );
+ }
+ $profile = $r[0]['nickname'];
+ goaway((strlen($destination_url)) ? $destination_url : $a->get_baseurl() . '/profile/' . $profile);
+ }
+ goaway($a->get_baseurl());
+ // NOTREACHED
+
+ }
+ else {
+ // XML reply
+ header("Content-type: text/xml");
+ echo '' . "\r\n"
+ . '' . "\r\n"
+ . "\t" . '' . $status . '' . "\r\n"
+ . "\t" . '' . DFRN_PROTOCOL_VERSION . '' . "\r\n"
+ . "\t" . '' . $encrypted_id . '' . "\r\n"
+ . "\t" . '' . $challenge . '' . "\r\n"
+ . '' . "\r\n" ;
+ killme();
+ // NOTREACHED
+ }
}
}