Add bindings for ClientSession, plus demo program

Cargo.toml

@@ -0,0 +1,20 @@
+[package]
+name = "crustls"
+version = "0.1.0"
+authors = ["Jacob Hoffman-Andrews <github@hoffman-andrews.com>"]
+description = "C-to-rustls bindings"
+edition = "2018"
+
+[dependencies]
+rustls = "0.19"
+webpki = "0.21"
+libc = "0.2"
+env_logger = "0.8"
+webpki-roots = "0.21"
+
+[dev_dependencies]
+cbindgen = "*"
+
+[lib]
+name = "crustls"
+crate-type = ["staticlib"]

Makefile

@@ -0,0 +1,23 @@
+CFLAGS := -Werror -Wall -Wextra -Wpedantic
+LDFLAGS := -Wl,--gc-sections -lpthread -ldl
+
+all: target/crustls-demo
+	target/crustls-demo httpbin.org /headers
+
+target:
+	mkdir -p $@
+
+src/lib.h: src/lib.rs
+	cbindgen --lang C --output src/lib.h
+
+target/crustls-demo: target/main.o target/debug/libcrustls.a
+	$(CC) -o $@ $^ $(LDFLAGS)
+
+target/debug/libcrustls.a: src/lib.rs Cargo.toml
+	cargo build
+
+target/main.o: src/main.c src/lib.h | target
+	$(CC) -o $@ -c $< $(CFLAGS)
+
+clean:
+	rm -rf target

src/lib.rs

@@ -0,0 +1,337 @@
+#![crate_type = "staticlib"]
+
+use libc::{c_char, c_int, c_void, size_t, ssize_t};
+use std::io::{Cursor, Read, Write};
+use std::slice;
+use std::{ffi::CStr, sync::Arc};
+use std::{io::ErrorKind::ConnectionAborted, mem};
+
+use rustls::{ClientConfig, ClientSession, Session};
+
+type CrustlsResult = c_int;
+
+pub const CRUSTLS_OK: c_int = 0;
+pub const CRUSTLS_ERROR: c_int = 1;
+
+/// Create a client_config. Caller owns the memory and must free it with
+/// rustls_client_config_free.
+#[no_mangle]
+pub extern "C" fn rustls_client_config_new() -> *const c_void {
+    let mut config = rustls::ClientConfig::new();
+    config
+        .root_store
+        .add_server_trust_anchors(&webpki_roots::TLS_SERVER_ROOTS);
+    env_logger::init();
+    Arc::into_raw(Arc::new(config)) as *const c_void
+}
+
+/// "Free" a client_config previously returned from rustls_client_config_new.
+/// Since client_config is actually an atomically reference-counted pointer,
+/// extant client_sessions may still hold an internal reference to the
+/// Rust object. However, C code must consider this pointer unusable after
+/// "free"ing it.
+/// Calling with NULL is fine. Must not be called twice with the same value.
+#[no_mangle]
+pub extern "C" fn rustls_client_config_free(config: *const c_void) {
+    unsafe {
+        if let Some(c) = (config as *const ClientConfig).as_ref() {
+            // To free the client_config, we reconstruct the Arc. It should have a refcount of 1,
+            // representing the C code's copy. When it drops, that refcount will go down to 0
+            // and the inner ClientConfig will be dropped.
+            let arc: Arc<ClientConfig> = Arc::from_raw(c);
+            let strong_count = Arc::strong_count(&arc);
+            if strong_count < 1 {
+                eprintln!(
+                    "rustls_client_config_free: invariant failed: arc.strong_count was < 1: {}. \
+                    You must not free the same client_config multiple times.",
+                    strong_count
+                );
+            }
+        } else {
+            eprintln!("rustls_client_config_free: config was NULL");
+        }
+    };
+}
+
+/// In rustls_client_config_new, we create an Arc, then call `into_raw` and return the resulting raw
+/// pointer to C. C can then call rustls_client_session_new multiple times using that same raw
+/// pointer. On each call, we need to reconstruct the Arc. But once we reconstruct the Arc, its
+/// reference count will be decremented on drop. We need to reference count to stay at 1, because
+/// the C code is holding a copy. This function turns the raw pointer back into an Arc, clones it
+/// to increment the reference count (which will make it 2 in this particular case), and
+/// mem::forgets the clone. The mem::forget prevents the reference count from being decremented when
+/// we exit this function, so it will stay at 2 as long as we are in Rust code. Once the caller
+/// drops its Arc, the reference count will go back down to 1, indicating the C code's copy.
+///
+/// Unsafety:
+///
+/// v must be a non-null pointer that resulted from previously calling `Arc::into_raw`.
+unsafe fn arc_with_incref_from_raw<T>(v: *const T) -> Arc<T> {
+    let r = Arc::from_raw(v);
+    let val = Arc::clone(&r);
+    mem::forget(r);
+    val
+}
+
+/// Create a new rustls::ClientSession, and return it in the output parameter `out`.
+/// If this returns an error code, the memory pointed to by `session_out` remains unchanged.
+/// If this returns a non-error, the memory pointed to by `session_out` is modified to point
+/// at a valid ClientSession. The caller now owns the ClientSession and must call
+/// `rustls_client_session_free` when done with it.
+#[no_mangle]
+pub extern "C" fn rustls_client_session_new(
+    config: *const c_void,
+    hostname: *const c_char,
+    session_out: *mut *mut c_void,
+) -> CrustlsResult {
+    let hostname: &CStr = unsafe {
+        if hostname.is_null() {
+            eprintln!("rustls_client_session_new: hostname was NULL");
+            return CRUSTLS_ERROR;
+        }
+        CStr::from_ptr(hostname)
+    };
+    let config: Arc<ClientConfig> = unsafe {
+        match (config as *const ClientConfig).as_ref() {
+            Some(c) => arc_with_incref_from_raw(c),
+            None => {
+                eprintln!("rustls_client_session_new: config was NULL");
+                return CRUSTLS_ERROR;
+            }
+        }
+    };
+    let hostname: &str = match hostname.to_str() {
+        Ok(s) => s,
+        Err(e) => {
+            eprintln!("converting hostname to Rust &str: {}", e);
+            return CRUSTLS_ERROR;
+        }
+    };
+    let name_ref = match webpki::DNSNameRef::try_from_ascii_str(hostname) {
+        Ok(nr) => nr,
+        Err(e) => {
+            eprintln!(
+                "turning hostname '{}' into webpki::DNSNameRef: {}",
+                hostname, e
+            );
+            return CRUSTLS_ERROR;
+        }
+    };
+    let client = ClientSession::new(&config, name_ref);
+
+    // We've succeeded. Put the client on the heap, and transfer ownership
+    // to the caller. After this point, we must return CRUSTLS_OK so the
+    // caller knows it is responsible for this memory.
+    let b = Box::new(client);
+    unsafe {
+        *session_out = Box::into_raw(b) as *mut c_void;
+    }
+
+    return CRUSTLS_OK;
+}
+
+#[no_mangle]
+pub extern "C" fn rustls_client_session_wants_read(session: *const c_void) -> bool {
+    unsafe {
+        match (session as *const ClientSession).as_ref() {
+            Some(cs) => cs.wants_read(),
+            None => false,
+        }
+    }
+}
+
+#[no_mangle]
+pub extern "C" fn rustls_client_session_wants_write(session: *const c_void) -> bool {
+    unsafe {
+        match (session as *const ClientSession).as_ref() {
+            Some(cs) => cs.wants_write(),
+            None => false,
+        }
+    }
+}
+
+#[no_mangle]
+pub extern "C" fn rustls_client_session_process_new_packets(session: *mut c_void) -> CrustlsResult {
+    let session: &mut ClientSession = unsafe {
+        match (session as *mut ClientSession).as_mut() {
+            Some(cs) => cs,
+            None => {
+                eprintln!("ClientSession::process_new_packets: session was NULL");
+                return CRUSTLS_ERROR;
+            }
+        }
+    };
+    let result: CrustlsResult = match session.process_new_packets() {
+        Ok(()) => CRUSTLS_OK,
+        Err(e) => {
+            eprintln!("ClientSession::process_new_packets: {}", e);
+            CRUSTLS_ERROR
+        }
+    };
+    result
+}
+
+/// Free a client_session previously returned from rustls_client_session_new.
+/// Calling with NULL is fine. Must not be called twice with the same value.
+#[no_mangle]
+pub extern "C" fn rustls_client_session_free(session: *mut c_void) {
+    unsafe {
+        if let Some(c) = (session as *mut ClientSession).as_mut() {
+            // Convert the pointer to a Box and drop it.
+            Box::from_raw(c);
+        } else {
+            eprintln!("warning: rustls_client_config_free: config was NULL");
+        }
+    }
+}
+
+/// Write plaintext bytes into the ClientSession. This acts like
+/// write(2). It returns the number of bytes written, or -1 on error.
+#[no_mangle]
+pub extern "C" fn rustls_client_session_write(
+    session: *const c_void,
+    buf: *const u8,
+    count: size_t,
+) -> ssize_t {
+    let session: &mut ClientSession = unsafe {
+        match (session as *mut ClientSession).as_mut() {
+            Some(cs) => cs,
+            None => {
+                eprintln!("ClientSession::write: session was NULL");
+                return -1;
+            }
+        }
+    };
+    let write_buf: &[u8] = unsafe {
+        if buf.is_null() {
+            eprintln!("ClientSession::write: buf was NULL");
+            return -1;
+        }
+        slice::from_raw_parts(buf, count as usize)
+    };
+    let n_written: usize = match session.write(write_buf) {
+        Ok(n) => n,
+        Err(e) => {
+            eprintln!("ClientSession::write: {}", e);
+            return -1;
+        }
+    };
+    n_written as ssize_t
+}
+
+/// Read plaintext bytes from the ClientSession. This acts like
+/// read(2), writing the plaintext bytes into `buf`. It returns
+/// the number of bytes read, or -1 on error.
+#[no_mangle]
+pub extern "C" fn rustls_client_session_read(
+    session: *const c_void,
+    buf: *mut u8,
+    count: size_t,
+) -> ssize_t {
+    let session: &mut ClientSession = unsafe {
+        match (session as *mut ClientSession).as_mut() {
+            Some(cs) => cs,
+            None => {
+                eprintln!("ClientSession::read: session was NULL");
+                return -1;
+            }
+        }
+    };
+    let read_buf: &mut [u8] = unsafe {
+        if buf.is_null() {
+            eprintln!("ClientSession::read: buf was NULL");
+            return -1;
+        }
+        slice::from_raw_parts_mut(buf, count as usize)
+    };
+    // Since it's *possible* for a Read impl to consume the possibly-uninitialized memory from buf,
+    // zero it out just in case. TODO: use Initializer once it's stabilized.
+    // https://doc.rust-lang.org/nightly/std/io/trait.Read.html#method.initializer
+    for c in read_buf.iter_mut() {
+        *c = 0;
+    }
+    let n_read: usize = match session.read(read_buf) {
+        Ok(n) => n,
+        // The CloseNotify TLS alert is benign, but rustls returns it as an Error. See comment on
+        // https://docs.rs/rustls/0.19.0/rustls/struct.ClientSession.html#impl-Read.
+        // Log it and return EOF.
+        Err(e) if e.kind() == ConnectionAborted && e.to_string().contains("CloseNotify") => {
+            eprintln!("ClientSession::read: CloseNotify (this is expected): {}", e);
+            return 0;
+        }
+        Err(e) => {
+            eprintln!("ClientSession::read: {}", e);
+            return -1;
+        }
+    };
+    n_read as ssize_t
+}
+
+/// Read TLS bytes taken from a socket into the ClientSession. This acts like
+/// read(2). It returns the number of bytes read, or -1 on error.
+#[no_mangle]
+pub extern "C" fn rustls_client_session_read_tls(
+    session: *const c_void,
+    buf: *const u8,
+    count: size_t,
+) -> ssize_t {
+    let session: &mut ClientSession = unsafe {
+        match (session as *mut ClientSession).as_mut() {
+            Some(cs) => cs,
+            None => {
+                eprintln!("ClientSession::read_tls: session was NULL");
+                return -1;
+            }
+        }
+    };
+    let input_buf: &[u8] = unsafe {
+        if buf.is_null() {
+            eprintln!("ClientSession::read_tls: buf was NULL");
+            return -1;
+        }
+        slice::from_raw_parts(buf, count as usize)
+    };
+    let mut cursor = Cursor::new(input_buf);
+    let n_read: usize = match session.read_tls(&mut cursor) {
+        Ok(n) => n,
+        Err(e) => {
+            eprintln!("ClientSession::read_tls: {}", e);
+            return -1;
+        }
+    };
+    n_read as ssize_t
+}
+
+/// Write TLS bytes from the ClientSession into a buffer. Those bytes should then be written to
+/// a socket. This acts like write(2). It returns the number of bytes read, or -1 on error.
+#[no_mangle]
+pub extern "C" fn rustls_client_session_write_tls(
+    session: *const c_void,
+    buf: *mut u8,
+    count: size_t,
+) -> ssize_t {
+    let session: &mut ClientSession = unsafe {
+        match (session as *mut ClientSession).as_mut() {
+            Some(cs) => cs,
+            None => {
+                eprintln!("ClientSession::write_tls: session was NULL");
+                return -1;
+            }
+        }
+    };
+    let mut output_buf: &mut [u8] = unsafe {
+        if buf.is_null() {
+            eprintln!("ClientSession::write_tls: buf was NULL");
+            return -1;
+        }
+        slice::from_raw_parts_mut(buf, count as usize)
+    };
+    let n_written: usize = match session.write_tls(&mut output_buf) {
+        Ok(n) => n,
+        Err(e) => {
+            eprintln!("ClientSession::write_tls: {}", e);
+            return -1;
+        }
+    };
+    n_written as ssize_t
+}