Merge pull request #7425 from MrPetovan/task/2fa-ping-disallowed
2FA: Remove mod/ping from exception list
This commit is contained in:
Philipp
GitHub
commit
56e0a92d83
443
src/App.php
443
src/App.php
|
|
@ -12,10 +12,12 @@ use Friendica\Core\Config\Cache\ConfigCache;
|
||||||
use Friendica\Core\Config\Configuration;
|
use Friendica\Core\Config\Configuration;
|
||||||
use Friendica\Core\Hook;
|
use Friendica\Core\Hook;
|
||||||
use Friendica\Core\L10n\L10n;
|
use Friendica\Core\L10n\L10n;
|
||||||
|
use Friendica\Core\System;
|
||||||
use Friendica\Core\Theme;
|
use Friendica\Core\Theme;
|
||||||
use Friendica\Database\Database;
|
use Friendica\Database\Database;
|
||||||
use Friendica\Database\DBA;
|
use Friendica\Database\DBA;
|
||||||
use Friendica\Model\Profile;
|
use Friendica\Model\Profile;
|
||||||
|
use Friendica\Module\Login;
|
||||||
use Friendica\Network\HTTPException;
|
use Friendica\Network\HTTPException;
|
||||||
use Friendica\Util\BaseURL;
|
use Friendica\Util\BaseURL;
|
||||||
use Friendica\Util\ConfigFileLoader;
|
use Friendica\Util\ConfigFileLoader;
|
||||||
|
|
@ -1001,231 +1003,224 @@ class App
|
||||||
*/
|
*/
|
||||||
public function runFrontend()
|
public function runFrontend()
|
||||||
{
|
{
|
||||||
// Missing DB connection: ERROR
|
|
||||||
if ($this->getMode()->has(App\Mode::LOCALCONFIGPRESENT) && !$this->getMode()->has(App\Mode::DBAVAILABLE)) {
|
|
||||||
Module\Special\HTTPException::rawContent(
|
|
||||||
new HTTPException\InternalServerErrorException('Apologies but the website is unavailable at the moment.')
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
// Max Load Average reached: ERROR
|
|
||||||
if ($this->isMaxProcessesReached() || $this->isMaxLoadReached()) {
|
|
||||||
header('Retry-After: 120');
|
|
||||||
header('Refresh: 120; url=' . $this->getBaseURL() . "/" . $this->query_string);
|
|
||||||
|
|
||||||
Module\Special\HTTPException::rawContent(
|
|
||||||
new HTTPException\ServiceUnavailableException('The node is currently overloaded. Please try again later.')
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!$this->getMode()->isInstall()) {
|
|
||||||
// Force SSL redirection
|
|
||||||
if ($this->baseURL->checkRedirectHttps()) {
|
|
||||||
header('HTTP/1.1 302 Moved Temporarily');
|
|
||||||
header('Location: ' . $this->getBaseURL() . '/' . $this->query_string);
|
|
||||||
exit();
|
|
||||||
}
|
|
||||||
|
|
||||||
Core\Session::init();
|
|
||||||
Core\Hook::callAll('init_1');
|
|
||||||
}
|
|
||||||
|
|
||||||
// Exclude the backend processes from the session management
|
|
||||||
if (!$this->isBackend()) {
|
|
||||||
$stamp1 = microtime(true);
|
|
||||||
session_start();
|
|
||||||
$this->profiler->saveTimestamp($stamp1, 'parser', Core\System::callstack());
|
|
||||||
$this->l10n->setSessionVariable();
|
|
||||||
$this->l10n->setLangFromSession();
|
|
||||||
} else {
|
|
||||||
$_SESSION = [];
|
|
||||||
Core\Worker::executeIfIdle();
|
|
||||||
}
|
|
||||||
|
|
||||||
if ($this->getMode()->isNormal()) {
|
|
||||||
$requester = HTTPSignature::getSigner('', $_SERVER);
|
|
||||||
if (!empty($requester)) {
|
|
||||||
Profile::addVisitorCookieForHandle($requester);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// ZRL
|
|
||||||
if (!empty($_GET['zrl']) && $this->getMode()->isNormal()) {
|
|
||||||
$this->query_string = Model\Profile::stripZrls($this->query_string);
|
|
||||||
if (!local_user()) {
|
|
||||||
// Only continue when the given profile link seems valid
|
|
||||||
// Valid profile links contain a path with "/profile/" and no query parameters
|
|
||||||
if ((parse_url($_GET['zrl'], PHP_URL_QUERY) == "") &&
|
|
||||||
strstr(parse_url($_GET['zrl'], PHP_URL_PATH), "/profile/")) {
|
|
||||||
if (Core\Session::get('visitor_home') != $_GET["zrl"]) {
|
|
||||||
Core\Session::set('my_url', $_GET['zrl']);
|
|
||||||
Core\Session::set('authenticated', 0);
|
|
||||||
}
|
|
||||||
|
|
||||||
Model\Profile::zrlInit($this);
|
|
||||||
} else {
|
|
||||||
// Someone came with an invalid parameter, maybe as a DDoS attempt
|
|
||||||
// We simply stop processing here
|
|
||||||
Core\Logger::log("Invalid ZRL parameter " . $_GET['zrl'], Core\Logger::DEBUG);
|
|
||||||
Module\Special\HTTPException::rawContent(
|
|
||||||
new HTTPException\ForbiddenException()
|
|
||||||
);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!empty($_GET['owt']) && $this->getMode()->isNormal()) {
|
|
||||||
$token = $_GET['owt'];
|
|
||||||
$this->query_string = Model\Profile::stripQueryParam($this->query_string, 'owt');
|
|
||||||
Model\Profile::openWebAuthInit($token);
|
|
||||||
}
|
|
||||||
|
|
||||||
Module\Login::sessionAuth();
|
|
||||||
|
|
||||||
if (empty($_SESSION['authenticated'])) {
|
|
||||||
header('X-Account-Management-Status: none');
|
|
||||||
}
|
|
||||||
|
|
||||||
$_SESSION['sysmsg'] = Core\Session::get('sysmsg', []);
|
|
||||||
$_SESSION['sysmsg_info'] = Core\Session::get('sysmsg_info', []);
|
|
||||||
$_SESSION['last_updated'] = Core\Session::get('last_updated', []);
|
|
||||||
|
|
||||||
/*
|
|
||||||
* check_config() is responsible for running update scripts. These automatically
|
|
||||||
* update the DB schema whenever we push a new one out. It also checks to see if
|
|
||||||
* any addons have been added or removed and reacts accordingly.
|
|
||||||
*/
|
|
||||||
|
|
||||||
// in install mode, any url loads install module
|
|
||||||
// but we need "view" module for stylesheet
|
|
||||||
if ($this->getMode()->isInstall() && $this->module !== 'install') {
|
|
||||||
$this->internalRedirect('install');
|
|
||||||
} elseif (!$this->getMode()->isInstall() && !$this->getMode()->has(App\Mode::MAINTENANCEDISABLED) && $this->module !== 'maintenance') {
|
|
||||||
$this->internalRedirect('maintenance');
|
|
||||||
} else {
|
|
||||||
$this->checkURL();
|
|
||||||
Core\Update::check($this->getBasePath(), false, $this->getMode());
|
|
||||||
Core\Addon::loadAddons();
|
|
||||||
Core\Hook::loadHooks();
|
|
||||||
}
|
|
||||||
|
|
||||||
$this->page = [
|
|
||||||
'aside' => '',
|
|
||||||
'bottom' => '',
|
|
||||||
'content' => '',
|
|
||||||
'footer' => '',
|
|
||||||
'htmlhead' => '',
|
|
||||||
'nav' => '',
|
|
||||||
'page_title' => '',
|
|
||||||
'right_aside' => '',
|
|
||||||
'template' => '',
|
|
||||||
'title' => ''
|
|
||||||
];
|
|
||||||
|
|
||||||
// Compatibility with the Android Diaspora client
|
|
||||||
if ($this->module == 'stream') {
|
|
||||||
$this->internalRedirect('network?order=post');
|
|
||||||
}
|
|
||||||
|
|
||||||
if ($this->module == 'conversations') {
|
|
||||||
$this->internalRedirect('message');
|
|
||||||
}
|
|
||||||
|
|
||||||
if ($this->module == 'commented') {
|
|
||||||
$this->internalRedirect('network?order=comment');
|
|
||||||
}
|
|
||||||
|
|
||||||
if ($this->module == 'liked') {
|
|
||||||
$this->internalRedirect('network?order=comment');
|
|
||||||
}
|
|
||||||
|
|
||||||
if ($this->module == 'activity') {
|
|
||||||
$this->internalRedirect('network?conv=1');
|
|
||||||
}
|
|
||||||
|
|
||||||
if (($this->module == 'status_messages') && ($this->cmd == 'status_messages/new')) {
|
|
||||||
$this->internalRedirect('bookmarklet');
|
|
||||||
}
|
|
||||||
|
|
||||||
if (($this->module == 'user') && ($this->cmd == 'user/edit')) {
|
|
||||||
$this->internalRedirect('settings');
|
|
||||||
}
|
|
||||||
|
|
||||||
if (($this->module == 'tag_followings') && ($this->cmd == 'tag_followings/manage')) {
|
|
||||||
$this->internalRedirect('search');
|
|
||||||
}
|
|
||||||
|
|
||||||
// Compatibility with the Firefox App
|
|
||||||
if (($this->module == "users") && ($this->cmd == "users/sign_in")) {
|
|
||||||
$this->module = "login";
|
|
||||||
}
|
|
||||||
|
|
||||||
/*
|
|
||||||
* ROUTING
|
|
||||||
*
|
|
||||||
* From the request URL, routing consists of obtaining the name of a BaseModule-extending class of which the
|
|
||||||
* post() and/or content() static methods can be respectively called to produce a data change or an output.
|
|
||||||
*/
|
|
||||||
|
|
||||||
// First we try explicit routes defined in App\Router
|
|
||||||
$this->router->collectRoutes();
|
|
||||||
|
|
||||||
$data = $this->router->getRouteCollector();
|
|
||||||
Hook::callAll('route_collection', $data);
|
|
||||||
|
|
||||||
$this->module_class = $this->router->getModuleClass($this->cmd);
|
|
||||||
|
|
||||||
// Then we try addon-provided modules that we wrap in the LegacyModule class
|
|
||||||
if (!$this->module_class && Core\Addon::isEnabled($this->module) && file_exists("addon/{$this->module}/{$this->module}.php")) {
|
|
||||||
//Check if module is an app and if public access to apps is allowed or not
|
|
||||||
$privateapps = $this->config->get('config', 'private_addons', false);
|
|
||||||
if ((!local_user()) && Core\Hook::isAddonApp($this->module) && $privateapps) {
|
|
||||||
info($this->l10n->t("You must be logged in to use addons. "));
|
|
||||||
} else {
|
|
||||||
include_once "addon/{$this->module}/{$this->module}.php";
|
|
||||||
if (function_exists($this->module . '_module')) {
|
|
||||||
LegacyModule::setModuleFile("addon/{$this->module}/{$this->module}.php");
|
|
||||||
$this->module_class = LegacyModule::class;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Finally, we look for a 'standard' program module in the 'mod' directory
|
|
||||||
* We emulate a Module class through the LegacyModule class
|
|
||||||
*/
|
|
||||||
if (!$this->module_class && file_exists("mod/{$this->module}.php")) {
|
|
||||||
LegacyModule::setModuleFile("mod/{$this->module}.php");
|
|
||||||
$this->module_class = LegacyModule::class;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* The URL provided does not resolve to a valid module.
|
|
||||||
*
|
|
||||||
* On Dreamhost sites, quite often things go wrong for no apparent reason and they send us to '/internal_error.html'.
|
|
||||||
* We don't like doing this, but as it occasionally accounts for 10-20% or more of all site traffic -
|
|
||||||
* we are going to trap this and redirect back to the requested page. As long as you don't have a critical error on your page
|
|
||||||
* this will often succeed and eventually do the right thing.
|
|
||||||
*
|
|
||||||
* Otherwise we are going to emit a 404 not found.
|
|
||||||
*/
|
|
||||||
if (!$this->module_class) {
|
|
||||||
// Stupid browser tried to pre-fetch our Javascript img template. Don't log the event or return anything - just quietly exit.
|
|
||||||
if (!empty($_SERVER['QUERY_STRING']) && preg_match('/{[0-9]}/', $_SERVER['QUERY_STRING']) !== 0) {
|
|
||||||
exit();
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!empty($_SERVER['QUERY_STRING']) && ($_SERVER['QUERY_STRING'] === 'q=internal_error.html') && isset($dreamhost_error_hack)) {
|
|
||||||
Core\Logger::log('index.php: dreamhost_error_hack invoked. Original URI =' . $_SERVER['REQUEST_URI']);
|
|
||||||
$this->internalRedirect($_SERVER['REQUEST_URI']);
|
|
||||||
}
|
|
||||||
|
|
||||||
Core\Logger::log('index.php: page not found: ' . $_SERVER['REQUEST_URI'] . ' ADDRESS: ' . $_SERVER['REMOTE_ADDR'] . ' QUERY: ' . $_SERVER['QUERY_STRING'], Core\Logger::DEBUG);
|
|
||||||
|
|
||||||
$this->module_class = Module\PageNotFound::class;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Initialize module that can set the current theme in the init() method, either directly or via App->profile_uid
|
|
||||||
$this->page['page_title'] = $this->module;
|
|
||||||
try {
|
try {
|
||||||
|
// Missing DB connection: ERROR
|
||||||
|
if ($this->getMode()->has(App\Mode::LOCALCONFIGPRESENT) && !$this->getMode()->has(App\Mode::DBAVAILABLE)) {
|
||||||
|
throw new HTTPException\InternalServerErrorException('Apologies but the website is unavailable at the moment.');
|
||||||
|
}
|
||||||
|
|
||||||
|
// Max Load Average reached: ERROR
|
||||||
|
if ($this->isMaxProcessesReached() || $this->isMaxLoadReached()) {
|
||||||
|
header('Retry-After: 120');
|
||||||
|
header('Refresh: 120; url=' . $this->getBaseURL() . "/" . $this->query_string);
|
||||||
|
|
||||||
|
throw new HTTPException\ServiceUnavailableException('The node is currently overloaded. Please try again later.');
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!$this->getMode()->isInstall()) {
|
||||||
|
// Force SSL redirection
|
||||||
|
if ($this->baseURL->checkRedirectHttps()) {
|
||||||
|
System::externalRedirect($this->getBaseURL() . '/' . $this->query_string);
|
||||||
|
}
|
||||||
|
|
||||||
|
Core\Session::init();
|
||||||
|
Core\Hook::callAll('init_1');
|
||||||
|
}
|
||||||
|
|
||||||
|
// Exclude the backend processes from the session management
|
||||||
|
if (!$this->isBackend()) {
|
||||||
|
$stamp1 = microtime(true);
|
||||||
|
session_start();
|
||||||
|
$this->profiler->saveTimestamp($stamp1, 'parser', Core\System::callstack());
|
||||||
|
$this->l10n->setSessionVariable();
|
||||||
|
$this->l10n->setLangFromSession();
|
||||||
|
} else {
|
||||||
|
$_SESSION = [];
|
||||||
|
Core\Worker::executeIfIdle();
|
||||||
|
}
|
||||||
|
|
||||||
|
if ($this->getMode()->isNormal()) {
|
||||||
|
$requester = HTTPSignature::getSigner('', $_SERVER);
|
||||||
|
if (!empty($requester)) {
|
||||||
|
Profile::addVisitorCookieForHandle($requester);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// ZRL
|
||||||
|
if (!empty($_GET['zrl']) && $this->getMode()->isNormal()) {
|
||||||
|
$this->query_string = Model\Profile::stripZrls($this->query_string);
|
||||||
|
if (!local_user()) {
|
||||||
|
// Only continue when the given profile link seems valid
|
||||||
|
// Valid profile links contain a path with "/profile/" and no query parameters
|
||||||
|
if ((parse_url($_GET['zrl'], PHP_URL_QUERY) == "") &&
|
||||||
|
strstr(parse_url($_GET['zrl'], PHP_URL_PATH), "/profile/")) {
|
||||||
|
if (Core\Session::get('visitor_home') != $_GET["zrl"]) {
|
||||||
|
Core\Session::set('my_url', $_GET['zrl']);
|
||||||
|
Core\Session::set('authenticated', 0);
|
||||||
|
}
|
||||||
|
|
||||||
|
Model\Profile::zrlInit($this);
|
||||||
|
} else {
|
||||||
|
// Someone came with an invalid parameter, maybe as a DDoS attempt
|
||||||
|
// We simply stop processing here
|
||||||
|
Core\Logger::log("Invalid ZRL parameter " . $_GET['zrl'], Core\Logger::DEBUG);
|
||||||
|
throw new HTTPException\ForbiddenException();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!empty($_GET['owt']) && $this->getMode()->isNormal()) {
|
||||||
|
$token = $_GET['owt'];
|
||||||
|
$this->query_string = Model\Profile::stripQueryParam($this->query_string, 'owt');
|
||||||
|
Model\Profile::openWebAuthInit($token);
|
||||||
|
}
|
||||||
|
|
||||||
|
Module\Login::sessionAuth();
|
||||||
|
|
||||||
|
if (empty($_SESSION['authenticated'])) {
|
||||||
|
header('X-Account-Management-Status: none');
|
||||||
|
}
|
||||||
|
|
||||||
|
$_SESSION['sysmsg'] = Core\Session::get('sysmsg', []);
|
||||||
|
$_SESSION['sysmsg_info'] = Core\Session::get('sysmsg_info', []);
|
||||||
|
$_SESSION['last_updated'] = Core\Session::get('last_updated', []);
|
||||||
|
|
||||||
|
/*
|
||||||
|
* check_config() is responsible for running update scripts. These automatically
|
||||||
|
* update the DB schema whenever we push a new one out. It also checks to see if
|
||||||
|
* any addons have been added or removed and reacts accordingly.
|
||||||
|
*/
|
||||||
|
|
||||||
|
// in install mode, any url loads install module
|
||||||
|
// but we need "view" module for stylesheet
|
||||||
|
if ($this->getMode()->isInstall() && $this->module !== 'install') {
|
||||||
|
$this->internalRedirect('install');
|
||||||
|
} elseif (!$this->getMode()->isInstall() && !$this->getMode()->has(App\Mode::MAINTENANCEDISABLED) && $this->module !== 'maintenance') {
|
||||||
|
$this->internalRedirect('maintenance');
|
||||||
|
} else {
|
||||||
|
$this->checkURL();
|
||||||
|
Core\Update::check($this->getBasePath(), false, $this->getMode());
|
||||||
|
Core\Addon::loadAddons();
|
||||||
|
Core\Hook::loadHooks();
|
||||||
|
}
|
||||||
|
|
||||||
|
$this->page = [
|
||||||
|
'aside' => '',
|
||||||
|
'bottom' => '',
|
||||||
|
'content' => '',
|
||||||
|
'footer' => '',
|
||||||
|
'htmlhead' => '',
|
||||||
|
'nav' => '',
|
||||||
|
'page_title' => '',
|
||||||
|
'right_aside' => '',
|
||||||
|
'template' => '',
|
||||||
|
'title' => ''
|
||||||
|
];
|
||||||
|
|
||||||
|
// Compatibility with the Android Diaspora client
|
||||||
|
if ($this->module == 'stream') {
|
||||||
|
$this->internalRedirect('network?order=post');
|
||||||
|
}
|
||||||
|
|
||||||
|
if ($this->module == 'conversations') {
|
||||||
|
$this->internalRedirect('message');
|
||||||
|
}
|
||||||
|
|
||||||
|
if ($this->module == 'commented') {
|
||||||
|
$this->internalRedirect('network?order=comment');
|
||||||
|
}
|
||||||
|
|
||||||
|
if ($this->module == 'liked') {
|
||||||
|
$this->internalRedirect('network?order=comment');
|
||||||
|
}
|
||||||
|
|
||||||
|
if ($this->module == 'activity') {
|
||||||
|
$this->internalRedirect('network?conv=1');
|
||||||
|
}
|
||||||
|
|
||||||
|
if (($this->module == 'status_messages') && ($this->cmd == 'status_messages/new')) {
|
||||||
|
$this->internalRedirect('bookmarklet');
|
||||||
|
}
|
||||||
|
|
||||||
|
if (($this->module == 'user') && ($this->cmd == 'user/edit')) {
|
||||||
|
$this->internalRedirect('settings');
|
||||||
|
}
|
||||||
|
|
||||||
|
if (($this->module == 'tag_followings') && ($this->cmd == 'tag_followings/manage')) {
|
||||||
|
$this->internalRedirect('search');
|
||||||
|
}
|
||||||
|
|
||||||
|
// Compatibility with the Firefox App
|
||||||
|
if (($this->module == "users") && ($this->cmd == "users/sign_in")) {
|
||||||
|
$this->module = "login";
|
||||||
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
* ROUTING
|
||||||
|
*
|
||||||
|
* From the request URL, routing consists of obtaining the name of a BaseModule-extending class of which the
|
||||||
|
* post() and/or content() static methods can be respectively called to produce a data change or an output.
|
||||||
|
*/
|
||||||
|
|
||||||
|
// First we try explicit routes defined in App\Router
|
||||||
|
$this->router->collectRoutes();
|
||||||
|
|
||||||
|
$data = $this->router->getRouteCollector();
|
||||||
|
Hook::callAll('route_collection', $data);
|
||||||
|
|
||||||
|
$this->module_class = $this->router->getModuleClass($this->cmd);
|
||||||
|
|
||||||
|
// Then we try addon-provided modules that we wrap in the LegacyModule class
|
||||||
|
if (!$this->module_class && Core\Addon::isEnabled($this->module) && file_exists("addon/{$this->module}/{$this->module}.php")) {
|
||||||
|
//Check if module is an app and if public access to apps is allowed or not
|
||||||
|
$privateapps = $this->config->get('config', 'private_addons', false);
|
||||||
|
if ((!local_user()) && Core\Hook::isAddonApp($this->module) && $privateapps) {
|
||||||
|
info($this->l10n->t("You must be logged in to use addons. "));
|
||||||
|
} else {
|
||||||
|
include_once "addon/{$this->module}/{$this->module}.php";
|
||||||
|
if (function_exists($this->module . '_module')) {
|
||||||
|
LegacyModule::setModuleFile("addon/{$this->module}/{$this->module}.php");
|
||||||
|
$this->module_class = LegacyModule::class;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Finally, we look for a 'standard' program module in the 'mod' directory
|
||||||
|
* We emulate a Module class through the LegacyModule class
|
||||||
|
*/
|
||||||
|
if (!$this->module_class && file_exists("mod/{$this->module}.php")) {
|
||||||
|
LegacyModule::setModuleFile("mod/{$this->module}.php");
|
||||||
|
$this->module_class = LegacyModule::class;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* The URL provided does not resolve to a valid module.
|
||||||
|
*
|
||||||
|
* On Dreamhost sites, quite often things go wrong for no apparent reason and they send us to '/internal_error.html'.
|
||||||
|
* We don't like doing this, but as it occasionally accounts for 10-20% or more of all site traffic -
|
||||||
|
* we are going to trap this and redirect back to the requested page. As long as you don't have a critical error on your page
|
||||||
|
* this will often succeed and eventually do the right thing.
|
||||||
|
*
|
||||||
|
* Otherwise we are going to emit a 404 not found.
|
||||||
|
*/
|
||||||
|
if (!$this->module_class) {
|
||||||
|
// Stupid browser tried to pre-fetch our Javascript img template. Don't log the event or return anything - just quietly exit.
|
||||||
|
if (!empty($_SERVER['QUERY_STRING']) && preg_match('/{[0-9]}/', $_SERVER['QUERY_STRING']) !== 0) {
|
||||||
|
exit();
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!empty($_SERVER['QUERY_STRING']) && ($_SERVER['QUERY_STRING'] === 'q=internal_error.html') && isset($dreamhost_error_hack)) {
|
||||||
|
Core\Logger::log('index.php: dreamhost_error_hack invoked. Original URI =' . $_SERVER['REQUEST_URI']);
|
||||||
|
$this->internalRedirect($_SERVER['REQUEST_URI']);
|
||||||
|
}
|
||||||
|
|
||||||
|
Core\Logger::log('index.php: page not found: ' . $_SERVER['REQUEST_URI'] . ' ADDRESS: ' . $_SERVER['REMOTE_ADDR'] . ' QUERY: ' . $_SERVER['QUERY_STRING'], Core\Logger::DEBUG);
|
||||||
|
|
||||||
|
$this->module_class = Module\PageNotFound::class;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Initialize module that can set the current theme in the init() method, either directly or via App->profile_uid
|
||||||
|
$this->page['page_title'] = $this->module;
|
||||||
|
|
||||||
$placeholder = '';
|
$placeholder = '';
|
||||||
|
|
||||||
Core\Hook::callAll($this->module . '_mod_init', $placeholder);
|
Core\Hook::callAll($this->module . '_mod_init', $placeholder);
|
||||||
|
|
|
||||||
|
|
@ -7,6 +7,7 @@ namespace Friendica\Core;
|
||||||
|
|
||||||
use Friendica\App;
|
use Friendica\App;
|
||||||
use Friendica\BaseObject;
|
use Friendica\BaseObject;
|
||||||
|
use Friendica\Network\HTTPException\ForbiddenException;
|
||||||
use Friendica\Util\BaseURL;
|
use Friendica\Util\BaseURL;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
@ -71,7 +72,7 @@ class Authentication extends BaseObject
|
||||||
}
|
}
|
||||||
|
|
||||||
// Check current path, if 2fa authentication module return
|
// Check current path, if 2fa authentication module return
|
||||||
if ($a->argc > 0 && in_array($a->argv[0], ['ping', '2fa', 'view', 'help', 'api', 'proxy', 'logout'])) {
|
if ($a->argc > 0 && in_array($a->argv[0], ['2fa', 'view', 'help', 'api', 'proxy', 'logout'])) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -81,7 +82,11 @@ class Authentication extends BaseObject
|
||||||
}
|
}
|
||||||
|
|
||||||
// Case 2: No valid 2FA session: redirect to code verification page
|
// Case 2: No valid 2FA session: redirect to code verification page
|
||||||
$a->internalRedirect('2fa');
|
if ($a->isAjax()) {
|
||||||
|
throw new ForbiddenException();
|
||||||
|
} else {
|
||||||
|
$a->internalRedirect('2fa');
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -16,18 +16,20 @@ use PragmaRX\Google2FA\Google2FA;
|
||||||
*/
|
*/
|
||||||
class Verify extends BaseModule
|
class Verify extends BaseModule
|
||||||
{
|
{
|
||||||
|
private static $errors = [];
|
||||||
|
|
||||||
public static function post()
|
public static function post()
|
||||||
{
|
{
|
||||||
if (!local_user()) {
|
if (!local_user()) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (defaults($_POST, 'action', null) == 'verify') {
|
if (($_POST['action'] ?? '') == 'verify') {
|
||||||
self::checkFormSecurityTokenRedirectOnError('2fa', 'twofactor_verify');
|
self::checkFormSecurityTokenRedirectOnError('2fa', 'twofactor_verify');
|
||||||
|
|
||||||
$a = self::getApp();
|
$a = self::getApp();
|
||||||
|
|
||||||
$code = defaults($_POST, 'verify_code', '');
|
$code = $_POST['verify_code'] ?? '';
|
||||||
|
|
||||||
$valid = (new Google2FA())->verifyKey(PConfig::get(local_user(), '2fa', 'secret'), $code);
|
$valid = (new Google2FA())->verifyKey(PConfig::get(local_user(), '2fa', 'secret'), $code);
|
||||||
|
|
||||||
|
|
@ -38,7 +40,7 @@ class Verify extends BaseModule
|
||||||
// Resume normal login workflow
|
// Resume normal login workflow
|
||||||
Session::setAuthenticatedForUser($a, $a->user, true, true);
|
Session::setAuthenticatedForUser($a, $a->user, true, true);
|
||||||
} else {
|
} else {
|
||||||
notice(L10n::t('Invalid code, please retry.'));
|
self::$errors[] = L10n::t('Invalid code, please retry.');
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -59,6 +61,8 @@ class Verify extends BaseModule
|
||||||
|
|
||||||
'$title' => L10n::t('Two-factor authentication'),
|
'$title' => L10n::t('Two-factor authentication'),
|
||||||
'$message' => L10n::t('<p>Open the two-factor authentication app on your device to get an authentication code and verify your identity.</p>'),
|
'$message' => L10n::t('<p>Open the two-factor authentication app on your device to get an authentication code and verify your identity.</p>'),
|
||||||
|
'$errors_label' => L10n::tt('Error', 'Errors', count(self::$errors)),
|
||||||
|
'$errors' => self::$errors,
|
||||||
'$recovery_message' => L10n::t('Don’t have your phone? <a href="%s">Enter a two-factor recovery code</a>', '2fa/recovery'),
|
'$recovery_message' => L10n::t('Don’t have your phone? <a href="%s">Enter a two-factor recovery code</a>', '2fa/recovery'),
|
||||||
'$verify_code' => ['verify_code', L10n::t('Please enter a code from your authentication app'), '', '', 'required', 'autofocus placeholder="000000"'],
|
'$verify_code' => ['verify_code', L10n::t('Please enter a code from your authentication app'), '', '', 'required', 'autofocus placeholder="000000"'],
|
||||||
'$verify_label' => L10n::t('Verify code and complete login'),
|
'$verify_label' => L10n::t('Verify code and complete login'),
|
||||||
|
|
|
||||||
|
|
@ -2,6 +2,17 @@
|
||||||
<h1>{{$title}}</h1>
|
<h1>{{$title}}</h1>
|
||||||
<div>{{$message nofilter}}</div>
|
<div>{{$message nofilter}}</div>
|
||||||
|
|
||||||
|
{{if $errors}}
|
||||||
|
<div class="panel panel-danger">
|
||||||
|
<div class="panel-heading">{{$errors_label}}</div>
|
||||||
|
<ul class="list-group">
|
||||||
|
{{foreach $errors as $error}}
|
||||||
|
<li class="list-group-item">{{$error}}</li>
|
||||||
|
{{/foreach}}
|
||||||
|
</ul>
|
||||||
|
</div>
|
||||||
|
{{/if}}
|
||||||
|
|
||||||
<form action="" method="post">
|
<form action="" method="post">
|
||||||
<input type="hidden" name="form_security_token" value="{{$form_security_token}}">
|
<input type="hidden" name="form_security_token" value="{{$form_security_token}}">
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue