Skip to content

Commit 59fd7ce

Browse files
fix: handle session cookies with no expiry
1 parent d95b4b4 commit 59fd7ce

2 files changed

Lines changed: 25 additions & 3 deletions

File tree

‎ibmcloudant/couchdb_session_token_manager.py‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,8 @@ def request_token(self):
8484

8585
return response
8686

87+
_DEFAULT_SESSION_COOKIE_TTL_SECONDS = 400 * 24 * 60 * 60
88+
8789
def _save_token_info(self, token_response) -> None:
8890
"""
8991
Decode the access token and save the response from the service to the object's state
@@ -100,6 +102,8 @@ def _save_token_info(self, token_response) -> None:
100102
cookie = next(x for x in self.access_token if x.name == 'AuthSession')
101103
exp = cookie.expires
102104
iat = self._get_current_time()
105+
if exp is None:
106+
exp = iat + self._DEFAULT_SESSION_COOKIE_TTL_SECONDS
103107
self.expire_time = exp
104108
ttl = exp - iat
105109
buffer = ttl * 0.2

‎test/unit/test_couchdb_session_auth.py‎

Lines changed: 21 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,9 +55,12 @@ def setUp(self) -> None:
5555

5656
def prepare_for_url(self, url):
5757
def post_session(request):
58-
return (200, {
59-
"Set-Cookie": "AuthSession=" + self.cookie_value + "; Version=1; Expires=" +
60-
self.cookie_expire_time + "; Max-Age=600; Path=/; HttpOnly"},
58+
if self.cookie_expire_time is None:
59+
set_cookie = "AuthSession=" + self.cookie_value + "; Version=1; Path=/; HttpOnly"
60+
else:
61+
set_cookie = ("AuthSession=" + self.cookie_value + "; Version=1; Expires=" +
62+
self.cookie_expire_time + "; Max-Age=600; Path=/; HttpOnly")
63+
return (200, {"Set-Cookie": set_cookie},
6164
json.dumps({"ok": True, "name": "adm", "roles": ["_admin"]}))
6265

6366
responses.add_callback(responses.POST, url + '/_session', post_session)
@@ -177,6 +180,21 @@ def test_refresh_time_calculation(self):
177180
self.assertAlmostEqual(self.authenticator.token_manager.refresh_time,
178181
self.authenticator.token_manager._get_current_time() + 8 * 60, delta=3)
179182

183+
@responses.activate
184+
def test_cookie_without_expiry(self):
185+
self.client.get_session_information()
186+
self.assertEqual(responses.calls[-1].request.headers["Cookie"], "AuthSession=foobar")
187+
self.cookie_value = "bar"
188+
self.cookie_expire_time = None
189+
self.authenticator.token_manager.refresh_time = 0
190+
self.client.get_session_information()
191+
self.assertEqual(responses.calls[-1].request.headers["Cookie"], "AuthSession=bar")
192+
token_manager = self.authenticator.token_manager
193+
self.assertIsNotNone(token_manager.expire_time)
194+
self.assertIsNotNone(token_manager.refresh_time)
195+
self.assertFalse(token_manager._is_token_expired())
196+
self.assertGreater(token_manager.expire_time, token_manager._get_current_time())
197+
180198
@responses.activate
181199
def test_set_service_url(self):
182200
self.client.get_session_information()

0 commit comments

Comments
 (0)