Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitc884399

Browse files
chalasrnicolas-grekas
authored andcommitted
[Security] Fix tests
1 parentce227a1 commitc884399

File tree

6 files changed

+26
-34
lines changed

6 files changed

+26
-34
lines changed

‎src/Symfony/Component/Security/Http/Authenticator/AbstractPreAuthenticatedAuthenticator.php

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -91,10 +91,9 @@ public function supports(Request $request): ?bool
9191

9292
publicfunctionauthenticate(Request$request):Passport
9393
{
94-
returnnewSelfValidatingPassport(
95-
newUserBadge($request->attributes->get('_pre_authenticated_username'),$this->userProvider->loadUserByIdentifier(...)),
96-
[newPreAuthenticatedUserBadge()]
97-
);
94+
$userBadge =newUserBadge($request->attributes->get('_pre_authenticated_username'),$this->userProvider->loadUserByIdentifier(...));
95+
96+
returnnewSelfValidatingPassport($userBadge, [newPreAuthenticatedUserBadge()]);
9897
}
9998

10099
publicfunctioncreateToken(Passport$passport,string$firewallName):TokenInterface

‎src/Symfony/Component/Security/Http/Authenticator/FormLoginAuthenticator.php

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -82,11 +82,9 @@ public function authenticate(Request $request): Passport
8282
{
8383
$credentials =$this->getCredentials($request);
8484

85-
$passport =newPassport(
86-
newUserBadge($credentials['username'],$this->userProvider->loadUserByIdentifier(...)),
87-
newPasswordCredentials($credentials['password']),
88-
[newRememberMeBadge()]
89-
);
85+
$userBadge =newUserBadge($credentials['username'],$this->userProvider->loadUserByIdentifier(...));
86+
$passport =newPassport($userBadge,newPasswordCredentials($credentials['password']), [newRememberMeBadge()]);
87+
9088
if ($this->options['enable_csrf']) {
9189
$passport->addBadge(newCsrfTokenBadge($this->options['csrf_token_id'],$credentials['csrf_token']));
9290
}

‎src/Symfony/Component/Security/Http/Authenticator/HttpBasicAuthenticator.php

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -63,10 +63,9 @@ public function authenticate(Request $request): Passport
6363
$username =$request->headers->get('PHP_AUTH_USER');
6464
$password =$request->headers->get('PHP_AUTH_PW','');
6565

66-
$passport =newPassport(
67-
newUserBadge($username,$this->userProvider->loadUserByIdentifier(...)),
68-
newPasswordCredentials($password)
69-
);
66+
$userBadge =newUserBadge($username,$this->userProvider->loadUserByIdentifier(...));
67+
$passport =newPassport($userBadge,newPasswordCredentials($password));
68+
7069
if ($this->userProviderinstanceof PasswordUpgraderInterface) {
7170
$passport->addBadge(newPasswordUpgradeBadge($password,$this->userProvider));
7271
}

‎src/Symfony/Component/Security/Http/Authenticator/JsonLoginAuthenticator.php

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -85,11 +85,8 @@ public function authenticate(Request $request): Passport
8585
}
8686

8787
$userBadge =newUserBadge($credentials['username'],$this->userProvider->loadUserByIdentifier(...));
88+
$passport =newPassport($userBadge,newPasswordCredentials($credentials['password']));
8889

89-
$passport =newPassport(
90-
$userBadge,
91-
newPasswordCredentials($credentials['password'])
92-
);
9390
if ($this->userProviderinstanceof PasswordUpgraderInterface) {
9491
$passport->addBadge(newPasswordUpgradeBadge($credentials['password'],$this->userProvider));
9592
}

‎src/Symfony/Component/Security/Http/Authenticator/LoginLinkAuthenticator.php

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -54,23 +54,21 @@ public function supports(Request $request): ?bool
5454

5555
publicfunctionauthenticate(Request$request):Passport
5656
{
57-
$username =$request->get('user');
58-
if (!$username) {
57+
if (!$username =$request->get('user')) {
5958
thrownewInvalidLoginLinkAuthenticationException('Missing user from link.');
6059
}
6160

62-
returnnewSelfValidatingPassport(
63-
newUserBadge($username,function ()use ($request) {
64-
try {
65-
$user =$this->loginLinkHandler->consumeLoginLink($request);
66-
}catch (InvalidLoginLinkExceptionInterface$e) {
67-
thrownewInvalidLoginLinkAuthenticationException('Login link could not be validated.',0,$e);
68-
}
61+
$userBadge =newUserBadge($username,function ()use ($request) {
62+
try {
63+
$user =$this->loginLinkHandler->consumeLoginLink($request);
64+
}catch (InvalidLoginLinkExceptionInterface$e) {
65+
thrownewInvalidLoginLinkAuthenticationException('Login link could not be validated.',0,$e);
66+
}
6967

70-
return$user;
71-
}),
72-
[newRememberMeBadge()]
73-
);
68+
return$user;
69+
});
70+
71+
returnnewSelfValidatingPassport($userBadge, [newRememberMeBadge()]);
7472
}
7573

7674
publicfunctiononAuthenticationSuccess(Request$request,TokenInterface$token,string$firewallName): ?Response

‎src/Symfony/Component/Security/Http/Authenticator/RememberMeAuthenticator.php

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -81,16 +81,17 @@ public function supports(Request $request): ?bool
8181

8282
publicfunctionauthenticate(Request$request):Passport
8383
{
84-
$rawCookie =$request->cookies->get($this->cookieName);
85-
if (!$rawCookie) {
84+
if (!$rawCookie =$request->cookies->get($this->cookieName)) {
8685
thrownew \LogicException('No remember-me cookie is found.');
8786
}
8887

8988
$rememberMeCookie = RememberMeDetails::fromRawCookie($rawCookie);
9089

91-
returnnewSelfValidatingPassport(newUserBadge($rememberMeCookie->getUserIdentifier(),function ()use ($rememberMeCookie) {
90+
$userBadge =newUserBadge($rememberMeCookie->getUserIdentifier(),function ()use ($rememberMeCookie) {
9291
return$this->rememberMeHandler->consumeRememberMeCookie($rememberMeCookie);
93-
}));
92+
});
93+
94+
returnnewSelfValidatingPassport($userBadge);
9495
}
9596

9697
publicfunctioncreateToken(Passport$passport,string$firewallName):TokenInterface

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp