Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

No cookies on other domain when using parent_domain #1072

Merged
merged 1 commit into from
Aug 15, 2013
Merged

No cookies on other domain when using parent_domain #1072

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions pyramid/authentication.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -865,22 +865,22 @@ def _get_cookies(self, environ, value, max_age=None):
if ':' in cur_domain:
cur_domain = cur_domain.split(':', 1)[0]

cookies = [
('Set-Cookie', '%s="%s"; Path=%s%s%s' % (
self.cookie_name, value, self.path, max_age, self.static_flags))
]

domains = []
if self.parent_domain and cur_domain.count('.') > 1:
domains.append('.' + cur_domain.split('.', 1)[1])
else:
domains.append(None)
domains.append(cur_domain)
if self.wild_domain:
domains.append('.' + cur_domain)

cookies = []
base_cookie = '%s="%s"; Path=%s%s%s' % (self.cookie_name, value,
self.path, max_age, self.static_flags)
for domain in domains:
cookies.append(('Set-Cookie', '%s="%s"; Path=%s; Domain=%s%s%s' % (
self.cookie_name, value, self.path, domain, max_age,
self.static_flags)))
domain = '; Domain=%s' % domain if domain is not None else ''
cookies.append(('Set-Cookie', '%s%s' % (base_cookie, domain)))

return cookies

Expand Down
25 changes: 10 additions & 15 deletions pyramid/tests/test_authentication.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -908,11 +908,11 @@ def test_remember_http_only(self):
self.assertTrue(result[0][1].startswith('auth_tkt='))

self.assertEqual(result[1][0], 'Set-Cookie')
self.assertTrue(result[1][1].endswith('; HttpOnly'))
self.assertTrue('; HttpOnly' in result[1][1])
self.assertTrue(result[1][1].startswith('auth_tkt='))

self.assertEqual(result[2][0], 'Set-Cookie')
self.assertTrue(result[2][1].endswith('; HttpOnly'))
self.assertTrue('; HttpOnly' in result[2][1])
self.assertTrue(result[2][1].startswith('auth_tkt='))

def test_remember_secure(self):
Expand Down Expand Up @@ -952,24 +952,19 @@ def test_remember_parent_domain(self):
request = self._makeRequest()
request.environ['HTTP_HOST'] = 'www.example.com'
result = helper.remember(request, 'other')
self.assertEqual(len(result), 2)
self.assertEqual(len(result), 1)

self.assertEqual(result[0][0], 'Set-Cookie')
self.assertTrue(result[0][1].endswith('; Path=/'))
self.assertTrue(result[0][1].endswith('; Path=/; Domain=.example.com'))
self.assertTrue(result[0][1].startswith('auth_tkt='))

self.assertEqual(result[1][0], 'Set-Cookie')
self.assertTrue(result[1][1].endswith('; Path=/; Domain=.example.com'))
self.assertTrue(result[1][1].startswith('auth_tkt='))

def test_remember_parent_domain_supercedes_wild_domain(self):
helper = self._makeOne('secret', parent_domain=True, wild_domain=True)
request = self._makeRequest()
request.environ['HTTP_HOST'] = 'www.example.com'
result = helper.remember(request, 'other')
self.assertEqual(len(result), 2)
self.assertTrue(result[0][1].endswith('; Path=/'))
self.assertTrue(result[1][1].endswith('; Path=/; Domain=.example.com'))
self.assertEqual(len(result), 1)
self.assertTrue(result[0][1].endswith('; Domain=.example.com'))

def test_remember_domain_has_port(self):
helper = self._makeOne('secret', wild_domain=False)
Expand Down Expand Up @@ -1102,13 +1097,13 @@ def test_forget(self):
name, value = headers[1]
self.assertEqual(name, 'Set-Cookie')
self.assertEqual(value,
'auth_tkt=""; Path=/; Domain=localhost; Max-Age=0; '
'Expires=Wed, 31-Dec-97 23:59:59 GMT')
'auth_tkt=""; Path=/; Max-Age=0; '
'Expires=Wed, 31-Dec-97 23:59:59 GMT; Domain=localhost')
name, value = headers[2]
self.assertEqual(name, 'Set-Cookie')
self.assertEqual(value,
'auth_tkt=""; Path=/; Domain=.localhost; Max-Age=0; '
'Expires=Wed, 31-Dec-97 23:59:59 GMT')
'auth_tkt=""; Path=/; Max-Age=0; '
'Expires=Wed, 31-Dec-97 23:59:59 GMT; Domain=.localhost')

class TestAuthTicket(unittest.TestCase):
def _makeOne(self, *arg, **kw):
Expand Down