TonBERRY/microdot
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Cookie path support in session and test client

Browse Source
This commit is contained in:
Miguel Grinberg
2024-06-18 20:27:01 +01:00
parent 0151611fc8
commit 6ffb8a8fe9
5 changed files with 34 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/microdot/session.py
View File

@@ -117,7 +117,7 @@ class Session:
"""
@request.after_request
def _delete_session(request, response):
response.delete_cookie('session')
response.delete_cookie('session', **self.cookie_options)
return response
def encode(self, payload, secret_key=None):

8
src/microdot/test_client.py
View File

@@ -156,7 +156,6 @@ class TestClient:
age = 0
if age <= 0:
delete = True
break
elif option.startswith('expires='):
_, e = option.split('=', 1)
# this is a very limited parser for cookie expiry
@@ -164,12 +163,15 @@ class TestClient:
# the date is 1/1/1970
if '1 jan 1970' in e.lower(): # pragma: no branch
delete = True
break
elif option.startswith('path='):
_, path = option.split('=', 1)
if delete:
if cookie_name in self.cookies: # pragma: no branch
del self.cookies[cookie_name]
cookie_path = self.cookies[cookie_name][1] \
if isinstance(self.cookies[cookie_name], tuple) \
else '/'
if path == cookie_path:
del self.cookies[cookie_name]
else:
if path == '/':
self.cookies[cookie_name] = cookie_options[0]

1
tests/test_microdot.py
View File

@@ -203,6 +203,7 @@ class TestMicrodot(unittest.TestCase):
req.cookies['one'] + req.cookies['two'] + req.cookies['three'])
res.set_cookie('four', '4')
res.delete_cookie('two', path='/')
res.delete_cookie('one', path='/bad')
return res
client = TestClient(app, cookies={'one': '1', 'two': '2'})

3
tests/test_response.py
View File

@@ -193,6 +193,7 @@ class TestResponse(unittest.TestCase):
expires='Tue, 05 Nov 2019 02:23:54 GMT', max_age=123,
secure=True, http_only=True)
res.delete_cookie('foo8', http_only=True)
res.delete_cookie('foo9', path='/s')
self.assertEqual(res.headers, {'Set-Cookie': [
'foo1=bar1',
'foo2=bar2; Path=/; Partitioned',
@@ -205,6 +206,8 @@ class TestResponse(unittest.TestCase):
'HttpOnly',
('foo8=; Expires=Thu, 01 Jan 1970 00:00:01 GMT; Max-Age=0; '
'HttpOnly'),
('foo9=; Path=/s; Expires=Thu, 01 Jan 1970 00:00:01 GMT; '
'Max-Age=0'),
]})
def test_redirect(self):

26
tests/test_session.py
View File

@@ -85,7 +85,7 @@ class TestSession(unittest.TestCase):
def test_session_default_path(self):
app = Microdot()
session_ext.initialize(app, secret_key='some-other-secret')
Session(app, secret_key='some-other-secret')
client = TestClient(app)
@app.get('/')
@@ -100,15 +100,26 @@ class TestSession(unittest.TestCase):
def child(req, session):
return str(session.get('foo'))
@app.get('/delete')
@with_session
def delete(req, session):
session.delete()
return ''
res = self._run(client.get('/'))
self.assertEqual(res.status_code, 200)
res = self._run(client.get('/child'))
self.assertEqual(res.text, 'bar')
res = self._run(client.get('/delete'))
res = self._run(client.get('/child'))
self.assertEqual(res.text, 'None')
def test_session_custom_path(self):
app = Microdot()
session_ext = Session()
session_ext.initialize(app, secret_key='some-other-secret',
cookie_options={'path': '/child'})
cookie_options={'path': '/child',
'http_only': False})
client = TestClient(app)
@app.get('/')
@@ -128,9 +139,20 @@ class TestSession(unittest.TestCase):
def foo(req, session):
return str(session.get('foo'))
@app.get('/child/delete')
@with_session
def delete(req, session):
session.delete()
return ''
res = self._run(client.get('/child'))
self.assertEqual(res.status_code, 200)
res = self._run(client.get('/'))
self.assertEqual(res.text, 'None')
res = self._run(client.get('/child/foo'))
self.assertEqual(res.text, 'bar')
res = self._run(client.get('/child/delete'))
res = self._run(client.get('/'))
self.assertEqual(res.text, 'None')
res = self._run(client.get('/child/foo'))
self.assertEqual(res.text, 'None')