Added rust-version in Cargo.toml (fixes issue conradkleinespel#73) an…

…d updated string cleanup to handle ctrl+u (fixes issue conradkleinespel#70)

Cargo.toml

@@ -8,6 +8,7 @@ homepage = "https://github.com/conradkleinespel/rpassword"
 repository = "https://github.com/conradkleinespel/rpassword"
 documentation = "https://docs.rs/rpassword/"
 readme = "README.md"
+rust-version = "1.60"
 keywords = ["read", "password", "security", "pass", "getpass"]
 edition = "2018"
 

src/rpassword/all.rs

@@ -1,4 +1,4 @@
-use crate::rutil::fix_new_line::fix_new_line;
+use crate::rutil::fix_line_issues::fix_line_issues;
 use crate::rutil::print_tty::{print_tty, print_writer};
 use crate::rutil::safe_string::SafeString;
 use std::io::{BufRead, Write};
@@ -199,7 +199,7 @@ mod windows {
 
         std::mem::drop(hidden_input);
 
-        super::fix_new_line(password.into_inner())
+        super::fix_line_issues(password.into_inner())
     }
 }
 
@@ -215,7 +215,7 @@ pub fn read_password_from_bufread(reader: &mut impl BufRead) -> std::io::Result<
     let mut password = SafeString::new();
     reader.read_line(&mut password)?;
 
-    fix_new_line(password.into_inner())
+    fix_line_issues(password.into_inner())
 }
 
 /// Prompts on the TTY and then reads a password from anything that implements BufRead

src/rutil.rs

@@ -1,5 +1,5 @@
 pub mod atty;
-pub mod fix_new_line;
+pub mod fix_line_issues;
 pub mod print_tty;
 pub mod safe_string;
 #[cfg(feature = "serde")]

src/rutil/fix_line_issues.rs

@@ -0,0 +1,27 @@
+/// Normalizes the return of `read_line()` in the context of a CLI application
+pub fn fix_line_issues(mut line: String) -> std::io::Result<String> {
+    if !line.ends_with('\n') {
+        return Err(std::io::Error::new(
+            std::io::ErrorKind::UnexpectedEof,
+            "unexpected end of file",
+        ));
+    }
+
+    // Remove the \n from the line.
+    line.pop();
+
+    // Remove the \r from the line if present
+    if line.ends_with('\r') {
+        line.pop();
+    }
+
+    if line.contains("") {
+        let vec: Vec<&str> = line.split("").collect();
+        line = match vec.last() {
+            None => String::new(),
+            Some(i) => i.to_string()
+        }
+    }
+
+    Ok(line)
+}

tests/no-terminal.rs

@@ -38,6 +38,10 @@ fn mock_input_lf() -> Cursor<&'static [u8]> {
     Cursor::new(&b"A mocked response.\nAnother mocked response.\n"[..])
 }
 
+fn mock_input_ctrl_u() ->  Cursor<&'static [u8]> {
+    Cursor::new(&b"A mocked response.Another mocked response.\n"[..])
+}
+
 #[test]
 fn can_read_from_redirected_input_many_times() {
     close_stdin();
@@ -55,3 +59,12 @@ fn can_read_from_redirected_input_many_times() {
     let response = crate::read_password_from_bufread(&mut reader_lf).unwrap();
     assert_eq!(response, "Another mocked response.");
 }
+
+#[test]
+fn can_read_from_input_ctrl_u() {
+    close_stdin();
+
+    let mut reader_ctrl_u = crate::mock_input_ctrl_u();
+    let response = crate::read_password_from_bufread(&mut reader_ctrl_u).unwrap();
+    assert_eq!(response, "Another mocked response.");
+}