X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModule%2FMagic.php;h=c861d3054b73e1f68f520171447e8be40210bb14;hb=561aba18e3a230c0912ad9483c6df43cc40e09d6;hp=cbd629fd3c0c6e9d5f3742888cb99dd4b2ae688b;hpb=9cc4682e0a6957d40ecc9a931ddd5b8f32c594b6;p=friendica.git

diff --git a/src/Module/Magic.php b/src/Module/Magic.php
index cbd629fd3c..c861d3054b 100644
--- a/src/Module/Magic.php
+++ b/src/Module/Magic.php
@@ -21,14 +21,19 @@
 
 namespace Friendica\Module;
 
+use Friendica\App;
 use Friendica\BaseModule;
-use Friendica\Core\Logger;
+use Friendica\Core\L10n;
 use Friendica\Core\System;
-use Friendica\Database\DBA;
-use Friendica\DI;
+use Friendica\Database\Database;
 use Friendica\Model\Contact;
+use Friendica\Model\User;
+use Friendica\Network\HTTPClient\Capability\ICanSendHttpRequests;
+use Friendica\Network\HTTPClient\Client\HttpClientOptions;
 use Friendica\Util\HTTPSignature;
+use Friendica\Util\Profiler;
 use Friendica\Util\Strings;
+use Psr\Log\LoggerInterface;
 
 /**
  * Magic Auth (remote authentication) module.
@@ -37,17 +42,30 @@ use Friendica\Util\Strings;
  */
 class Magic extends BaseModule
 {
-	public static function init(array $parameters = [])
+	/** @var App */
+	protected $app;
+	/** @var Database */
+	protected $dba;
+	/** @var ICanSendHttpRequests */
+	protected $httpClient;
+
+	public function __construct(App $app, L10n $l10n, App\BaseURL $baseUrl, App\Arguments $args, LoggerInterface $logger, Profiler $profiler, Response $response, Database $dba, ICanSendHttpRequests $httpClient, array $server, array $parameters = [])
 	{
-		$a = DI::app();
-		$ret = ['success' => false, 'url' => '', 'message' => ''];
-		Logger::info('magic mdule: invoked');
+		parent::__construct($l10n, $baseUrl, $args, $logger, $profiler, $response, $server, $parameters);
 
-		Logger::debug('args', ['request' => $_REQUEST]);
+		$this->app        = $app;
+		$this->dba        = $dba;
+		$this->httpClient = $httpClient;
+	}
+
+	protected function rawContent(array $request = [])
+	{
+		$this->logger->info('magic module: invoked');
+
+		$this->logger->debug('args', ['request' => $_REQUEST]);
 
 		$addr = $_REQUEST['addr'] ?? '';
 		$dest = $_REQUEST['dest'] ?? '';
-		$test = (!empty($_REQUEST['test']) ? intval($_REQUEST['test']) : 0);
 		$owa  = (!empty($_REQUEST['owa'])  ? intval($_REQUEST['owa'])  : 0);
 		$cid  = 0;
 
@@ -58,78 +76,66 @@ class Magic extends BaseModule
 		}
 
 		if (!$cid) {
-			Logger::info('No contact record found', $_REQUEST);
+			$this->logger->info('No contact record found', $_REQUEST);
 			// @TODO Finding a more elegant possibility to redirect to either internal or external URL
-			$a->redirect($dest);
+			$this->app->redirect($dest);
 		}
-		$contact = DBA::selectFirst('contact', ['id', 'nurl', 'url'], ['id' => $cid]);
+		$contact = $this->dba->selectFirst('contact', ['id', 'nurl', 'url'], ['id' => $cid]);
 
 		// Redirect if the contact is already authenticated on this site.
-		if ($a->getContactId() && strpos($contact['nurl'], Strings::normaliseLink(DI::baseUrl()->get())) !== false) {
-			if ($test) {
-				$ret['success'] = true;
-				$ret['message'] .= 'Local site - you are already authenticated.' . EOL;
-				return $ret;
-			}
-
-			Logger::info('Contact is already authenticated');
+		if ($this->app->getContactId() && strpos($contact['nurl'], Strings::normaliseLink($this->baseUrl->get())) !== false) {
+			$this->logger->info('Contact is already authenticated');
 			System::externalRedirect($dest);
 		}
 
-		if (local_user()) {
-			$user = $a->user;
-
-			// OpenWebAuth
-			if ($owa) {
-				// Extract the basepath
-				// NOTE: we need another solution because this does only work
-				// for friendica contacts :-/ . We should have the basepath
-				// of a contact also in the contact table.
-				$exp = explode('/profile/', $contact['url']);
-				$basepath = $exp[0];
-
-				$header = [];
-				$header['Accept'] = 'application/x-dfrn+json, application/x-zot+json';
-				$header['X-Open-Web-Auth'] = Strings::getRandomHex();
-
-				// Create a header that is signed with the local users private key.
-				$header = HTTPSignature::createSig(
-					$header,
-					$user['prvkey'],
-					'acct:' . $user['nickname'] . '@' . DI::baseUrl()->getHostname() . (DI::baseUrl()->getUrlPath() ? '/' . DI::baseUrl()->getUrlPath() : '')
-				);
-
-				// Try to get an authentication token from the other instance.
-				$curlResult = DI::httpRequest()->get($basepath . '/owa', ['header' => $header]);
-
-				if ($curlResult->isSuccess()) {
-					$j = json_decode($curlResult->getBody(), true);
-
-					if ($j['success']) {
-						$token = '';
-						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(Strings::base64UrlDecode($j['encrypted_token']), $token, $user['prvkey']);
-						} else {
-							$token = $j['token'];
-						}
-						$args = (strpbrk($dest, '?&') ? '&' : '?') . 'owt=' . $token;
-
-						Logger::info('Redirecting', ['path' => $dest . $args]);
-						System::externalRedirect($dest . $args);
+		// OpenWebAuth
+		if (local_user() && $owa) {
+			$user = User::getById(local_user());
+
+			// Extract the basepath
+			// NOTE: we need another solution because this does only work
+			// for friendica contacts :-/ . We should have the basepath
+			// of a contact also in the contact table.
+			$exp = explode('/profile/', $contact['url']);
+			$basepath = $exp[0];
+
+			$header = [
+				'Accept'		  => ['application/x-dfrn+json', 'application/x-zot+json'],
+				'X-Open-Web-Auth' => [Strings::getRandomHex()],
+			];
+
+			// Create a header that is signed with the local users private key.
+			$header = HTTPSignature::createSig(
+				$header,
+				$user['prvkey'],
+				'acct:' . $user['nickname'] . '@' . $this->baseUrl->getHostname() . ($this->baseUrl->getUrlPath() ? '/' . $this->baseUrl->getUrlPath() : '')
+			);
+
+			// Try to get an authentication token from the other instance.
+			$curlResult = $this->httpClient->get($basepath . '/owa', [HttpClientOptions::HEADERS => $header]);
+
+			if ($curlResult->isSuccess()) {
+				$j = json_decode($curlResult->getBody(), true);
+
+				if ($j['success']) {
+					$token = '';
+					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(Strings::base64UrlDecode($j['encrypted_token']), $token, $user['prvkey']);
+					} else {
+						$token = $j['token'];
 					}
+					$args = (strpbrk($dest, '?&') ? '&' : '?') . 'owt=' . $token;
+
+					$this->logger->info('Redirecting', ['path' => $dest . $args]);
+					System::externalRedirect($dest . $args);
 				}
-				System::externalRedirect($dest);
 			}
-		}
-
-		if ($test) {
-			$ret['message'] = 'Not authenticated or invalid arguments' . EOL;
-			return $ret;
+			System::externalRedirect($dest);
 		}
 
 		// @TODO Finding a more elegant possibility to redirect to either internal or external URL
-		$a->redirect($dest);
+		$this->app->redirect($dest);
 	}
 }