Merge pull request #5 from software-artificer/http-to-url

Replace http::uri::Uri with url::Url

Author: software-artificer

Cargo.lock

@@ -14,7 +14,6 @@ anyhow = "1.0"
 argon2 = { version = "0.5" }
 clap = { version = "4", default-features = false, features = ["std", "derive", "help", "usage"] }
 handlebars = { version = "6", features = ["dir_source"] }
-http-serde = "1"
 rand = { version = "0.9", default-features = false, features = [] }
 rustls = { version = "0.23.13", default-features = false, features = ["logging", "ring", "std"] }
 rustls-pemfile = "2.1.3"
@@ -24,3 +23,4 @@ serde_yaml_ng = { version = "0.10.0", default-features = false, features = [] }
 thiserror = { version = "2", default-features = false, features = [] }
 tracing = { version = "0.1.40", features = ["log"] }
 tracing-subscriber = "0.3.18"
+url = { version = "2.5.7", default-features = false, features = ["serde"] }

Cargo.toml

@@ -1,9 +1,10 @@
 ---
 listen_on: 127.0.0.1:9753
-worlds_path: /var/lib/minecraft/worlds
+worlds_path: /tmp/nix-shell.Bihv8S/tmp.YDoMbAsiBf
 current_world_name: current_world
 server_socket_path: /run/minecraft/minecraft.socket
-users_file_path: /var/lib/minecraft/users.yml
+users_file_path: ./users.yaml
 base_url: http://127.0.0.1:9753/
 min_password_length: 10
 max_password_length: 128
+server_properties_path: ./server.properties

config.yml

@@ -1,6 +1,4 @@
 use crate::core;
-use actix_web::http::uri;
-use std::str::FromStr;
 
 #[derive(thiserror::Error, Debug)]
 pub enum Error {
@@ -18,11 +16,9 @@ pub fn enroll(config: core::AppConfig, username: String) -> Result<(), Error> {
     let users = core::Users::load(config.users_file_path).map_err(Error::FailedToEnrol)?;
     let token = users.enroll_user(username).map_err(Error::FailedToEnrol)?;
 
-    let mut parts = config.base_url.into_parts();
-    let path_and_query = uri::PathAndQuery::from_str(&format!("/enroll?token={}", token.reveal()))
-        .expect("Failed to create the path and query part for an enrollment URL.");
-    parts.path_and_query = Some(path_and_query);
-    let url: uri::Uri = uri::Uri::from_parts(parts).expect("Failed to generate an enrollment URL.");
+    let mut url = config.base_url;
+    url.set_path("/enroll");
+    url.set_query(Some(&format!("token={}", token.reveal())));
 
     println!("To finish the enrollment visit {}", url);
 

src/cli/user.rs

@@ -1,14 +1,12 @@
 use super::properties;
-use actix_web::http::uri;
 use std::{env, fs, io, net, num, path};
 
 #[derive(serde::Deserialize)]
 struct ConfigFile {
     listen_on: net::SocketAddr,
     worlds_path: path::PathBuf,
     users_file_path: path::PathBuf,
-    #[serde(with = "http_serde::uri")]
-    base_url: uri::Uri,
+    base_url: url::Url,
     #[serde(default = "default_min_password_len")]
     min_password_length: u8,
     #[serde(default = "default_max_password_len")]
@@ -57,7 +55,7 @@ pub enum ConfigValidationError {
     #[error("Invalid users file path: {0}")]
     UsersFilePath(String),
     #[error("Invalid base URL: {0}")]
-    InvalidBaseUrl(uri::Uri),
+    InvalidBaseUrl(url::Url),
     #[error("Invalid server.properties path: {}", .0.display())]
     PropertiesPath(path::PathBuf),
     #[error("Unable to load server.properties file: {0}")]
@@ -70,7 +68,7 @@ pub struct AppConfig {
     pub worlds_path: path::PathBuf,
     pub rcon_address: net::SocketAddr,
     pub users_file_path: path::PathBuf,
-    pub base_url: uri::Uri,
+    pub base_url: url::Url,
     pub min_password_length: usize,
     pub max_password_length: usize,
     pub server_properties_path: path::PathBuf,
@@ -199,11 +197,11 @@ fn resolve_users_file_path(
     }
 }
 
-fn check_base_url(url: uri::Uri) -> Result<uri::Uri, ConfigValidationError> {
-    if url.scheme().is_none() {
-        Err(ConfigValidationError::InvalidBaseUrl(url))
-    } else {
+fn check_base_url(url: url::Url) -> Result<url::Url, ConfigValidationError> {
+    if url.scheme().starts_with("http") {
         Ok(url)
+    } else {
+        Err(ConfigValidationError::InvalidBaseUrl(url))
     }
 }