python/httpie-cli
1
0
Fork 0
mirror of https://github.com/httpie/cli.git synced 2024-11-24 08:22:22 +02:00
Code

Avoid override of headers by urllib3 when unset (#1502)

Browse Source 
* Pass SKIP_HEADER const when header is unset

* Hide SKIP_HEADER constant when displaying headers

* Test that omits User-Agent
This commit is contained in:
Abdelhakim Qbaich 2023-05-19 17:53:26 -04:00 committed by GitHub
parent 3664644722
commit cbe53ed79a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
httpie/client.py
View File

@ -10,6 +10,7 @@ from urllib.parse import urlparse, urlunparse
import requests import requests
# noinspection PyPackageRequirements # noinspection PyPackageRequirements
import urllib3 import urllib3
from urllib3.util import SKIP_HEADER, SKIPPABLE_HEADERS
from . import __version__ from . import __version__
from .adapters import HTTPieHTTPAdapter from .adapters import HTTPieHTTPAdapter
@ -200,6 +201,10 @@ def finalize_headers(headers: HTTPHeadersDict) -> HTTPHeadersDict:
if isinstance(value, str): if isinstance(value, str):
# See <https://github.com/httpie/httpie/issues/212> # See <https://github.com/httpie/httpie/issues/212>
value = value.encode() value = value.encode()
elif name.lower() in SKIPPABLE_HEADERS:
# Some headers get overwritten by urllib3 when set to `None`
# and should be replaced with the `SKIP_HEADER` constant.
value = SKIP_HEADER
final_headers.add(name, value) final_headers.add(name, value)
return final_headers return final_headers

2
httpie/models.py
View File

@ -1,6 +1,7 @@
from time import monotonic from time import monotonic
import requests import requests
from urllib3.util import SKIP_HEADER, SKIPPABLE_HEADERS
from enum import Enum, auto from enum import Enum, auto
from typing import Iterable, Union, NamedTuple from typing import Iterable, Union, NamedTuple
@ -152,6 +153,7 @@ class HTTPRequest(HTTPMessage):
headers = [ headers = [
f'{name}: {value if isinstance(value, str) else value.decode()}' f'{name}: {value if isinstance(value, str) else value.decode()}'
for name, value in headers.items() for name, value in headers.items()
if not (name.lower() in SKIPPABLE_HEADERS and value == SKIP_HEADER)
] ]
headers.insert(0, request_line) headers.insert(0, request_line)

8
tests/test_httpie.py
View File

@ -196,6 +196,14 @@ def test_unset_host_header(httpbin_both):
assert 'Host' not in r.json['headers'] # default Host unset assert 'Host' not in r.json['headers'] # default Host unset
def test_unset_useragent_header(httpbin_both):
r = http('GET', httpbin_both + '/headers')
assert 'User-Agent' in r.json['headers'] # default User-Agent present
r = http('GET', httpbin_both + '/headers', 'User-Agent:')
assert 'User-Agent' not in r.json['headers'] # default User-Agent unset
def test_headers_empty_value(httpbin_both): def test_headers_empty_value(httpbin_both):
r = http('GET', httpbin_both + '/headers') r = http('GET', httpbin_both + '/headers')
assert r.json['headers']['Accept'] # default Accept has value assert r.json['headers']['Accept'] # default Accept has value