Merge pull request #74 from PThorpe92/dev

Dev

Author: PThorpe92

Cargo.lock

@@ -10,6 +10,7 @@ name = "cute"
 path = "src/main.rs"
 
 [dependencies]
+cross = "*"
 crossterm = "0.27.0"
 tui = { package = "ratatui", features = [
   "crossterm",

Cargo.toml

@@ -4,6 +4,7 @@
 # Rust TUI HTTP Client with API Key Management
 
 #### This project is still in active development and although it is useable, there may still be bugs and significant changes are still needed to both refactor the codebase and add new features.
+#### I am distracted with work and a new project at the moment, so I am not able to put in as much time as I would like here and I am afraid that if I don't open source it now, it will end up in the side-project graveyard. Collaboration is welcome and encouraged, there is LOTS of low-hanging fruit here, while still being a useful tool.
 ![image](screenshot.png)
 
 Terminal user interface (TUI) HTTP client in Rust designed to simplify the process of making various types of HTTP requests while supporting various different kinds of Authentication (powered by libcURL), recursive downloading of directories (powered by GNU Wget), and storage + management of your previous requests + API keys.
@@ -78,6 +79,10 @@ This project is licensed under the [GPL3.0 License](LICENSE).
 
 ---
 
-If you have any questions or need assistance, feel free to reach out to [Preston](https://github.com/PThorpe92)
+If you have any questions or need assistance, feel free to [reach out](preston@unlockedlabs.org)
+
+**Fun fact:** This project was written in the Maine State Prison system, the main author and 2nd largest contributor are both currently incarcerated. I would like to bring whatever awareness possible to the importance of education and rehabilitation for those 2.2 million Americans currently incarcerated. Access to education and technology is severely limited in the carceral system and I am incredibly fortunate to be in a situation where I am permitted to have remote employment and access to participate in Open source projects. This is incredibly rare, and I am very grateful for the opportunity, but I recognize that this is very much the exception and not the rule. We need to do better as a society.
+
+If you are interested in helping support the education of incarcerated and justice-impacted individuals, please consider donating to a company like the one I currently work for, [Unlocked Labs](https://unlockedlabs.org/) or similar non-profits like [The Last Mile](https://thelastmile.org/) or [Recidiviz](https://www.recidiviz.org/)
 
 **Disclaimer:** This project is provided as-is, and its creators are not responsible for any misuse or potential security vulnerabilities resulting from the usage of API keys.

README.md

@@ -29,24 +29,24 @@ pub struct DB {
 
 impl DB {
     pub fn new() -> Result<Self, rusqlite::Error> {
-        let mut path: PathBuf = PathBuf::new();
+        let mut _path: PathBuf = PathBuf::new();
         if std::env::var("CUTE_DB_PATH").is_ok() {
-            path = PathBuf::from_str(env::var("CUTE_DB_PATH").unwrap().as_str()).unwrap();
+            _path = PathBuf::from_str(env::var("CUTE_DB_PATH").unwrap().as_str()).unwrap();
         } else {
-            path = DB::get_default_path();
+            _path = DB::get_default_path();
         }
-        if !path.exists() {
+        if !_path.exists() {
             // If it doesn't exist, create it
-            if let Err(err) = std::fs::create_dir_all(&path) {
-                std::fs::File::create(&path).expect("failed to create database");
+            if let Err(err) = std::fs::create_dir_all(&_path) {
+                std::fs::File::create(&_path).expect("failed to create database");
                 eprintln!("Failed to create CuTE directory: {}", err);
             } else {
-                println!("CuTE directory created at {:?}", path);
+                println!("CuTE directory created at {:?}", _path);
             }
         }
 
         let conn_result = Connection::open_with_flags(
-            path.join("CuTE.db"),
+            _path.join("CuTE.db"),
             OpenFlags::SQLITE_OPEN_READ_WRITE
                 | OpenFlags::SQLITE_OPEN_CREATE
                 | OpenFlags::SQLITE_OPEN_URI
@@ -81,7 +81,7 @@ impl DB {
     }
 
     pub fn get_default_path() -> PathBuf {
-        let mut dir = data_local_dir().expect("Failed to get data local directory,\nPlease specify a path at $CONFIG/CuTE/config.toml\nOr with the --db_path={path/to/CuTE.db}");
+        let dir = data_local_dir().expect("Failed to get data local directory,\nPlease specify a path at $CONFIG/CuTE/config.toml\nOr with the --db_path={path/to/CuTE.db}");
         dir.join("CuTE")
     }
 
@@ -226,5 +226,4 @@ impl SavedKey {
     pub fn from_json(json: &str) -> Result<Self> {
         Ok(serde_json::from_str(json).expect("Failed to deserialize"))
     }
-    //TODO: implement actual encryption
 }

src/database/db.rs

@@ -86,6 +86,7 @@ pub const DISPLAY_OPT_CA_PATH: &str = "  󰄤 SSL Certificate path: ";
 pub const DISPLAY_OPT_AUTH: &str = "  Authentication: ";
 pub const DISPLAY_OPT_MATCH_WILDCARD: &str = "  Match glob wildcard 󰛄 ";
 pub const DISPLAY_OPT_CERT_INFO: &str = "  Request certificate info 󰄤 ";
+pub const DISPLAY_OPT_BODY: &str = "  Request Body: ";
 pub const DISPLAY_OPT_UPLOAD: &str = "  Upload file: ";
 pub const DISPLAY_OPT_REQUEST_BODY: &str = "  Request Body";
 pub const DISPLAY_OPT_TCP_KEEPALIVE: &str = "  Enable TCP keepalive 󰗶 ";
@@ -183,10 +184,11 @@ lazy_static! {
         "Specify User-Agent  󰖟 ",
         "Enable TCP keepalive 󰗶 ",
     ];
-    pub static ref RESPONSE_MENU_OPTIONS: [&'static str; 4] = [
+    pub static ref RESPONSE_MENU_OPTIONS: [&'static str; 5] = [
         "Write to file? 󱇧 ",
         "View response headers 󰰀 ",
         "View response body 󰈮 ",
-        "Copy command to clipboard 󰅎 "
+        "Copy command to clipboard 󰅎 ",
+        "Return to main menu  ",
     ];
 }

src/display/menuopts.rs

@@ -3,12 +3,13 @@ use crate::display::menuopts::{
 };
 
 use self::menuopts::{
-    DISPLAY_OPT_AUTH, DISPLAY_OPT_CA_PATH, DISPLAY_OPT_CERT_INFO, DISPLAY_OPT_COMMAND_SAVED,
-    DISPLAY_OPT_COOKIE, DISPLAY_OPT_FAIL_ON_ERROR, DISPLAY_OPT_FOLLOW_REDIRECTS,
-    DISPLAY_OPT_HEADERS, DISPLAY_OPT_MATCH_WILDCARD, DISPLAY_OPT_OUTFILE, DISPLAY_OPT_PROGRESS_BAR,
-    DISPLAY_OPT_PROXY_TUNNEL, DISPLAY_OPT_TCP_KEEPALIVE, DISPLAY_OPT_TOKEN_SAVED,
-    DISPLAY_OPT_UNIX_SOCKET, DISPLAY_OPT_UNRESTRICTED_AUTH, DISPLAY_OPT_UPLOAD, DISPLAY_OPT_URL,
-    DISPLAY_OPT_USERAGENT, DISPLAY_OPT_VERBOSE,
+    DISPLAY_OPT_AUTH, DISPLAY_OPT_BODY, DISPLAY_OPT_CA_PATH, DISPLAY_OPT_CERT_INFO,
+    DISPLAY_OPT_COMMAND_SAVED, DISPLAY_OPT_COOKIE, DISPLAY_OPT_FAIL_ON_ERROR,
+    DISPLAY_OPT_FOLLOW_REDIRECTS, DISPLAY_OPT_HEADERS, DISPLAY_OPT_MATCH_WILDCARD,
+    DISPLAY_OPT_OUTFILE, DISPLAY_OPT_PROGRESS_BAR, DISPLAY_OPT_PROXY_TUNNEL,
+    DISPLAY_OPT_TCP_KEEPALIVE, DISPLAY_OPT_TOKEN_SAVED, DISPLAY_OPT_UNIX_SOCKET,
+    DISPLAY_OPT_UNRESTRICTED_AUTH, DISPLAY_OPT_UPLOAD, DISPLAY_OPT_URL, DISPLAY_OPT_USERAGENT,
+    DISPLAY_OPT_VERBOSE,
 };
 
 /*
@@ -138,7 +139,7 @@ impl AppOptions {
             AppOptions::TcpKeepAlive => DISPLAY_OPT_TCP_KEEPALIVE.to_string(),
             AppOptions::UnrestrictedAuth => format!("{}{}", DISPLAY_OPT_UNRESTRICTED_AUTH, "󰄨"),
             AppOptions::UploadFile(file) => format!("{}{}", DISPLAY_OPT_UPLOAD, file.clone()),
-            AppOptions::RequestBody(body) => format!("{}{}", DISPLAY_OPT_UPLOAD, body.clone()),
+            AppOptions::RequestBody(body) => format!("{}{}", DISPLAY_OPT_BODY, body.clone()),
         }
     }
 }

src/display/mod.rs

@@ -957,7 +957,7 @@ define_curl_flags! {
     Cookie("-b"),
     Output("-o"),
     User("-u"),
-    Bearer("-H"),
+    Bearer("-H"),// bearer/basic auth are just headers
     CertInfo("--certinfo"),
     Headers("-H"),
     Digest("--digest"),
@@ -981,7 +981,7 @@ define_curl_flags! {
     // is default on CLI, so flag has no value
     TcpKeepAlive(" "),
     CaPath("--capath"),
-    SpnegoAuth("--negotiate"),
+    SpnegoAuth("--negotiate -u:"),
     Progress("--progress-bar"),
     RequestBody("--data"),
 }

src/request/curl.rs

@@ -55,11 +55,13 @@ pub fn handle_authentication_screen<B: Backend>(app: &mut App, frame: &mut Frame
             4 => {
                 app.command.as_mut().unwrap().set_auth(AuthKind::Spnego);
                 app.add_app_option(AppOptions::Auth(AuthType::SPNEGO.to_string()));
-                app.goto_screen(Screen::RequestMenu(String::from("Alert: Negotiate Auth")));
+                app.goto_screen(Screen::RequestMenu(String::from("")));
             }
             5 => {
                 app.command.as_mut().unwrap().set_auth(AuthKind::Ntlm);
-                app.goto_screen(Screen::RequestMenu(String::from("Alert: NTLM Auth")));
+                app.goto_screen(Screen::RequestMenu(String::from(
+                    "Alert: NTLM Auth Enabled",
+                )));
             }
             _ => {}
         }

src/screens/auth.rs

@@ -6,13 +6,17 @@ use crate::screens::screen::Screen;
 use tui::backend::Backend;
 use tui::Frame;
 
+use super::error_alert_box;
 use super::render::handle_screen_defaults;
 
-pub fn handle_downloads_screen<B: Backend>(app: &mut App, frame: &mut Frame<'_, B>) {
+pub fn handle_downloads_screen<B: Backend>(app: &mut App, frame: &mut Frame<'_, B>, err: &str) {
+    handle_screen_defaults(app, frame);
+    if !err.is_empty() {
+        error_alert_box(frame, err);
+    }
     if app.command.is_none() {
         app.set_command(Box::new(Cmd::Wget(Wget::new())));
     }
-    handle_screen_defaults(app, frame);
     match app.selected {
         // Setting Recursion level
         Some(0) => {

src/screens/downloads.rs

@@ -8,7 +8,6 @@ use tui::text::Text;
 use tui::widgets::{Block, Borders, ListState, Paragraph, Wrap};
 use tui::Frame;
 
-
 fn err_box<B: Backend>(frame: &mut Frame<'_, B>, error_msg: String) {
     let popup_layout = Layout::default()
         .direction(Direction::Vertical)
@@ -64,7 +63,7 @@ pub fn handle_error_screen<B: Backend>(app: &mut App, frame: &mut Frame<'_, B>,
     app.state = Some(state.clone());
     app.state.as_mut().unwrap().select(Some(app.cursor));
     frame.set_cursor(0, app.cursor as u16);
-    //frame.render_stateful_widget(new_list, area, &mut state);
+    frame.render_stateful_widget(new_list, area, &mut state);
 
     err_box(frame, error_msg);
 }