bpo-46075: Allow for explicit domains in CookieJar #30108
Conversation
|
Hello, and thanks for your contribution! I'm a bot set up to make sure that the project can legally accept this contribution by verifying everyone involved has signed the PSF contributor agreement (CLA). CLA MissingOur records indicate the following people have not signed the CLA: For legal reasons we need all the people listed to sign the CLA before we can look at your contribution. Please follow the steps outlined in the CPython devguide to rectify this issue. If you have recently signed the CLA, please wait at least one business day You can check yourself to see if the CLA has been received. Thanks again for the contribution, we look forward to reviewing it! |
|
This PR is stale because it has been open for 30 days with no activity. |
|
@keddad gentle bump |
github-actions
bot
removed
the
stale
A few comments. I want to be very careful here because I'm not that familiar with cookie processing and I feel like getting something wrong here is a CVE waiting to happen.
|
|
||
| interact_netscape(c, "http://localhost", "foo=bar; domain=localhost;") | ||
|
|
||
| self.assertEqual(len(c), 1) |
There was a problem hiding this comment.
Can you also test that the cookie in the jar is what you expect it to be?
There was a problem hiding this comment.
I've written such a test, and it looks like it saves the cookie under ".localhost". Without "domain" attribute present, it saves them under "localhost.local". I'm not so familiar with cookie processing as well, so I'm not really sure if "domain" attribute should affect this in such a way. I've commited the tests in cec78ed.
There was a problem hiding this comment.
Yes, that's a bit odd. It might be fine though as long as it behaves consistently. The public interface doesn't expose the domain names as far as I can see.
| @@ -1044,12 +1044,13 @@ def set_ok_domain(self, cookie, request): | |||
| else: | |||
| undotted_domain = domain | |||
| embedded_dots = (undotted_domain.find(".") >= 0) | |||
| if not embedded_dots and domain != ".local": | |||
| if not embedded_dots and not erhn.endswith(".local"): | |||
There was a problem hiding this comment.
Previously this checked a domain that came from the cookie, and now it checks the hostname from the request. Can you explain why this is changed and why the change is safe?
There was a problem hiding this comment.
This check considers localhost to be a non-local domain. It also doesn't have any embedded_dots, so it doesn't process it, which really shouldn't happen. My change should be safe because for local domains effective request hostname would end with ".local" (ERHN will end with .local if it ls clearly specified as part of the domain (foo.local), or if the domain consists of only one level (localhost has EHRN of localhost.local)).
There was a problem hiding this comment.
Thanks! I'm still worried about cases where the domain and the ERHN don't match (e.g. a malicious website evil.com sets a cookie for localhost). I see there are some checks for that and a test in test_wrong_domain, but it's not very thorough. Could you add more tests for similar cases (request to non-local domain setting a local cookie, and vice versa)?
There was a problem hiding this comment.
I've added some tests for those cases in a31fa40. Looks like everything is fine.
Co-authored-by: Jelle Zijlstra <jelle.zijlstra@gmail.com>
https://bugs.python.org/issue46075