Skip to content

Commit 930c0ff

Browse files
committed
fix: distinguish unparseable authorization headers
1 parent b7a8731 commit 930c0ff

3 files changed

Lines changed: 50 additions & 1 deletion

File tree

‎pytest_httpserver/httpserver.py‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,11 @@ def __init__(self, matchers: Mapping[str, Callable[[str | None, str], bool]] | N
147147

148148
@staticmethod
149149
def authorization_header_value_matcher(actual: str | None, expected: str) -> bool:
150-
return Authorization.from_header(actual) == Authorization.from_header(expected)
150+
actual_authorization = Authorization.from_header(actual)
151+
expected_authorization = Authorization.from_header(expected)
152+
if actual_authorization is None or expected_authorization is None:
153+
return actual == expected
154+
return actual_authorization == expected_authorization
151155

152156
@staticmethod
153157
def default_header_value_matcher(actual: str | None, expected: str) -> bool:
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
fixes:
2+
- |
3+
Authorization header matching now compares the original header values when
4+
either value cannot be parsed. Missing headers no longer match expected
5+
empty or malformed values, and different malformed Basic credentials no
6+
longer match each other. Valid Authorization values still use parsed
7+
comparison in both header value matchers.

‎tests/test_headers.py‎

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33

44
import pytest
55
import requests
6+
from werkzeug import Request
67
from werkzeug.datastructures import Headers
78
from werkzeug.http import parse_dict_header
89

@@ -13,6 +14,43 @@
1314
from pytest_httpserver.httpserver import NoMethodFoundForMatchingHeaderValueError
1415

1516

17+
@pytest.mark.parametrize(
18+
("matcher_class", "header_name"),
19+
[
20+
(HeaderValueMatcher, "Authorization"),
21+
(CaseInsensitiveHeaderValueMatcher, "Authorization"),
22+
(CaseInsensitiveHeaderValueMatcher, "authorization"),
23+
(CaseInsensitiveHeaderValueMatcher, "AUTHORIZATION"),
24+
],
25+
)
26+
@pytest.mark.parametrize(
27+
("actual", "expected", "matches"),
28+
[
29+
(None, "", False),
30+
(None, "Basic !!!!", False),
31+
("", "Basic !!!!", False),
32+
("Basic !!!!", "Basic ????", False),
33+
("Basic /w==", "Basic /g==", False),
34+
("", "", True),
35+
("Basic !!!!", "Basic !!!!", True),
36+
("Basic /w==", "Basic /w==", True),
37+
("Basic Zm9vOmJhcg==", "basic Zm9vOmJhcg==", True),
38+
("Basic Zm9vOmJhcg==", "Basic Zm9vOmJheg==", False),
39+
("Bearer token", "bearer token", True),
40+
("Bearer different", "Bearer token", False),
41+
('Digest a="1", b="2"', 'Digest b="2", a="1"', True),
42+
(None, "Basic Zm9vOmJhcg==", False),
43+
("Basic !!!!", "Basic Zm9vOmJhcg==", False),
44+
("Basic Zm9vOmJhcg==", "Basic !!!!", False),
45+
],
46+
)
47+
def test_authorization_header_parse_failures(matcher_class, header_name, actual, expected, matches):
48+
matcher = RequestMatcher("/", headers={header_name: expected}, header_value_matcher=matcher_class())
49+
request = Request.from_values("/", headers={} if actual is None else {header_name: actual})
50+
51+
assert matcher.match(request) is matches
52+
53+
1654
def test_case_insensitive_header_matcher_fallback_does_not_cache_header_names():
1755
comparators = iter(
1856
[HeaderValueMatcher.default_header_value_matcher, lambda actual, expected: actual == expected.upper()]

0 commit comments

Comments
 (0)