X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fdfrn_poll.php;h=001202d5e564e639d9f464d9ac4937db230a2112;hb=9feab828c88dfdc0c66fef3269f6cdf0122d2840;hp=0c55af2a8959f26f86ca7e6cdba4d9b054794115;hpb=ca734f168caaa3a9fb66fd7ada6ecc26e1299ae6;p=friendica.git diff --git a/mod/dfrn_poll.php b/mod/dfrn_poll.php index 0c55af2a89..001202d5e5 100644 --- a/mod/dfrn_poll.php +++ b/mod/dfrn_poll.php @@ -1,74 +1,98 @@ argc > 1) && ($dfrn_id == '') && !strstr($user_agent, 'Friendica')) { + $nickname = $a->argv[1]; + header("Content-type: application/atom+xml"); + echo OStatus::feed($nickname, $last_update, 10); + killme(); + } -function dfrn_poll_init(&$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'] : ''); - $challenge = ((x($_GET,'challenge')) ? $_GET['challenge'] : ''); - $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); - + $direction = -1; - if(strpos($dfrn_id,':') == 1) { - $direction = intval(substr($dfrn_id,0,1)); - $dfrn_id = substr($dfrn_id,2); + if (strpos($dfrn_id, ':') == 1) { + $direction = intval(substr($dfrn_id, 0, 1)); + $dfrn_id = substr($dfrn_id, 2); } $hidewall = false; - if(($dfrn_id === '') && (! x($_POST,'dfrn_id'))) { - if((get_config('system','block_public')) && (! local_user()) && (! remote_user())) { - http_status_exit(403); + if (($dfrn_id === '') && empty($_POST['dfrn_id'])) { + if (Config::get('system', 'block_public') && !local_user() && !remote_user()) { + System::httpExit(403); } $user = ''; - if($a->argc > 1) { + if ($a->argc > 1) { $r = q("SELECT `hidewall`,`nickname` FROM `user` WHERE `user`.`nickname` = '%s' LIMIT 1", - dbesc($a->argv[1]) + DBA::escape($a->argv[1]) ); - if (!$r) - http_status_exit(404); + if (!$r) { + System::httpExit(404); + } $hidewall = ($r[0]['hidewall'] && !local_user()); $user = $r[0]['nickname']; } - logger('dfrn_poll: public feed request from ' . $_SERVER['REMOTE_ADDR'] . ' for ' . $user); + Logger::log('dfrn_poll: public feed request from ' . $_SERVER['REMOTE_ADDR'] . ' for ' . $user); header("Content-type: application/atom+xml"); - echo dfrn::feed('', $user,$last_update, 0, $hidewall); + echo DFRN::feed('', $user, $last_update, 0, $hidewall); killme(); } - if(($type === 'profile') && (! strlen($sec))) { - + if (($type === 'profile') && (!strlen($sec))) { $sql_extra = ''; - switch($direction) { - case (-1): - $sql_extra = sprintf(" AND ( `dfrn-id` = '%s' OR `issued-id` = '%s' ) ", dbesc($dfrn_id),dbesc($dfrn_id)); + switch ($direction) { + case -1: + $sql_extra = sprintf(" AND ( `dfrn-id` = '%s' OR `issued-id` = '%s' ) ", DBA::escape($dfrn_id), DBA::escape($dfrn_id)); $my_id = $dfrn_id; break; case 0: - $sql_extra = sprintf(" AND `issued-id` = '%s' AND `duplex` = 1 ", dbesc($dfrn_id)); + $sql_extra = sprintf(" AND `issued-id` = '%s' AND `duplex` = 1 ", DBA::escape($dfrn_id)); $my_id = '1:' . $dfrn_id; break; case 1: - $sql_extra = sprintf(" AND `dfrn-id` = '%s' AND `duplex` = 1 ", dbesc($dfrn_id)); + $sql_extra = sprintf(" AND `dfrn-id` = '%s' AND `duplex` = 1 ", DBA::escape($dfrn_id)); $my_id = '0:' . $dfrn_id; break; default: - goaway(z_root()); + $a->internalRedirect(); break; // NOTREACHED } @@ -76,106 +100,111 @@ function dfrn_poll_init(&$a) { 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]) + DBA::escape($a->argv[1]) ); - if (dbm::is_result($r)) { - - $s = fetch_url($r[0]['poll'] . '?dfrn_id=' . $my_id . '&type=profile-check'); - - logger("dfrn_poll: old profile returns " . $s, LOGGER_DATA); + if (DBA::isResult($r)) { + $s = Network::fetchUrl($r[0]['poll'] . '?dfrn_id=' . $my_id . '&type=profile-check'); - if(strlen($s)) { + Logger::log("dfrn_poll: old profile returns " . $s, Logger::DATA); - $xml = parse_xml_string($s); + if (strlen($s)) { + $xml = XML::parseString($s); - if((int) $xml->status == 1) { + if ((int)$xml->status === 1) { $_SESSION['authenticated'] = 1; - if(! x($_SESSION,'remote')) - $_SESSION['remote'] = array(); + if (empty($_SESSION['remote'])) { + $_SESSION['remote'] = []; + } - $_SESSION['remote'][] = array('cid' => $r[0]['id'],'uid' => $r[0]['uid'],'url' => $r[0]['url']); + $_SESSION['remote'][] = ['cid' => $r[0]['id'], 'uid' => $r[0]['uid'], 'url' => $r[0]['url']]; $_SESSION['visitor_id'] = $r[0]['id']; $_SESSION['visitor_home'] = $r[0]['url']; $_SESSION['visitor_handle'] = $r[0]['addr']; $_SESSION['visitor_visiting'] = $r[0]['uid']; - if(!$quiet) - info( sprintf(t('%1$s welcomes %2$s'), $r[0]['username'] , $r[0]['name']) . EOL); + $_SESSION['my_url'] = $r[0]['url']; + if (!$quiet) { + info(L10n::t('%1$s welcomes %2$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'", - dbesc($expire), - dbesc($session_id) + DBA::escape($expire), + DBA::escape($session_id) ); } } - $profile = $r[0]['nickname']; - goaway((strlen($destination_url)) ? $destination_url : App::get_baseurl() . '/profile/' . $profile); - } - goaway(z_root()); + $profile = (count($r) > 0 && isset($r[0]['nickname']) ? $r[0]['nickname'] : ''); + if (!empty($destination_url)) { + System::externalRedirect($destination_url); + } else { + $a->internalRedirect('profile/' . $profile); + } + } + $a->internalRedirect(); } - if($type === 'profile-check' && $dfrn_version < 2.2 ) { - - if((strlen($challenge)) && (strlen($sec))) { - - q("DELETE FROM `profile_check` WHERE `expire` < " . intval(time())); + if ($type === 'profile-check' && $dfrn_version < 2.2) { + if ((strlen($challenge)) && (strlen($sec))) { + DBA::delete('profile_check', ["`expire` < ?", time()]); $r = q("SELECT * FROM `profile_check` WHERE `sec` = '%s' ORDER BY `expire` DESC LIMIT 1", - dbesc($sec) + DBA::escape($sec) ); - if (! dbm::is_result($r)) { - xml_status(3, 'No ticket'); + if (!DBA::isResult($r)) { + System::xmlExit(3, 'No ticket'); // NOTREACHED } + $orig_id = $r[0]['dfrn_id']; - if(strpos($orig_id, ':')) - $orig_id = substr($orig_id,2); + 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'); + if (!DBA::isResult($c)) { + System::xmlExit(3, 'No profile'); } + $contact = $c[0]; $sent_dfrn_id = hex2bin($dfrn_id); - $challenge = hex2bin($challenge); + $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']); + 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 (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'); + if ($final_dfrn_id != $orig_id) { + Logger::log('profile_check: ' . $final_dfrn_id . ' != ' . $orig_id, Logger::DEBUG); + // did not decode properly - cannot trust this site + System::xmlExit(3, 'Bad decryption'); } header("Content-type: text/xml"); echo "0$decoded_challenge$sec"; killme(); // NOTREACHED - } - else { - // old protocol - - switch($direction) { + } else { + // old protocol + switch ($direction) { case 1: $dfrn_id = '0:' . $dfrn_id; break; @@ -186,82 +215,79 @@ function dfrn_poll_init(&$a) { break; } - - q("DELETE FROM `profile_check` WHERE `expire` < " . intval(time())); + DBA::delete('profile_check', ["`expire` < ?", time()]); $r = q("SELECT * FROM `profile_check` WHERE `dfrn_id` = '%s' ORDER BY `expire` DESC", - dbesc($dfrn_id)); - if (dbm::is_result($r)) { - xml_status(1); + DBA::escape($dfrn_id)); + if (DBA::isResult($r)) { + System::xmlExit(1); return; // NOTREACHED } - xml_status(0); + System::xmlExit(0); return; // NOTREACHED } } - } - - -function dfrn_poll_post(&$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') { - - if((strlen($challenge)) && (strlen($sec))) { - - logger('dfrn_poll: POST: profile-check'); - - q("DELETE FROM `profile_check` WHERE `expire` < " . intval(time())); +function dfrn_poll_post(App $a) +{ + $dfrn_id = defaults($_POST, 'dfrn_id' , ''); + $challenge = defaults($_POST, 'challenge', ''); + $url = defaults($_POST, 'url' , ''); + $sec = defaults($_POST, 'sec' , ''); + $ptype = defaults($_POST, 'type' , ''); + $perm = defaults($_POST, 'perm' , 'r'); + $dfrn_version = !empty($_POST['dfrn_version']) ? (float) $_POST['dfrn_version'] : 2.0; + + if ($ptype === 'profile-check') { + if (strlen($challenge) && strlen($sec)) { + Logger::log('dfrn_poll: POST: profile-check'); + + DBA::delete('profile_check', ["`expire` < ?", time()]); $r = q("SELECT * FROM `profile_check` WHERE `sec` = '%s' ORDER BY `expire` DESC LIMIT 1", - dbesc($sec) + DBA::escape($sec) ); - if (! dbm::is_result($r)) { - xml_status(3, 'No ticket'); + if (!DBA::isResult($r)) { + System::xmlExit(3, 'No ticket'); // NOTREACHED } + $orig_id = $r[0]['dfrn_id']; - if(strpos($orig_id, ':')) - $orig_id = substr($orig_id,2); + 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'); + if (!DBA::isResult($c)) { + System::xmlExit(3, 'No profile'); } + $contact = $c[0]; $sent_dfrn_id = hex2bin($dfrn_id); - $challenge = hex2bin($challenge); + $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']); + 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 (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'); + if ($final_dfrn_id != $orig_id) { + Logger::log('profile_check: ' . $final_dfrn_id . ' != ' . $orig_id, Logger::DEBUG); + // did not decode properly - cannot trust this site + System::xmlExit(3, 'Bad decryption'); } header("Content-type: text/xml"); @@ -269,58 +295,49 @@ function dfrn_poll_post(&$a) { killme(); // NOTREACHED } - } - $direction = (-1); - if(strpos($dfrn_id,':') == 1) { - $direction = intval(substr($dfrn_id,0,1)); - $dfrn_id = substr($dfrn_id,2); + $direction = -1; + if (strpos($dfrn_id, ':') == 1) { + $direction = intval(substr($dfrn_id, 0, 1)); + $dfrn_id = substr($dfrn_id, 2); } - $r = q("SELECT * FROM `challenge` WHERE `dfrn-id` = '%s' AND `challenge` = '%s' LIMIT 1", - dbesc($dfrn_id), - dbesc($challenge) + DBA::escape($dfrn_id), + DBA::escape($challenge) ); - if (! dbm::is_result($r)) { + if (!DBA::isResult($r)) { killme(); } $type = $r[0]['type']; $last_update = $r[0]['last_update']; - $r = q("DELETE FROM `challenge` WHERE `dfrn-id` = '%s' AND `challenge` = '%s'", - dbesc($dfrn_id), - dbesc($challenge) - ); - + DBA::delete('challenge', ['dfrn-id' => $dfrn_id, 'challenge' => $challenge]); $sql_extra = ''; - switch($direction) { - case (-1): - $sql_extra = sprintf(" AND `issued-id` = '%s' ", dbesc($dfrn_id)); + switch ($direction) { + case -1: + $sql_extra = sprintf(" AND `issued-id` = '%s' ", DBA::escape($dfrn_id)); $my_id = $dfrn_id; break; case 0: - $sql_extra = sprintf(" AND `issued-id` = '%s' AND `duplex` = 1 ", dbesc($dfrn_id)); + $sql_extra = sprintf(" AND `issued-id` = '%s' AND `duplex` = 1 ", DBA::escape($dfrn_id)); $my_id = '1:' . $dfrn_id; break; case 1: - $sql_extra = sprintf(" AND `dfrn-id` = '%s' AND `duplex` = 1 ", dbesc($dfrn_id)); + $sql_extra = sprintf(" AND `dfrn-id` = '%s' AND `duplex` = 1 ", DBA::escape($dfrn_id)); $my_id = '0:' . $dfrn_id; break; default: - goaway(z_root()); + $a->internalRedirect(); break; // NOTREACHED } - $r = q("SELECT * FROM `contact` WHERE `blocked` = 0 AND `pending` = 0 $sql_extra LIMIT 1"); - - - if (! dbm::is_result($r)) { + if (!DBA::isResult($r)) { killme(); } @@ -328,20 +345,19 @@ function dfrn_poll_post(&$a) { $owner_uid = $r[0]['uid']; $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), + DBA::escape($url), intval($owner_uid) ); $reputation = 0; $text = ''; - if (dbm::is_result($r)) { + if (DBA::isResult($r)) { $reputation = $r[0]['rating']; $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; $text = ''; } @@ -356,18 +372,17 @@ function dfrn_poll_post(&$a) { "; killme(); // NOTREACHED - } - else { - + } else { // Update the writable flag if it changed - logger('dfrn_poll: post request feed: ' . print_r($_POST,true),LOGGER_DATA); - if($dfrn_version >= 2.21) { - if($perm === 'rw') + Logger::log('dfrn_poll: post request feed: ' . print_r($_POST, true), Logger::DATA); + if ($dfrn_version >= 2.21) { + if ($perm === 'rw') { $writable = 1; - else + } else { $writable = 0; + } - if($writable != $contact['writable']) { + if ($writable != $contact['writable']) { q("UPDATE `contact` SET `writable` = %d WHERE `id` = %d", intval($writable), intval($contact_id) @@ -376,68 +391,68 @@ function dfrn_poll_post(&$a) { } header("Content-type: application/atom+xml"); - $o = dfrn::feed($dfrn_id, $a->argv[1], $last_update, $direction); + $o = DFRN::feed($dfrn_id, $a->argv[1], $last_update, $direction); echo $o; killme(); - } } -function dfrn_poll_content(&$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); - - $direction = (-1); - if(strpos($dfrn_id,':') == 1) { - $direction = intval(substr($dfrn_id,0,1)); - $dfrn_id = substr($dfrn_id,2); +function dfrn_poll_content(App $a) +{ + $dfrn_id = defaults($_GET, 'dfrn_id' , ''); + $type = defaults($_GET, 'type' , 'data'); + $last_update = defaults($_GET, 'last_update' , ''); + $destination_url = defaults($_GET, 'destination_url', ''); + $sec = defaults($_GET, 'sec' , ''); + $dfrn_version = !empty($_GET['dfrn_version']) ? (float) $_GET['dfrn_version'] : 2.0; + $quiet = !empty($_GET['quiet']); + + $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 - $hash = random_string(); + $hash = Strings::getRandomHex(); $status = 0; - $r = q("DELETE FROM `challenge` WHERE `expire` < " . intval(time())); + DBA::delete('challenge', ["`expire` < ?", time()]); - if($type !== 'profile') { + 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), + DBA::escape($hash), + DBA::escape($dfrn_id), intval(time() + 60 ), - dbesc($type), - dbesc($last_update) + DBA::escape($type), + DBA::escape($last_update) ); } + $sql_extra = ''; - switch($direction) { - case (-1): - 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)); + switch ($direction) { + case -1: + if ($type === 'profile') { + $sql_extra = sprintf(" AND ( `dfrn-id` = '%s' OR `issued-id` = '%s' ) ", DBA::escape($dfrn_id), DBA::escape($dfrn_id)); + } else { + $sql_extra = sprintf(" AND `issued-id` = '%s' ", DBA::escape($dfrn_id)); + } + $my_id = $dfrn_id; break; case 0: - $sql_extra = sprintf(" AND `issued-id` = '%s' AND `duplex` = 1 ", dbesc($dfrn_id)); + $sql_extra = sprintf(" AND `issued-id` = '%s' AND `duplex` = 1 ", DBA::escape($dfrn_id)); $my_id = '1:' . $dfrn_id; break; case 1: - $sql_extra = sprintf(" AND `dfrn-id` = '%s' AND `duplex` = 1 ", dbesc($dfrn_id)); + $sql_extra = sprintf(" AND `dfrn-id` = '%s' AND `duplex` = 1 ", DBA::escape($dfrn_id)); $my_id = '0:' . $dfrn_id; break; default: - goaway(z_root()); + $a->internalRedirect(); break; // NOTREACHED } @@ -447,112 +462,110 @@ function dfrn_poll_content(&$a) { 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($nickname) + DBA::escape($nickname) ); - - if (dbm::is_result($r)) { - + if (DBA::isResult($r)) { $challenge = ''; $encrypted_id = ''; - $id_str = $my_id . '.' . mt_rand(1000,9999); - - if(($r[0]['duplex'] && strlen($r[0]['pubkey'])) || (! strlen($r[0]['prvkey']))) { - openssl_public_encrypt($hash,$challenge,$r[0]['pubkey']); - openssl_public_encrypt($id_str,$encrypted_id,$r[0]['pubkey']); - } - else { - openssl_private_encrypt($hash,$challenge,$r[0]['prvkey']); - openssl_private_encrypt($id_str,$encrypted_id,$r[0]['prvkey']); + $id_str = $my_id . '.' . mt_rand(1000, 9999); + + if (($r[0]['duplex'] && strlen($r[0]['pubkey'])) || !strlen($r[0]['prvkey'])) { + openssl_public_encrypt($hash, $challenge, $r[0]['pubkey']); + openssl_public_encrypt($id_str, $encrypted_id, $r[0]['pubkey']); + } else { + openssl_private_encrypt($hash, $challenge, $r[0]['prvkey']); + openssl_private_encrypt($id_str, $encrypted_id, $r[0]['prvkey']); } $challenge = bin2hex($challenge); $encrypted_id = bin2hex($encrypted_id); - } - else { + } else { $status = 1; $challenge = ''; $encrypted_id = ''; } - if(($type === 'profile') && (strlen($sec))) { + if (($type === 'profile') && (strlen($sec))) { + // heluecht: I don't know why we don't fail immediately when the user or contact hadn't been found. + // Since it doesn't make sense to continue from this point on, we now fail here. This should be safe. + if (!DBA::isResult($r)) { + System::httpExit(404, ["title" => L10n::t('Page not found.')]); + } // URL reply - - if($dfrn_version < 2.2) { - $s = fetch_url($r[0]['poll'] + if ($dfrn_version < 2.2) { + $s = Network::fetchUrl($r[0]['poll'] . '?dfrn_id=' . $encrypted_id . '&type=profile-check' . '&dfrn_version=' . DFRN_PROTOCOL_VERSION . '&challenge=' . $challenge . '&sec=' . $sec ); - } - else { - $s = post_url($r[0]['poll'], array( + } else { + $s = Network::post($r[0]['poll'], [ 'dfrn_id' => $encrypted_id, 'type' => 'profile-check', 'dfrn_version' => DFRN_PROTOCOL_VERSION, 'challenge' => $challenge, 'sec' => $sec - )); - } - - $profile = ((dbm::is_result($r) && $r[0]['nickname']) ? $r[0]['nickname'] : $nickname); - - switch($destination_url) { - case 'profile': - $dest = App::get_baseurl() . '/profile/' . $profile . '?f=&tab=profile'; - break; - case 'photos': - $dest = App::get_baseurl() . '/photos/' . $profile; - break; - case 'status': - case '': - $dest = App::get_baseurl() . '/profile/' . $profile; - break; - default: - $dest = $destination_url . '?f=&redir=1'; - break; + ])->getBody(); } - logger("dfrn_poll: sec profile: " . $s, LOGGER_DATA); + Logger::log("dfrn_poll: sec profile: " . $s, Logger::DATA); - if(strlen($s) && strstr($s,'challenge . ' expecting ' . $hash); + Logger::log('dfrn_poll: secure profile: sec: ' . $xml->sec . ' expecting ' . $sec); - logger('dfrn_poll: secure profile: challenge: ' . $xml->challenge . ' expecting ' . $hash); - 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; - if(! x($_SESSION,'remote')) - $_SESSION['remote'] = array(); - $_SESSION['remote'][] = array('cid' => $r[0]['id'],'uid' => $r[0]['uid'],'url' => $r[0]['url']); + if (empty($_SESSION['remote'])) { + $_SESSION['remote'] = []; + } + + $_SESSION['remote'][] = ['cid' => $r[0]['id'], 'uid' => $r[0]['uid'], 'url' => $r[0]['url']]; $_SESSION['visitor_id'] = $r[0]['id']; $_SESSION['visitor_home'] = $r[0]['url']; $_SESSION['visitor_visiting'] = $r[0]['uid']; - if(!$quiet) - info( sprintf(t('%1$s welcomes %2$s'), $r[0]['username'] , $r[0]['name']) . EOL); + $_SESSION['my_url'] = $r[0]['url']; + if (!$quiet) { + info(L10n::t('%1$s welcomes %2$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'", - dbesc($expire), - dbesc($session_id) + DBA::escape($expire), + DBA::escape($session_id) ); } + } + + $profile = ((DBA::isResult($r) && $r[0]['nickname']) ? $r[0]['nickname'] : $nickname); - goaway($dest); + switch ($destination_url) { + case 'profile': + $a->internalRedirect('profile/' . $profile . '?f=&tab=profile'); + break; + case 'photos': + $a->internalRedirect('photos/' . $profile); + break; + case 'status': + case '': + $a->internalRedirect('profile/' . $profile); + break; + default: + $appendix = (strstr($destination_url, '?') ? '&f=&redir=1' : '?f=&redir=1'); + $a->redirect($destination_url . $appendix); + break; } - goaway($dest); // NOTREACHED - - } - else { + } else { // XML reply header("Content-type: text/xml"); echo '' . "\r\n" @@ -561,7 +574,7 @@ function dfrn_poll_content(&$a) { . "\t" . '' . DFRN_PROTOCOL_VERSION . '' . "\r\n" . "\t" . '' . $encrypted_id . '' . "\r\n" . "\t" . '' . $challenge . '' . "\r\n" - . '' . "\r\n" ; + . '' . "\r\n"; killme(); // NOTREACHED }