Skip to content

Commit c4501c5

Browse files
committed
feature symfony#16719 [Security] remove deprecated HTTP digest auth key (xabbuh)
This PR was merged into the 3.0-dev branch. Discussion ---------- [Security] remove deprecated HTTP digest auth key | Q | A | ------------- | --- | Bug fix? | no | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | | License | MIT | Doc PR | Commits ------- 812396d [Security] remove deprecated HTTP digest auth key
2 parents 380ce60 + 812396d commit c4501c5

File tree

3 files changed

+1
-27
lines changed

3 files changed

+1
-27
lines changed

src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/HttpDigestFactory.php

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -58,22 +58,6 @@ public function getKey()
5858
public function addConfiguration(NodeDefinition $node)
5959
{
6060
$node
61-
->beforeNormalization()
62-
->ifTrue(function ($v) { return isset($v['key']); })
63-
->then(function ($v) {
64-
if (isset($v['secret'])) {
65-
throw new \LogicException('Cannot set both key and secret options for http_digest, use only secret instead.');
66-
}
67-
68-
@trigger_error('http_digest.key is deprecated since version 2.8 and will be removed in 3.0. Use http_digest.secret instead.', E_USER_DEPRECATED);
69-
70-
$v['secret'] = $v['key'];
71-
72-
unset($v['key']);
73-
74-
return $v;
75-
})
76-
->end()
7761
->children()
7862
->scalarNode('provider')->end()
7963
->scalarNode('realm')->defaultValue('Secured Area')->end()

src/Symfony/Component/Security/Http/EntryPoint/DigestAuthenticationEntryPoint.php

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -64,16 +64,6 @@ public function start(Request $request, AuthenticationException $authException =
6464
return $response;
6565
}
6666

67-
/**
68-
* @deprecated Since version 2.8, to be removed in 3.0. Use getSecret() instead.
69-
*/
70-
public function getKey()
71-
{
72-
@trigger_error(__method__.'() is deprecated since version 2.8 and will be removed in 3.0. Use getSecret() instead.', E_USER_DEPRECATED);
73-
74-
return $this->getSecret();
75-
}
76-
7767
/**
7868
* @return string
7969
*/

src/Symfony/Component/Security/Http/Firewall/DigestAuthenticationListener.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ public function handle(GetResponseEvent $event)
7878
}
7979

8080
try {
81-
$digestAuth->validateAndDecode($this->authenticationEntryPoint->getKey(), $this->authenticationEntryPoint->getRealmName());
81+
$digestAuth->validateAndDecode($this->authenticationEntryPoint->getSecret(), $this->authenticationEntryPoint->getRealmName());
8282
} catch (BadCredentialsException $e) {
8383
$this->fail($event, $request, $e);
8484

0 commit comments

Comments
 (0)