X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fdfrn_poll.php;h=5b72c0bf940cec4fa7d4ac0c643430c9b1e4c425;hb=4a47425bfd64f5ba04139899880fce21ddcc0623;hp=943ddddecc53623fe1b10c23f3e8f28fbd55c7f9;hpb=413424064c30c3b799f03ed728ab0a3f8f5eb424;p=friendica.git
diff --git a/mod/dfrn_poll.php b/mod/dfrn_poll.php
index 943ddddecc..5b72c0bf94 100644
--- a/mod/dfrn_poll.php
+++ b/mod/dfrn_poll.php
@@ -7,16 +7,16 @@
use Friendica\App;
use Friendica\Core\Config;
use Friendica\Core\L10n;
+use Friendica\Core\Logger;
use Friendica\Core\System;
use Friendica\Database\DBA;
use Friendica\Module\Login;
use Friendica\Protocol\DFRN;
use Friendica\Protocol\OStatus;
use Friendica\Util\Network;
+use Friendica\Util\Strings;
use Friendica\Util\XML;
-require_once 'include/items.php';
-
function dfrn_poll_init(App $a)
{
Login::sessionAuth();
@@ -28,15 +28,15 @@ function dfrn_poll_init(App $a)
$challenge = defaults($_GET, 'challenge' , '');
$sec = defaults($_GET, 'sec' , '');
$dfrn_version = (float) defaults($_GET, 'dfrn_version' , 2.0);
- $perm = defaults($_GET, 'perm' , 'r');
- $quiet = x($_GET, 'quiet');
+ $quiet = !empty($_GET['quiet']);
// Possibly it is an OStatus compatible server that requests a user feed
- if (($a->argc > 1) && ($dfrn_id == '') && !strstr($_SERVER["HTTP_USER_AGENT"], 'Friendica')) {
+ $user_agent = defaults($_SERVER, 'HTTP_USER_AGENT', '');
+ if (($a->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();
+ exit();
}
$direction = -1;
@@ -48,7 +48,7 @@ function dfrn_poll_init(App $a)
$hidewall = false;
- if (($dfrn_id === '') && (!x($_POST, 'dfrn_id'))) {
+ if (($dfrn_id === '') && empty($_POST['dfrn_id'])) {
if (Config::get('system', 'block_public') && !local_user() && !remote_user()) {
System::httpExit(403);
}
@@ -67,10 +67,10 @@ function dfrn_poll_init(App $a)
$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);
- killme();
+ exit();
}
if (($type === 'profile') && (!strlen($sec))) {
@@ -89,7 +89,7 @@ function dfrn_poll_init(App $a)
$my_id = '0:' . $dfrn_id;
break;
default:
- goaway(System::baseUrl());
+ $a->internalRedirect();
break; // NOTREACHED
}
@@ -103,14 +103,14 @@ function dfrn_poll_init(App $a)
if (DBA::isResult($r)) {
$s = Network::fetchUrl($r[0]['poll'] . '?dfrn_id=' . $my_id . '&type=profile-check');
- logger("dfrn_poll: old profile returns " . $s, LOGGER_DATA);
+ Logger::log("dfrn_poll: old profile returns " . $s, Logger::DATA);
if (strlen($s)) {
$xml = XML::parseString($s);
- if ((int) $xml->status === 1) {
+ if ((int)$xml->status === 1) {
$_SESSION['authenticated'] = 1;
- if (!x($_SESSION, 'remote')) {
+ if (empty($_SESSION['remote'])) {
$_SESSION['remote'] = [];
}
@@ -134,10 +134,15 @@ function dfrn_poll_init(App $a)
);
}
}
- $profile = $r[0]['nickname'];
- goaway((strlen($destination_url)) ? $destination_url : System::baseUrl() . '/profile/' . $profile);
+
+ $profile = (count($r) > 0 && isset($r[0]['nickname']) ? $r[0]['nickname'] : '');
+ if (!empty($destination_url)) {
+ System::externalRedirect($destination_url);
+ } else {
+ $a->internalRedirect('profile/' . $profile);
+ }
}
- goaway(System::baseUrl());
+ $a->internalRedirect();
}
if ($type === 'profile-check' && $dfrn_version < 2.2) {
@@ -185,14 +190,14 @@ function dfrn_poll_init(App $a)
}
if ($final_dfrn_id != $orig_id) {
- logger('profile_check: ' . $final_dfrn_id . ' != ' . $orig_id, LOGGER_DEBUG);
+ 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();
+ exit();
// NOTREACHED
} else {
// old protocol
@@ -222,17 +227,17 @@ function dfrn_poll_init(App $a)
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';
+ $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('dfrn_poll: POST: profile-check');
+ 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",
@@ -277,14 +282,14 @@ function dfrn_poll_post(App $a)
}
if ($final_dfrn_id != $orig_id) {
- logger('profile_check: ' . $final_dfrn_id . ' != ' . $orig_id, LOGGER_DEBUG);
+ 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();
+ exit();
// NOTREACHED
}
}
@@ -301,7 +306,7 @@ function dfrn_poll_post(App $a)
);
if (!DBA::isResult($r)) {
- killme();
+ exit();
}
$type = $r[0]['type'];
@@ -313,24 +318,21 @@ function dfrn_poll_post(App $a)
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 ", DBA::escape($dfrn_id));
- $my_id = '1:' . $dfrn_id;
break;
case 1:
$sql_extra = sprintf(" AND `dfrn-id` = '%s' AND `duplex` = 1 ", DBA::escape($dfrn_id));
- $my_id = '0:' . $dfrn_id;
break;
default:
- goaway(System::baseUrl());
+ $a->internalRedirect();
break; // NOTREACHED
}
$r = q("SELECT * FROM `contact` WHERE `blocked` = 0 AND `pending` = 0 $sql_extra LIMIT 1");
if (!DBA::isResult($r)) {
- killme();
+ exit();
}
$contact = $r[0];
@@ -362,11 +364,11 @@ function dfrn_poll_post(App $a)
$text
";
- killme();
+ exit();
// NOTREACHED
} else {
// Update the writable flag if it changed
- logger('dfrn_poll: post request feed: ' . print_r($_POST, true), LOGGER_DATA);
+ Logger::log('dfrn_poll: post request feed: ' . print_r($_POST, true), Logger::DATA);
if ($dfrn_version >= 2.21) {
if ($perm === 'rw') {
$writable = 1;
@@ -385,20 +387,19 @@ function dfrn_poll_post(App $a)
header("Content-type: application/atom+xml");
$o = DFRN::feed($dfrn_id, $a->argv[1], $last_update, $direction);
echo $o;
- killme();
+ exit();
}
}
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 = 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) {
@@ -408,14 +409,14 @@ function dfrn_poll_content(App $a)
if ($dfrn_id != '') {
// initial communication from external contact
- $hash = random_string();
+ $hash = Strings::getRandomHex();
$status = 0;
DBA::delete('challenge', ["`expire` < ?", time()]);
if ($type !== 'profile') {
- $r = q("INSERT INTO `challenge` ( `challenge`, `dfrn-id`, `expire` , `type`, `last_update` )
+ q("INSERT INTO `challenge` ( `challenge`, `dfrn-id`, `expire` , `type`, `last_update` )
VALUES( '%s', '%s', '%s', '%s', '%s' ) ",
DBA::escape($hash),
DBA::escape($dfrn_id),
@@ -429,7 +430,7 @@ function dfrn_poll_content(App $a)
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));
+ $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));
}
@@ -445,7 +446,7 @@ function dfrn_poll_content(App $a)
$my_id = '0:' . $dfrn_id;
break;
default:
- goaway(System::baseUrl());
+ $a->internalRedirect();
break; // NOTREACHED
}
@@ -479,6 +480,12 @@ function dfrn_poll_content(App $a)
}
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 = Network::fetchUrl($r[0]['poll']
@@ -495,41 +502,22 @@ function dfrn_poll_content(App $a)
'dfrn_version' => DFRN_PROTOCOL_VERSION,
'challenge' => $challenge,
'sec' => $sec
- ]);
+ ])->getBody();
}
- $profile = ((DBA::isResult($r) && $r[0]['nickname']) ? $r[0]['nickname'] : $nickname);
-
- switch ($destination_url) {
- case 'profile':
- $dest = System::baseUrl() . '/profile/' . $profile . '?f=&tab=profile';
- break;
- case 'photos':
- $dest = System::baseUrl() . '/photos/' . $profile;
- break;
- case 'status':
- case '':
- $dest = System::baseUrl() . '/profile/' . $profile;
- break;
- default:
- $appendix = (strstr($destination_url, '?') ? '&f=&redir=1' : '?f=&redir=1');
- $dest = $destination_url . $appendix;
- break;
- }
-
- 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('dfrn_poll: secure profile: sec: ' . $xml->sec . ' expecting ' . $sec);
+ Logger::log('dfrn_poll: secure profile: challenge: ' . $xml->challenge . ' expecting ' . $hash);
+ Logger::log('dfrn_poll: secure profile: sec: ' . $xml->sec . ' expecting ' . $sec);
if (((int) $xml->status == 0) && ($xml->challenge == $hash) && ($xml->sec == $sec)) {
$_SESSION['authenticated'] = 1;
- if (!x($_SESSION, 'remote')) {
+ if (empty($_SESSION['remote'])) {
$_SESSION['remote'] = [];
}
@@ -550,10 +538,26 @@ function dfrn_poll_content(App $a)
DBA::escape($session_id)
);
}
+ }
- goaway($dest);
+ $profile = ((DBA::isResult($r) && $r[0]['nickname']) ? $r[0]['nickname'] : $nickname);
+
+ 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 {
// XML reply
@@ -565,7 +569,7 @@ function dfrn_poll_content(App $a)
. "\t" . '' . $encrypted_id . '' . "\r\n"
. "\t" . '' . $challenge . '' . "\r\n"
. '' . "\r\n";
- killme();
+ exit();
// NOTREACHED
}
}