8000 [Security] Improve profiler’s panel by MatTheCat · Pull Request #1 · MatTheCat/symfony · GitHub
[go: up one dir, main page]
Skip to content

[Security] Improve profiler’s panel #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 3 commits into from
Closed

[Security] Improve profiler’s panel #1

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d8f4d5d
Get up-to-date informations from lazy listeners
MatTheCat Jun 15, 2024
fc9f753
Prevent data to be missing if a listener throws
MatTheCat Jun 16, 2024
0c51184
Do not display duration if there is none
MatTheCat Jun 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Prevent data to be missing if a listener throws
  • Loading branch information
@MatTheCat
MatTheCat committed Jun 17, 2024
commit fc9f753507128cad2a365ff62805452c25aaa5d9
66 changes: 32 additions & 34 deletions src/Symfony/Bundle/SecurityBundle/Debug/TraceableFirewallListener.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
final class TraceableFirewallListener extends FirewallListener implements ResetInterface
{
private array $wrappedListeners = [];
private array $authenticatorsInfo = [];
private ?TraceableAuthenticatorManagerListener $authenticatorManagerListener = null;

public function getWrappedListeners(): array
{
Expand All @@ -39,62 +39,60 @@ public function getWrappedListeners(): array

public function getAuthenticatorsInfo(): array
{
return $this->authenticatorsInfo;
return $this->authenticatorManagerListener?->getAuthenticatorsInfo() ?? [];
}

public function reset(): void
{
$this->wrappedListeners = [];
$this->authenticatorsInfo = [];
$this->authenticatorManagerListener = null;
}

protected function callListeners(RequestEvent $event, iterable $listeners): void
{
$wrappedListeners = [];
$authenticatorManagerListener = null;

$requestListeners = [];
foreach ($listeners as $listener) {
if ($listener instanceof LazyFirewallContext) {
\Closure::bind(function () use (&$wrappedListeners, &$authenticatorManagerListener) {
$listeners = [];
$contextWrappedListeners = [];
$contextAuthenticatorManagerListener = null;

\Closure::bind(function () use (&$contextWrappedListeners, &$contextAuthenticatorManagerListener) {
foreach ($this->listeners as $listener) {
if (!$authenticatorManagerListener && $listener instanceof TraceableAuthenticatorManagerListener) {
$authenticatorManagerListener = $listener;
}
if ($listener instanceof FirewallListenerInterface) {
$listener = new WrappedLazyListener($listener);
$listeners[] = $listener;
$wrappedListeners[] = $listener;
} else {
$listeners[] = function (RequestEvent $event) use ($listener, &$wrappedListeners) {
$wrappedListener = new WrappedListener($listener);
$wrappedListener($event);
$wrappedListeners[] = $wrappedListener;
};
if ($listener instanceof TraceableAuthenticatorManagerListener) {
$contextAuthenticatorManagerListener ??= $listener;
}
$contextWrappedListeners[] = $listener instanceof FirewallListenerInterface
? new WrappedLazyListener($listener)
: new WrappedListener($listener)
;
}
$this->listeners = $listeners;
$this->listeners = $contextWrappedListeners;
}, $listener, FirewallContext::class)();

$listener($event);
$this->authenticatorManagerListener ??= $contextAuthenticatorManagerListener;
$this->wrappedListeners = array_merge($this->wrappedListeners, $contextWrappedListeners);

$requestListeners[] = $listener;
} else {
$wrappedListener = $listener instanceof FirewallListenerInterface ? new WrappedLazyListener($listener) : new WrappedListener($listener);
$wrappedListener($event);
$this->wrappedListeners[] = $wrappedListener;
if (!$authenticatorManagerListener && $listener instanceof TraceableAuthenticatorManagerListener) {
$authenticatorManagerListener = $listener;
if ($listener instanceof TraceableAuthenticatorManagerListener) {
$this->authenticatorManagerListener ??= $listener;
}
}
$wrappedListener = $listener instanceof FirewallListenerInterface
? new WrappedLazyListener($listener)
: new WrappedListener($listener)
;
$this->wrappedListeners[] = $wrappedListener;

if ($event->hasResponse()) {
break;
$requestListeners[] = $wrappedListener;
}
}

$this->wrappedListeners = array_merge($this->wrappedListeners, $wrappedListeners);
foreach ($requestListeners as $listener) {
$listener($event);

if ($authenticatorManagerListener) {
$this->authenticatorsInfo = $authenticatorManagerListener->getAuthenticatorsInfo();
if ($event->hasResponse()) {
break;
}
}
}
}
0