.gitignore

@@ -9,5 +9,3 @@ urls.sqlite
 **/.directory
 .env
 cookie*
-.idea/
-.DS_Store

Makefile

@@ -24,7 +24,6 @@ docker-test: docker-local docker-stop
 	docker run -p ${PORT}:${PORT} --name chhoto-url -e password="${PASSWORD}" -e public_mode="${PUBLIC_MODE}" \
 		-e site_url="${SITE_URL}" -e db_url="${DB_URL}" -e redirect_method="${REDIRECT_METHOD}" -e port="${PORT}"\
 		-e slug_style="${SLUG_STYLE}" -e slug_length="${SLUG_LENGTH}" -e cache_control_header="${CACHE_CONTROL_HEADER}"\
-		-e api_key="${API_KEY}" -e disable_frontend="${DISABLE_FRONTEND}"\
 		-d chhoto-url
 	docker logs chhoto-url -f
 

README.md

@@ -45,10 +45,9 @@ for small. URL means, well... URL. So the name simply means Small URL.
   stays under 5MB under normal use.)
 - Counts number of hits for each short link in a privacy respecting way
   i.e. only the hit is recorded, and nothing else.
-- Has a mobile friendly UI, and automatic dark mode.
+- Has a mobile friendly UI.
 - Has a public mode, where anyone can add links without authentication. Deleting 
-  or listing available links will need admin access using the password. It's also 
-  possible to completely disable the frontend.
+  or listing available links will need admin access using the password.
 - Allows setting the URL of your website, in case you want to conveniently
   generate short links locally.
 - Links are stored in an SQLite database.
@@ -57,7 +56,7 @@ for small. URL means, well... URL. So the name simply means Small URL.
   written in plain HTML and vanilla JS, using [Pure CSS](https://purecss.io/)
   for styling.
 - Uses very basic authentication using a provided password. It's not encrypted in transport.
-  I  recommend using a reverse proxy such as [caddy](https://caddyserver.com/) to
+  I  recommend using something like [caddy](https://caddyserver.com/) to
   encrypt the connection by SSL.
   
 # Bloat that will not be implemented
@@ -72,7 +71,7 @@ not needed here.
 - Paywalls or messages begging for donations. If you want to support me (for
 whatever reason), you can message me through GitHub issues.
 
-# Screenshots 
+# Screenshots
 <p align="middle">
   <img src="screenshot-desktop.webp" height="250" alt="desktop screenshot" />
   <img src="screenshot-mobile.webp" height="250" alt="mobile screenshot" />
@@ -128,17 +127,6 @@ docker run -p 4567:4567 \
     -e site_url="https://www.example.com" \
     -d chhoto-url:latest
 ```
-1.c Further, set an API key to activate JSON result mode (optional)
-
-```
-docker run -p 4567:4567 \
-    -e password="password" \
-    -e api_key="SECURE_API_KEY" \
-    -v ./urls.sqlite:/urls.sqlite \
-    -e db_url=/urls.sqlite \
-    -e site_url="https://www.example.com" \
-    -d chhoto-url:latest
-```
 
 You can set the redirect method to Permanent 308 (default) or Temporary 307 by setting
 the `redirect_method` variable to `TEMPORARY` or `PERMANENT` (it's matched exactly). By
@@ -147,8 +135,7 @@ the `slug_style` variable to `UID`. You can also set the length of those slug by
 the `slug_length` variable. It defaults to 8, and a minimum of 4 is supported.
 
 To enable public mode, set `public_mode` to `Enable`. With this, anyone will be able to add 
-links. Listing existing links or deleting links will need admin access using the password. To
-completely disable the frontend, set `disable_frontend` to `True`.
+links. Listing existing links or deleting links will need admin access using the password.
 
 By default, the server sends no Cache-Control headers. You can set custom `cache_control_header` 
 to send your desired headers. It must be a comma separated list of valid 
@@ -156,65 +143,14 @@ to send your desired headers. It must be a comma separated list of valid
 you can set it to `no-cache, private` to disable caching. It might help during testing if
 served through a proxy.
 
-## Deploying in your Kubernetes cluster with Helm
-The helm values are very sparse to keep it simple. If you need more values to be variable, feel free to adjust.
-
-The PVC allocates 100Mi and the PV is using a host path volume.
-
-The helm chart assumes you have [cert manager](https://github.com/jetstack/cert-manager) deployed to have TLS certificates managed easily in your cluster. Feel free to remove the issuer and adjust the ingress if you're on AWS with EKS for example. To install cert-manager, I recommend using the ["kubectl apply" way](https://cert-manager.io/docs/installation/kubectl/) to install cert-manager.
-
-To get started, `cp helm-chart/values.yaml helm-chart/my-values.yaml` and adjust `password`, `fqdn` and `letsencryptmail` in your new `my-values.yaml`, then just run
-
-``` bash
-cd helm-chart
-helm upgrade --install chhoto-url . -n chhoto-url --create-namespace -f my-values.yaml
-```
-
 ## Instructions for CLI usage
 The application can be used from the terminal using something like `curl`. In all the examples
 below, replace `http://localhost:4567` with where your instance of `chhoto-url` is accessible.
 
-You can get the version of `chhoto-url` the server is running using `curl http://localhost:4567/api/version` and
-get the siteurl using `curl http://localhost:4567/api/siteurl`. These routes are accessible without any authentication.
-
-### API key validation
-**This is required for programs that rely on a JSON response from Chhoto URL**
-
-In order to use API key validation, set the `api_key` environment variable. If this is not set, the API will default to cookie
-validation (see section above). If the API key is insecure, a warning will be outputted along with a generated API key which may be used.
-
-Example Linux command for generating a secure API key: `tr -dc A-Za-z0-9 </dev/urandom | head -c 128`
-
-To add a link:
-``` bash
-curl -X POST -H "X-API-Key: <YOUR_API_KEY>" -d '{"shortlink":"<shortlink>", "longlink":"<longlink>"}' http://localhost:4567/api/new
-```
-Send an empty `<shortlink>` if you want it to be auto-generated. The server will reply with the generated shortlink.
-
-To get information about a single shortlink:
-``` bash
-curl -H "X-API-Key: <YOUR_API_KEY>" -d '<shortlink>' http://localhost:4567/api/expand
-```
-(This route is not accessible using cookie validation.)
-
-To get a list of all the currently available links:
-``` bash
-curl -H "X-API-Key: <YOUR_API_KEY>" http://localhost:4567/api/all
-```
-
-To delete a link:
-``` bash
-curl -X DELETE -H "X-API-Key: <YOUR_API_KEY>" http://localhost:4567/api/del/<shortlink>
-```
-Where `<shortlink>` is name of the shortened link you would like to delete. For example, if the shortened link is
-`http://localhost:4567/example`, `<shortlink>` would be `example`.
-
-The server will output when the instance is accessed over API, when an incorrect API key is received, etc.
-
-### Cookie validation
-If you have set up a password, first do the following to get an authentication cookie and store it in a file.
+If you have set up
+a password, first do the following to get an authentication cookie and store it in a file.
 ```bash
-curl -X POST -d "<your-password>" -c cookie.txt http://localhost:4567/api/login
+curl -X post -d "<your-password>" -c cookie.txt http://localhost:4567/api/login
 ```
 You should receive "Correct password!" if the provided password was correct. For any subsequent
 request, please add `-b cookie.txt` to provide authentication.
@@ -236,6 +172,9 @@ curl -X DELETE http://localhost:4567/api/del/<shortlink>
 ```
 The server will send a confirmation.
 
+You can get the version of `chhoto-url` the server is running using `curl http://localhost:4567/api/version` and
+get the siteurl using `curl http://localhost:4567/api/siteurl`.
+
 ## Disable authentication
 If you do not define a password environment variable when starting the docker image, authentication
 will be disabled.
@@ -247,7 +186,5 @@ that those links aren't created by you.
 
 ## Notes
 - It started as a fork of [`simply-shorten`](https://gitlab.com/draganczukp/simply-shorten).
-- There's an (unofficial) extension maintained by for shortening URLs easily using Chhoto URL.
-  [You can take a look at it here.](https://github.com/SolninjaA/Chhoto-URL-Extension)
 - The list of adjectives and names used for random short url generation is a modified
   version of [this list used by docker](https://github.com/moby/moby/blob/master/pkg/namesgenerator/names-generator.go).

actix/Cargo.toml

@@ -3,7 +3,7 @@
 
 [package]
 name = "chhoto-url"
-version = "5.6.3"
+version = "5.4.4"
 edition = "2021"
 authors = ["Sayantan Santra <sayantan[dot]santra689[at]gmail[dot]com"]
 license = "mit"
@@ -29,10 +29,9 @@ categories = ["web-programming"]
 [dependencies]
 actix-web = "4.5.1"
 actix-files = "0.6.5"
-rusqlite = { version = "0.34.0", features = ["bundled"] }
+rusqlite = { version = "0.32.0", features = ["bundled"] }
 regex = "1.10.3"
-rand = "0.9.0"
-passwords = "3.1.16"
+rand = "0.8.5"
 actix-session = { version = "0.10.0", features = ["cookie-session"] }
 env_logger = "0.11.1"
 nanoid = "0.4.0"

actix/src/auth.rs

@@ -2,55 +2,8 @@
 // SPDX-License-Identifier: MIT
 
 use actix_session::Session;
-use actix_web::HttpRequest;
 use std::{env, time::SystemTime};
 
-// API key generation and scoring
-use passwords::{analyzer, scorer, PasswordGenerator};
-
-// Validate API key
-pub fn validate_key(key: String) -> bool {
-    if let Ok(api_key) = env::var("api_key") {
-        if api_key != key {
-            eprintln!("Incorrect API key was provided when connecting to Chhoto URL.");
-            false
-        } else {
-            eprintln!("Server accessed with API key.");
-            true
-        }
-    } else {
-        eprintln!("API was accessed with API key validation but no API key was specified. Set the 'api_key' environment variable.");
-        false
-    }
-}
-
-// Generate an API key if the user doesn't specify a secure key
-// Called in main.rs
-pub fn gen_key() -> String {
-    let key = PasswordGenerator {
-        length: 128,
-        numbers: true,
-        lowercase_letters: true,
-        uppercase_letters: true,
-        symbols: false,
-        spaces: false,
-        exclude_similar_characters: false,
-        strict: true,
-    };
-    key.generate_one().unwrap()
-}
-
-// Check if the API key header exists
-pub fn api_header(req: &HttpRequest) -> Option<&str> {
-    req.headers().get("X-API-Key")?.to_str().ok()
-}
-
-// Determine whether the inputted API key is sufficiently secure
-pub fn is_key_secure() -> bool {
-    let score = scorer::score(&analyzer::analyze(env::var("api_key").unwrap()));
-    score >= 90.0
-}
-
 // Validate a given password
 pub fn validate(session: Session) -> bool {
     // If there's no password provided, just return true

actix/src/database.rs

@@ -13,27 +13,20 @@ pub struct DBRow {
 }
 
 // Find a single URL
-pub fn find_url(shortlink: &str, db: &Connection, needhits: bool) -> (Option<String>, Option<i64>) {
-    let query = if needhits {
-        "SELECT long_url,hits FROM urls WHERE short_url = ?1"
-    } else {
-        "SELECT long_url FROM urls WHERE short_url = ?1"
-    };
+pub fn find_url(shortlink: &str, db: &Connection) -> Option<String> {
     let mut statement = db
-        .prepare_cached(query)
+        .prepare_cached("SELECT long_url FROM urls WHERE short_url = ?1")
         .expect("Error preparing SQL statement for find_url.");
 
-    let longlink = statement
+    statement
         .query_row([shortlink], |row| row.get("long_url"))
-        .ok();
-    let hits = statement.query_row([shortlink], |row| row.get("hits")).ok();
-    (longlink, hits)
+        .ok()
 }
 
 // Get all URLs in DB
 pub fn getall(db: &Connection) -> Vec<DBRow> {
     let mut statement = db
-        .prepare_cached("SELECT * FROM urls ORDER BY id ASC")
+        .prepare_cached("SELECT * FROM urls")
         .expect("Error preparing SQL statement for getall.");
 
     let mut data = statement
@@ -98,6 +91,5 @@ pub fn open_db(path: String) -> Connection {
         [],
     )
     .expect("Unable to initialize empty database.");
-
     db
 }

actix/src/main.rs

@@ -24,13 +24,11 @@ async fn main() -> Result<()> {
 
     // Generate session key in runtime so that restart invalidates older logins
     let secret_key = Key::generate();
-
     let db_location = env::var("db_url")
         .ok()
         .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>()
@@ -40,51 +38,9 @@ async fn main() -> Result<()> {
         .ok()
         .filter(|s| !s.trim().is_empty());
 
-    let disable_frontend = env::var("disable_frontend").is_ok_and(|s| s.trim() == "True");
-
-    // 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())
-        } 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}.");
-
     // Actually start the server
     HttpServer::new(move || {
-        let mut app = App::new()
+        App::new()
             .wrap(middleware::Logger::default())
             .wrap(middleware::Compress::default())
             .wrap(
@@ -110,15 +66,9 @@ async fn main() -> Result<()> {
             .service(services::delete_link)
             .service(services::login)
             .service(services::logout)
-            .service(services::expand);
-
-        if !disable_frontend {
-            app = app.service(Files::new("/", "./resources/").index_file("index.html"));
-        }
-
-        app.default_service(actix_web::web::get().to(services::error404))
+            .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

@@ -8,11 +8,9 @@ use actix_web::{
     http::StatusCode,
     post,
     web::{self, Redirect},
-    Either, HttpRequest, HttpResponse, Responder,
+    Either, HttpResponse, Responder,
 };
 use std::env;
-// Serialize JSON data
-use serde::Serialize;
 
 use crate::auth;
 use crate::database;
@@ -22,93 +20,12 @@ use crate::AppState;
 // Store the version number
 const VERSION: &str = env!("CARGO_PKG_VERSION");
 
-// Define JSON struct for returning JSON data
-#[derive(Serialize)]
-struct Response {
-    success: bool,
-    error: bool,
-    reason: String,
-}
-
-// Needed to return the short URL to make it easier for programs leveraging the API
-#[derive(Serialize)]
-struct CreatedURL {
-    success: bool,
-    error: bool,
-    shorturl: String,
-}
-
-// Struct for returning information about a shortlink
-#[derive(Serialize)]
-struct LinkInfo {
-    success: bool,
-    error: bool,
-    longurl: String,
-    hits: i64,
-}
-
 // Define the routes
 
 // Add new links
 #[post("/api/new")]
-pub async fn add_link(
-    req: String,
-    data: web::Data<AppState>,
-    session: Session,
-    http: HttpRequest,
-) -> HttpResponse {
-    // Call is_api_ok() function, pass HttpRequest
-    let result = utils::is_api_ok(http);
-    // If success, add new link
-    if result.success {
-        let out = utils::add_link(req, &data.db);
-        if out.0 {
-            let port = env::var("port")
-                .unwrap_or(String::from("4567"))
-                .parse::<u16>()
-                .expect("Supplied port is not an integer");
-            let mut url = format!(
-                "{}:{}",
-                env::var("site_url")
-                    .ok()
-                    .filter(|s| !s.trim().is_empty())
-                    .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,
-                shorturl: format!("{}/{}", url, out.1),
-            };
-            HttpResponse::Created().json(response)
-        } else {
-            let response = Response {
-                success: false,
-                error: true,
-                reason: out.1,
-            };
-            HttpResponse::Conflict().json(response)
-        }
-    } else if result.error {
-        HttpResponse::Unauthorized().json(result)
-    // If password authentication or public mode is used - keeps backwards compatibility
-    } else if env::var("public_mode") == Ok(String::from("Enable")) || auth::validate(session) {
+pub async fn add_link(req: String, data: web::Data<AppState>, session: Session) -> HttpResponse {
+    if env::var("public_mode") == Ok(String::from("Enable")) || auth::validate(session) {
         let out = utils::add_link(req, &data.db);
         if out.0 {
             HttpResponse::Created().body(out.1)
@@ -122,20 +39,8 @@ pub async fn add_link(
 
 // Return all active links
 #[get("/api/all")]
-pub async fn getall(
-    data: web::Data<AppState>,
-    session: Session,
-    http: HttpRequest,
-) -> HttpResponse {
-    // Call is_api_ok() function, pass HttpRequest
-    let result = utils::is_api_ok(http);
-    // If success, return all links
-    if result.success {
-        HttpResponse::Ok().body(utils::getall(&data.db))
-    } else if result.error {
-        HttpResponse::Unauthorized().json(result)
-    // If password authentication is used - keeps backwards compatibility
-    } else if auth::validate(session) {
+pub async fn getall(data: web::Data<AppState>, session: Session) -> HttpResponse {
+    if auth::validate(session) {
         HttpResponse::Ok().body(utils::getall(&data.db))
     } else {
         let body = if env::var("public_mode") == Ok(String::from("Enable")) {
@@ -147,35 +52,6 @@ pub async fn getall(
     }
 }
 
-// Get information about a single shortlink
-#[post("/api/expand")]
-pub async fn expand(req: String, data: web::Data<AppState>, http: HttpRequest) -> HttpResponse {
-    let result = utils::is_api_ok(http);
-    if result.success {
-        let linkinfo = utils::get_longurl(req, &data.db, true);
-        if let Some(longlink) = linkinfo.0 {
-            let body = LinkInfo {
-                success: true,
-                error: false,
-                longurl: longlink,
-                hits: linkinfo
-                    .1
-                    .expect("Error getting hit count for existing shortlink."),
-            };
-            HttpResponse::Ok().json(body)
-        } else {
-            let body = Response {
-                success: false,
-                error: true,
-                reason: "The shortlink does not exist on the server.".to_string(),
-            };
-            HttpResponse::Unauthorized().json(body)
-        }
-    } else {
-        HttpResponse::Unauthorized().json(result)
-    }
-}
-
 // Get the site URL
 #[get("/api/siteurl")]
 pub async fn siteurl() -> HttpResponse {
@@ -207,7 +83,7 @@ pub async fn link_handler(
     data: web::Data<AppState>,
 ) -> impl Responder {
     let shortlink_str = shortlink.to_string();
-    if let Some(longlink) = utils::get_longurl(shortlink_str, &data.db, false).0 {
+    if let Some(longlink) = utils::get_longurl(shortlink_str, &data.db) {
         let redirect_method = env::var("redirect_method").unwrap_or(String::from("PERMANENT"));
         database::add_hit(shortlink.as_str(), &data.db);
         if redirect_method == "TEMPORARY" {
@@ -229,48 +105,20 @@ pub async fn link_handler(
 // Handle login
 #[post("/api/login")]
 pub async fn login(req: String, session: Session) -> HttpResponse {
-    // Keep this function backwards compatible
-    if env::var("api_key").is_ok() {
-        if let Ok(password) = env::var("password") {
-            if password != req {
-                eprintln!("Failed login attempt!");
-                let response = Response {
-                    success: false,
-                    error: true,
-                    reason: "Wrong password!".to_string(),
-                };
-                return HttpResponse::Unauthorized().json(response);
-            }
+    if let Ok(password) = env::var("password") {
+        if password != req {
+            eprintln!("Failed login attempt!");
+            return HttpResponse::Unauthorized().body("Wrong password!");
         }
-        // Return Ok if no password was set on the server side
-        session
-            .insert("chhoto-url-auth", auth::gen_token())
-            .expect("Error inserting auth token.");
-
-        let response = Response {
-            success: true,
-            error: false,
-            reason: "Correct password!".to_string(),
-        };
-        HttpResponse::Ok().json(response)
-    } else {
-        if let Ok(password) = env::var("password") {
-            if password != req {
-                eprintln!("Failed login attempt!");
-                return HttpResponse::Unauthorized().body("Wrong password!");
-            }
-        }
-        // Return Ok if no password was set on the server side
-        session
-            .insert("chhoto-url-auth", auth::gen_token())
-            .expect("Error inserting auth token.");
-
-        HttpResponse::Ok().body("Correct password!")
     }
+    // Return Ok if no password was set on the server side
+    session
+        .insert("chhoto-url-auth", auth::gen_token())
+        .expect("Error inserting auth token.");
+    HttpResponse::Ok().body("Correct password!")
 }
 
 // Handle logout
-// There's no reason to be calling this route with an API key, so it is not necessary to check if the api_key env variable is set.
 #[delete("/api/logout")]
 pub async fn logout(session: Session) -> HttpResponse {
     if session.remove("chhoto-url-auth").is_some() {
@@ -286,31 +134,8 @@ pub async fn delete_link(
     shortlink: web::Path<String>,
     data: web::Data<AppState>,
     session: Session,
-    http: HttpRequest,
 ) -> HttpResponse {
-    // Call is_api_ok() function, pass HttpRequest
-    let result = utils::is_api_ok(http);
-    // If success, delete shortlink
-    if result.success {
-        if utils::delete_link(shortlink.to_string(), &data.db) {
-            let response = Response {
-                success: true,
-                error: false,
-                reason: format!("Deleted {}", shortlink),
-            };
-            HttpResponse::Ok().json(response)
-        } else {
-            let response = Response {
-                success: false,
-                error: true,
-                reason: "The short link was not found, and could not be deleted.".to_string(),
-            };
-            HttpResponse::NotFound().json(response)
-        }
-    } else if result.error {
-        HttpResponse::Unauthorized().json(result)
-    // If "pass" is true - keeps backwards compatibility
-    } else if auth::validate(session) {
+    if auth::validate(session) {
         if utils::delete_link(shortlink.to_string(), &data.db) {
             HttpResponse::Ok().body(format!("Deleted {shortlink}"))
         } else {

actix/src/utils.rs

@@ -1,15 +1,15 @@
 // SPDX-FileCopyrightText: 2023 Sayantan Santra <sayantan.santra689@gmail.com>
 // SPDX-License-Identifier: MIT
 
-use crate::{auth, database};
-use actix_web::HttpRequest;
 use nanoid::nanoid;
-use rand::seq::IndexedRandom;
+use rand::seq::SliceRandom;
 use regex::Regex;
 use rusqlite::Connection;
-use serde::{Deserialize, Serialize};
+use serde::Deserialize;
 use std::env;
 
+use crate::database;
+
 // Struct for reading link pairs sent during API call
 #[derive(Deserialize)]
 struct URLPair {
@@ -17,74 +17,12 @@ struct URLPair {
     longlink: String,
 }
 
-// Define JSON struct for response
-#[derive(Serialize)]
-pub struct Response {
-    pub(crate) success: bool,
-    pub(crate) error: bool,
-    reason: String,
-    pass: bool,
-}
-
-// If the api_key environment variable exists
-pub fn is_api_ok(http: HttpRequest) -> Response {
-    // If the api_key environment variable exists
-    if env::var("api_key").is_ok() {
-        // If the header exists
-        if let Some(header) = auth::api_header(&http) {
-            // If the header is correct
-            if auth::validate_key(header.to_string()) {
-                Response {
-                    success: true,
-                    error: false,
-                    reason: "Correct API key".to_string(),
-                    pass: false,
-                }
-            } else {
-                Response {
-                    success: false,
-                    error: true,
-                    reason: "Incorrect API key".to_string(),
-                    pass: false,
-                }
-            }
-        // The header may not exist when the user logs in through the web interface, so allow a request with no header.
-        // Further authentication checks will be conducted in services.rs
-        } else {
-            // Due to the implementation of this result in services.rs, this JSON object will not be outputted.
-            Response {
-                success: false,
-                error: false,
-                reason: "X-API-Key header was not found".to_string(),
-                pass: true,
-            }
-        }
-    } else {
-        // If the API key isn't set, but an API Key header is provided
-        if auth::api_header(&http).is_some() {
-            Response {
-                success: false, 
-                error: true, 
-                reason: "An API key was provided, but the 'api_key' environment variable is not configured in the Chhoto URL instance".to_string(), 
-                pass: false
-            }
-        } else {
-            Response {
-                success: false,
-                error: false,
-                reason: "".to_string(),
-                pass: true,
-            }
-        }
-    }
-}
-
 // Request the DB for searching an URL
-pub fn get_longurl(shortlink: String, db: &Connection, needhits: bool) -> (Option<String>, Option<i64>) {
+pub fn get_longurl(shortlink: String, db: &Connection) -> Option<String> {
     if validate_link(&shortlink) {
-        database::find_url(shortlink.as_str(), db, needhits)
+        database::find_url(shortlink.as_str(), db)
     } else {
-        (None, None)
+        None
     }
 }
 
@@ -124,7 +62,7 @@ pub fn add_link(req: String, db: &Connection) -> (bool, String) {
     }
 
     if validate_link(chunks.shortlink.as_str())
-        && get_longurl(chunks.shortlink.clone(), db, false).0.is_none()
+        && get_longurl(chunks.shortlink.clone(), db).is_none()
     {
         (
             database::add_link(chunks.shortlink.clone(), chunks.longlink, db),
@@ -190,10 +128,10 @@ fn gen_link(style: String, len: usize) -> String {
         format!(
             "{0}-{1}",
             ADJECTIVES
-                .choose(&mut rand::rng())
+                .choose(&mut rand::thread_rng())
                 .expect("Error choosing random adjective."),
             NAMES
-                .choose(&mut rand::rng())
+                .choose(&mut rand::thread_rng())
                 .expect("Error choosing random name.")
         )
     }

compose.yaml

@@ -6,45 +6,21 @@ services:
         image: sintan1729/chhoto-url:latest
         restart: unless-stopped
         container_name: chhoto-url
-        # You may enable the next two options if you want, but it may break the program if the db is bind
-        # mounted from the system. It does add extra security, but I don't know enough about docker
-        # to help in case it breaks something.
-        # read_only: true
-        # cap_drop:
-        #   - ALL
         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.
-            # In this case, you can get rid of the db volume below
-            # and instead do a mount manually by specifying the location.
-            # Make sure that you create an empty file with the correct name 
-            # before starting the container if you do make any changes.
-            # (In fact, I'd suggest that you do that so that you can keep
-            # a copy of your database.)
-            - db_url=/db/urls.sqlite
+            # If you do change it, make sure to accordingly change the volume 
+            # mount location below.
+            - db_url=/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=$3CuReP4S$W0rD
             
-            - password=TopSecretPass
-
-            # This needs to be set in order to use programs that use the JSON interface of Chhoto URL.
-            # You will get a warning if this is insecure, and a generated value will be output
-            # You may use that value if you can't think of a secure key
-            # - api_key=SECURE_API_KEY
-
             # Pass the redirect method, if needed. TEMPORARY and PERMANENT
             # are accepted values, defaults to PERMANENT.
             # - redirect_method=TEMPORARY
@@ -59,17 +35,16 @@ services:
             # In case you want to provide public access to adding links (and not 
             # delete, or listing), change the following option to Enable.
             # - public_mode=Disable
-            # In case you want to completely disable the frontend, change the following
-            # to True.
-            # - disable_frontend=False
             
             # By default, the server sends no Cache-Control headers. You can supply a 
             # comma separated list of valid header as per RFC 7234 §5.2 to send those
             # headers instead.
             # - cache_control_header=no-cache, private
         volumes:
-            - db:/db
-
-volumes:
-    db:
+            - ./urls.sqlite:/urls.sqlite
+        networks:
+            - proxy
 
+networks:
+    proxy:
+        external: true

helm-chart/Chart.yaml

@@ -1,24 +0,0 @@
-apiVersion: v2
-name: chhoto-url
-description: A Helm chart for Kubernetes
-
-# A chart can be either an 'application' or a 'library' chart.
-#
-# Application charts are a collection of templates that can be packaged into versioned archives
-# to be deployed.
-#
-# Library charts provide useful utilities or functions for the chart developer. They're included as
-# a dependency of application charts to inject those utilities and functions into the rendering
-# pipeline. Library charts do not define any templates and therefore cannot be deployed.
-type: application
-
-# This is the chart version. This version number should be incremented each time you make changes
-# to the chart and its templates, including the app version.
-# Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.1.0
-
-# This is the version number of the application being deployed. This version number should be
-# incremented each time you make changes to the application. Versions are not expected to
-# follow Semantic Versioning. They should reflect the version the application is using.
-# It is recommended to use it with quotes.
-appVersion: "1.16.0"

helm-chart/templates/ingress.yml

@@ -1,23 +0,0 @@
-apiVersion: networking.k8s.io/v1
-kind: Ingress
-metadata:
-  name: chhoto-url
-  annotations:
-    cert-manager.io/issuer: "letsencrypt"
-    acme.cert-manager.io/http01-edit-in-place: "true"
-spec:
-  tls:
-    - hosts:
-      - {{ .Values.fqdn }}
-      secretName: my-tls
-  rules:
-  - host: {{ .Values.fqdn }}
-    http:
-      paths:
-      - path: /
-        pathType: Prefix
-        backend:
-          service:
-            name: chhoto-url
-            port:
-              number: 80

helm-chart/templates/issuer.yml

@@ -1,18 +0,0 @@
-apiVersion: cert-manager.io/v1
-kind: Issuer
-metadata:
-  name: letsencrypt
-spec:
-  acme:
-    # The ACME server URL
-    server: https://acme-v02.api.letsencrypt.org/directory
-    # Email address used for ACME registration
-    email: {{ .Values.letsencryptmail }}
-    # Name of a secret used to store the ACME account private key
-    privateKeySecretRef:
-      name: letsencrypt
-    # Enable the HTTP-01 challenge provider
-    solvers:
-      - http01:
-          ingress:
-            ingressClassName: nginx

helm-chart/templates/pv.yml

@@ -1,13 +0,0 @@
-apiVersion: v1
-kind: PersistentVolume
-metadata:
-  name: chhoto-pv
-  labels:
-    app: chhoto-url
-spec:
-  capacity:
-    storage: 100Mi
-  accessModes:
-    - ReadWriteOnce
-  hostPath:
-    path: {{ .Values.persistence.hostPath.path }}

helm-chart/templates/secret.yml

@@ -1,10 +0,0 @@
-apiVersion: v1
-kind: Secret
-metadata:
-  name: secret
-type: Opaque
-data:
-  password: {{ .Values.password }}
-  {{- if .Values.api_key }}
-  api_key: {{ .Values.api_key }}
-  {{- end }}

helm-chart/templates/sts.yml

@@ -1,61 +0,0 @@
-apiVersion: apps/v1
-kind: StatefulSet
-metadata:
-  name: chhoto-url
-spec:
-  replicas: 1
-  selector:
-    matchLabels:
-      app: chhoto-url
-  template:
-    metadata:
-      labels:
-        app: chhoto-url
-    spec:
-      containers:
-        - name: chhoto-url
-          image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
-          ports:
-            - containerPort: 4567
-          env:
-            - name: password
-              valueFrom:
-                secretKeyRef:
-                  name: secret
-                  key: password
-            {{- if .Values.api_key }}
-            - name: api_key
-              valueFrom:
-                secretKeyRef:
-                  name: secret
-                  key: api_key
-            {{- end }}
-            - name: db_url
-              value: /db/urls.sqlite
-            - name: site_url
-              value: "{{ .Values.protocol }}://{{ .Values.fqdn }}"
-            - name: redirect_method
-              value: {{ .Values.redirect_method }}
-            - name: slug_style
-              value: {{ .Values.slug_style }}
-            - name: slug_length
-              value: "{{ .Values.slug_length }}"
-            - name: public_mode
-              value: {{ .Values.public_mode }}
-            - name: disable_frontend
-              value: {{ .Values.disable_frontend }}
-            {{- if .Values.cache_control_header }}
-            - name: cache_control_header
-              value: {{ .Values.cache_control_header }}
-            {{- end }}
-          volumeMounts:
-            - name: data
-              mountPath: /db
-  volumeClaimTemplates:
-    - metadata:
-        name: data
-      spec:
-        accessModes: [ "ReadWriteOnce" ]
-        resources:
-          requests:
-            storage: 100Mi

helm-chart/templates/svc.yml

@@ -1,14 +0,0 @@
-apiVersion: v1
-kind: Service
-metadata:
-  name: chhoto-url
-  labels:
-    app: chhoto-url
-spec:
-  type: ClusterIP
-  ports:
-    - port: 80
-      targetPort: 4567
-      protocol: TCP
-  selector:
-    app: chhoto-url

helm-chart/values.yaml

@@ -1,28 +0,0 @@
-# Default values for chhoto-url.
-# This is a YAML-formatted file.
-# Declare variables to be passed into your templates.
-
-image:
-  repository: sintan1729/chhoto-url
-  pullPolicy: IfNotPresent
-  tag: "5.4.6"
-
-# please use a better password in your values and base64 encode it
-password: cGFzc3dvcmQ=
-# if used, needs to be base64 encoded as well
-# api_key: U0VDVVJFX0FQSV9LRVk=
-
-persistence:
-  hostPath:
-    path: /mnt/data/chhoto-data
-
-redirect_method: PERMANENT
-slug_style: Pair
-slug_length: 8
-public_mode: Disable
-disable_frontend: False
-# cache_control_header: "no-cache, private"
-
-protocol: https
-fqdn: your.short.link.url.com
-letsencryptmail: your.mail@address.com

resources/index.html

@@ -38,7 +38,7 @@
                 <div class=" pure-control-group">
                     <label for="shortUrl">Short URL (optional)</label>
                     <input type="text" name="shortUrl" id="shortUrl" placeholder="Only a-z, 0-9, - and _ are allowed"
-                        pattern="[a-z0-9\-_]+" title="Only a-z, 0-9, - and _ are allowed" autocapitalize="off"/>
+                        pattern="[a-z0-9\-_]+" title="Only a-z, 0-9, - and _ are allowed"/>
                 </div>
                 <div class="pure-controls" id="controls">
                     <button class="pure-button pure-button-primary">Shorten!</button>
@@ -78,7 +78,7 @@
             <p>Please enter password to access this website</p>
             <input type="password" id="password" />
             <button class="pure-button pure-button-primary" value="default">Log in</button>
-            <p id="wrong-pass" hidden>Wrong password!</p>
+            <p id="wrong-pass">&nbsp;</p>
         </form>
     </dialog>
 

resources/static/script.js

@@ -56,7 +56,7 @@ const refreshData = async () => {
         }
     } else {
         let data = await res.json();
-        displayData(data.reverse());
+        displayData(data);
     }
 }
 
@@ -103,10 +103,7 @@ const TR = (row, site) => {
     const tr = document.createElement("tr");
     const longTD = TD(A_LONG(row["longlink"]), "Long URL");
     var shortTD = null;
-    var isSafari = /Safari/.test(navigator.userAgent) && /Apple Computer/.test(navigator.vendor);
-    // For now, we disable copying on WebKit due to a possible bug. Manual copying is enabled instead.
-    // Take a look at https://github.com/SinTan1729/chhoto-url/issues/36
-    if (window.isSecureContext && !(isSafari)) {
+    if (window.isSecureContext) {
         shortTD = TD(A_SHORT(row["shortlink"], site), "Short URL");
     }
     else {
@@ -129,10 +126,10 @@ const copyShortUrl = async (link) => {
     const site = await getSiteUrl();
     try {
         navigator.clipboard.writeText(`${site}/${link}`);
-        showAlert(`Short URL ${link} was copied to clipboard!`, "light-dark(green, #72ff72)");
+        showAlert(`Short URL ${link} was copied to clipboard!`, "green");
     } catch (e) {
         console.log(e);
-        showAlert(`Could not copy short URL to clipboard, please do it manually: <a href=${site}/${link}>${site}/${link}</a>`, "light-dark(red, #ff1a1a)");
+        showAlert(`Could not copy short URL to clipboard, please do it manually: <a href=${site}/${link}>${site}/${link}</a>`, "red");
     }
 
 }
@@ -213,7 +210,7 @@ const submitForm = () => {
         })
         .then(text => {
             if (!ok) {
-                showAlert(text, "light-dark(red, #ff1a1a)");
+                showAlert(text, "red");
             }
             else {
                 copyShortUrl(text);
@@ -234,10 +231,11 @@ const submitLogin = () => {
             document.getElementById("container").style.filter = "blur(0px)"
             document.getElementById("login-dialog").close();
             password.value = '';
-            document.getElementById("wrong-pass").hidden = true;
             refreshData();
         } else {
-            document.getElementById("wrong-pass").hidden = false;
+            const wrongPassBox = document.getElementById("wrong-pass");
+            wrongPassBox.innerHTML = "Wrong password!";
+            wrongPassBox.style.color = "red";
             password.focus();
         }
     })

resources/static/styles.css

@@ -3,34 +3,7 @@
 
 @font-face {
     font-family: Montserrat;
-    src: url('/assets/Montserrat-VF.woff2');
-}
-
-:root {
-    color-scheme: light dark;
-}
-
-body {
-    color: light-dark(black, #e8e6e3);
-    background-color: light-dark(white, #181a1b);
-}
-
-.pure-button {
-    background-color: light-dark(#0078e7, #0060b9);
-}
-
-input {
-    border-color: light-dark(#cccccc, #3e4446) !important;
-    box-shadow: light-dark(#dddddd, #2b2f31) 0px 1px 3px inset !important;
-}
-
-::placeholder {
-    color: light-dark(#757575, #636061);
-}
-
-legend {
-    color: light-dark(#333333, #c8c3bc) !important;
-    border-bottom-color: light-dark(#e5e5e5 ,#373c3e) !important;
+    src: url('Montserrat-VF.woff2');
 }
 
 * {
@@ -42,10 +15,6 @@ legend {
     margin: 20px auto auto;
 }
 
-a {
-    color: light-dark(blue, #3391ff);
-}
-
 table tr td div {
     max-height: 75px;
     line-height: 25px;
@@ -54,19 +23,6 @@ table tr td div {
     overflow: auto;
 }
 
-.pure-table {
-    border-color: light-dark(black, #867d6e);
-}
-
-.pure-table caption {
-    color: light-dark(black, #e8e6e3);
-}
-
-.pure-table thead {
-    color: light-dark(black, #e8e6e3);
-    background-color: light-dark(#e0e0e0, #2a2d2f);
-}
-
 .pure-table td {
     border-left: none;
 }
@@ -101,6 +57,10 @@ input {
     width: 65%;
 }
 
+form input[name="shortUrl"] {
+    text-transform: lowercase;
+}
+
 form input[name="shortUrl"]::placeholder {
     text-transform: none;
 }
@@ -130,19 +90,10 @@ div[name="links-div"] {
     margin-bottom: 10px;
 }
 
-#login-dialog {
-    border-radius: 10px;
-    border-width: 2px;
-}
-
-#login-dialog form {
+dialog form {
     text-align: center;
 }
 
-#wrong-pass {
-    color: light-dark(red, #ff1a1a);
-}
-
 /* Settings for mobile devices */
 @media (pointer:none),
 (pointer:coarse) {