Merge branch 'master' into feat/otp_uri_export

# Conflicts:
#	src/utils.rs

Author: replydev

.devcontainer/devcontainer.json

@@ -0,0 +1,11 @@
+{
+  "image": "mcr.microsoft.com/devcontainers/universal:2",
+  "features": {
+    "ghcr.io/devcontainers/features/rust:1": {
+      "profile": "default"
+    },
+    "ghcr.io/devcontainers/features/python:1": {
+      "version": "3.11"
+    }
+  }
+}

.github/workflows/build.yml

@@ -89,7 +89,7 @@ jobs:
         if: matrix.build != 'aarch64-linux'
         run: cargo build
 
-      - uses: actions/upload-artifact@v3.1.2
+      - uses: actions/upload-artifact@v3.1.3
         with:
           name: bins-${{ matrix.build }}
           # Two paths, the first for x86_64 jobs, the second for aarch64.

.github/workflows/release.yml

@@ -66,7 +66,7 @@ jobs:
             cp "target/${{ matrix.target }}/release/$BIN_NAME" "dist/"
           fi
 
-      - uses: actions/upload-artifact@v3.1.2
+      - uses: actions/upload-artifact@v3.1.3
         with:
           name: bins-${{ matrix.build }}
           path: dist

Cargo.lock

@@ -27,29 +27,29 @@ debug = false
 strip = "symbols"
 
 [dependencies]
-serde_json = "1.0.105"
+serde_json = "1.0.107"
 serde = { version = "1.0.188", features = ["derive"] }
 dirs = "5.0.1"
 rpassword = "7.2.0"
 data-encoding = "2.4.0"
 copypasta-ext = "0.4.4"
 zeroize = "1.6.0"
-clap = { version = "4.4.2", features = ["derive"] }
+clap = { version = "4.4.6", features = ["derive"] }
 hmac = "0.12.1"
 sha-1 = "0.10.1"
-sha2 = "0.10.7"
+sha2 = "0.10.8"
 chacha20poly1305 = "0.10.1"
 rust-argon2 = "2.0.0"
 getrandom = "0.2.10"
 scrypt = "0.11.0"
-aes-gcm = "0.10.2"
+aes-gcm = "0.10.3"
 hex = "0.4.3"
 qrcode = "0.12.0"
 urlencoding = "2.1.3"
-regex = "1.9.3"
+regex = "1.9.6"
 once_cell = "1.18.0"
-base64 = "0.21.3"
-md-5 = "0.10.5"
+base64 = "0.21.4"
+md-5 = "0.10.6"
 ratatui = { version = "0.23.0", features = ["all-widgets"] }
 crossterm = "0.27.0"
 url = "2.4.1"

Cargo.toml

@@ -0,0 +1,64 @@
+use base64::{engine::general_purpose, Engine as _};
+use copypasta_ext::prelude::*;
+#[cfg(target_os = "linux")]
+use copypasta_ext::wayland_bin::WaylandBinClipboardContext;
+use copypasta_ext::x11_bin::ClipboardContext as BinClipboardContext;
+use copypasta_ext::x11_fork::ClipboardContext as ForkClipboardContext;
+use crossterm::style::Print;
+use std::{env, io};
+
+pub enum CopyType {
+    Native,
+    OSC52,
+}
+
+pub fn copy_string_to_clipboard(content: String) -> Result<CopyType, ()> {
+    if ssh_clipboard(content.as_str()) {
+        Ok(CopyType::OSC52)
+    } else if wayland_clipboard(content.as_str()) || other_platform_clipboard(content.as_str()) {
+        Ok(CopyType::Native)
+    } else {
+        Err(())
+    }
+}
+
+fn ssh_clipboard(content: &str) -> bool {
+    env_var_set("SSH_CONNECTION")
+        // We do not use copypasta_ext::osc52 module because we have enabled terminal raw mode, so we print with crossterm utilities
+        // Check https://github.com/timvisee/rust-clipboard-ext/blob/371df19d2f961882a21c957f396d1e24548d1f28/src/osc52.rs#L92
+        && crossterm::execute!(
+            io::stdout(),
+            Print(format!(
+                "\x1B]52;c;{}\x07",
+                general_purpose::STANDARD.encode(content)
+            ))
+        )
+        .is_ok()
+}
+#[cfg(target_os = "linux")]
+fn wayland_clipboard(content: &str) -> bool {
+    env_var_set("WAYLAND_DISPLAY")
+        && WaylandBinClipboardContext::new()
+            .and_then(|mut ctx| ctx.set_contents(content.to_owned()))
+            .is_ok()
+}
+
+#[cfg(not(target_os = "linux"))]
+fn wayland_clipboard(content: &str) -> bool {
+    false
+}
+
+fn other_platform_clipboard(content: &str) -> bool {
+    BinClipboardContext::new()
+        .and_then(|mut ctx| ctx.set_contents(content.to_owned()))
+        .is_ok()
+        || ForkClipboardContext::new()
+            .and_then(|mut ctx| ctx.set_contents(content.to_owned()))
+            .is_ok()
+}
+
+fn env_var_set(env_var: &str) -> bool {
+    env::var(env_var)
+        .map(|v| !v.trim().is_empty())
+        .unwrap_or(false)
+}

src/clipboard.rs

@@ -1,9 +1,9 @@
+use crate::clipboard::{copy_string_to_clipboard, CopyType};
 use crossterm::event::{KeyCode, KeyEvent, KeyModifiers};
 
 use crate::interface::app::{App, AppResult};
 use crate::interface::enums::Page::*;
 use crate::otp::otp_type::OTPType;
-use crate::utils::{copy_string_to_clipboard, CopyType};
 
 use super::app::Popup;
 use super::enums::Page;
@@ -103,7 +103,7 @@ fn main_handler(key_event: KeyEvent, app: &mut App) {
             handle_exit(app);
         }
         // exit application on Ctrl-D
-        KeyCode::Char('d') | KeyCode::Char('D') => {
+        KeyCode::Char('d') | KeyCode::Char('D') | KeyCode::Char('c') => {
             if key_event.modifiers == KeyModifiers::CONTROL {
                 handle_exit(app);
             } else if app.table.state.selected().is_some() {

src/interface/handler.rs

@@ -15,6 +15,7 @@ use zeroize::Zeroize;
 
 mod args;
 mod argument_functions;
+mod clipboard;
 mod crypto;
 mod exporters;
 mod importers;

src/main.rs

@@ -1,48 +1,33 @@
-use base64::{engine::general_purpose, Engine as _};
-use copypasta_ext::prelude::*;
-use copypasta_ext::x11_fork::ClipboardContext;
-use crossterm::style::Print;
-#[cfg(not(debug_assertions))]
 use dirs::home_dir;
 use std::path::PathBuf;
 use std::time::{SystemTime, UNIX_EPOCH};
 use std::{env, io};
 
-pub enum CopyType {
-    Native,
-    OSC52,
-}
-
 pub fn get_db_path() -> PathBuf {
     match env::var("COTP_DB_PATH") {
         Ok(value) => PathBuf::from(value),
         Err(_e) => get_default_db_path(),
     }
 }
 
+pub fn is_portable_mode() -> bool {
+    PathBuf::from("db.cotp").exists()
+}
+
 // Pushing an absolute path to a PathBuf replaces the entire PathBuf: https://doc.rust-lang.org/std/path/struct.PathBuf.html#method.push
 pub fn get_default_db_path() -> PathBuf {
-    let result: Option<PathBuf> = {
-        #[cfg(not(debug_assertions))]
-        {
-            home_dir()
-        }
-        #[cfg(debug_assertions)]
-        Some(PathBuf::from("."))
-    };
-    match result {
-        Some(home) => home,
-        None => {
-            let current_dir = PathBuf::from(".");
-            if let Some(str_dir) = current_dir.to_str() {
-                eprintln!("Cannot get home folder, using: {str_dir}");
-            } else {
-                eprintln!("Cannot get home folder, using");
-            }
-            current_dir
-        }
+    let db_from_current_dir = PathBuf::from("./db.cotp");
+
+    // If db.cotp is present in the current directory or we are using a debug artifact, do not use the one in home dir
+    // First condition is optimized away in release mode
+    if cfg!(debug_assertions) || is_portable_mode() {
+        return db_from_current_dir;
     }
-    .join(".cotp/db.cotp")
+
+    // Take from homedir, otherwise fallback to portable mode
+    home_dir()
+        .map(|path| path.join(".cotp/db.cotp"))
+        .unwrap_or(db_from_current_dir)
 }
 
 pub fn init_app() -> Result<bool, ()> {
@@ -94,33 +79,3 @@ pub fn verified_password(message: &str, minimum_length: usize) -> String {
         return password;
     }
 }
-
-fn in_ssh_shell() -> bool {
-    return env::var("SSH_CONNECTION")
-        .map(|v| !v.trim().is_empty())
-        .unwrap_or(false);
-}
-
-pub fn copy_string_to_clipboard(content: String) -> Result<CopyType, ()> {
-    if in_ssh_shell() {
-        // We do not use copypasta_ext::osc52 module because we have enabled terminal raw mode, so we print with crossterm utilities
-        // Check https://github.com/timvisee/rust-clipboard-ext/blob/371df19d2f961882a21c957f396d1e24548d1f28/src/osc52.rs#L92
-        return match crossterm::execute!(
-            io::stdout(),
-            Print(format!(
-                "\x1B]52;c;{}\x07",
-                general_purpose::STANDARD.encode(content)
-            ))
-        ) {
-            Ok(_) => Ok(CopyType::OSC52),
-            Err(_) => Err(()),
-        };
-    } else if let Ok(mut ctx) = ClipboardContext::new() {
-        return if ctx.set_contents(content).is_ok() {
-            Ok(CopyType::Native)
-        } else {
-            Err(())
-        };
-    }
-    Err(())
-}