feature #16719 [Security] remove deprecated HTTP digest auth key (xabbuh)

fabpot · fabpot · commit c4501c511b25 · 2015-11-28T11:31:12.000+01:00
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
diff --git a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/HttpDigestFactory.php b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/HttpDigestFactory.php
@@ -58,22 +58,6 @@ public function getKey()
     public function addConfiguration(NodeDefinition $node)
     {
         $node
-            ->beforeNormalization()
-                ->ifTrue(function ($v) { return isset($v['key']); })
-                ->then(function ($v) {
-                    if (isset($v['secret'])) {
-                        throw new \LogicException('Cannot set both key and secret options for http_digest, use only secret instead.');
-                    }
-
-                    @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);
-
-                    $v['secret'] = $v['key'];
-
-                    unset($v['key']);
-
-                    return $v;
-                })
-            ->end()
             ->children()
                 ->scalarNode('provider')->end()
                 ->scalarNode('realm')->defaultValue('Secured Area')->end()
diff --git a/src/Symfony/Component/Security/Http/EntryPoint/DigestAuthenticationEntryPoint.php b/src/Symfony/Component/Security/Http/EntryPoint/DigestAuthenticationEntryPoint.php
@@ -64,16 +64,6 @@ public function start(Request $request, AuthenticationException $authException =
         return $response;
     }
 
-    /**
-     * @deprecated Since version 2.8, to be removed in 3.0. Use getSecret() instead.
-     */
-    public function getKey()
-    {
-        @trigger_error(__method__.'() is deprecated since version 2.8 and will be removed in 3.0. Use getSecret() instead.', E_USER_DEPRECATED);
-
-        return $this->getSecret();
-    }
-
     /**
      * @return string
      */
diff --git a/src/Symfony/Component/Security/Http/Firewall/DigestAuthenticationListener.php b/src/Symfony/Component/Security/Http/Firewall/DigestAuthenticationListener.php
@@ -78,7 +78,7 @@ public function handle(GetResponseEvent $event)
         }
 
         try {
-            $digestAuth->validateAndDecode($this->authenticationEntryPoint->getKey(), $this->authenticationEntryPoint->getRealmName());
+            $digestAuth->validateAndDecode($this->authenticationEntryPoint->getSecret(), $this->authenticationEntryPoint->getRealmName());
         } catch (BadCredentialsException $e) {
             $this->fail($event, $request, $e);
 

Original file line number	Diff line number	Diff line change
`@@ -78,7 +78,7 @@ public function handle(GetResponseEvent $event)`
`78`	`78`	`}`
`79`	`79`
`80`	`80`	`try {`
`81`		`- $digestAuth->validateAndDecode($this->authenticationEntryPoint->getKey(), $this->authenticationEntryPoint->getRealmName());`
	`81`	`+ $digestAuth->validateAndDecode($this->authenticationEntryPoint->getSecret(), $this->authenticationEntryPoint->getRealmName());`
`82`	`82`	`} catch (BadCredentialsException $e) {`
`83`	`83`	`$this->fail($event, $request, $e);`
`84`	`84`