fix cargo versioning per cargo docs

This disables clipboard copying and lets the user
manually copy the links.

actix/Cargo.lock

@@ -476,7 +476,7 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
 
 [[package]]
 name = "chhoto-url"
-version = "5.4.4"
+version = "1.1.0"
 dependencies = [
  "actix-files",
  "actix-session",

actix/Cargo.toml

@@ -3,14 +3,14 @@
 
 [package]
 name = "chhoto-url"
-version = "5.4.4"
+version = "1.1.0"
 edition = "2021"
 authors = ["Sayantan Santra <sayantan[dot]santra689[at]gmail[dot]com"]
 license = "mit"
 description = "A simple selfhosted URL shortener with no unnecessary features."
-homepage = "https://github.com/SinTan1729/chhoto-url"
-documentation = "https://github.com/SinTan1729/chhoto-url"
-repository = "https://github.com/SinTan1729/chhoto-url"
+homepage = "https://github.com/minoplhy/chhoto-url"
+documentation = "https://github.com/minoplhy/chhoto-url"
+repository = "https://github.com/minoplhy/chhoto-url"
 readme = "README.md"
 keywords = [
     "docker",

actix/src/auth.rs

@@ -2,11 +2,11 @@
 // SPDX-License-Identifier: MIT
 
 use actix_session::Session;
-use actix_web::{web, HttpRequest};
+use actix_web::HttpRequest;
+use rusqlite::Connection;
 use std::{env, time::SystemTime};
 
-use crate::database::get_api_key;
-use crate::AppState;
+use crate::database;
 
 // Validate a given password
 pub fn validate(session: Session) -> bool {
@@ -27,11 +27,11 @@ pub fn validate(session: Session) -> bool {
 }
 
 // Validate x-api-header to match the key in database
-pub fn apikey_validate(httprequest: HttpRequest, data: web::Data<AppState>) -> bool {
+pub fn apikey_validate(httprequest: HttpRequest, db: &Connection) -> bool {
     httprequest.headers()
         .get("x-api-key")
         .and_then(|h| h.to_str().ok())
-        .map(|key| key == get_api_key(&data.db))
+        .map(|key| key == database::get_api_key(&db))
         .unwrap_or(false)
 }
 

actix/src/services.rs

@@ -8,7 +8,7 @@ use actix_web::{
 };
 use std::env;
 
-use crate::auth::{self, apikey_validate};
+use crate::auth;
 use crate::database;
 use crate::utils;
 use crate::AppState;
@@ -26,7 +26,7 @@ pub async fn add_link(
     session: Session, 
     httprequest: HttpRequest) 
     -> HttpResponse {
-    if env::var("public_mode") == Ok(String::from("Enable")) || auth::validate(session) || apikey_validate(httprequest, data.clone()) {
+    if env::var("public_mode") == Ok(String::from("Enable")) || auth::validate(session) || auth::apikey_validate(httprequest, &data.db) {
         let out = utils::add_link(req, &data.db);
         if out.0 {
             HttpResponse::Created().body(out.1)
@@ -45,7 +45,7 @@ pub async fn getall(
     session: Session, 
     httprequest: HttpRequest
 ) -> HttpResponse {
-    if auth::validate(session) || apikey_validate(httprequest, data.clone()) {
+    if auth::validate(session) || auth::apikey_validate(httprequest, &data.db) {
         HttpResponse::Ok().body(utils::getall(&data.db))
     } else {
         let body = if env::var("public_mode") == Ok(String::from("Enable")) {
@@ -126,7 +126,7 @@ pub async fn login(req: String, session: Session) -> HttpResponse {
 // Create API Key
 #[post("/api/key")]
 pub async fn gen_api_key(session: Session, httprequest: HttpRequest, data: web::Data<AppState>) -> HttpResponse {
-    if auth::validate(session) || apikey_validate(httprequest, data.clone()) {
+    if auth::validate(session) || auth::apikey_validate(httprequest, &data.db) {
         let key = utils::gen_api_key(&data.db);
         if key.0 {
             HttpResponse::Ok().body(key.1)
@@ -157,7 +157,7 @@ pub async fn edit_link(
     session: Session,
     httprequest: HttpRequest,
 ) -> HttpResponse {
-    if auth::validate(session) || apikey_validate(httprequest, data.clone()) {
+    if auth::validate(session) || auth::apikey_validate(httprequest, &data.db) {
         let out = utils::edit_link(req, shortlink.to_string(), &data.db);
         if out.0 {
             HttpResponse::Created().body(out.1)
@@ -177,7 +177,7 @@ pub async fn delete_link(
     session: Session,
     httprequest: HttpRequest,
 ) -> HttpResponse {
-    if auth::validate(session) || apikey_validate(httprequest, data.clone()) {
+    if auth::validate(session) || auth::apikey_validate(httprequest, &data.db) {
         if utils::delete_link(shortlink.to_string(), &data.db) {
             HttpResponse::Ok().body(format!("Deleted {shortlink}"))
         } else {

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" />
+                        pattern="[a-z0-9\-_]+" title="Only a-z, 0-9, - and _ are allowed" autocapitalize="off"/>
                 </div>
                 <div class="pure-controls" id="controls">
                     <button class="pure-button pure-button-primary">Shorten!</button>
@@ -71,7 +71,7 @@
         &nbsp;
         <a id="api-key-button" href="javascript:fetchApiKey()" hidden>API Key</a>
         &nbsp;
-        <a id="version-number" href="https://github.com/SinTan1729/chhoto-url" target="_blank" rel="noopener noreferrer"
+        <a id="version-number" href="https://github.com/minoplhy/chhoto-url" target="_blank" rel="noopener noreferrer"
             hidden>Source Code</a>
     </div>
 

resources/static/script.js

@@ -109,7 +109,10 @@ const TR = (row, site) => {
     const tr = document.createElement("tr");
     const longTD = TD(A_LONG(row["longlink"]), "Long URL");
     var shortTD = null;
-    if (window.isSecureContext) {
+    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)) {
         shortTD = TD(A_SHORT(row["shortlink"], site), "Short URL");
     } else {
         shortTD = TD(A_SHORT_INSECURE(row["shortlink"], site), "Short URL");

resources/static/styles.css

@@ -57,10 +57,6 @@ input {
     width: 65%;
 }
 
-form input[name="shortUrl"] {
-    text-transform: lowercase;
-}
-
 form input[name="shortUrl"]::placeholder {
     text-transform: none;
 }