diff --git a/Cargo.lock b/Cargo.lock index 8f18873..a8651b0 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -24,7 +24,6 @@ dependencies = [ "configparser", "env_logger", "futures-util", - "gemini-fetch", "getopts", "glob", "log", @@ -33,7 +32,8 @@ dependencies = [ "percent-encoding", "rcgen", "tokio", - "tokio-rustls 0.26.0", + "tokio-rustls", + "trotter", "url", ] @@ -85,12 +85,6 @@ dependencies = [ "windows-sys 0.52.0", ] -[[package]] -name = "anyhow" -version = "1.0.81" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0952808a6c2afd1aa8947271f3a60f1a6763c7b912d210184c5149b5cf147247" - [[package]] name = "autocfg" version = "1.2.0" @@ -113,16 +107,10 @@ dependencies = [ ] [[package]] -name = "base64" -version = "0.13.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" - -[[package]] -name = "bumpalo" -version = "3.15.4" +name = "bitflags" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ff69b9dd49fd426c69a0db9fc04dd934cdb6645ff000864d98f7e2af8830eaa" +checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1" [[package]] name = "bytes" @@ -185,6 +173,21 @@ dependencies = [ "log", ] +[[package]] +name = "foreign-types" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" +dependencies = [ + "foreign-types-shared", +] + +[[package]] +name = "foreign-types-shared" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" + [[package]] name = "form_urlencoded" version = "1.2.1" @@ -231,24 +234,6 @@ dependencies = [ "slab", ] -[[package]] -name = "gemini-fetch" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa12dfaa57be769c6681b4d193398cae8db7f7b9af3e86d362d7f0a3c294a1a0" -dependencies = [ - "anyhow", - "ring 0.16.20", - "rustls 0.19.1", - "thiserror", - "tokio", - "tokio-rustls 0.22.0", - "url", - "webpki", - "webpki-roots", - "x509-signature", -] - [[package]] name = "getopts" version = "0.2.21" @@ -303,15 +288,6 @@ dependencies = [ "unicode-normalization", ] -[[package]] -name = "js-sys" -version = "0.3.69" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d" -dependencies = [ - "wasm-bindgen", -] - [[package]] name = "libc" version = "0.2.153" @@ -397,6 +373,44 @@ version = "1.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" +[[package]] +name = "openssl" +version = "0.10.64" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95a0481286a310808298130d22dd1fef0fa571e05a8f44ec801801e84b216b1f" +dependencies = [ + "bitflags", + "cfg-if", + "foreign-types", + "libc", + "once_cell", + "openssl-macros", + "openssl-sys", +] + +[[package]] +name = "openssl-macros" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "openssl-sys" +version = "0.9.102" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c597637d56fbc83893a35eb0dd04b2b8e7a50c91e64e9493e398b5df4fb45fa2" +dependencies = [ + "cc", + "libc", + "pkg-config", + "vcpkg", +] + [[package]] name = "percent-encoding" version = "2.3.1" @@ -415,6 +429,12 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" +[[package]] +name = "pkg-config" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" + [[package]] name = "powerfmt" version = "0.2.0" @@ -445,27 +465,12 @@ version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "aa96feb4d337a43eae1b39b6d4cafc2860a46cf9cec6f1e65294244ece65e348" dependencies = [ - "ring 0.17.8", + "ring", "rustls-pki-types", "time", "yasna", ] -[[package]] -name = "ring" -version = "0.16.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3053cf52e236a3ed746dfc745aa9cacf1b791d846bdaf412f60a8d7d6e17c8fc" -dependencies = [ - "cc", - "libc", - "once_cell", - "spin 0.5.2", - "untrusted 0.7.1", - "web-sys", - "winapi", -] - [[package]] name = "ring" version = "0.17.8" @@ -476,8 +481,8 @@ dependencies = [ "cfg-if", "getrandom", "libc", - "spin 0.9.8", - "untrusted 0.9.0", + "spin", + "untrusted", "windows-sys 0.52.0", ] @@ -487,19 +492,6 @@ version = "0.1.23" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" -[[package]] -name = "rustls" -version = "0.19.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35edb675feee39aec9c99fa5ff985081995a06d594114ae14cbe797ad7b7a6d7" -dependencies = [ - "base64", - "log", - "ring 0.16.20", - "sct", - "webpki", -] - [[package]] name = "rustls" version = "0.23.4" @@ -508,7 +500,7 @@ checksum = "8c4d6d8ad9f2492485e13453acbb291dd08f64441b6609c491f1c2cd2c6b4fe1" dependencies = [ "log", "once_cell", - "ring 0.17.8", + "ring", "rustls-pki-types", "rustls-webpki", "subtle", @@ -527,19 +519,9 @@ version = "0.102.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "faaa0a62740bedb9b2ef5afa303da42764c012f743917351dc9a237ea1663610" dependencies = [ - "ring 0.17.8", + "ring", "rustls-pki-types", - "untrusted 0.9.0", -] - -[[package]] -name = "sct" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b362b83898e0e69f38515b82ee15aa80636befe47c3b6d3d89a911e78fc228ce" -dependencies = [ - "ring 0.16.20", - "untrusted 0.7.1", + "untrusted", ] [[package]] @@ -581,12 +563,6 @@ dependencies = [ "windows-sys 0.52.0", ] -[[package]] -name = "spin" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" - [[package]] name = "spin" version = "0.9.8" @@ -693,14 +669,15 @@ dependencies = [ ] [[package]] -name = "tokio-rustls" -version = "0.22.0" +name = "tokio-openssl" +version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc6844de72e57df1980054b38be3a9f4702aba4858be64dd700181a8a6d0e1b6" +checksum = "6ffab79df67727f6acf57f1ff743091873c24c579b1e2ce4d8f53e47ded4d63d" dependencies = [ - "rustls 0.19.1", + "futures-util", + "openssl", + "openssl-sys", "tokio", - "webpki", ] [[package]] @@ -709,11 +686,24 @@ version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0c7bc40d0e5a97695bb96e27995cd3a08538541b0a846f65bba7a359f36700d4" dependencies = [ - "rustls 0.23.4", + "rustls", "rustls-pki-types", "tokio", ] +[[package]] +name = "trotter" +version = "0.6.0" +dependencies = [ + "openssl", + "thiserror", + "tokio", + "tokio-openssl", + "url", + "urlencoding", + "wildmatch", +] + [[package]] name = "unicase" version = "2.7.0" @@ -750,12 +740,6 @@ version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85" -[[package]] -name = "untrusted" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" - [[package]] name = "untrusted" version = "0.9.0" @@ -773,12 +757,24 @@ dependencies = [ "percent-encoding", ] +[[package]] +name = "urlencoding" +version = "2.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "daf8dba3b7eb870caf1ddeed7bc9d2a049f3cfdfae7cb521b087cc33ae4c49da" + [[package]] name = "utf8parse" version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" +[[package]] +name = "vcpkg" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" + [[package]] name = "version_check" version = "0.9.4" @@ -792,109 +788,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] -name = "wasm-bindgen" -version = "0.2.92" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8" -dependencies = [ - "cfg-if", - "wasm-bindgen-macro", -] - -[[package]] -name = "wasm-bindgen-backend" -version = "0.2.92" +name = "wildmatch" +version = "2.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da" -dependencies = [ - "bumpalo", - "log", - "once_cell", - "proc-macro2", - "quote", - "syn", - "wasm-bindgen-shared", -] - -[[package]] -name = "wasm-bindgen-macro" -version = "0.2.92" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726" -dependencies = [ - "quote", - "wasm-bindgen-macro-support", -] - -[[package]] -name = "wasm-bindgen-macro-support" -version = "0.2.92" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" -dependencies = [ - "proc-macro2", - "quote", - "syn", - "wasm-bindgen-backend", - "wasm-bindgen-shared", -] - -[[package]] -name = "wasm-bindgen-shared" -version = "0.2.92" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96" - -[[package]] -name = "web-sys" -version = "0.3.69" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77afa9a11836342370f4817622a2f0f418b134426d91a82dfb48f532d2ec13ef" -dependencies = [ - "js-sys", - "wasm-bindgen", -] - -[[package]] -name = "webpki" -version = "0.21.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8e38c0608262c46d4a56202ebabdeb094cef7e560ca7a226c6bf055188aa4ea" -dependencies = [ - "ring 0.16.20", - "untrusted 0.7.1", -] - -[[package]] -name = "webpki-roots" -version = "0.21.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aabe153544e473b775453675851ecc86863d2a81d786d741f6b76778f2a48940" -dependencies = [ - "webpki", -] - -[[package]] -name = "winapi" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" -dependencies = [ - "winapi-i686-pc-windows-gnu", - "winapi-x86_64-pc-windows-gnu", -] - -[[package]] -name = "winapi-i686-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" - -[[package]] -name = "winapi-x86_64-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" +checksum = "939e59c1bc731542357fdaad98b209ef78c8743d652bb61439d16b16a79eb025" [[package]] name = "windows-sys" @@ -1028,16 +925,6 @@ version = "0.52.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "32b752e52a2da0ddfbdbcc6fceadfeede4c939ed16d13e648833a61dfb611ed8" -[[package]] -name = "x509-signature" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fb2bc2a902d992cd5f471ee3ab0ffd6603047a4207384562755b9d6de977518" -dependencies = [ - "ring 0.16.20", - "untrusted 0.7.1", -] - [[package]] name = "yasna" version = "0.5.2" diff --git a/Cargo.toml b/Cargo.toml index 7954222..aaaa887 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -27,9 +27,12 @@ tokio = { version = "1.37", features = ["fs", "io-util", "net", "rt-multi-thread url = "2.5.0" [dev-dependencies] -gemini-fetch = "0.2.1" +trotter = "0.6.0" [profile.release] lto = true codegen-units = 1 panic = "abort" + +[patch.crates-io] +trotter = { path = "../trotter/" } diff --git a/tests/tests.rs b/tests/tests.rs index ee40001..9cf5e25 100644 --- a/tests/tests.rs +++ b/tests/tests.rs @@ -1,4 +1,4 @@ -use gemini_fetch::{Page, Status}; +use trotter::{Actor, Response, Status}; use rustls::{pki_types::CertificateDer, ClientConnection, RootCertStore}; use std::convert::TryInto; use std::io::{BufRead, BufReader, Read, Write}; @@ -129,12 +129,19 @@ impl Drop for Server { } } -fn get(args: &[&str], url: &str) -> Result { +fn get(args: &[&str], url: &str) -> Result { let mut server = Server::new(args); + let url = Url::parse(url).unwrap(); - let request = Page::fetch_from(&url, server.get_addr(), None); - let page = tokio::runtime::Runtime::new().unwrap().block_on(request); - server.stop().and(page.map_err(|e| e.to_string())) + let host = url.domain().unwrap().to_string(); + let port = url.port().unwrap_or(1965); + + let actor = Actor::default().proxy(host, port); + let request = actor.get(url); + + let response = tokio::runtime::Runtime::new().unwrap().block_on(request).map_err(|e| e.to_string()); + server.stop()?; + response } #[test] @@ -143,10 +150,10 @@ fn get(args: &[&str], url: &str) -> Result { fn index_page() { let page = get(&[], "gemini://localhost").expect("could not get page"); - assert_eq!(page.header.status, Status::Success); - assert_eq!(page.header.meta, "text/gemini"); + assert_eq!(page.status, Status::Success.value()); + assert_eq!(page.meta, "text/gemini"); - assert_eq!(page.body.unwrap(), include_str!("data/content/index.gmi")); + assert_eq!(page.content, include_bytes!("data/content/index.gmi")); } #[cfg(unix)] @@ -204,9 +211,9 @@ fn index_page_unix() { fn symlink_page() { let page = get(&[], "gemini://localhost/symlink.gmi").expect("could not get page"); - assert_eq!(page.header.status, Status::Success); - assert_eq!(page.header.meta, "text/gemini"); - assert_eq!(page.body.unwrap(), include_str!("data/content/index.gmi")); + assert_eq!(page.status, Status::Success.value()); + assert_eq!(page.meta, "text/gemini"); + assert_eq!(page.content, include_bytes!("data/content/index.gmi")); } #[test] @@ -214,11 +221,11 @@ fn symlink_page() { fn symlink_directory() { let page = get(&[], "gemini://localhost/symlinked_dir/file.gmi").expect("could not get page"); - assert_eq!(page.header.status, Status::Success); - assert_eq!(page.header.meta, "text/gemini"); + assert_eq!(page.status, Status::Success.value()); + assert_eq!(page.meta, "text/gemini"); assert_eq!( - page.body.unwrap(), - include_str!("data/symlinked_dir/file.gmi") + page.content, + include_bytes!("data/symlinked_dir/file.gmi") ); } @@ -227,8 +234,8 @@ fn symlink_directory() { /// - MIME media types can be set in the configuration file fn meta() { let page = get(&[], "gemini://localhost/test").expect("could not get page"); - assert_eq!(page.header.status, Status::Success); - assert_eq!(page.header.meta, "text/html"); + assert_eq!(page.status, Status::Success.value()); + assert_eq!(page.meta, "text/html"); } #[test] @@ -236,8 +243,8 @@ fn meta() { /// - MIME media type parameters can be set in the configuration file fn meta_param() { let page = get(&[], "gemini://localhost/test.gmi").expect("could not get page"); - assert_eq!(page.header.status, Status::Success); - assert_eq!(page.header.meta, "text/gemini;lang=en ;charset=us-ascii"); + assert_eq!(page.status, Status::Success.value()); + assert_eq!(page.meta, "text/gemini;lang=en ;charset=us-ascii"); } #[test] @@ -245,8 +252,8 @@ fn meta_param() { /// - distributed configuration file is used when `-C` flag not used fn glob() { let page = get(&[], "gemini://localhost/testdir/a.nl.gmi").expect("could not get page"); - assert_eq!(page.header.status, Status::Success); - assert_eq!(page.header.meta, "text/plain;lang=nl"); + assert_eq!(page.status, Status::Success.value()); + assert_eq!(page.meta, "text/plain;lang=nl"); } #[test] @@ -254,16 +261,16 @@ fn glob() { /// - central configuration file is used when `-C` flag is used fn doubleglob() { let page = get(&["-C"], "gemini://localhost/testdir/a.nl.gmi").expect("could not get page"); - assert_eq!(page.header.status, Status::Success); - assert_eq!(page.header.meta, "text/gemini;lang=nl"); + assert_eq!(page.status, Status::Success.value()); + assert_eq!(page.meta, "text/gemini;lang=nl"); } #[test] /// - full header lines can be set in the configuration file fn full_header_preset() { let page = get(&[], "gemini://localhost/gone.txt").expect("could not get page"); - assert_eq!(page.header.status, Status::Gone); - assert_eq!(page.header.meta, "This file is no longer available."); + assert_eq!(page.status, Status::Gone.value()); + assert_eq!(page.meta, "This file is no longer available."); } #[test] @@ -275,7 +282,7 @@ fn fragment() { ) .expect("could not get page"); - assert_eq!(page.header.status, Status::BadRequest); + assert_eq!(page.status, Status::BadRequest.value()); } #[test] @@ -284,7 +291,7 @@ fn username() { let page = get(&["--hostname", "example.com"], "gemini://user@example.com/") .expect("could not get page"); - assert_eq!(page.header.status, Status::BadRequest); + assert_eq!(page.status, Status::BadRequest.value()); } #[test] @@ -331,7 +338,7 @@ fn password() { ) .expect("could not get page"); - assert_eq!(page.header.status, Status::BadRequest); + assert_eq!(page.status, Status::BadRequest.value()); } #[test] @@ -341,7 +348,7 @@ fn hostname_check() { let page = get(&["--hostname", "example.org"], "gemini://example.com/").expect("could not get page"); - assert_eq!(page.header.status, Status::ProxyRequestRefused); + assert_eq!(page.status, Status::ProxyRequestRefused.value()); } #[test] @@ -351,7 +358,7 @@ fn port_check() { let page = get(&["--hostname", "example.org"], "gemini://example.org:1/").expect("could not get page"); - assert_eq!(page.header.status, Status::ProxyRequestRefused); + assert_eq!(page.status, Status::ProxyRequestRefused.value()); } #[test] @@ -363,7 +370,7 @@ fn port_check_skipped() { ) .expect("could not get page"); - assert_eq!(page.header.status, Status::Success); + assert_eq!(page.status, Status::Success.value()); } #[test] @@ -371,7 +378,7 @@ fn port_check_skipped() { fn secret_nonexistent() { let page = get(&[], "gemini://localhost/.non-existing-secret").expect("could not get page"); - assert_eq!(page.header.status, Status::Gone); + assert_eq!(page.status, Status::Gone.value()); } #[test] @@ -379,7 +386,7 @@ fn secret_nonexistent() { fn secret_exists() { let page = get(&[], "gemini://localhost/.meta").expect("could not get page"); - assert_eq!(page.header.status, Status::Gone); + assert_eq!(page.status, Status::Gone.value()); } #[test] @@ -387,7 +394,7 @@ fn secret_exists() { fn serve_secret() { let page = get(&["--serve-secret"], "gemini://localhost/.meta").expect("could not get page"); - assert_eq!(page.header.status, Status::Success); + assert_eq!(page.status, Status::Success.value()); } #[test] @@ -395,7 +402,7 @@ fn serve_secret() { fn serve_secret_meta_config() { let page = get(&[], "gemini://localhost/.servable-secret").expect("could not get page"); - assert_eq!(page.header.status, Status::Success); + assert_eq!(page.status, Status::Success.value()); } #[test] @@ -404,7 +411,7 @@ fn serve_secret_meta_config_subdir() { let page = get(&["-C"], "gemini://localhost/.well-known/servable-secret").expect("could not get page"); - assert_eq!(page.header.status, Status::Success); + assert_eq!(page.status, Status::Success.value()); } #[test] @@ -436,7 +443,7 @@ fn directory_traversal_regression() { let urls = [absolute, relative]; for url in urls.iter() { let page = get(&[], url.as_str()).expect("could not get page"); - assert_eq!(page.header.status, Status::NotFound); + assert_eq!(page.status, Status::NotFound.value()); } } @@ -485,10 +492,10 @@ mod vhosts { ) .expect("could not get page"); - assert_eq!(page.header.status, Status::Success); + assert_eq!(page.status, Status::Success.value()); assert_eq!( - page.body.unwrap(), - include_str!("data/content/example.com/index.gmi") + page.content, + include_bytes!("data/content/example.com/index.gmi") ); } @@ -501,10 +508,10 @@ mod vhosts { ) .expect("could not get page"); - assert_eq!(page.header.status, Status::Success); + assert_eq!(page.status, Status::Success.value()); assert_eq!( - page.body.unwrap(), - include_str!("data/content/example.org/index.gmi") + page.content, + include_bytes!("data/content/example.org/index.gmi") ); } } @@ -605,11 +612,11 @@ mod directory_listing { let page = get(&["--content", "dirlist-preamble"], "gemini://localhost/") .expect("could not get page"); - assert_eq!(page.header.status, Status::Success); - assert_eq!(page.header.meta, "text/gemini"); + assert_eq!(page.status, Status::Success.value()); + assert_eq!(page.meta, "text/gemini"); assert_eq!( - page.body.unwrap(), - "This is a directory listing\n=> a\n=> b\n=> wao%20spaces wao spaces\n" + page.content, + b"This is a directory listing\n=> a\n=> b\n=> wao%20spaces wao spaces\n" ); } @@ -618,8 +625,8 @@ mod directory_listing { let page = get(&["--content", "dirlist"], "gemini://localhost/").expect("could not get page"); - assert_eq!(page.header.status, Status::Success); - assert_eq!(page.header.meta, "text/gemini"); - assert_eq!(page.body.unwrap(), "=> a\n=> b\n"); + assert_eq!(page.status, Status::Success.value()); + assert_eq!(page.meta, "text/gemini"); + assert_eq!(page.content, b"=> a\n=> b\n"); } }