Merge pull request #19 from dfinity/igor/fix-extract

Fix crash in extract_host, add test

Author: blind-oracle

src/http/mod.rs

@@ -90,6 +90,10 @@ pub const fn http_method(v: &Method) -> &'static str {
 /// Attempts to extract "host" from "host:port" format.
 /// Host can be either FQDN or IPv4/IPv6 address.
 pub fn extract_host(host_port: &str) -> Option<&str> {
+    if host_port.is_empty() {
+        return None;
+    }
+
     // Cover IPv6 case
     if host_port.as_bytes()[0] == b'[' {
         host_port.find(']').map(|i| &host_port[0..=i])
@@ -216,8 +220,10 @@ mod test {
             Some("[fe80::b696:91ff:fe84:3ae8]")
         );
 
-        // Unterminated bracket, the only failure case
+        // Unterminated bracket
         assert_eq!(extract_host("[fe80::b696:91ff:fe84:3ae8:123"), None);
+        // Empty
+        assert_eq!(extract_host(""), None);
     }
 
     #[test]

src/tls/acme/acme.rs

@@ -15,11 +15,8 @@ use tokio::fs;
 use tracing::{debug, info};
 use x509_parser::prelude::*;
 
-use crate::tls::extract_sans;
-
-pub use instant_acme;
-
 use super::{AcmeOptions, TokenManager};
+use crate::tls::extract_sans;
 
 const FILE_CERT: &str = "cert.pem";
 const FILE_KEY: &str = "cert.key";

src/tls/acme/mod.rs

@@ -12,6 +12,8 @@ use async_trait::async_trait;
 use derive_new::new;
 use strum_macros::{Display, EnumString};
 
+pub use instant_acme;
+
 #[derive(Clone, Display, EnumString, PartialEq, Eq)]
 #[strum(serialize_all = "snake_case")]
 pub enum Challenge {