diff options
| author | Fabien Potencier <fabien.potencier@gmail.com> | 2016-01-12 18:46:01 +0100 |
|---|---|---|
| committer | Fabien Potencier <fabien.potencier@gmail.com> | 2016-01-12 18:46:01 +0100 |
| commit | 59a00bcff338c70a74008efdf34ae7af0c912eeb (patch) | |
| tree | 65f10516d3ad5443d85c0069da21dfd1d6aad26d | |
| parent | becc1094ba2645dcdca8fdf192a7eecd2b9d7fcb (diff) | |
| parent | b2d09e668458778673cbeb237b8ce697e8f2286e (diff) | |
| download | symfony-security-59a00bcff338c70a74008efdf34ae7af0c912eeb.zip symfony-security-59a00bcff338c70a74008efdf34ae7af0c912eeb.tar.gz symfony-security-59a00bcff338c70a74008efdf34ae7af0c912eeb.tar.bz2 | |
Merge branch '2.7' into 2.8
* 2.7:
Typo fix
[2.3] Static Code Analysis for Components
Added support \IteratorAggregate for UniqueEntityValidator
Update AbstractChoiceListTest.php
Fix #17306 Paths with % in it are note allowed (like urlencoded)
Use proper class to fetch $versionStrategy property
Added sort order SORT_STRING for params in UriSigner
Remove normalizer cache in Serializer class
| -rw-r--r-- | Http/Firewall/DigestAuthenticationListener.php | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/Http/Firewall/DigestAuthenticationListener.php b/Http/Firewall/DigestAuthenticationListener.php index 41e5d6d..d8d71fb 100644 --- a/Http/Firewall/DigestAuthenticationListener.php +++ b/Http/Firewall/DigestAuthenticationListener.php @@ -170,10 +170,8 @@ class DigestData throw new BadCredentialsException(sprintf('Missing mandatory digest value; received header "%s" (%s)', $this->header, implode(', ', $keys))); } - if ('auth' === $this->elements['qop']) { - if (!isset($this->elements['nc']) || !isset($this->elements['cnonce'])) { - throw new BadCredentialsException(sprintf('Missing mandatory digest value; received header "%s"', $this->header)); - } + if ('auth' === $this->elements['qop'] && !isset($this->elements['nc'], $this->elements['cnonce'])) { + throw new BadCredentialsException(sprintf('Missing mandatory digest value; received header "%s"', $this->header)); } if ($expectedRealm !== $this->elements['realm']) { |