Try to fix logging in tests again

Author: EpicEric

src/ssh.rs

@@ -603,6 +603,7 @@ impl Handler for ServerHandler {
                     let set: Result<BTreeSet<Fingerprint>, _> = command
                         .trim_start_matches("allowed-fingerprints=")
                         .split(',')
+                        .filter(|a| !a.is_empty())
                         .map(|key| key.parse::<Fingerprint>())
                         .collect();
                     let set = match set {
@@ -781,6 +782,7 @@ impl Handler for ServerHandler {
                     let list: Result<Vec<IpNet>, _> = command
                         .trim_start_matches("ip-allowlist=")
                         .split(',')
+                        .filter(|a| !a.is_empty())
                         .map(|network| network.parse::<IpNet>())
                         .collect();
                     let list = match list {
@@ -819,6 +821,7 @@ impl Handler for ServerHandler {
                     let list: Result<Vec<IpNet>, _> = command
                         .trim_start_matches("ip-blocklist=")
                         .split(',')
+                        .filter(|a| !a.is_empty())
                         .map(|network| network.parse::<IpNet>())
                         .collect();
                     let list = match list {

tests/admin_interface.rs

@@ -18,7 +18,10 @@ use tokio::{
 #[tokio::test(flavor = "multi_thread")]
 async fn admin_interface() {
     // 1. Initialize Sandhole
-    let _ = env_logger::builder().is_test(true).try_init();
+    let _ = env_logger::builder()
+        .filter_level(log::LevelFilter::Debug)
+        .is_test(true)
+        .try_init();
     let config = ApplicationConfig::parse_from([
         "sandhole",
         "--domain=foobar.tld",

tests/admin_missing_pty.rs

@@ -18,7 +18,10 @@ use tokio::{
 #[tokio::test(flavor = "multi_thread")]
 async fn admin_missing_pty() {
     // 1. Initialize Sandhole
-    let _ = env_logger::builder().is_test(true).try_init();
+    let _ = env_logger::builder()
+        .filter_level(log::LevelFilter::Debug)
+        .is_test(true)
+        .try_init();
     let config = ApplicationConfig::parse_from([
         "sandhole",
         "--domain=foobar.tld",

tests/admin_no_interface_if_forwarding.rs

@@ -17,7 +17,10 @@ use tokio::{
 #[tokio::test(flavor = "multi_thread")]
 async fn admin_no_interface_if_forwarding() {
     // 1. Initialize Sandhole
-    let _ = env_logger::builder().is_test(true).try_init();
+    let _ = env_logger::builder()
+        .filter_level(log::LevelFilter::Debug)
+        .is_test(true)
+        .try_init();
     let config = ApplicationConfig::parse_from([
         "sandhole",
         "--domain=foobar.tld",

tests/admin_no_interface_if_proxying.rs

@@ -17,7 +17,10 @@ use tokio::{
 #[tokio::test(flavor = "multi_thread")]
 async fn admin_no_interface_if_proxying() {
     // 1. Initialize Sandhole
-    let _ = env_logger::builder().is_test(true).try_init();
+    let _ = env_logger::builder()
+        .filter_level(log::LevelFilter::Debug)
+        .is_test(true)
+        .try_init();
     let config = ApplicationConfig::parse_from([
         "sandhole",
         "--domain=foobar.tld",

tests/admin_remove_user.rs

@@ -27,7 +27,10 @@ use tower::Service;
 #[tokio::test(flavor = "multi_thread")]
 async fn admin_remove_user() {
     // 1. Initialize Sandhole
-    let _ = env_logger::builder().is_test(true).try_init();
+    let _ = env_logger::builder()
+        .filter_level(log::LevelFilter::Debug)
+        .is_test(true)
+        .try_init();
     let config = ApplicationConfig::parse_from([
         "sandhole",
         "--domain=foobar.tld",

tests/admin_window_change.rs

@@ -18,7 +18,10 @@ use tokio::{
 #[tokio::test(flavor = "multi_thread")]
 async fn admin_window_change() {
     // 1. Initialize Sandhole
-    let _ = env_logger::builder().is_test(true).try_init();
+    let _ = env_logger::builder()
+        .filter_level(log::LevelFilter::Debug)
+        .is_test(true)
+        .try_init();
     let config = ApplicationConfig::parse_from([
         "sandhole",
         "--domain=foobar.tld",

tests/alias_aliasing_tunnel.rs

@@ -18,7 +18,10 @@ use tokio::{
 #[tokio::test(flavor = "multi_thread")]
 async fn alias_aliasing_tunnel() {
     // 1. Initialize Sandhole
-    let _ = env_logger::builder().is_test(true).try_init();
+    let _ = env_logger::builder()
+        .filter_level(log::LevelFilter::Debug)
+        .is_test(true)
+        .try_init();
     let config = ApplicationConfig::parse_from([
         "sandhole",
         "--domain=foobar.tld",

tests/alias_cannot_be_localhost.rs

@@ -15,7 +15,10 @@ use tokio::{
 #[tokio::test(flavor = "multi_thread")]
 async fn alias_cannot_be_localhost() {
     // 1. Initialize Sandhole
-    let _ = env_logger::builder().is_test(true).try_init();
+    let _ = env_logger::builder()
+        .filter_level(log::LevelFilter::Debug)
+        .is_test(true)
+        .try_init();
     let config = ApplicationConfig::parse_from([
         "sandhole",
         "--domain=foobar.tld",

tests/alias_http_aliases.rs

@@ -29,7 +29,10 @@ use tower::Service;
 #[tokio::test(flavor = "multi_thread")]
 async fn alias_http_aliases() {
     // 1. Initialize Sandhole
-    let _ = env_logger::builder().is_test(true).try_init();
+    let _ = env_logger::builder()
+        .filter_level(log::LevelFilter::Debug)
+        .is_test(true)
+        .try_init();
     let config = ApplicationConfig::parse_from([
         "sandhole",
         "--domain=foobar.tld",

tests/alias_local_forward_existing_http.rs

@@ -31,7 +31,10 @@ use tower::Service;
 #[tokio::test(flavor = "multi_thread")]
 async fn alias_local_forward_existing_http() {
     // 1. Initialize Sandhole
-    let _ = env_logger::builder().is_test(true).try_init();
+    let _ = env_logger::builder()
+        .filter_level(log::LevelFilter::Debug)
+        .is_test(true)
+        .try_init();
     let config = ApplicationConfig::parse_from([
         "sandhole",
         "--domain=foobar.tld",

tests/alias_reject_port_0.rs

@@ -11,7 +11,10 @@ use tokio::{
 #[tokio::test(flavor = "multi_thread")]
 async fn alias_reject_port_0() {
     // 1. Initialize Sandhole
-    let _ = env_logger::builder().is_test(true).try_init();
+    let _ = env_logger::builder()
+        .filter_level(log::LevelFilter::Debug)
+        .is_test(true)
+        .try_init();
     let config = ApplicationConfig::parse_from([
         "sandhole",
         "--domain=foobar.tld",

tests/alias_require_allowed_fingerprints.rs

@@ -23,7 +23,10 @@ use tokio::{
 #[tokio::test(flavor = "multi_thread")]
 async fn alias_require_allowed_fingerprints() {
     // 1. Initialize Sandhole
-    let _ = env_logger::builder().is_test(true).try_init();
+    let _ = env_logger::builder()
+        .filter_level(log::LevelFilter::Debug)
+        .is_test(true)
+        .try_init();
     let config = ApplicationConfig::parse_from([
         "sandhole",
         "--domain=foobar.tld",

tests/alias_timeout.rs

@@ -17,7 +17,10 @@ use tokio::{
 #[tokio::test(flavor = "multi_thread")]
 async fn alias_timeout() {
     // 1. Initialize Sandhole
-    let _ = env_logger::builder().is_test(true).try_init();
+    let _ = env_logger::builder()
+        .filter_level(log::LevelFilter::Debug)
+        .is_test(true)
+        .try_init();
     let config = ApplicationConfig::parse_from([
         "sandhole",
         "--domain=foobar.tld",

tests/auth_prevent_unauthorized_actions.rs

@@ -23,7 +23,10 @@ use tokio::{
 #[tokio::test(flavor = "multi_thread")]
 async fn auth_prevent_unauthorized_actions() {
     // 1. Initialize Sandhole
-    let _ = env_logger::builder().is_test(true).try_init();
+    let _ = env_logger::builder()
+        .filter_level(log::LevelFilter::Debug)
+        .is_test(true)
+        .try_init();
     let config = ApplicationConfig::parse_from([
         "sandhole",
         "--domain=foobar.tld",

tests/auth_self_hosted_login_api.rs

@@ -26,7 +26,10 @@ use tower::Service;
 #[tokio::test(flavor = "multi_thread")]
 async fn auth_self_hosted_login_api() {
     // 1. Initialize Sandhole
-    let _ = env_logger::builder().is_test(true).try_init();
+    let _ = env_logger::builder()
+        .filter_level(log::LevelFilter::Debug)
+        .is_test(true)
+        .try_init();
     let config = ApplicationConfig::parse_from([
         "sandhole",
         "--domain=foobar.tld",

tests/config_disable_aliasing.rs

@@ -26,7 +26,10 @@ use tower::Service;
 #[tokio::test(flavor = "multi_thread")]
 async fn config_disable_aliasing() {
     // 1. Initialize Sandhole
-    let _ = env_logger::builder().is_test(true).try_init();
+    let _ = env_logger::builder()
+        .filter_level(log::LevelFilter::Debug)
+        .is_test(true)
+        .try_init();
     let config = ApplicationConfig::parse_from([
         "sandhole",
         "--domain=foobar.tld",

tests/config_disable_http.rs

@@ -23,7 +23,10 @@ use tower::Service;
 #[tokio::test(flavor = "multi_thread")]
 async fn config_disable_http() {
     // 1. Initialize Sandhole
-    let _ = env_logger::builder().is_test(true).try_init();
+    let _ = env_logger::builder()
+        .filter_level(log::LevelFilter::Debug)
+        .is_test(true)
+        .try_init();
     let config = ApplicationConfig::parse_from([
         "sandhole",
         "--domain=foobar.tld",

tests/config_disable_tcp.rs

@@ -23,7 +23,10 @@ use tower::Service;
 #[tokio::test(flavor = "multi_thread")]
 async fn config_disable_tcp() {
     // 1. Initialize Sandhole
-    let _ = env_logger::builder().is_test(true).try_init();
+    let _ = env_logger::builder()
+        .filter_level(log::LevelFilter::Debug)
+        .is_test(true)
+        .try_init();
     let config = ApplicationConfig::parse_from([
         "sandhole",
         "--domain=foobar.tld",

tests/config_invalid_options.rs

@@ -14,7 +14,10 @@ use tokio_rustls::TlsConnector;
 #[tokio::test(flavor = "multi_thread")]
 async fn config_invalid_options() {
     // 1. Fail to initialize Sandhole if HTTP, TCP, and aliasing are all disabled
-    let _ = env_logger::builder().is_test(true).try_init();
+    let _ = env_logger::builder()
+        .filter_level(log::LevelFilter::Debug)
+        .is_test(true)
+        .try_init();
     let config = ApplicationConfig::parse_from([
         "sandhole",
         "--domain=foobar.tld",

tests/config_ip_blocklist.rs

@@ -11,7 +11,10 @@ use tokio::{
 #[tokio::test(flavor = "multi_thread")]
 async fn config_ip_blocklist() {
     // 1. Initialize Sandhole
-    let _ = env_logger::builder().is_test(true).try_init();
+    let _ = env_logger::builder()
+        .filter_level(log::LevelFilter::Debug)
+        .is_test(true)
+        .try_init();
     let config = ApplicationConfig::parse_from([
         "sandhole",
         "--domain=foobar.tld",

tests/connection_deny_load_balancing.rs

@@ -15,7 +15,10 @@ use tokio::{
 #[tokio::test(flavor = "multi_thread")]
 async fn connection_deny_load_balancing() {
     // 1. Initialize Sandhole
-    let _ = env_logger::builder().is_test(true).try_init();
+    let _ = env_logger::builder()
+        .filter_level(log::LevelFilter::Debug)
+        .is_test(true)
+        .try_init();
     let config = ApplicationConfig::parse_from([
         "sandhole",
         "--domain=foobar.tld",

tests/connection_load_balancing.rs

@@ -16,7 +16,10 @@ use tokio::{
 #[tokio::test(flavor = "multi_thread")]
 async fn connection_load_balancing() {
     // 1. Initialize Sandhole
-    let _ = env_logger::builder().is_test(true).try_init();
+    let _ = env_logger::builder()
+        .filter_level(log::LevelFilter::Debug)
+        .is_test(true)
+        .try_init();
     let config = ApplicationConfig::parse_from([
         "sandhole",
         "--domain=foobar.tld",

tests/http_force_https_by_user.rs

@@ -24,7 +24,10 @@ use tower::Service;
 #[tokio::test(flavor = "multi_thread")]
 async fn http_force_https_by_user() {
     // 1. Initialize Sandhole
-    let _ = env_logger::builder().is_test(true).try_init();
+    let _ = env_logger::builder()
+        .filter_level(log::LevelFilter::Debug)
+        .is_test(true)
+        .try_init();
     let config = ApplicationConfig::parse_from([
         "sandhole",
         "--domain=foobar.tld",

tests/http_redirects.rs

@@ -22,7 +22,10 @@ use tower::Service;
 #[tokio::test(flavor = "multi_thread")]
 async fn http_redirects() {
     // 1. Initialize Sandhole
-    let _ = env_logger::builder().is_test(true).try_init();
+    let _ = env_logger::builder()
+        .filter_level(log::LevelFilter::Debug)
+        .is_test(true)
+        .try_init();
     let config = ApplicationConfig::parse_from([
         "sandhole",
         "--domain=foobar.tld",

tests/http_timeout.rs

@@ -27,7 +27,10 @@ use tower::Service;
 #[tokio::test(flavor = "multi_thread")]
 async fn http_timeout() {
     // 1. Initialize Sandhole
-    let _ = env_logger::builder().is_test(true).try_init();
+    let _ = env_logger::builder()
+        .filter_level(log::LevelFilter::Debug)
+        .is_test(true)
+        .try_init();
     let config = ApplicationConfig::parse_from([
         "sandhole",
         "--domain=foobar.tld",

tests/https_bind_all_hostnames.rs

@@ -28,7 +28,10 @@ use tower::Service;
 #[tokio::test(flavor = "multi_thread")]
 async fn https_bind_all_hostnames() {
     // 1. Initialize Sandhole
-    let _ = env_logger::builder().is_test(true).try_init();
+    let _ = env_logger::builder()
+        .filter_level(log::LevelFilter::Debug)
+        .is_test(true)
+        .try_init();
     let config = ApplicationConfig::parse_from([
         "sandhole",
         "--domain=foobar.tld",

tests/https_connect_ssh_on_https_port.rs

@@ -28,7 +28,10 @@ use tower::Service;
 #[tokio::test(flavor = "multi_thread")]
 async fn https_connect_ssh_on_https_port() {
     // 1. Initialize Sandhole
-    let _ = env_logger::builder().is_test(true).try_init();
+    let _ = env_logger::builder()
+        .filter_level(log::LevelFilter::Debug)
+        .is_test(true)
+        .try_init();
     let config = ApplicationConfig::parse_from([
         "sandhole",
         "--domain=foobar.tld",

tests/https_force_random_subdomains.rs

@@ -29,7 +29,10 @@ use tower::Service;
 #[tokio::test(flavor = "multi_thread")]
 async fn https_force_random_subdomains() {
     // 1. Initialize Sandhole
-    let _ = env_logger::builder().is_test(true).try_init();
+    let _ = env_logger::builder()
+        .filter_level(log::LevelFilter::Debug)
+        .is_test(true)
+        .try_init();
     let config = ApplicationConfig::parse_from([
         "sandhole",
         "--domain=foobar.tld",

tests/ip_blocklist_by_user.rs

@@ -24,7 +24,10 @@ use tower::Service;
 #[tokio::test(flavor = "multi_thread")]
 async fn ip_blocklist_by_user() {
     // 1. Initialize Sandhole
-    let _ = env_logger::builder().is_test(true).try_init();
+    let _ = env_logger::builder()
+        .filter_level(log::LevelFilter::Debug)
+        .is_test(true)
+        .try_init();
     let config = ApplicationConfig::parse_from([
         "sandhole",
         "--domain=foobar.tld",

tests/ip_error_on_repeated_cidr.rs

@@ -13,7 +13,10 @@ use tokio::{
 #[tokio::test(flavor = "multi_thread")]
 async fn ip_error_on_repeated_cidr() {
     // 1. Initialize Sandhole
-    let _ = env_logger::builder().is_test(true).try_init();
+    let _ = env_logger::builder()
+        .filter_level(log::LevelFilter::Debug)
+        .is_test(true)
+        .try_init();
     let config = ApplicationConfig::parse_from([
         "sandhole",
         "--domain=foobar.tld",

tests/lib_configure_from_scratch.rs

@@ -20,7 +20,10 @@ use tokio::{
 #[tokio::test(flavor = "multi_thread")]
 async fn lib_configure_from_scratch() {
     // 1. Create random temporary directory and initialize Sandhole
-    let _ = env_logger::builder().is_test(true).try_init();
+    let _ = env_logger::builder()
+        .filter_level(log::LevelFilter::Debug)
+        .is_test(true)
+        .try_init();
     let random_name = String::from_utf8(
         (0..6)
             .flat_map(|_| {