Merge pull request #8021 from nupplaphil/task/mod_openid

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

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;
 
 /**