Merge branch 'osc52'

Author: replydev

Cargo.lock

@@ -44,4 +44,5 @@ scrypt = "0.10.0"
 aes-gcm = "0.9.4"
 hex = "0.4.3"
 qrcode = "0.12.0"
-urlencoding = "2.1.0"
+urlencoding = "2.1.0"
+base64 = "0.13.0"

Cargo.toml

@@ -9,9 +9,7 @@ use utils::{check_elements, get_db_path, millis_before_next_step};
 use crate::cryptography;
 use crate::otp::otp_element::OTPElement;
 use crate::otp::otp_helper::get_otp_code;
-use crate::utils;
-use copypasta_ext::prelude::ClipboardProvider;
-use copypasta_ext::x11_fork::ClipboardContext;
+use crate::utils::{self, copy_string_to_clipboard, CopyType};
 use zeroize::Zeroize;
 
 pub fn get_elements() -> Result<Vec<OTPElement>, String> {
@@ -53,11 +51,12 @@ pub fn print_elements_matching(issuer: Option<&str>, label: Option<&str>) -> Res
                 otp_code,
                 millis_before_next_step() / 1000
             );
-            if let Ok(mut ctx) = ClipboardContext::new() {
-                match ctx.set_contents(otp_code) {
-                    Ok(_) => println!("Copied to clipboard"),
-                    Err(_) => println!("Cannot copy OTP Code to clipboard"),
-                };
+            match copy_string_to_clipboard(otp_code) {
+                Ok(result) => match result {
+                    CopyType::Native => println!("Copied to clipboard"),
+                    CopyType::OSC52 => println!("Remote copied to clipboard"),
+                },
+                Err(()) => println!("Cannot copy to clipboard"),
             }
             println!();
         });

src/database_management.rs

@@ -2,8 +2,7 @@ use crossterm::event::{KeyCode, KeyEvent, KeyModifiers};
 
 use crate::interface::app::{App, AppResult};
 use crate::interface::page::Page::*;
-use copypasta_ext::prelude::*;
-use copypasta_ext::x11_fork::ClipboardContext;
+use crate::utils::{copy_string_to_clipboard, CopyType};
 
 use super::page::Page;
 
@@ -36,7 +35,10 @@ fn handle_key_events_search_bar(key_event: KeyEvent, app: &mut App) {
                 search_and_select(app);
             }
         }
-        KeyCode::Enter => copy_selected_code_to_clipboard(app),
+        KeyCode::Enter => {
+            app.label_text = copy_selected_code_to_clipboard(app);
+            app.print_percentage = false;
+        }
         KeyCode::Esc => {
             app.search_bar_focused = false;
         }
@@ -107,26 +109,33 @@ fn handle_key_events_main(key_event: KeyEvent, app: &mut App) {
 
         KeyCode::Char('/') => app.search_bar_focused = true,
 
-        KeyCode::Enter => copy_selected_code_to_clipboard(app),
+        KeyCode::Enter => {
+            app.label_text = copy_selected_code_to_clipboard(app);
+            app.print_percentage = false;
+        }
         _ => {}
     }
 }
 
-fn copy_selected_code_to_clipboard(app: &mut App) {
-    if let Some(selected) = app.table.state.selected() {
-        if let Some(element) = app.table.items.get(selected) {
-            if let Some(otp_code) = element.get(3) {
-                // in some occasions we can't copy contents to clipboard, so let's check for a good result
-                if let Ok(mut ctx) = ClipboardContext::new() {
-                    match ctx.set_contents(otp_code.to_owned()) {
-                        Ok(_) => app.label_text = String::from("Copied!"),
-                        Err(_) => app.label_text = String::from("Cannot copy"),
+fn copy_selected_code_to_clipboard(app: &mut App) -> String {
+    match app.table.state.selected() {
+        Some(selected) => match app.table.items.get(selected) {
+            Some(element) => match element.get(3) {
+                Some(otp_code) => {
+                    if let Ok(result) = copy_string_to_clipboard(otp_code.to_owned()) {
+                        match result {
+                            CopyType::Native => "Copied!".to_string(),
+                            CopyType::OSC52 => "Remote copied!".to_string(),
+                        }
+                    } else {
+                        "Cannot copy".to_string()
                     }
-                    app.print_percentage = false;
-                    app.current_page = Main;
                 }
-            }
-        }
+                None => "Cannot get OTP Code column".to_string(),
+            },
+            None => format!("Cannot fetch element from index: {}", selected),
+        },
+        None => "No code selected".to_string(),
     }
 }
 

src/interface/handler.rs

@@ -1,14 +1,21 @@
-use std::env;
+use copypasta_ext::prelude::*;
+use copypasta_ext::x11_fork::ClipboardContext;
+use crossterm::style::Print;
+#[cfg(not(debug_assertions))]
+use dirs::home_dir;
 use std::fs::File;
 use std::io::prelude::*;
 use std::path::PathBuf;
 use std::time::{SystemTime, UNIX_EPOCH};
-
-#[cfg(not(debug_assertions))]
-use dirs::home_dir;
+use std::{env, io};
 
 use crate::otp::otp_element::OTPElement;
 
+pub enum CopyType {
+    Native,
+    OSC52,
+}
+
 pub fn get_db_path() -> PathBuf {
     match env::var("COTP_DB_PATH") {
         Ok(value) => PathBuf::from(value),
@@ -50,7 +57,7 @@ pub fn create_db_if_needed() -> Result<bool, ()> {
         }
     }
     if !db_path.exists() {
-        return match std::fs::File::create(db_path) {
+        return match File::create(db_path) {
             Ok(_f) => Ok(true),
             Err(_e) => Err(()),
         };
@@ -114,6 +121,34 @@ pub fn prompt_for_passwords(message: &str, minimum_password_length: usize, verif
     password
 }
 
+fn in_ssh_shell() -> bool {
+    return !env::var("SSH_CONNECTION")
+        .unwrap_or_default()
+        .trim()
+        .is_empty();
+}
+
+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", base64::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(())
+}
+
 #[cfg(test)]
 mod tests {
     use super::create_db_if_needed;