8000 add modussl_mbedtls.c methods and exceptions. esp32/unix by tuxlinuxien · Pull Request #5436 · micropython/micropython · GitHub
[go: up one dir, main page]
Skip to content

add modussl_mbedtls.c methods and exceptions. esp32/unix #5436

Closed
tuxlinuxien wants to merge 2 commits intomicropython:masterfrom
tuxlinuxien:master
Closed

add modussl_mbedtls.c methods and exceptions. esp32/unix #5436
tuxlinuxien wants to merge 2 commits intomicropython:masterfrom
tuxlinuxien:master

Conversation

@tuxlinuxien
Copy link
Copy Markdown
@tuxlinuxien tuxlinuxien commented Dec 18, 2019 •
edited
Loading

Changes

This pull requests adds:

  • send
  • recv
  • do_handshake

methods to ussl (mbedtls version only) plus few exceptions.

The goal is to fully support non-blocking ssl sockets and reduce the number of call to poll by throwing the exact I/O error like SSL_WANT_READ or SSL_WANT_WRITE. the user has now the possibility to call do_handshake() later if ussl.wrap_socket was set with do_handshake = False

Tests

successfully tested on micropython/ports/esp-32 (esp-ifd rev 6ccb4cf) and micropython/ports/unix

Example

# this snippet SHOULD be seen as an example
# on how to use these new methods and is not
# optimized.

import usocket
import ussl
import uselect

# [...]
# create socket and ussl_wrap(sock)
# 
8000
[...]

def do_handshake(sock, is_ssl):
    if not is_ssl:
        return
    poller = uselect.poll()
    poller.register(sock)
    while True:
        try:
            sock.do_handshake()
            break
        except ussl.SSLWantReadError:
            poller.modify(sock, uselect.POLLIN)
            poller.poll(5000)
            continue
        except ussl.SSLWantWriteError:
            poller.modify(sock, uselect.POLLOUT)
            poller.poll(5000)
            continue
        except ussl.SSLInProgress:
            continue

def reader(sock):
    poller = uselect.poll()
    poller.register(sock)
    while True:
        try:
            buff = sock.recv(4096)
        except ussl.SSLWantReadError:
            poller.modify(sock, uselect.POLLIN)
            poller.poll(5000)
            continue
        except ussl.SSLWantWriteError:
            poller.modify(sock, uselect.POLLOUT)
            poller.poll(5000)
            continue
        except Exception:
            raise
        if not buff:
            break
        yield buff
    return []

def sender(sock, buffer):
    poller = uselect.poll()
    poller.register(sock)
    while buffer:
        try:
            sent = sock.send(buffer)
        except ussl.SSLWantReadError:
            poller.modify(sock, uselect.POLLIN)
            poller.poll(5000)
            continue
        except ussl.SSLWantWriteError:
            poller.modify(sock, uselect.POLLOUT)
            poller.poll(5000)
            continue
        except Exception:
            raise
        buffer = buffer[sent:]

@tuxlinuxien tuxlinuxien changed the title add modussl_mbedtls.c methods and exceptions. add modussl_mbedtls.c methods and exceptions. esp32/unix Dec 18, 2019
@tve
Copy link
Copy Markdown
Contributor
tve commented Feb 5, 2020

Interesting addition / fix!
Has anyone other than the PR author looked into this or tested it?
I'm a bit puzzled in that I use mqtt_as (https://github.com/peterhinch/micropython-mqtt/blob/master/mqtt_as/mqtt_as.py) on esp32 with SSL and that uses a non-blocking socket, so I'm wondering why this PR is needed...? (Asking out of ignorance more than anything else.)

@tuxlinuxien
Copy link
Copy Markdown
Author
tuxlinuxien commented Feb 5, 2020 •
edited
Loading

@tve I can understand that my PR is not really important for micropython unix port. I had done these changes in order to build my own http library that works well in china (TCP and SSL are definitely not stable here if I try to ping a server outside of the GFW). I also don't like the idea of using sleep_ms in my code in order to wait for an event.

Since mbedTLS makes the distinction between read/write blocking socket, I thought it was better to use them.

Sorry that I couldn't do that for axTLS as well.

@dpgeorge dpgeorge added the extmod Relates to extmod/ directory in source label Jul 27, 2021
@dpgeorge
Copy link
Copy Markdown
Member
dpgeorge commented Jul 27, 2021

Related #5840

@tuxlinuxien
Copy link
Copy Markdown
Author
tuxlinuxien commented Jul 27, 2021

@dpgeorge should I remove this merge request?

@dpgeorge
Copy link
Copy Markdown
Member
dpgeorge commented Jul 27, 2021

should I remove this merge request?

Not at this stage, I think it's a valid alternative to consider for non-blocking SSL.

tannewt pushed a commit to tannewt/circuitpython that referenced this pull request Oct 13, 2021
@dhalbert
Merge pull request micropython#5436 from pewpew-game/stage-scale
3c993e5 
_stage: Fix handling of scaled display in the stage library
@dpgeorge dpgeorge mentioned this pull request Jul 16, 2022
Closed
@dpgeorge
Copy link
Copy Markdown
Member
dpgeorge commented Sep 5, 2023

Non-blocking SSL sockets have been implemented in a different way in ed58d6e

@dpgeorge dpgeorge closed this Sep 5, 2023
@dpgeorge
Copy link
Copy Markdown
Member
dpgeorge commented Sep 5, 2023

See also related commit ef71028

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

extmod Relates to extmod/ directory in source

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@tuxlinuxien @tve @dpgeorge
0