Merge pull request #8021 from nupplaphil/task/mod_openid

Move mod/openid to src\Module\Security\OpenId

mod/api.php

@@ -8,7 +8,7 @@ use Friendica\Core\Config;
 use Friendica\Core\L10n;
 use Friendica\Core\Renderer;
 use Friendica\Database\DBA;
-use Friendica\Module\Login;
+use Friendica\Module\Security\Login;
 
 require_once __DIR__ . '/../include/api.php';
 

mod/dfrn_poll.php

@@ -13,7 +13,7 @@ use Friendica\Core\Logger;
 use Friendica\Core\System;
 use Friendica\Core\Session;
 use Friendica\Database\DBA;
-use Friendica\Module\Login;
+use Friendica\Module\Security\Login;
 use Friendica\Protocol\DFRN;
 use Friendica\Protocol\OStatus;
 use Friendica\Util\Network;

mod/dfrn_request.php

@@ -25,7 +25,7 @@ use Friendica\Model\Contact;
 use Friendica\Model\Group;
 use Friendica\Model\Profile;
 use Friendica\Model\User;
-use Friendica\Module\Login;
+use Friendica\Module\Security\Login;
 use Friendica\Network\Probe;
 use Friendica\Protocol\Activity;
 use Friendica\Util\DateTimeFormat;

mod/events.php

@@ -19,7 +19,7 @@ use Friendica\Database\DBA;
 use Friendica\Model\Event;
 use Friendica\Model\Item;
 use Friendica\Model\Profile;
-use Friendica\Module\Login;
+use Friendica\Module\Security\Login;
 use Friendica\Util\ACLFormatter;
 use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Strings;

mod/message.php

@@ -15,7 +15,7 @@ use Friendica\Core\System;
 use Friendica\Database\DBA;
 use Friendica\Model\Contact;
 use Friendica\Model\Mail;
-use Friendica\Module\Login;
+use Friendica\Module\Security\Login;
 use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Proxy as ProxyUtils;
 use Friendica\Util\Strings;

mod/network.php

@@ -27,7 +27,7 @@ use Friendica\Model\Group;
 use Friendica\Model\Item;
 use Friendica\Model\Profile;
 use Friendica\Model\Term;
-use Friendica\Module\Login;
+use Friendica\Module\Security\Login;
 use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Proxy as ProxyUtils;
 use Friendica\Util\Strings;

mod/notifications.php

@@ -13,7 +13,7 @@ use Friendica\Core\Protocol;
 use Friendica\Core\Renderer;
 use Friendica\Core\System;
 use Friendica\Database\DBA;
-use Friendica\Module\Login;
+use Friendica\Module\Security\Login;
 use Friendica\Model\Introduction;
 use Friendica\Model\Notify;
 

mod/oexchange.php

@@ -6,7 +6,7 @@ use Friendica\App;
 use Friendica\Core\L10n;
 use Friendica\Core\Renderer;
 use Friendica\Core\System;
-use Friendica\Module\Login;
+use Friendica\Module\Security\Login;
 use Friendica\Util\Network;
 use Friendica\Util\Strings;
 

mod/openid.php

@@ -1,82 +0,0 @@
-<?php
-/**
- * @file mod/openid.php
- */
-
-use Friendica\App;
-use Friendica\BaseObject;
-use Friendica\App\Authentication;
-use Friendica\Core\Config;
-use Friendica\Core\L10n;
-use Friendica\Core\Logger;
-use Friendica\Core\Session;
-use Friendica\Database\DBA;
-use Friendica\Util\Strings;
-
-function openid_content(App $a) {
-
-	if (Config::get('system','no_openid')) {
-		$a->internalRedirect();
-	}
-
-	Logger::log('mod_openid ' . print_r($_REQUEST,true), Logger::DATA);
-
-	if (!empty($_GET['openid_mode']) && !empty($_SESSION['openid'])) {
-
-		$openid = new LightOpenID($a->getHostName());
-
-		if ($openid->validate()) {
-			$authid = $openid->data['openid_identity'];
-
-			if (empty($authid)) {
-				Logger::log(L10n::t('OpenID protocol error. No ID returned.') . EOL);
-				$a->internalRedirect();
-			}
-
-			// NOTE: we search both for normalised and non-normalised form of $authid
-			//       because the normalization step was removed from setting
-			//       mod/settings.php in 8367cad so it might have left mixed
-			//       records in the user table
-			//
-			$condition = ['blocked' => false, 'account_expired' => false, 'account_removed' => false, 'verified' => true,
-				'openid' => [$authid, Strings::normaliseOpenID($authid)]];
-			$user  = DBA::selectFirst('user', [], $condition);
-			if (DBA::isResult($user)) {
-
-				// successful OpenID login
-
-				unset($_SESSION['openid']);
-
-				/** @var Authentication $authentication */
-				$authentication = BaseObject::getClass(Authentication::class);
-				$authentication->setForUser($a, $user, true, true);
-
-				// just in case there was no return url set
-				// and we fell through
-
-				$a->internalRedirect();
-			}
-
-			// Successful OpenID login - but we can't match it to an existing account.
-			unset($_SESSION['register']);
-			Session::set('openid_attributes', $openid->getAttributes());
-			Session::set('openid_identity', $authid);
-
-			// Detect the server URL
-			$open_id_obj = new LightOpenID($a->getHostName());
-			$open_id_obj->identity = $authid;
-			Session::set('openid_server', $open_id_obj->discover($open_id_obj->identity));
-
-			if (intval(Config::get('config', 'register_policy')) === \Friendica\Module\Register::CLOSED) {
-				notice(L10n::t('Account not found. Please login to your existing account to add the OpenID to it.'));
-			} else {
-				notice(L10n::t('Account not found. Please register a new account or login to your existing account to add the OpenID to it.'));
-			}
-
-			$a->internalRedirect('login');
-		}
-	}
-	notice(L10n::t('Login failed.') . EOL);
-	$a->internalRedirect();
-	// NOTREACHED
-}

mod/profiles.php

@@ -20,7 +20,7 @@ use Friendica\Model\Contact;
 use Friendica\Model\GContact;
 use Friendica\Model\Profile;
 use Friendica\Model\User;
-use Friendica\Module\Login;
+use Friendica\Module\Security\Login;
 use Friendica\Network\Probe;
 use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Strings;

mod/regmod.php

@@ -11,7 +11,7 @@ use Friendica\Core\Worker;
 use Friendica\Database\DBA;
 use Friendica\Model\Register;
 use Friendica\Model\User;
-use Friendica\Module\Login;
+use Friendica\Module\Security\Login;
 
 function user_allow($hash)
 {

mod/settings.php

@@ -24,7 +24,7 @@ use Friendica\Model\Contact;
 use Friendica\Model\GContact;
 use Friendica\Model\Group;
 use Friendica\Model\User;
-use Friendica\Module\Login;
+use Friendica\Module\Security\Login;
 use Friendica\Protocol\Email;
 use Friendica\Util\ACLFormatter;
 use Friendica\Util\Network;

src/App.php

@@ -18,7 +18,7 @@ use Friendica\Core\System;
 use Friendica\Core\Theme;
 use Friendica\Database\Database;
 use Friendica\Model\Profile;
-use Friendica\Module\Login;
+use Friendica\Module\Security\Login;
 use Friendica\Module\Special\HTTPException as ModuleHTTPException;
 use Friendica\Network\HTTPException;
 use Friendica\Util\ConfigFileLoader;

src/Module/Bookmarklet.php

@@ -5,6 +5,7 @@ namespace Friendica\Module;
 use Friendica\BaseModule;
 use Friendica\Core\ACL;
 use Friendica\Core\L10n;
+use Friendica\Module\Security\Login;
 use Friendica\Network\HTTPException;
 use Friendica\Util\Strings;
 

src/Module/Contact.php

@@ -18,6 +18,7 @@ use Friendica\Core\System;
 use Friendica\Core\Worker;
 use Friendica\Database\DBA;
 use Friendica\Model;
+use Friendica\Module\Security\Login;
 use Friendica\Network\HTTPException\BadRequestException;
 use Friendica\Network\HTTPException\NotFoundException;
 use Friendica\Network\Probe;

src/Module/Home.php

@@ -6,6 +6,7 @@ use Friendica\BaseModule;
 use Friendica\Core\Hook;
 use Friendica\Core\L10n;
 use Friendica\Core\Renderer;
+use Friendica\Module\Security\Login;
 
 /**
  * Home module - Landing page of the current node

src/Module/Item/Compose.php

@@ -17,7 +17,7 @@ use Friendica\Model\FileTag;
 use Friendica\Model\Group;
 use Friendica\Model\Item;
 use Friendica\Model\User;
-use Friendica\Module\Login;
+use Friendica\Module\Security\Login;
 use Friendica\Network\HTTPException\NotImplementedException;
 use Friendica\Util\ACLFormatter;
 use Friendica\Util\Crypto;

src/Module/Profile.php

@@ -19,6 +19,7 @@ use Friendica\Model\Group;
 use Friendica\Model\Item;
 use Friendica\Model\Profile as ProfileModel;
 use Friendica\Model\User;
+use Friendica\Module\Security\Login;
 use Friendica\Protocol\ActivityPub;
 use Friendica\Protocol\DFRN;
 use Friendica\Util\DateTimeFormat;

src/Module/Search/Directory.php

@@ -5,7 +5,7 @@ namespace Friendica\Module\Search;
 use Friendica\Content\Widget;
 use Friendica\Core\L10n;
 use Friendica\Module\BaseSearchModule;
-use Friendica\Module\Login;
+use Friendica\Module\Security\Login;
 use Friendica\Util\Strings;
 
 /**

src/Module/Security/Login.php

@@ -4,7 +4,7 @@
  * @file src/Module/Login.php
  */
 
-namespace Friendica\Module;
+namespace Friendica\Module\Security;
 
 use Friendica\BaseModule;
 use Friendica\App\Authentication;
@@ -13,6 +13,7 @@ use Friendica\Core\Hook;
 use Friendica\Core\L10n;
 use Friendica\Core\Renderer;
 use Friendica\Core\Session;
+use Friendica\Module\Register;
 use Friendica\Util\Strings;
 
 /**

src/Module/Security/Logout.php

@@ -3,7 +3,7 @@
  * @file src/Module/Logout.php
  */
 
-namespace Friendica\Module;
+namespace Friendica\Module\Security;
 
 use Friendica\BaseModule;
 use Friendica\App\Authentication;

src/Module/Security/OpenID.php

@@ -0,0 +1,101 @@
+<?php
+
+namespace Friendica\Module\Security;
+
+use Friendica\App\Authentication;
+use Friendica\App\BaseURL;
+use Friendica\BaseModule;
+use Friendica\Core\Config\Configuration;
+use Friendica\Core\L10n\L10n;
+use Friendica\Core\Session\ISession;
+use Friendica\Database\Database;
+use Friendica\Util\Strings;
+use LightOpenID;
+use Psr\Log\LoggerInterface;
+
+/**
+ * Performs an login with OpenID
+ */
+class OpenID extends BaseModule
+{
+	public static function content(array $parameters = [])
+	{
+		/** @var Configuration $config */
+		$config = self::getClass(Configuration::class);
+
+		/** @var BaseURL $baseUrl */
+		$baseUrl = self::getClass(BaseURL::class);
+
+		if ($config->get('system', 'no_openid')) {
+			$baseUrl->redirect();
+		}
+
+		/** @var LoggerInterface $logger */
+		$logger = self::getClass(LoggerInterface::class);
+
+		$logger->debug('mod_openid.', ['request' => $_REQUEST]);
+
+		/** @var ISession $session */
+		$session = self::getClass(ISession::class);
+
+		if (!empty($_GET['openid_mode']) && !empty($session->get('openid'))) {
+
+			$openid = new LightOpenID($baseUrl->getHostname());
+
+			/** @var L10n $l10n */
+			$l10n = self::getClass(L10n::class);
+
+			if ($openid->validate()) {
+				$authId = $openid->data['openid_identity'];
+
+				if (empty($authId)) {
+					$logger->info($l10n->t('OpenID protocol error. No ID returned'));
+					$baseUrl->redirect();
+				}
+
+				// NOTE: we search both for normalised and non-normalised form of $authid
+				//       because the normalization step was removed from setting
+				//       mod/settings.php in 8367cad so it might have left mixed
+				//       records in the user table
+				//
+				$condition = ['blocked' => false, 'account_expired' => false, 'account_removed' => false, 'verified' => true,
+				              'openid' => [$authId, Strings::normaliseOpenID($authId)]];
+
+				$dba = self::getClass(Database::class);
+
+				$user  = $dba->selectFirst('user', [], $condition);
+				if ($dba->isResult($user)) {
+
+					// successful OpenID login
+					$session->remove('openid');
+
+					/** @var Authentication $auth */
+					$auth = self::getClass(Authentication::class);
+					$auth->setForUser(self::getApp(), $user, true, true);
+
+					// just in case there was no return url set
+					// and we fell through
+					$baseUrl->redirect();
+				}
+
+				// Successful OpenID login - but we can't match it to an existing account.
+				$session->remove('register');
+				$session->set('openid_attributes', $openid->getAttributes());
+				$session->set('openid_identity', $authId);
+
+				// Detect the server URL
+				$open_id_obj = new LightOpenID($baseUrl->getHostName());
+				$open_id_obj->identity = $authId;
+				$session->set('openid_server', $open_id_obj->discover($open_id_obj->identity));
+
+				if (intval($config->get('config', 'register_policy')) === \Friendica\Module\Register::CLOSED) {
+					notice($l10n->t('Account not found. Please login to your existing account to add the OpenID to it.'));
+				} else {
+					notice($l10n->t('Account not found. Please register a new account or login to your existing account to add the OpenID to it.'));
+				}
+
+				$baseUrl->redirect('login');
+			}
+		}
+	}
+}

src/Module/Security/TwoFactor/Recovery.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Friendica\Module\TwoFactor;
+namespace Friendica\Module\Security\TwoFactor;
 
 use Friendica\BaseModule;
 use Friendica\App\Authentication;

src/Module/Security/TwoFactor/Verify.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Friendica\Module\TwoFactor;
+namespace Friendica\Module\Security\TwoFactor;
 
 use Friendica\BaseModule;
 use Friendica\App\Authentication;

src/Module/Settings/TwoFactor/AppSpecific.php

@@ -9,7 +9,7 @@ use Friendica\Core\PConfig;
 use Friendica\Core\Renderer;
 use Friendica\Model\TwoFactor\AppSpecificPassword;
 use Friendica\Module\BaseSettingsModule;
-use Friendica\Module\Login;
+use Friendica\Module\Security\Login;
 
 /**
  * // Page 5: 2FA enabled, app-specific password generation

src/Module/Settings/TwoFactor/Index.php

@@ -12,7 +12,7 @@ use Friendica\Model\TwoFactor\AppSpecificPassword;
 use Friendica\Model\TwoFactor\RecoveryCode;
 use Friendica\Model\User;
 use Friendica\Module\BaseSettingsModule;
-use Friendica\Module\Login;
+use Friendica\Module\Security\Login;
 use PragmaRX\Google2FA\Google2FA;
 
 class Index extends BaseSettingsModule

src/Module/Settings/TwoFactor/Recovery.php

@@ -9,7 +9,7 @@ use Friendica\Core\PConfig;
 use Friendica\Core\Renderer;
 use Friendica\Model\TwoFactor\RecoveryCode;
 use Friendica\Module\BaseSettingsModule;
-use Friendica\Module\Login;
+use Friendica\Module\Security\Login;
 
 /**
  * // Page 3: 2FA enabled but not verified, show recovery codes

src/Module/Settings/TwoFactor/Verify.php

@@ -14,7 +14,7 @@ use Friendica\Core\PConfig;
 use Friendica\Core\Renderer;
 use Friendica\Core\Session;
 use Friendica\Module\BaseSettingsModule;
-use Friendica\Module\Login;
+use Friendica\Module\Security\Login;
 use PragmaRX\Google2FA\Google2FA;
 
 /**

static/routes.config.php

@@ -23,8 +23,8 @@ return [
 	],
 
 	'/2fa' => [
-		'[/]'       => [Module\TwoFactor\Verify::class,   [R::GET, R::POST]],
+		'[/]'       => [Module\Security\TwoFactor\Verify::class,   [R::GET, R::POST]],
-		'/recovery' => [Module\TwoFactor\Recovery::class, [R::GET, R::POST]],
+		'/recovery' => [Module\Security\TwoFactor\Recovery::class, [R::GET, R::POST]],
 	],
 
 	'/api' => [
@@ -156,8 +156,8 @@ return [
 
 	'/like/{item:\d+}'    => [Module\Like::class,            [R::GET]],
 	'/localtime'          => [Module\Debug\Localtime::class, [R::GET, R::POST]],
-	'/login'              => [Module\Login::class,           [R::GET, R::POST]],
+	'/login'              => [Module\Security\Login::class,  [R::GET, R::POST]],
-	'/logout'             => [Module\Logout::class,          [R::GET, R::POST]],
+	'/logout'             => [Module\Security\Logout::class, [R::GET, R::POST]],
 	'/magic'              => [Module\Magic::class,           [R::GET]],
 	'/maintenance'        => [Module\Maintenance::class,     [R::GET]],
 	'/manifest'           => [Module\Manifest::class,        [R::GET]],
@@ -180,6 +180,7 @@ return [
 	],
 	'/outbox/{owner}' => [Module\Outbox::class,          [R::GET]],
 	'/owa'            => [Module\Owa::class,             [R::GET]],
+	'/openid'         => [Module\Security\OpenID::class, [R::GET]],
 	'/opensearch'     => [Module\OpenSearch::class,      [R::GET]],
 
 	'/photo' => [