https: ureq http client with tls support

Cargo.toml

@@ -50,6 +50,11 @@ pbkdf2 = { version = "0.12", optional = true, default-features = false, features
 serde_json = { version = "1", optional = true }
 rusb = { version = "0.9.4", optional = true }
 tiny_http = { version = "0.12", optional = true }
+ureq = { version = "2.10.1", optional = true, default-features = false, features = ["gzip"] }
+native-tls = { version = "0", optional = true }
+rustls = { version = "0", default-features = false, features = ["ring", "logging", "std", "tls12"], optional = true }
+rustls-pemfile = { version = "2.1.3", optional = true }
+rustls-platform-verifier = { version = "0.3.4", optional = true }
 
 [dev-dependencies]
 ed25519-dalek = "2"
@@ -61,14 +66,19 @@ x509-cert = { version = "0.2.5", features = ["builder"] }
 [features]
 default = ["http", "passwords", "setup"]
 http-server = ["tiny_http"]
-http = []
+http = ["ureq"]
+native-tls = ["ureq/native-tls", "dep:native-tls", "_tls"]
+native-tls-vendored = ["native-tls", "native-tls/vendored"]
+rustls = ["ureq/tls", "dep:rustls", "dep:rustls-pemfile", "dep:rustls-platform-verifier", "_tls"]
 mockhsm = ["ecdsa/arithmetic", "ed25519-dalek", "p256/ecdsa", "secp256k1"]
 passwords = ["hmac", "pbkdf2"]
 secp256k1 = ["k256"]
 setup = ["passwords", "serde_json", "uuid/serde"]
 untested = []
 usb = ["rusb"]
 
+_tls = []
+
 [package.metadata.docs.rs]
 all-features = true
 rustdoc-args = ["--cfg", "docsrs"]

src/connector/error.rs

@@ -4,9 +4,6 @@ use crate::error::{BoxError, Context};
 use std::{fmt, io, num::ParseIntError, str::Utf8Error};
 use thiserror::Error;
 
-#[cfg(feature = "http")]
-use super::http;
-
 /// `yubihsm-connector` related errors
 pub type Error = crate::Error<ErrorKind>;
 
@@ -67,15 +64,13 @@ impl From<io::Error> for Error {
 }
 
 #[cfg(feature = "http")]
-impl From<http::client::Error> for Error {
-    fn from(err: http::client::Error) -> Error {
+impl From<ureq::Error> for Error {
+    fn from(err: ureq::Error) -> Error {
         let kind = match err.kind() {
-            http::client::ErrorKind::AddrInvalid => ErrorKind::AddrInvalid,
-            http::client::ErrorKind::IoError => ErrorKind::IoError,
-            http::client::ErrorKind::ParseError | http::client::ErrorKind::ResponseError => {
-                ErrorKind::ResponseError
-            }
-            http::client::ErrorKind::RequestError => ErrorKind::RequestError,
+            ureq::ErrorKind::Dns => ErrorKind::AddrInvalid,
+            ureq::ErrorKind::Io => ErrorKind::IoError,
+            ureq::ErrorKind::HTTP => ErrorKind::ResponseError,
+            _ => ErrorKind::RequestError,
         };
 
         kind.context(err).into()
@@ -91,7 +86,7 @@ impl From<rusb::Error> for Error {
             rusb::Error::Pipe => format_err!(ErrorKind::UsbError, "lost connection to USB device"),
             _ => format_err!(ErrorKind::UsbError, "{}", err),
         }
-        .into()
+            .into()
     }
 }
 

src/connector/http.rs

@@ -2,8 +2,8 @@
 //!
 //! <https://developers.yubico.com/YubiHSM2/Component_Reference/yubihsm-connector/>
 
-pub(super) mod client;
 mod config;
+#[cfg(feature = "http")]
 mod connection;
 #[cfg(feature = "http-server")]
 mod server;
@@ -12,6 +12,7 @@ pub use self::config::HttpConfig;
 #[cfg(feature = "http-server")]
 pub use self::server::Server;
 
+#[cfg(feature = "http")]
 use self::connection::HttpConnection;
 use crate::connector::{self, Connectable, Connection};