kenmirrors/grocy
1
0
Fork 0
mirror of https://github.com/grocy/grocy.git synced 2025-10-14 09:11:11 +00:00
Code Issues Projects Releases Wiki Activity

Reworked authentication related menu item handling (fixes #1462)

Browse Source
This commit is contained in:
Bernd Bestel
2021-07-03 19:40:42 +02:00
parent bcf963ac49
commit 47c936e026
8 changed files with 25 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
middleware/ApiKeyAuthMiddleware.php
View File

@@ -19,11 +19,6 @@ class ApiKeyAuthMiddleware extends AuthMiddleware
public function authenticate(Request $request)
{
if (!defined('GROCY_SHOW_AUTH_VIEWS'))
{
define('GROCY_SHOW_AUTH_VIEWS', true);
}
$routeContext = RouteContext::fromRequest($request);
$route = $routeContext->getRoute();
$routeName = $route->getName();

2
middleware/LdapAuthMiddleware.php
View File

@@ -11,6 +11,8 @@ class LdapAuthMiddleware extends AuthMiddleware
{
public function authenticate(Request $request)
{
define('GROCY_EXTERNALLY_MANAGED_AUTHENTICATION', true);
// TODO: Reuse DefaultAuthMiddleware->authenticate somehow
// First try to authenticate by API key

7
middleware/ReverseProxyAuthMiddleware.php
View File

@@ -10,12 +10,9 @@ class ReverseProxyAuthMiddleware extends AuthMiddleware
{
public function authenticate(Request $request)
{
$db = DatabaseService::getInstance()->GetDbConnection();
define('GROCY_EXTERNALLY_MANAGED_AUTHENTICATION', true);
if (!defined('GROCY_SHOW_AUTH_VIEWS'))
{
define('GROCY_SHOW_AUTH_VIEWS', false);
}
$db = DatabaseService::getInstance()->GetDbConnection();
// API key authentication is also ok
$auth = new ApiKeyAuthMiddleware($this->AppContainer, $this->ResponseFactory);

5
middleware/SessionAuthMiddleware.php
View File

@@ -15,11 +15,6 @@ class SessionAuthMiddleware extends AuthMiddleware
public function authenticate(Request $request)
{
if (!defined('GROCY_SHOW_AUTH_VIEWS'))
{
define('GROCY_SHOW_AUTH_VIEWS', true);
}
$sessionService = SessionService::getInstance();
if (!isset($_COOKIE[SessionService::SESSION_COOKIE_NAME]) || !$sessionService->IsValidSession($_COOKIE[SessionService::SESSION_COOKIE_NAME]))