actix/Cargo.lock

@@ -353,12 +353,11 @@ dependencies = [
 
 [[package]]
 name = "anstyle-wincon"
-version = "3.0.7"
+version = "3.0.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ca3534e77181a9cc07539ad51f2141fe32f6c3ffd4df76db8ad92346b003ae4e"
+checksum = "2109dbce0e72be3ec00bed26e6a7479ca384ad226efdd66db8fa2e3a38c83125"
 dependencies = [
  "anstyle",
- "once_cell",
  "windows-sys 0.59.0",
 ]
 
@@ -403,9 +402,9 @@ checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6"
 
 [[package]]
 name = "bitflags"
-version = "2.8.0"
+version = "2.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f68f53c83ab957f72c32642f3868eec03eb974d1fb82e453128456482613d36"
+checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de"
 
 [[package]]
 name = "block-buffer"
@@ -460,9 +459,9 @@ dependencies = [
 
 [[package]]
 name = "cc"
-version = "1.2.10"
+version = "1.2.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "13208fcbb66eaeffe09b99fffbe1af420f00a7b35aa99ad683dfc1aa76145229"
+checksum = "a012a0df96dd6d06ba9a1b29d6402d1a5d77c6befd2566afdc26e10603dc93d7"
 dependencies = [
  "jobserver",
  "libc",
@@ -477,7 +476,7 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
 
 [[package]]
 name = "chhoto-url"
-version = "5.6.1"
+version = "5.6.0"
 dependencies = [
  "actix-files",
  "actix-session",
@@ -1116,9 +1115,9 @@ dependencies = [
 
 [[package]]
 name = "log"
-version = "0.4.25"
+version = "0.4.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "04cbf5b083de1c7e0222a7a51dbfdba1cbe1c6ab0b15e29fff3f6c077fd9cd9f"
+checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24"
 
 [[package]]
 name = "memchr"
@@ -1144,9 +1143,9 @@ dependencies = [
 
 [[package]]
 name = "miniz_oxide"
-version = "0.8.3"
+version = "0.8.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b8402cab7aefae129c6977bb0ff1b8fd9a04eb5b51efc50a70bea51cda0c7924"
+checksum = "4ffbe83022cedc1d264172192511ae958937694cd57ce297164951b8b3568394"
 dependencies = [
  "adler2",
 ]
@@ -1296,9 +1295,9 @@ checksum = "dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068"
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.93"
+version = "1.0.92"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "60946a68e5f9d28b0dc1c21bb8a97ee7d018a8b322fa57838ba31cc878e22d99"
+checksum = "37d3544b3f2748c54e147655edb5025752e2303145b5aefb3c3ea2c78b973bb0"
 dependencies = [
  "unicode-ident",
 ]
@@ -1584,9 +1583,9 @@ checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292"
 
 [[package]]
 name = "syn"
-version = "2.0.96"
+version = "2.0.95"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d5d0adab1ae378d7f53bdebc67a39f1f151407ef230f0ce2883572f5d8985c80"
+checksum = "46f71c0377baf4ef1cc3e3402ded576dccc315800fbc62dfc7fe04b009773b4a"
 dependencies = [
  "proc-macro2",
  "quote",

actix/Cargo.toml

@@ -3,7 +3,7 @@
 
 [package]
 name = "chhoto-url"
-version = "5.6.1"
+version = "5.6.0"
 edition = "2021"
 authors = ["Sayantan Santra <sayantan[dot]santra689[at]gmail[dot]com"]
 license = "mit"

actix/src/main.rs

@@ -30,7 +30,6 @@ async fn main() -> Result<()> {
         .filter(|s| !s.trim().is_empty())
         .unwrap_or(String::from("urls.sqlite"));
 
-    // Get the port environment variable
     let port = env::var("port")
         .unwrap_or(String::from("4567"))
         .parse::<u16>()
@@ -43,42 +42,17 @@ async fn main() -> Result<()> {
     // If an API key is set, check the security
     if let Ok(key) = env::var("api_key") {
         if !auth::is_key_secure() {
-            eprintln!("WARN: API key is insecure! Please change it. Current key is: {}. Generated secure key which you may use: {}", key, auth::gen_key())
+            eprintln!("API key is insecure! Please change it. Current key is: {}. Generated secure key which you may use: {}", key, auth::gen_key())
         } else {
             eprintln!("Secure API key was provided.")
         }
     }
 
-    // If the site_url env variable exists
-    if let Some(site_url) = env::var("site_url").ok().filter(|s| !s.trim().is_empty()) {
-        // Get first and last characters of the site_url
-        let mut chars = site_url.chars();
-        let first = chars.next();
-        let last = chars.next_back();
-        let url = chars.as_str();
-        // If the site_url is encapsulated by quotes (i.e. invalid)
-        if first == Option::from('"') || first == Option::from('\'') && first == last {
-            // Set the site_url without the quotes
-            env::set_var("site_url", url);
-            eprintln!("WARN: The site_url environment variable is encapsulated by quotes. Automatically adjusting to {}", url);
-
-            // Tell the user what URI the server will respond with
-            eprintln!("INFO: Public URI is: {url}:{port}.")
-        } else {
-            // No issues
-            eprintln!("INFO: Configured Site URL is: {site_url}.");
-
-            // Tell the user what URI the server will respond with
-            eprintln!("INFO: Public URI is: {site_url}:{port}.")
-        }
-    } else {
-        // Site URL is not configured
-        eprintln!("WARN: The site_url environment variable is not configured. Defaulting to http://localhost");
-        eprintln!("INFO: Public URI is: http://localhost:{port}.")
-    }
-
     // Tell the user that the server has started, and where it is listening to, rather than simply outputting nothing
     eprintln!("Server has started at 0.0.0.0 on port {port}.");
+    if let Some(site_url) = env::var("site_url").ok().filter(|s| !s.trim().is_empty()) {
+        eprintln!("Configured Site URL is: {site_url}.");
+    }
 
     // Actually start the server
     HttpServer::new(move || {
@@ -112,7 +86,6 @@ async fn main() -> Result<()> {
             .service(Files::new("/", "./resources/").index_file("index.html"))
             .default_service(actix_web::web::get().to(services::error404))
     })
-    // Hardcode the port the server listens to. Allows for more intuitive Docker Compose port management
     .bind(("0.0.0.0", port))?
     .run()
     .await

actix/src/services.rs

@@ -11,6 +11,7 @@ use actix_web::{
     Either, HttpRequest, HttpResponse, Responder,
 };
 use std::env;
+
 // Serialize JSON data
 use serde::Serialize;
 
@@ -67,7 +68,7 @@ pub async fn add_link(
                 .unwrap_or(String::from("4567"))
                 .parse::<u16>()
                 .expect("Supplied port is not an integer");
-            let mut url = format!(
+            let url = format!(
                 "{}:{}",
                 env::var("site_url")
                     .ok()
@@ -75,22 +76,6 @@ pub async fn add_link(
                     .unwrap_or(String::from("http://localhost")),
                 port
             );
-            // If the port is 80, remove the port from the returned URL (better for copying and pasting)
-            // Return http://
-            if port == 80 {
-                url = env::var("site_url")
-                        .ok()
-                        .filter(|s| !s.trim().is_empty())
-                        .unwrap_or(String::from("http://localhost"));
-            }
-            // If the port is 443, remove the port from the returned URL (better for copying and pasting)
-            // Return https://
-            if port == 443 {
-                url = env::var("site_url")
-                    .ok()
-                    .filter(|s| !s.trim().is_empty())
-                    .unwrap_or(String::from("https://localhost"));
-            }
             let response = CreatedURL {
                 success: true,
                 error: false,

compose.yaml

@@ -7,9 +7,6 @@ services:
         restart: unless-stopped
         container_name: chhoto-url
         ports:
-            # If you changed the "port" environment variable, adjust accordingly
-            # The number AFTER the colon should match the "port" variable and the number
-            # before the colon is the port where you would access the container from outside.
             - 4567:4567
         environment:
             # Change if you want to mount the database somewhere else.
@@ -21,17 +18,11 @@ services:
             # a copy of your database.)
             - db_url=/db/urls.sqlite
 
-            # Change this if your server URL is not "http://localhost"
-            # This must not be surrounded by quotes. For example:
-            # site_url="https://www.example.com"   incorrect
-            # site_url=https://www.example.com     correct
-            # This is important to ensure Chhoto URL outputs the shortened link with the correct URL.
+            # Change it in case you want to set the website name
+            # displayed in front of the shorturls, defaults to
+            # the hostname you're accessing it from.
             # - site_url=https://www.example.com
 
-            # Change this if you are running Chhoto URL on a port which is not 4567.
-            # This is important to ensure Chhoto URL outputs the shortened link with the correct port.
-            # - port=4567
-            
             - password=TopSecretPass
 
             # This needs to be set in order to use programs that use the JSON interface of Chhoto URL.