extmod/asyncio: Add ssl support with SSLContext.
This adds asyncio ssl support with SSLContext and the corresponding tests in `tests/net_inet` and `tests/multi_net`. Note that not doing the handshake on connect will delegate the handshake to the following `mbedtls_ssl_read/write` calls. However if the handshake fails when a client certificate is required and not presented by the peer, it needs to be notified of this handshake error (otherwise it will hang until timeout if any). Finally at MicroPython side raise the proper mbedtls error code and message. Signed-off-by: Carlos Gil <carlosgilglez@gmail.com>
This commit is contained in:
@@ -63,6 +63,8 @@ class Stream:
|
||||
while True:
|
||||
yield core._io_queue.queue_read(self.s)
|
||||
l2 = self.s.readline() # may do multiple reads but won't block
|
||||
if l2 is None:
|
||||
continue
|
||||
l += l2
|
||||
if not l2 or l[-1] == 10: # \n (check l in case l2 is str)
|
||||
return l
|
||||
@@ -100,19 +102,29 @@ StreamWriter = Stream
|
||||
# Create a TCP stream connection to a remote host
|
||||
#
|
||||
# async
|
||||
def open_connection(host, port):
|
||||
def open_connection(host, port, ssl=None, server_hostname=None):
|
||||
from errno import EINPROGRESS
|
||||
import socket
|
||||
|
||||
ai = socket.getaddrinfo(host, port, 0, socket.SOCK_STREAM)[0] # TODO this is blocking!
|
||||
s = socket.socket(ai[0], ai[1], ai[2])
|
||||
s.setblocking(False)
|
||||
ss = Stream(s)
|
||||
try:
|
||||
s.connect(ai[-1])
|
||||
except OSError as er:
|
||||
if er.errno != EINPROGRESS:
|
||||
raise er
|
||||
# wrap with SSL, if requested
|
||||
if ssl:
|
||||
if ssl is True:
|
||||
import ssl as _ssl
|
||||
|
||||
ssl = _ssl.SSLContext(_ssl.PROTOCOL_TLS_CLIENT)
|
||||
if not server_hostname:
|
||||
server_hostname = host
|
||||
s = ssl.wrap_socket(s, server_hostname=server_hostname, do_handshake_on_connect=False)
|
||||
s.setblocking(False)
|
||||
ss = Stream(s)
|
||||
yield core._io_queue.queue_write(s)
|
||||
return ss, ss
|
||||
|
||||
@@ -135,7 +147,7 @@ class Server:
|
||||
async def wait_closed(self):
|
||||
await self.task
|
||||
|
||||
async def _serve(self, s, cb):
|
||||
async def _serve(self, s, cb, ssl):
|
||||
self.state = False
|
||||
# Accept incoming connections
|
||||
while True:
|
||||
@@ -156,6 +168,13 @@ class Server:
|
||||
except:
|
||||
# Ignore a failed accept
|
||||
continue
|
||||
if ssl:
|
||||
try:
|
||||
s2 = ssl.wrap_socket(s2, server_side=True, do_handshake_on_connect=False)
|
||||
except OSError as e:
|
||||
core.sys.print_exception(e)
|
||||
s2.close()
|
||||
continue
|
||||
s2.setblocking(False)
|
||||
s2s = Stream(s2, {"peername": addr})
|
||||
core.create_task(cb(s2s, s2s))
|
||||
@@ -163,7 +182,7 @@ class Server:
|
||||
|
||||
# Helper function to start a TCP stream server, running as a new task
|
||||
# TODO could use an accept-callback on socket read activity instead of creating a task
|
||||
async def start_server(cb, host, port, backlog=5):
|
||||
async def start_server(cb, host, port, backlog=5, ssl=None):
|
||||
import socket
|
||||
|
||||
# Create and bind server socket.
|
||||
@@ -176,7 +195,7 @@ async def start_server(cb, host, port, backlog=5):
|
||||
|
||||
# Create and return server object and task.
|
||||
srv = Server()
|
||||
srv.task = core.create_task(srv._serve(s, cb))
|
||||
srv.task = core.create_task(srv._serve(s, cb, ssl))
|
||||
try:
|
||||
# Ensure that the _serve task has been scheduled so that it gets to
|
||||
# handle cancellation.
|
||||
|
||||
Reference in New Issue
Block a user