summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBatuhan Taskaya <isidentical@gmail.com>2022-04-03 16:48:31 +0300
committerGitHub <noreply@github.com>2022-04-03 06:48:31 -0700
commitd03e3f4e146aae641e25de911d6ab5f13b552a11 (patch)
treefe5800c3a56ca9c7c9ee5f30bfa88a784cf32568
parentc15794853188d56af7a1d53473e1ad821f3ec861 (diff)
Implement support for multiple headers with the same name in sessions (#1335)
* Properly remove duplicate Cookie headers * Implement support for multiple headers with the same name in sessions * More testing * Cleanup * Remove duplicated test, cleanup * Fix pycodestyle * CHANGELOG Co-authored-by: Jakub Roztocil <jakub@roztocil.co>
-rw-r--r--CHANGELOG.md1
-rw-r--r--httpie/cli/dicts.py10
-rw-r--r--httpie/legacy/v3_1_0_session_cookie_format.py (renamed from httpie/legacy/cookie_format.py)9
-rw-r--r--httpie/legacy/v3_2_0_session_header_format.py73
-rw-r--r--httpie/manager/tasks/sessions.py17
-rw-r--r--httpie/sessions.py139
-rw-r--r--tests/fixtures/session_data/new/cookies_dict.json2
-rw-r--r--tests/fixtures/session_data/new/cookies_dict_dev_version.json2
-rw-r--r--tests/fixtures/session_data/new/cookies_dict_with_extras.json14
-rw-r--r--tests/fixtures/session_data/new/empty_cookies_dict.json2
-rw-r--r--tests/fixtures/session_data/new/empty_cookies_list.json2
-rw-r--r--tests/fixtures/session_data/new/empty_headers_dict.json14
-rw-r--r--tests/fixtures/session_data/new/empty_headers_list.json14
-rw-r--r--tests/fixtures/session_data/new/headers_cookies_dict_mixed.json40
-rw-r--r--tests/fixtures/session_data/new/headers_dict.json23
-rw-r--r--tests/fixtures/session_data/new/headers_dict_extras.json39
-rw-r--r--tests/fixtures/session_data/new/headers_list.json23
-rw-r--r--tests/fixtures/session_data/old/cookies_dict.json2
-rw-r--r--tests/fixtures/session_data/old/cookies_dict_dev_version.json2
-rw-r--r--tests/fixtures/session_data/old/cookies_dict_with_extras.json14
-rw-r--r--tests/fixtures/session_data/old/empty_cookies_dict.json2
-rw-r--r--tests/fixtures/session_data/old/empty_cookies_list.json2
-rw-r--r--tests/fixtures/session_data/old/empty_headers_dict.json14
-rw-r--r--tests/fixtures/session_data/old/empty_headers_list.json14
-rw-r--r--tests/fixtures/session_data/old/headers_cookies_dict_mixed.json30
-rw-r--r--tests/fixtures/session_data/old/headers_dict.json17
-rw-r--r--tests/fixtures/session_data/old/headers_dict_extras.json33
-rw-r--r--tests/fixtures/session_data/old/headers_list.json23
-rw-r--r--tests/test_sessions.py114
29 files changed, 619 insertions, 72 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index c8cd462e..6f8f5541 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,7 @@ This project adheres to [Semantic Versioning](https://semver.org/).
## [3.1.1.dev0](https://github.com/httpie/httpie/compare/3.1.0...HEAD) (Unreleased)
+- Added support for session persistence of repeated headers with the same name. ([#1335](https://github.com/httpie/httpie/pull/1335))
- Changed `httpie plugins` to the new `httpie cli` namespace as `httpie cli plugins` (`httpie plugins` continues to work as a hidden alias). ([#1320](https://github.com/httpie/httpie/issues/1320))
- Fixed redundant creation of `Content-Length` header on `OPTIONS` requests. ([#1310](https://github.com/httpie/httpie/issues/1310))
diff --git a/httpie/cli/dicts.py b/httpie/cli/dicts.py
index 434a3966..074cd9e7 100644
--- a/httpie/cli/dicts.py
+++ b/httpie/cli/dicts.py
@@ -35,6 +35,16 @@ class HTTPHeadersDict(CIMultiDict, BaseMultiDict):
super().add(key, value)
+ def remove_item(self, key, value):
+ """
+ Remove a (key, value) pair from the dict.
+ """
+ existing_values = self.popall(key)
+ existing_values.remove(value)
+
+ for value in existing_values:
+ self.add(key, value)
+
class RequestJSONDataDict(OrderedDict):
pass
diff --git a/httpie/legacy/cookie_format.py b/httpie/legacy/v3_1_0_session_cookie_format.py
index b5c6392b..32b7e517 100644
--- a/httpie/legacy/cookie_format.py
+++ b/httpie/legacy/v3_1_0_session_cookie_format.py
@@ -4,6 +4,7 @@ from typing import Any, Type, List, Dict, TYPE_CHECKING
if TYPE_CHECKING:
from httpie.sessions import Session
+
INSECURE_COOKIE_JAR_WARNING = '''\
Outdated layout detected for the current session. Please consider updating it,
in order to not get affected by potential security problems.
@@ -53,16 +54,12 @@ def pre_process(session: 'Session', cookies: Any) -> List[Dict[str, Any]]:
for cookie in normalized_cookies
)
- if should_issue_warning and not session.refactor_mode:
+ if should_issue_warning:
warning = INSECURE_COOKIE_JAR_WARNING.format(hostname=session.bound_host, session_id=session.session_id)
if not session.is_anonymous:
warning += INSECURE_COOKIE_JAR_WARNING_FOR_NAMED_SESSIONS
warning += INSECURE_COOKIE_SECURITY_LINK
-
- session.env.log_error(
- warning,
- level='warning'
- )
+ session.warn_legacy_usage(warning)
return normalized_cookies
diff --git a/httpie/legacy/v3_2_0_session_header_format.py b/httpie/legacy/v3_2_0_session_header_format.py
new file mode 100644
index 00000000..4d9e031c
--- /dev/null
+++ b/httpie/legacy/v3_2_0_session_header_format.py
@@ -0,0 +1,73 @@
+from typing import Any, Type, List, Dict, TYPE_CHECKING
+
+if TYPE_CHECKING:
+ from httpie.sessions import Session
+
+
+OLD_HEADER_STORE_WARNING = '''\
+Outdated layout detected for the current session. Please consider updating it,
+in order to use the latest features regarding the header layout.
+
+For fixing the current session:
+
+ $ httpie cli sessions upgrade {hostname} {session_id}
+'''
+
+OLD_HEADER_STORE_WARNING_FOR_NAMED_SESSIONS = '''\
+
+For fixing all named sessions:
+
+ $ httpie cli sessions upgrade-all
+'''
+
+OLD_HEADER_STORE_LINK = '\nSee $INSERT_LINK for more information.'
+
+
+def pre_process(session: 'Session', headers: Any) -> List[Dict[str, Any]]:
+ """Serialize the headers into a unified form and issue a warning if
+ the session file is using the old layout."""
+
+ is_old_style = isinstance(headers, dict)
+ if is_old_style:
+ normalized_headers = list(headers.items())
+ else:
+ normalized_headers = [
+ (item['name'], item['value'])
+ for item in headers
+ ]
+
+ if is_old_style:
+ warning = OLD_HEADER_STORE_WARNING.format(hostname=session.bound_host, session_id=session.session_id)
+ if not session.is_anonymous:
+ warning += OLD_HEADER_STORE_WARNING_FOR_NAMED_SESSIONS
+ warning += OLD_HEADER_STORE_LINK
+ session.warn_legacy_usage(warning)
+
+ return normalized_headers
+
+
+def post_process(
+ normalized_headers: List[Dict[str, Any]],
+ *,
+ original_type: Type[Any]
+) -> Any:
+ """Deserialize given header store into the original form it was
+ used in."""
+
+ if issubclass(original_type, dict):
+ # For the legacy behavior, preserve the last value.
+ return {
+ item['name']: item['value']
+ for item in normalized_headers
+ }
+ else:
+ return normalized_headers
+
+
+def fix_layout(session: 'Session', *args, **kwargs) -> None:
+ from httpie.sessions import materialize_headers
+
+ if not isinstance(session['headers'], dict):
+ return None
+
+ session['headers'] = materialize_headers(session['headers'])
diff --git a/httpie/manager/tasks/sessions.py b/httpie/manager/tasks/sessions.py
index 10866cae..bc74ec15 100644
--- a/httpie/manager/tasks/sessions.py
+++ b/httpie/manager/tasks/sessions.py
@@ -4,10 +4,16 @@ from typing import Tuple
from httpie.sessions import SESSIONS_DIR_NAME, get_httpie_session
from httpie.status import ExitStatus
from httpie.context import Environment
-from httpie.legacy import cookie_format as legacy_cookies
+from httpie.legacy import v3_1_0_session_cookie_format, v3_2_0_session_header_format
from httpie.manager.cli import missing_subcommand, parser
+FIXERS_TO_VERSIONS = {
+ '3.1.0': v3_1_0_session_cookie_format.fix_layout,
+ '3.2.0': v3_2_0_session_header_format.fix_layout,
+}
+
+
def cli_sessions(env: Environment, args: argparse.Namespace) -> ExitStatus:
action = args.cli_sessions_action
if action is None:
@@ -22,7 +28,7 @@ def cli_sessions(env: Environment, args: argparse.Namespace) -> ExitStatus:
def is_version_greater(version_1: str, version_2: str) -> bool:
- # In an ideal scenerio, we would depend on `packaging` in order
+ # In an ideal scenario, we would depend on `packaging` in order
# to offer PEP 440 compatible parsing. But since it might not be
# commonly available for outside packages, and since we are only
# going to parse HTTPie's own version it should be fine to compare
@@ -40,11 +46,6 @@ def is_version_greater(version_1: str, version_2: str) -> bool:
return split_version(version_1) > split_version(version_2)
-FIXERS_TO_VERSIONS = {
- '3.1.0': legacy_cookies.fix_layout
-}
-
-
def upgrade_session(env: Environment, args: argparse.Namespace, hostname: str, session_name: str):
session = get_httpie_session(
env=env,
@@ -52,7 +53,7 @@ def upgrade_session(env: Environment, args: argparse.Namespace, hostname: str, s
session_name=session_name,
host=hostname,
url=hostname,
- refactor_mode=True
+ suppress_legacy_warnings=True
)
session_name = session.path.stem
diff --git a/httpie/sessions.py b/httpie/sessions.py
index e4a20a53..2f44e04d 100644
--- a/httpie/sessions.py
+++ b/httpie/sessions.py
@@ -13,12 +13,16 @@ from typing import Any, Dict, List, Optional, Union
from requests.auth import AuthBase
from requests.cookies import RequestsCookieJar, remove_cookie_by_name
-from .context import Environment
+from .context import Environment, Levels
from .cli.dicts import HTTPHeadersDict
from .config import BaseConfigDict, DEFAULT_CONFIG_DIR
from .utils import url_as_host
from .plugins.registry import plugin_manager
-from .legacy import cookie_format as legacy_cookies
+
+from .legacy import (
+ v3_1_0_session_cookie_format as legacy_cookies,
+ v3_2_0_session_header_format as legacy_headers
+)
SESSIONS_DIR_NAME = 'sessions'
@@ -67,6 +71,23 @@ def materialize_cookie(cookie: Cookie) -> Dict[str, Any]:
return materialized_cookie
+def materialize_cookies(jar: RequestsCookieJar) -> List[Dict[str, Any]]:
+ return [
+ materialize_cookie(cookie)
+ for cookie in jar
+ ]
+
+
+def materialize_headers(headers: Dict[str, str]) -> List[Dict[str, Any]]:
+ return [
+ {
+ 'name': name,
+ 'value': value
+ }
+ for name, value in headers.copy().items()
+ ]
+
+
def get_httpie_session(
env: Environment,
config_dir: Path,
@@ -74,7 +95,7 @@ def get_httpie_session(
host: Optional[str],
url: str,
*,
- refactor_mode: bool = False
+ suppress_legacy_warnings: bool = False
) -> 'Session':
bound_hostname = host or url_as_host(url)
if not bound_hostname:
@@ -93,7 +114,7 @@ def get_httpie_session(
env=env,
session_id=session_id,
bound_host=strip_port(bound_hostname),
- refactor_mode=refactor_mode
+ suppress_legacy_warnings=suppress_legacy_warnings
)
session.load()
return session
@@ -109,30 +130,29 @@ class Session(BaseConfigDict):
env: Environment,
bound_host: str,
session_id: str,
- refactor_mode: bool = False,
+ suppress_legacy_warnings: bool = False,
):
super().__init__(path=Path(path))
- self['headers'] = {}
+
+ # Default values for the session files
+ self['headers'] = []
self['cookies'] = []
self['auth'] = {
'type': None,
'username': None,
'password': None
}
+
+ # Runtime state of the Session objects.
self.env = env
+ self._headers = HTTPHeadersDict()
self.cookie_jar = RequestsCookieJar()
self.session_id = session_id
self.bound_host = bound_host
- self.refactor_mode = refactor_mode
-
- def pre_process_data(self, data: Dict[str, Any]) -> Dict[str, Any]:
- cookies = data.get('cookies')
- if cookies:
- normalized_cookies = legacy_cookies.pre_process(self, cookies)
- else:
- normalized_cookies = []
+ self.suppress_legacy_warnings = suppress_legacy_warnings
- for cookie in normalized_cookies:
+ def _add_cookies(self, cookies: List[Dict[str, Any]]) -> None:
+ for cookie in cookies:
domain = cookie.get('domain', '')
if domain is None:
# domain = None means explicitly lack of cookie, though
@@ -143,29 +163,38 @@ class Session(BaseConfigDict):
self.cookie_jar.set(**cookie)
+ def pre_process_data(self, data: Dict[str, Any]) -> Dict[str, Any]:
+ for key, deserializer, importer in [
+ ('cookies', legacy_cookies.pre_process, self._add_cookies),
+ ('headers', legacy_headers.pre_process, self._headers.update),
+ ]:
+ values = data.get(key)
+ if values:
+ normalized_values = deserializer(self, values)
+ else:
+ normalized_values = []
+
+ importer(normalized_values)
+
return data
def post_process_data(self, data: Dict[str, Any]) -> Dict[str, Any]:
- cookies = data.get('cookies')
-
- normalized_cookies = [
- materialize_cookie(cookie)
- for cookie in self.cookie_jar
- ]
- data['cookies'] = legacy_cookies.post_process(
- normalized_cookies,
- original_type=type(cookies)
- )
+ for key, store, serializer, exporter in [
+ ('cookies', self.cookie_jar, materialize_cookies, legacy_cookies.post_process),
+ ('headers', self._headers, materialize_headers, legacy_headers.post_process),
+ ]:
+ original_type = type(data.get(key))
+ values = serializer(store)
+
+ data[key] = exporter(
+ values,
+ original_type=original_type
+ )
return data
- def update_headers(self, request_headers: HTTPHeadersDict):
- """
- Update the session headers with the request ones while ignoring
- certain name prefixes.
-
- """
- headers = self.headers
+ def _compute_new_headers(self, request_headers: HTTPHeadersDict) -> HTTPHeadersDict:
+ new_headers = HTTPHeadersDict()
for name, value in request_headers.copy().items():
if value is None:
continue # Ignore explicitly unset headers
@@ -183,24 +212,40 @@ class Session(BaseConfigDict):
morsel['path'] = DEFAULT_COOKIE_PATH
self.cookie_jar.set(cookie_name, morsel)
- all_cookie_headers = request_headers.getall(name)
- if len(all_cookie_headers) > 1:
- all_cookie_headers.remove(original_value)
- else:
- request_headers.popall(name)
+ request_headers.remove_item(name, original_value)
continue
for prefix in SESSION_IGNORED_HEADER_PREFIXES:
if name.lower().startswith(prefix.lower()):
break
else:
- headers[name] = value
+ new_headers.add(name, value)
+
+ return new_headers
+
+ def update_headers(self, request_headers: HTTPHeadersDict):
+ """
+ Update the session headers with the request ones while ignoring
+ certain name prefixes.
- self['headers'] = dict(headers)
+ """
+
+ new_headers = self._compute_new_headers(request_headers)
+ new_keys = new_headers.copy().keys()
+
+ # New headers will take priority over the existing ones, and override
+ # them directly instead of extending them.
+ for key, value in self._headers.copy().items():
+ if key in new_keys:
+ continue
+
+ new_headers.add(key, value)
+
+ self._headers = new_headers
@property
def headers(self) -> HTTPHeadersDict:
- return HTTPHeadersDict(self['headers'])
+ return self._headers.copy()
@property
def cookies(self) -> RequestsCookieJar:
@@ -257,3 +302,17 @@ class Session(BaseConfigDict):
@property
def is_anonymous(self):
return is_anonymous_session(self.session_id)
+
+ def warn_legacy_usage(self, warning: str) -> None:
+ if self.suppress_legacy_warnings:
+ return None
+
+ self.env.log_error(
+ warning,
+ level=Levels.WARNING
+ )
+
+ # We don't want to spam multiple warnings on each usage,
+ # so if there is already a warning for the legacy usage
+ # we'll skip the next ones.
+ self.suppress_legacy_warnings = True
diff --git a/tests/fixtures/session_data/new/cookies_dict.json b/tests/fixtures/session_data/new/cookies_dict.json
index 8a4d5f2e..4354f4d9 100644
--- a/tests/fixtures/session_data/new/cookies_dict.json
+++ b/tests/fixtures/session_data/new/cookies_dict.json
@@ -27,5 +27,5 @@
"value": "bar"
}
],
- "headers": {}
+ "headers": []
}
diff --git a/tests/fixtures/session_data/new/cookies_dict_dev_version.json b/tests/fixtures/session_data/new/cookies_dict_dev_version.json
index 8a4d5f2e..4354f4d9 100644
--- a/tests/fixtures/session_data/new/cookies_dict_dev_version.json
+++ b/tests/fixtures/session_data/new/cookies_dict_dev_version.json
@@ -27,5 +27,5 @@
"value": "bar"
}
],
- "headers": {}
+ "headers": []
}
diff --git a/tests/fixtures/session_data/new/cookies_dict_with_extras.json b/tests/fixtures/session_data/new/cookies_dict_with_extras.json
index 9a99f152..baf77da0 100644
--- a/tests/fixtures/session_data/new/cookies_dict_with_extras.json
+++ b/tests/fixtures/session_data/new/cookies_dict_with_extras.json
@@ -26,8 +26,14 @@
"value": "bar"
}
],
- "headers": {
- "X-Data": "value",
- "X-Foo": "bar"
- }
+ "headers": [
+ {
+ "name": "X-Data",
+ "value": "value"
+ },
+ {
+ "name": "X-Foo",
+ "value": "bar"
+ }
+ ]
}
diff --git a/tests/fixtures/session_data/new/empty_cookies_dict.json b/tests/fixtures/session_data/new/empty_cookies_dict.json
index 1d01661a..a2f3c5c4 100644
--- a/tests/fixtures/session_data/new/empty_cookies_dict.json
+++ b/tests/fixtures/session_data/new/empty_cookies_dict.json
@@ -10,5 +10,5 @@
"username": null
},
"cookies": [],
- "headers": {}
+ "headers": []
}
diff --git a/tests/fixtures/session_data/new/empty_cookies_list.json b/tests/fixtures/session_data/new/empty_cookies_list.json
index 1d01661a..a2f3c5c4 100644
--- a/tests/fixtures/session_data/new/empty_cookies_list.json
+++ b/tests/fixtures/session_data/new/empty_cookies_list.json
@@ -10,5 +10,5 @@
"username": null
},
"cookies": [],
- "headers": {}
+ "headers": []
}
diff --git a/tests/fixtures/session_data/new/empty_headers_dict.json b/tests/fixtures/session_data/new/empty_headers_dict.json
new file mode 100644
index 00000000..a2f3c5c4
--- /dev/null
+++ b/tests/fixtures/session_data/new/empty_headers_dict.json
@@ -0,0 +1,14 @@
+{
+ "__meta__": {
+ "about": "HTTPie session file",
+ "help": "https://httpie.io/docs#sessions",
+ "httpie": "__version__"
+ },
+ "auth": {
+ "password": null,
+ "type": null,
+ "username": null
+ },
+ "cookies": [],
+ "headers": []
+}
diff --git a/tests/fixtures/session_data/new/empty_headers_list.json b/tests/fixtures/session_data/new/empty_headers_list.json
new file mode 100644
index 00000000..a2f3c5c4
--- /dev/null
+++ b/tests/fixtures/session_data/new/empty_headers_list.json
@@ -0,0 +1,14 @@
+{
+ "__meta__": {
+ "about": "HTTPie session file",
+ "help": "https://httpie.io/docs#sessions",
+ "httpie": "__version__"
+ },
+ "auth": {
+ "password": null,
+ "type": null,
+ "username": null
+ },
+ "cookies": [],
+ "headers": []
+}
diff --git a/tests/fixtures/session_data/new/headers_cookies_dict_mixed.json b/tests/fixtures/session_data/new/headers_cookies_dict_mixed.json
new file mode 100644
index 00000000..f2eb3fe3
--- /dev/null
+++ b/tests/fixtures/session_data/new/headers_cookies_dict_mixed.json
@@ -0,0 +1,40 @@
+{
+ "__meta__": {
+ "about": "HTTPie session file",
+ "help": "https://httpie.io/docs#sessions",
+ "httpie": "__version__"
+ },
+ "auth": {
+ "password": null,
+ "type": null,
+ "username": null
+ },
+ "cookies": [
+ {
+ "domain": __host__,
+ "expires": null,
+ "name": "baz",
+ "path": "/",
+ "secure": false,
+ "value": "quux"
+ },
+ {
+ "domain": __host__,
+ "expires": null,
+ "name": "foo",
+ "path": "/",
+ "secure": false,
+ "value": "bar"
+ }
+ ],
+ "headers": [
+ {
+ "name": "X-Data",
+ "value": "value"
+ },
+ {
+ "name": "X-Foo",
+ "value": "bar"
+ }
+ ]
+}
diff --git a/tests/fixtures/session_data/new/headers_dict.json b/tests/fixtures/session_data/new/headers_dict.json
new file mode 100644
index 00000000..5a04c4b0
--- /dev/null
+++ b/tests/fixtures/session_data/new/headers_dict.json
@@ -0,0 +1,23 @@
+{
+ "__meta__": {
+ "about": "HTTPie session file",
+ "help": "https://httpie.io/docs#sessions",
+ "httpie": "__version__"
+ },
+ "auth": {
+ "password": null,
+ "type": null,
+ "username": null
+ },
+ "cookies": [],
+ "headers": [
+ {
+ "name": "foo",
+ "value": "bar"
+ },
+ {
+ "name": "baz",
+ "value": "quux"
+ }
+ ]
+}
diff --git a/tests/fixtures/session_data/new/headers_dict_extras.json b/tests/fixtures/session_data/new/headers_dict_extras.json
new file mode 100644
index 00000000..f0ae1763
--- /dev/null
+++ b/tests/fixtures/session_data/new/headers_dict_extras.json
@@ -0,0 +1,39 @@
+{
+ "__meta__": {
+ "about": "HTTPie session file",
+ "help": "https://httpie.io/docs#sessions",
+ "httpie": "__version__"
+ },
+ "auth": {
+ "raw_auth": "foo:bar",
+ "type": "basic"
+ },
+ "cookies": [
+ {
+ "domain": null,
+ "expires": null,
+ "name": "baz",
+ "path": "/",
+ "secure": false,
+ "value": "quux"
+ },
+ {
+ "domain": null,
+ "expires": null,
+ "name": "foo",
+ "path": "/",
+ "secure": false,
+ "value": "bar"
+ }
+ ],
+ "headers": [
+ {
+ "name": "X-Data",
+ "value": "value"
+ },
+ {
+ "name": "X-Foo",
+ "value": "bar"
+ }
+ ]
+}
diff --git a/tests/fixtures/session_data/new/headers_list.json b/tests/fixtures/session_data/new/headers_list.json
new file mode 100644
index 00000000..7fe309d8
--- /dev/null
+++ b/tests/fixtures/session_data/new/headers_list.json
@@ -0,0 +1,23 @@
+{
+ "__meta__": {
+ "about": "HTTPie session file",
+ "help": "https://httpie.io/docs#sessions",
+ "httpie": "3.2.0"
+ },
+ "auth": {
+ "password": null,
+ "type": null,
+ "username": null
+ },
+ "cookies": [],
+ "headers": [
+ {
+ "name": "X-Data",
+ "value": "value"
+ },
+ {
+ "name": "X-Foo",
+ "value": "bar"
+ }
+ ]
+}
diff --git a/tests/fixtures/session_data/old/cookies_dict.json b/tests/fixtures/session_data/old/cookies_dict.json
index 9c4fd214..5521ee22 100644
--- a/tests/fixtures/session_data/old/cookies_dict.json
+++ b/tests/fixtures/session_data/old/cookies_dict.json
@@ -23,5 +23,5 @@
"value": "bar"
}
},
- "headers": {}
+ "headers": []
}
diff --git a/tests/fixtures/session_data/old/cookies_dict_dev_version.json b/tests/fixtures/session_data/old/cookies_dict_dev_version.json
index 935b43f0..e460390d 100644
--- a/tests/fixtures/session_data/old/cookies_dict_dev_version.json
+++ b/tests/fixtures/session_data/old/cookies_dict_dev_version.json
@@ -23,5 +23,5 @@
"value": "bar"
}
},
- "headers": {}
+ "headers": []
}
diff --git a/tests/fixtures/session_data/old/cookies_dict_with_extras.json b/tests/fixtures/session_data/old/cookies_dict_with_extras.json
index 42968e52..0649379a 100644
--- a/tests/fixtures/session_data/old/cookies_dict_with_extras.json
+++ b/tests/fixtures/session_data/old/cookies_dict_with_extras.json
@@ -22,8 +22,14 @@
"value": "bar"
}
},
- "headers": {
- "X-Data": "value",
- "X-Foo": "bar"
- }
+ "headers": [
+ {
+ "name": "X-Data",
+ "value": "value"
+ },
+ {
+ "name": "X-Foo",
+ "value": "bar"
+ }
+ ]
}
diff --git a/tests/fixtures/session_data/old/empty_cookies_dict.json b/tests/fixtures/session_data/old/empty_cookies_dict.json
index 8de1a921..aba17ad5 100644
--- a/tests/fixtures/session_data/old/empty_cookies_dict.json
+++ b/tests/fixtures/session_data/old/empty_cookies_dict.json
@@ -10,5 +10,5 @@
"username": null
},
"cookies": {},
- "headers": {}
+ "headers": []
}
diff --git a/tests/fixtures/session_data/old/empty_cookies_list.json b/tests/fixtures/session_data/old/empty_cookies_list.json
index 12194f7e..faf07a6e 100644
--- a/