Repository navigation
gh-160369: Reject buffered plaintext after IMAP STARTTLS - #160370
Open
JelleZijlstra wants to merge 5 commits into
Open
JelleZijlstra wants to merge 5 commits into
JelleZijlstra wants to merge 5 commits into
Conversation
Open
JelleZijlstra
added
the
type-security
ChatGPT Codex Connector
JelleZijlstra
marked this pull request as ready for review
October 22, 2026 22:01
sethmlarson
reviewed
Oct 29, 2026
| if typ == 'OK': | ||
| if any(self._readbuf): | ||
| raise self.abort('unexpected data after STARTTLS response') | ||
| self._readbuf = [] |
Contributor
There was a problem hiding this comment.
We have to discard all cached state that could have been received before a STARTTLS command, so that includes untagged_responses, too. We should add a test for this case.
Member
|
@JelleZijlstra @sethmlarson I was thinking it'd be good to get this into alpha 2 tomorrow if we can. Do you folks think that's doable? |
Contributor
|
@savannahostrowski I think so, @JelleZijlstra I can take over submitting a fix for my comment? |
Contributor
|
@JelleZijlstra Pushed a fix here for you to review: 55f6dda |
jelle-openai
reviewed
Nov 9, 2026
| ssl_context=ssl_context) | ||
| client.shutdown() | ||
|
|
||
| def test_starttls_discards_untagged_responses(self): |
Contributor
There was a problem hiding this comment.
This test should be moved into NewIMAPTests, the SSL fixture already makes all commands run as TLS so we don't test what we need to test.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Reject unexpected plaintext buffered after the STARTTLS response before upgrading the connection, so it cannot be interpreted as TLS-protected server responses. Add regression coverage and a Security NEWS entry.
Closes #160369.