<?php
/**
- * @copyright Copyright (C) 2010-2021, the Friendica project
+ * @copyright Copyright (C) 2010-2022, the Friendica project
*
* @license GNU AGPL version 3 or any later version
*
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\HTTPRequestOptions;
+use Friendica\Network\HTTPClient\Capability\ICanSendHttpRequests;
+use Friendica\Network\HTTPClient\Client\HttpClient;
+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.
*/
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;
}
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);
}
$header = HTTPSignature::createSig(
$header,
$user['prvkey'],
- 'acct:' . $user['nickname'] . '@' . DI::baseUrl()->getHostname() . (DI::baseUrl()->getUrlPath() ? '/' . DI::baseUrl()->getUrlPath() : '')
+ 'acct:' . $user['nickname'] . '@' . $this->baseUrl->getHostname() . ($this->baseUrl->getUrlPath() ? '/' . $this->baseUrl->getUrlPath() : '')
);
// Try to get an authentication token from the other instance.
- $curlResult = DI::httpRequest()->get($basepath . '/owa', [HTTPRequestOptions::HEADERS => $header]);
+ $curlResult = $this->httpClient->get($basepath . '/owa', [HttpClientOptions::HEADERS => $header]);
if ($curlResult->isSuccess()) {
$j = json_decode($curlResult->getBody(), true);
}
$args = (strpbrk($dest, '?&') ? '&' : '?') . 'owt=' . $token;
- Logger::info('Redirecting', ['path' => $dest . $args]);
+ $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;
- }
-
// @TODO Finding a more elegant possibility to redirect to either internal or external URL
- $a->redirect($dest);
+ $this->app->redirect($dest);
}
}