preserve client certs

CHANGELOG.md

@@ -1,15 +1,5 @@
 # Changelog
 
-## 0.6.2
-
-Bump gemtext to 0.2.0
-
-## 0.6.1
-
-### FIXED
-
-- [#9] Fixes from @boringcactus for gemtext rendering
-
 ## 0.6.0
 
 ### ADDED

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "maj"
-version = "0.6.2"
+version = "0.6.0"
 authors = ["Christine Dodrill <me@christine.website>"]
 edition = "2018"
 license = "0BSD"
@@ -11,7 +11,7 @@ repository = "https://tulpa.dev/cadey/maj"
 
 [dependencies]
 async-std = { version = "1.6", optional = true }
-async-tls = { default-features = false, optional = true, version = "0" }
+async-tls = { default-features = false, optional = true, version = "0", git = "https://github.com/FlorianUekermann/async-tls.git" }
 async-trait = { version = "0", optional = true }
 log = "0.4"
 mime_guess = "2.0"

VERSION

@@ -1 +1 @@
-0.6.2
+0.6.0

gemtext/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "gemtext"
-version = "0.2.0"
+version = "0.1.0"
 authors = ["Christine Dodrill <me@christine.website>"]
 edition = "2018"
 license = "0BSD"

gemtext/src/lib.rs

@@ -60,13 +60,7 @@ pub fn render(nodes: Vec<Node>, out: &mut impl Write) -> io::Result<()> {
 
     for node in nodes {
         match node {
-            Text(body) => {
-                let special_prefixes = ["=>", "```", "#", "*", ">"];
-                if special_prefixes.iter().any(|prefix| body.starts_with(prefix)) {
-                    write!(out, " ")?;
-                }
-                write!(out, "{}\n", body)?
-            },
+            Text(body) => write!(out, "{}\n", body)?,
             Link { to, name } => match name {
                 Some(name) => write!(out, "=> {} {}\n", to, name)?,
                 None => write!(out, "=> {}\n", to)?,
@@ -343,15 +337,4 @@ mod tests {
         ];
         assert_eq!(expected, parse(msg));
     }
-
-    #[test]
-    fn ambiguous_text() {
-        let _ = pretty_env_logger::try_init();
-        let original = Node::Text("#1 World's Best Coder".to_string());
-        let expected = " #1 World's Best Coder\n";
-        let mut rendered: Vec<u8> = vec![];
-        render(vec![original], &mut rendered).unwrap();
-        let rendered = String::from_utf8(rendered).unwrap();
-        assert_eq!(expected, rendered)
-    }
 }

src/server/mod.rs

@@ -102,10 +102,14 @@ async fn handle_request(
                 Err(RequestParsingError::InvalidScheme(url.scheme().to_string()))?
             }
 
+            let certs = stream
+                .peer_certificates()
+                .map(|certs| certs.into_iter().map(Certificate).collect());
+
             let req = Request {
                 url: url,
                 addr: addr,
-                certs: None,
+                certs: certs,
             };
             handle(h, req, &mut stream, addr).await;
         }