Merge pull request #6126 from annando/notice-return-path

[friendica.git] / src / Module / Magic.php

diff --git a/src/Module/Magic.php b/src/Module/Magic.php
index 768fe69ebbedb94e410f2d6de19e8ba9e55d82ba..ecfe18e596b528b3587af7be1ae9b06b7201663a 100644 (file)
--- a/src/Module/Magic.php
+++ b/src/Module/Magic.php
@@ -5,10 +5,13 @@
 namespace Friendica\Module;
 
 use Friendica\BaseModule;
+use Friendica\Core\Logger;
+use Friendica\Core\System;
 use Friendica\Database\DBA;
 use Friendica\Model\Contact;
 use Friendica\Util\HTTPSignature;
 use Friendica\Util\Network;
+use Friendica\Util\Strings;
 
 /**
  * Magic Auth (remote authentication) module.
@@ -21,9 +24,9 @@ class Magic extends BaseModule
        {
                $a = self::getApp();
                $ret = ['success' => false, 'url' => '', 'message' => ''];
-               logger('magic mdule: invoked', LOGGER_DEBUG);
+               Logger::log('magic mdule: invoked', Logger::DEBUG);
 
-               logger('args: ' . print_r($_REQUEST, true), LOGGER_DATA);
+               Logger::log('args: ' . print_r($_REQUEST, true), Logger::DATA);
 
                $addr = ((x($_REQUEST, 'addr')) ? $_REQUEST['addr'] : '');
                $dest = ((x($_REQUEST, 'dest')) ? $_REQUEST['dest'] : '');
@@ -40,22 +43,22 @@ class Magic extends BaseModule
                }
 
                if (!$cid) {
-                       logger('No contact record found: ' . print_r($_REQUEST, true), LOGGER_DEBUG);
-                       goaway($dest);
+                       Logger::log('No contact record found: ' . print_r($_REQUEST, true), Logger::DEBUG);
+                       // @TODO Finding a more elegant possibility to redirect to either internal or external URL
+                       $a->redirect($dest);
                }
-
                $contact = DBA::selectFirst('contact', ['id', 'nurl', 'url'], ['id' => $cid]);
 
                // Redirect if the contact is already authenticated on this site.
-               if (!empty($a->contact) && array_key_exists('id', $a->contact) && strpos($contact['nurl'], normalise_link(self::getApp()->getBaseURL())) !== false) {
+               if (!empty($a->contact) && array_key_exists('id', $a->contact) && strpos($contact['nurl'], Strings::normaliseLink(self::getApp()->getBaseURL())) !== false) {
                        if ($test) {
                                $ret['success'] = true;
                                $ret['message'] .= 'Local site - you are already authenticated.' . EOL;
                                return $ret;
                        }
 
-                       logger('Contact is already authenticated', LOGGER_DEBUG);
-                       goaway($dest);
+                       Logger::log('Contact is already authenticated', Logger::DEBUG);
+                       System::externalRedirect($dest);
                }
 
                if (local_user()) {
@@ -72,7 +75,7 @@ class Magic extends BaseModule
 
                                $headers = [];
                                $headers['Accept'] = 'application/x-dfrn+json';
-                               $headers['X-Open-Web-Auth'] = random_string();
+                               $headers['X-Open-Web-Auth'] = Strings::getRandomHex();
 
                                // Create a header that is signed with the local users private key.
                                $headers = HTTPSignature::createSig(
@@ -92,17 +95,17 @@ class Magic extends BaseModule
                                                if ($j['encrypted_token']) {
                                                        // The token is encrypted. If the local user is really the one the other instance
                                                        // thinks he/she is, the token can be decrypted with the local users public key.
-                                                       openssl_private_decrypt(base64url_decode($j['encrypted_token']), $token, $user['prvkey']);
+                                                       openssl_private_decrypt(Strings::base64UrlDecode($j['encrypted_token']), $token, $user['prvkey']);
                                                } else {
                                                        $token = $j['token'];
                                                }
                                                $x = strpbrk($dest, '?&');
                                                $args = (($x) ? '&owt=' . $token : '?f=&owt=' . $token);
 
-                                               goaway($dest . $args);
+                                               System::externalRedirect($dest . $args);
                                        }
                                }
-                               goaway($dest);
+                               System::externalRedirect($dest);
                        }
                }
 
@@ -111,6 +114,7 @@ class Magic extends BaseModule
                        return $ret;
                }
 
-               goaway($dest);
+               // @TODO Finding a more elegant possibility to redirect to either internal or external URL
+               $a->redirect($dest);
        }
 }