feat(p3): implement wasi:tls#12174
feat(p3): implement wasi:tls#12174rvolosatovs wants to merge 5 commits intobytecodealliance:mainfrom
wasi:tls#12174Conversation
04b4cf4 to
7c0ba54
Compare
Signed-off-by: Roman Volosatovs <rvolosatovs@riseup.net>
4c9f3b8 to
187b386
Compare
Signed-off-by: Roman Volosatovs <rvolosatovs@riseup.net>
187b386 to
84b3548
Compare
Signed-off-by: Roman Volosatovs <rvolosatovs@riseup.net>
Signed-off-by: Roman Volosatovs <rvolosatovs@riseup.net>
Signed-off-by: Roman Volosatovs <rvolosatovs@riseup.net>
alexcrichton
left a comment
There was a problem hiding this comment.
I'm finding host/mod.rs pretty gnarly here especially with Waker logic and such to the point that I'd have to dig more into what rustls is offering here to double-check all the logic. That being said I'd also be fine to defer to @badeend in terms of review on that.
I'll note though that this is a pretty beefy implementation with relatively light testing. Would it be possible to enhance the tests here or does the current test basically not pass unless all the bits and bobs are present?
There was a problem hiding this comment.
I realize that this is duplicating the p2 tests already present, but given that this is basically modeled as "run the thing" that could also be modeled as a p3_cli_* test run as part of tests/all/cli_tests.rs where it bottoms out in wasmtime run -S... foo.wasm.
I might recommend moving more in that direction than having librarified test here to make it a bit more uniform to run tests
| mod client; | ||
| mod types; | ||
|
|
||
| macro_rules! mk_push { |
There was a problem hiding this comment.
I'm not sure if this was copied from elsewhere, but personally I'd say that these macros are probably overkill given the that they're mostly one-liners around table.$method(thing) and the type annotations on Resource<T> is typically enough to guide everything type-inference wide. The benefit of these macros would be the extra error context information, but given how rarely these will all be triggered I'm not sure it's worth the complexity.
| )) | ||
| } | ||
|
|
||
| async fn connect<T>( |
There was a problem hiding this comment.
connect should perform the handshake and not return before that has succeeded or failed. But in its current form this method doesn't do any I/O.
There was a problem hiding this comment.
The WIT file mentions:
Closing the
cleartextstream will cause aclose_notifypacket to be emitted on the returned output stream.
I don't see where graceful shutdown is handled in the current implementation. I would expect a call to send_close_notify somewhere
There was a problem hiding this comment.
The wasi-tls create already has a bunch of these types in crates/wasi-tls/src/lib.rs. E.g. WasiTls<'a>, WasiTlsCtx, WasiTlsCtxBuilder. Can the P3 implementation make use of those existing ones?
| return Poll::Pending; | ||
| } | ||
|
|
||
| let state = match conn.process_new_packets() { |
There was a problem hiding this comment.
I notice process_new_packets appear multiple times in this file.
The rustls documentation mentions that this method should only be called after a successful call to Connection::read_tls. This lines up with how e.g. tokio-rustls does it, where the term process_new_packets appears only once in the entire crate, right after the call to read_tls.
I think only CiphertextConsumer has to use process_new_packets, and the other ones can get by without:
- The returned
statevariable is used as a heuristic for the capacity of.as_direct(..). A fixed size could work too, optionally bounded bydst.remaining(). peer_has_closedis also surfaced from the regularreadcall, when it returns Ok(0)
| ciphertext_producer.take().map(Waker::wake); | ||
| plaintext_consumer.take().map(Waker::wake); | ||
| plaintext_producer.take().map(Waker::wake); |
There was a problem hiding this comment.
The error returned by process_new_packets only affects the read_tls side. The other directions may still continue to work. From rustls docs:
After an error is received from process_new_packets, you should not call read_tls any more (it will fill up buffers to no purpose). However, you may call the other methods on the connection, including write, send_close_notify, and write_tls. Most likely you will want to call write_tls to send any alerts queued by the error and then close the underlying connection.
So I don't know if waking everybody up is the right thing to do.
This is the implementation of current p3 draft WebAssembly/wasi-tls#17
refs #12102