Dockerfile

@@ -1,6 +1,3 @@
-# SPDX-FileCopyrightText: 2023 Sayantan Santra <sayantan.santra689@gmail.com>
-# SPDX-License-Identifier: MIT
-
 FROM lukemathwalker/cargo-chef:latest-rust-slim AS chef
 WORKDIR /chhoto-url
 

Dockerfile.multiarch

@@ -1,6 +1,3 @@
-# SPDX-FileCopyrightText: 2023 Sayantan Santra <sayantan.santra689@gmail.com>
-# SPDX-License-Identifier: MIT
-
 FROM scratch as builder-amd64
 COPY ./actix/target/x86_64-unknown-linux-musl/release/chhoto-url /chhoto-url
 

Makefile

@@ -1,6 +1,3 @@
-# SPDX-FileCopyrightText: 2023 Sayantan Santra <sayantan.santra689@gmail.com>
-# SPDX-License-Identifier: MIT
-
 # .env file has the variables $DOCKER_USERNAME and $PASSWORD defined
 include .env
 

README.md

@@ -1,6 +1,3 @@
-<!-- SPDX-FileCopyrightText: 2023 Sayantan Santra <sayantan.santra689@gmail.com> -->
-<!-- SPDX-License-Identifier: MIT -->
-
 [![docker-pulls](https://img.shields.io/docker/pulls/sintan1729/chhoto-url)](https://hub.docker.com/r/sintan1729/chhoto-url)
 [![maintainer](https://img.shields.io/badge/maintainer-SinTan1729-blue)](https://github.com/SinTan1729)
 ![commit-since-latest-release](https://img.shields.io/github/commits-since/SinTan1729/chhoto-url/latest?sort=semver&label=commits%20since%20latest%20release)
@@ -42,7 +39,6 @@ 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.
 - Allows setting the URL of your website, in case you want to conveniently
   generate short links locally.
 - Links are stored in an SQLite database.

actix/Cargo.toml

@@ -1,6 +1,3 @@
-# SPDX-FileCopyrightText: 2023 Sayantan Santra <sayantan.santra689@gmail.com>
-# SPDX-License-Identifier: MIT
-
 [package]
 name = "chhoto-url"
 version = "5.2.4"

actix/src/auth.rs

@@ -1,6 +1,3 @@
-// SPDX-FileCopyrightText: 2023 Sayantan Santra <sayantan.santra689@gmail.com>
-// SPDX-License-Identifier: MIT
-
 use actix_session::Session;
 use std::{env, time::SystemTime};
 

actix/src/database.rs

@@ -1,6 +1,3 @@
-// SPDX-FileCopyrightText: 2023 Sayantan Santra <sayantan.santra689@gmail.com>
-// SPDX-License-Identifier: MIT
-
 use rusqlite::Connection;
 use serde::Serialize;
 

actix/src/main.rs

@@ -1,6 +1,3 @@
-// SPDX-FileCopyrightText: 2023 Sayantan Santra <sayantan.santra689@gmail.com>
-// SPDX-License-Identifier: MIT
-
 use actix_files::{Files, NamedFile};
 use actix_session::{storage::CookieSessionStore, Session, SessionMiddleware};
 use actix_web::{
@@ -12,7 +9,7 @@ use actix_web::{
     App, Either, HttpResponse, HttpServer, Responder,
 };
 use rusqlite::Connection;
-use std::{env, io::Result};
+use std::env;
 mod auth;
 mod database;
 mod utils;
@@ -33,12 +30,12 @@ async fn add_link(req: String, data: web::Data<AppState>, session: Session) -> H
     if auth::validate(session) {
         let out = utils::add_link(req, &data.db);
         if out.0 {
-            HttpResponse::Created().body(out.1)
+            HttpResponse::Ok().body(out.1)
         } else {
-            HttpResponse::Conflict().body(out.1)
+            HttpResponse::BadRequest().body(out.1)
         }
     } else {
-        HttpResponse::Unauthorized().body("Not logged in!")
+        HttpResponse::Forbidden().body("Not logged in!")
     }
 }
 
@@ -48,7 +45,7 @@ async fn getall(data: web::Data<AppState>, session: Session) -> HttpResponse {
     if auth::validate(session) {
         HttpResponse::Ok().body(utils::getall(&data.db))
     } else {
-        HttpResponse::Unauthorized().body("Not logged in!")
+        HttpResponse::Forbidden().body("Not logged in!")
     }
 }
 
@@ -59,7 +56,7 @@ async fn siteurl(session: Session) -> HttpResponse {
         let site_url = env::var("site_url").unwrap_or(String::from("unset"));
         HttpResponse::Ok().body(site_url)
     } else {
-        HttpResponse::Unauthorized().body("Not logged in!")
+        HttpResponse::Forbidden().body("Not logged in!")
     }
 }
 
@@ -106,7 +103,7 @@ async fn login(req: String, session: Session) -> HttpResponse {
     if let Ok(password) = env::var("password") {
         if password != req {
             eprintln!("Failed login attempt!");
-            return HttpResponse::Unauthorized().body("Wrong password!");
+            return HttpResponse::Forbidden().body("Wrong password!");
         }
     }
     // Return Ok if no password was set on the server side
@@ -130,12 +127,12 @@ async fn delete_link(
             HttpResponse::NotFound().body("Not found!")
         }
     } else {
-        HttpResponse::Unauthorized().body("Not logged in!")
+        HttpResponse::Forbidden().body("Not logged in!")
     }
 }
 
 #[actix_web::main]
-async fn main() -> Result<()> {
+async fn main() -> std::io::Result<()> {
     env_logger::init_from_env(env_logger::Env::new().default_filter_or("warn"));
 
     // Generate session key in runtime so that restart invalidates older logins

actix/src/utils.rs

@@ -1,6 +1,3 @@
-// SPDX-FileCopyrightText: 2023 Sayantan Santra <sayantan.santra689@gmail.com>
-// SPDX-License-Identifier: MIT
-
 use nanoid::nanoid;
 use rand::seq::SliceRandom;
 use regex::Regex;

compose.yaml

@@ -1,6 +1,3 @@
-# SPDX-FileCopyrightText: 2023 Sayantan Santra <sayantan.santra689@gmail.com>
-# SPDX-License-Identifier: MIT
-
 services:
     chhoto-url:
         image: sintan1729/chhoto-url:latest

resources/index.html

@@ -1,6 +1,3 @@
-<!-- SPDX-FileCopyrightText: 2023 Sayantan Santra <sayantan.santra689@gmail.com> -->
-<!-- SPDX-License-Identifier: MIT -->
-
 <!DOCTYPE html>
 <html lang="en">
 

resources/static/404.html

@@ -1,6 +1,3 @@
-<!-- SPDX-FileCopyrightText: 2023 Sayantan Santra <sayantan.santra689@gmail.com> -->
-<!-- SPDX-License-Identifier: MIT -->
-
 <!DOCTYPE html>
 <html>
 
@@ -26,4 +23,4 @@
     </div>
 </body>
 
-</html>
+</html>

resources/static/script.js

@@ -1,6 +1,3 @@
-// SPDX-FileCopyrightText: 2023 Sayantan Santra <sayantan.santra689@gmail.com>
-// SPDX-License-Identifier: MIT
-
 const prepSubdir = (link) => {
     let thisPage = new URL(window.location.href);
     let subdir = thisPage.pathname;

resources/static/styles.css

@@ -1,6 +1,3 @@
-/* SPDX-FileCopyrightText: 2023 Sayantan Santra <sayantan.santra689@gmail.com> */
-/* SPDX-License-Identifier: MIT */
-
 @font-face {
     font-family: Montserrat;
     src: url('Montserrat-VF.woff2');