Merge pull request #11575 from annando/issue-11469

[friendica.git] / mod / redir.php

diff --git a/mod/redir.php b/mod/redir.php
index b2f76738bee74f020673e9a2a4bd69db960e83bd..ba1b7e13b6a9f45cfe957c57816e31f553942f56 100644 (file)
--- a/mod/redir.php
+++ b/mod/redir.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2020, Friendica
+ * @copyright Copyright (C) 2010-2022, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -27,6 +27,8 @@ use Friendica\Database\DBA;
 use Friendica\DI;
 use Friendica\Model\Contact;
 use Friendica\Model\Profile;
+use Friendica\Network\HTTPClient\Client\HttpClientAccept;
+use Friendica\Network\HTTPClient\Client\HttpClientOptions;
 use Friendica\Util\Strings;
 
 function redir_init(App $a) {
@@ -35,10 +37,9 @@ function redir_init(App $a) {
        }
 
        $url = $_GET['url'] ?? '';
-       $quiet = !empty($_GET['quiet']) ? '&quiet=1' : '';
 
-       if ($a->argc > 1 && intval($a->argv[1])) {
-               $cid = intval($a->argv[1]);
+       if (DI::args()->getArgc() > 1 && intval(DI::args()->getArgv()[1])) {
+               $cid = intval(DI::args()->getArgv()[1]);
        } else {
                $cid = 0;
        }
@@ -50,7 +51,7 @@ function redir_init(App $a) {
                throw new \Friendica\Network\HTTPException\BadRequestException(DI::l10n()->t('Bad Request.'));
        }
 
-       $fields = ['id', 'uid', 'nurl', 'url', 'addr', 'name', 'network', 'poll', 'issued-id', 'dfrn-id', 'duplex', 'pending'];
+       $fields = ['id', 'uid', 'nurl', 'url', 'addr', 'name'];
        $contact = DBA::selectFirst('contact', $fields, ['id' => $cid, 'uid' => [0, local_user()]]);
        if (!DBA::isResult($contact)) {
                throw new \Friendica\Network\HTTPException\NotFoundException(DI::l10n()->t('Contact not found.'));
@@ -58,7 +59,7 @@ function redir_init(App $a) {
 
        $contact_url = $contact['url'];
 
-       if (!empty($a->contact['id']) && $a->contact['id'] == $cid) {
+       if (!empty($a->getContactId()) && $a->getContactId() == $cid) {
                // Local user is already authenticated.
                redir_check_url($contact_url, $url);
                $a->redirect($url ?: $contact_url);
@@ -73,11 +74,11 @@ function redir_init(App $a) {
                        $cid = $contact['id'];
                }
 
-               if (!empty($a->contact['id']) && $a->contact['id'] == $cid) {
+               if (!empty($a->getContactId()) && $a->getContactId() == $cid) {
                        // Local user is already authenticated.
                        redir_check_url($contact_url, $url);
                        $target_url = $url ?: $contact_url;
-                       Logger::log($contact['name'] . " is already authenticated. Redirecting to " . $target_url, Logger::DEBUG);
+                       Logger::info($contact['name'] . " is already authenticated. Redirecting to " . $target_url);
                        $a->redirect($target_url);
                }
        }
@@ -94,38 +95,11 @@ function redir_init(App $a) {
                        // Remote user is already authenticated.
                        redir_check_url($contact_url, $url);
                        $target_url = $url ?: $contact_url;
-                       Logger::log($contact['name'] . " is already authenticated. Redirecting to " . $target_url, Logger::DEBUG);
+                       Logger::info($contact['name'] . " is already authenticated. Redirecting to " . $target_url);
                        $a->redirect($target_url);
                }
        }
 
-       // Doing remote auth with dfrn.
-       if (local_user() && (!empty($contact['dfrn-id']) || !empty($contact['issued-id'])) && empty($contact['pending'])) {
-               $dfrn_id = $orig_id = (($contact['issued-id']) ? $contact['issued-id'] : $contact['dfrn-id']);
-
-               if ($contact['duplex'] && $contact['issued-id']) {
-                       $orig_id = $contact['issued-id'];
-                       $dfrn_id = '1:' . $orig_id;
-               }
-               if ($contact['duplex'] && $contact['dfrn-id']) {
-                       $orig_id = $contact['dfrn-id'];
-                       $dfrn_id = '0:' . $orig_id;
-               }
-
-               $sec = Strings::getRandomHex();
-
-               $fields = ['uid' => local_user(), 'cid' => $cid, 'dfrn_id' => $dfrn_id,
-                       'sec' => $sec, 'expire' => time() + 45];
-               DBA::insert('profile_check', $fields);
-
-               Logger::log('mod_redir: ' . $contact['name'] . ' ' . $sec, Logger::DEBUG);
-
-               $dest = (!empty($url) ? '&destination_url=' . $url : '');
-
-               System::externalRedirect($contact['poll'] . '?dfrn_id=' . $dfrn_id
-                       . '&dfrn_version=' . DFRN_PROTOCOL_VERSION . '&type=profile&sec=' . $sec . $dest . $quiet);
-       }
-
        if (empty($url)) {
                throw new \Friendica\Network\HTTPException\BadRequestException(DI::l10n()->t('Bad Request.'));
        }
@@ -140,7 +114,7 @@ function redir_init(App $a) {
                $url .= $separator . 'zrl=' . urlencode($my_profile);
        }
 
-       Logger::log('redirecting to ' . $url, Logger::DEBUG);
+       Logger::info('redirecting to ' . $url);
        $a->redirect($url);
 }
 
@@ -170,7 +144,7 @@ function redir_magic($a, $cid, $url)
        }
 
        // Test for magic auth on the target system
-       $serverret = DI::httpRequest()->get($basepath . '/magic');
+       $serverret = DI::httpClient()->head($basepath . '/magic', [HttpClientOptions::ACCEPT_CONTENT => HttpClientAccept::HTML]);
        if ($serverret->isSuccess()) {
                $separator = strpos($target_url, '?') ? '&' : '?';
                $target_url .= $separator . 'zrl=' . urlencode($visitor) . '&addr=' . urlencode($contact_url);