Skip to content

Commit 4494154

Browse files
committed
Fix regression introduced in 56fcd72. Server was added to the configuration before SwapinAuthUser::class resulting in the configured LDAP user being used for all queries and not the logged in user. Fixes #348
1 parent b22c950 commit 4494154

File tree

3 files changed

+4
-31
lines changed

3 files changed

+4
-31
lines changed

app/Http/Middleware/ApplicationSession.php

Lines changed: 0 additions & 29 deletions
This file was deleted.

app/Http/Middleware/SwapinAuthUser.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
namespace App\Http\Middleware;
44

5+
use App\Classes\LDAP\Server;
56
use Closure;
67
use Illuminate\Http\Request;
78
use Illuminate\Support\Facades\Config;
@@ -43,6 +44,8 @@ public function handle(Request $request,Closure $next): mixed
4344
$c->setConfiguration(config('ldap.connections.'.$key));
4445
$c->setGuardResolver(fn()=>new Guard($c->getLdapConnection(),$c->getConfiguration()));
4546

47+
Config::set('server',new Server);
48+
4649
return $next($request);
4750
}
4851
}

bootstrap/app.php

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
use Illuminate\Foundation\Configuration\Exceptions;
55
use Illuminate\Foundation\Configuration\Middleware;
66

7-
use App\Http\Middleware\{AcceptLanguage,AllowAnonymous,ApplicationSession,CheckUpdate,SwapinAuthUser,ViewVariables};
7+
use App\Http\Middleware\{AcceptLanguage,AllowAnonymous,CheckUpdate,SwapinAuthUser,ViewVariables};
88

99
return Application::configure(basePath: dirname(__DIR__))
1010
->withRouting(
@@ -16,7 +16,6 @@
1616
$middleware->appendToGroup(
1717
group: 'web',
1818
middleware: [
19-
ApplicationSession::class,
2019
AcceptLanguage::class,
2120
AllowAnonymous::class,
2221
SwapinAuthUser::class,

0 commit comments

Comments
 (0)