Implement STARTTLS event; Fix #113 #214
Merged
Conversation
This file contains 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
spaceone
commented
Jan 23, 2017
| sock.setblocking(False) | ||
| self._poller.addReader(self, sock) | ||
| self._clients.append(sock) | ||
| self.fire(connect(sock, *sock.getpeername())) |
There was a problem hiding this comment.
Add check for already started starttls and don't fire connect again.
| def starttls(self, sock): | ||
| if not HAS_SSL: | ||
| return | ||
| if self.__starttls: |
There was a problem hiding this comment.
Oh, this seems wrong. Should be a dict of sock -> bool.
spaceone
force-pushed
the
starttls
branch
2 times, most recently
from
7853628
to
f8edea5
Compare
|
Nice! |
prologic
reviewed
Jan 29, 2017
| @handler('starttls') | ||
| def starttls(self, sock): | ||
| if not HAS_SSL: | ||
| return # TODO: emit a warning? |
There was a problem hiding this comment.
Just raise an appropriate exception maybe?
There was a problem hiding this comment.
@prologic Done that.
|
Rebase? |
Current coverage is 77.10% (diff: 60.97%)
|
spaceone
force-pushed
the
starttls
branch
2 times, most recently
from
0c8e9dd
to
27c689e
Compare
prologic
approved these changes
Jan 29, 2017
from circuits import Component, Debugger
from circuits.net.sockets import TCPServer, write
from circuits.net.events import starttls
class TLSEchoServer(Component):
def init(self, bind):
self.transport = TCPServer(bind,
certfile="/circuits/tests/net/cert.pem",
).register(self)
def connect(self, sock, foo, bar):
self.fire(write(sock, b'* OK [CAPABILITY STARTTLS] Dovecot ready.\r\n'))
def read(self, sock, data):
if data.strip().upper() == b". STARTTLS":
yield self.fire(write(sock, b'. OK Begin TLS negotiation now.'))
self.fire(starttls(sock))
return
if data.strip() == b'. CAPABILITY':
self.fire(write(sock, b'* CAPABILITY STARTTLS \r\n. OK Pre-login capabilities listed, post-login capabilities have more.\r\n'))
else:
self.fire(write(sock, b'Thanks for TLS encrypting! You wrote: %r' % (data,)))
(TLSEchoServer(("0.0.0.0", 8000)) + Debugger()).run()
$ openssl s_client -connect localhost:8000 -starttls imap
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.
$ openssl s_client -connect localhost:8000 -starttls imap