Combine cookies from original request and session file

httpie/sessions.py

@@ -79,6 +79,13 @@ def update_headers(self, request_headers: RequestHeadersDict):
             if name == 'User-Agent' and value.startswith('HTTPie/'):
                 continue
 
+            if name == 'Cookie':
+                for cookie in value.split(';'):
+                    name, value = cookie.split("=")
+                    self['cookies'][name.strip()] = {'value': value.strip()}
+                del request_headers['Cookie']
+                continue
+
             for prefix in SESSION_IGNORED_HEADER_PREFIXES:
                 if name.lower().startswith(prefix.lower()):
                     break

tests/test_sessions.py

@@ -277,3 +277,50 @@ def test_expired_cookies(self, httpbin):
     )
     def test_get_expired_cookies_manages_multiple_cookie_headers(self, headers, now, expected_expired):
         assert get_expired_cookies(headers, now=now) == expected_expired
+
+
+@pytest.mark.parametrize(
+    argnames=["new_cookies", "new_cookies_dict", "expected"],
+    argvalues=[(
+        "new=bar",
+        {"new": "bar"},
+        "existing_cookie=foo; new=bar"
+    ),
+        (
+        "new=bar;chocolate=milk",
+        {"new": "bar", "chocolate": "milk"},
+        "chocolate=milk; existing_cookie=foo; new=bar"
+    ),
+        (
+        "new=bar; chocolate=milk",
+        {"new": "bar", "chocolate": "milk"},
+        "chocolate=milk; existing_cookie=foo; new=bar"
+    )
+    ]
+)
+def test_existing_and_new_cookies_sent_in_request(new_cookies, new_cookies_dict, expected, httpbin):
+    config_dir = mk_config_dir()
+    orig_session = {
+        'cookies': {
+            'existing_cookie': {
+                'value': 'foo',
+            }
+        }
+    }
+    session_path = config_dir / 'test-session.json'
+    session_path.write_text(json.dumps(orig_session))
+
+    r = http(
+        '--session', str(session_path),
+        '--print=H',
+        httpbin.url,
+        'Cookie:' + new_cookies,
+    )
+    # Note: cookies in response are in alphabetical order
+    assert 'Cookie: ' + expected in r
+
+    updated_session = json.loads(session_path.read_text())
+    for name, value in new_cookies_dict.items():
+        assert name, value in updated_session['cookies']
+        assert "Cookie" not in updated_session['headers']
+    shutil.rmtree(config_dir)