diff --git a/Cargo.lock b/Cargo.lock index 50bb595..87f3820 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1441,6 +1441,7 @@ dependencies = [ "gpui-kit", "gpui-omarchy", "include_dir", + "jiff", "serde", "serde_json", "tempfile", @@ -4061,6 +4062,58 @@ version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8f42a60cbdf9a97f5d2305f08a87dc4e09308d1276d28c869c684d7777685682" +[[package]] +name = "jiff" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed5d126d72eb017f10b302e73bdeca446bea405ee449af4d9e7866d6b082d83e" +dependencies = [ + "jiff-core", + "jiff-static", + "jiff-tzdb-platform", + "log", + "portable-atomic", + "portable-atomic-util", + "serde_core", + "windows-link 0.2.1", +] + +[[package]] +name = "jiff-core" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6b46a105a9874634dd96231021526bf24ca04955a5998c59a9c7666e634b7b8" +dependencies = [ + "log", +] + +[[package]] +name = "jiff-static" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c0127e9bde3c6130d6169e7d8d68676e4be69c4bf7573c308b6f960a5089c428" +dependencies = [ + "jiff-core", + "proc-macro2", + "quote", + "syn 3.0.9", +] + +[[package]] +name = "jiff-tzdb" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "12e71a1b68a875a44a33bb7a1dd84392cb77145a3367a552a3cfe6a4f5cf3afc" + +[[package]] +name = "jiff-tzdb-platform" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc65b284afcfa8f6cf189c7274c805505314a7ab975c60e1f548bff56525420e" +dependencies = [ + "jiff-tzdb", +] + [[package]] name = "jni-sys" version = "0.3.1" diff --git a/Cargo.toml b/Cargo.toml index 1f758ee..e6bb887 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -17,6 +17,7 @@ getrandom = { version = "0.4.3", features = ["sys_rng"] } gpui-kit = "0.7.0" gpui-omarchy = "0.2.1" include_dir = "0.7.4" +jiff = { version = "1.0.1", features = ["serde"] } serde = "1.0.229" serde_json = "1.0.154" testresult = "0.4.2" diff --git a/migrations/001_initial.sql b/migrations/001_initial.sql index 090f393..d39d679 100644 --- a/migrations/001_initial.sql +++ b/migrations/001_initial.sql @@ -2,3 +2,12 @@ CREATE TABLE config (value JSON); -- seed it with an empty object, which will be populated with default values on deserialization INSERT INTO config VALUES ('{}'); + + +CREATE TABLE aws_credentials ( + name VARCHAR PRIMARY KEY, + created_at TIMESTAMP WITH TIME ZONE, + updated_at TIMESTAMP WITH TIME ZONE, + access_key_id VARCHAR UNIQUE, + secret_access_key VARCHAR, +); diff --git a/src/credentials/aws.rs b/src/credentials/aws.rs new file mode 100644 index 0000000..5b8ffce --- /dev/null +++ b/src/credentials/aws.rs @@ -0,0 +1,17 @@ +use jiff::Timestamp; +use serde::{Serialize, Deserialize}; + +#[derive(Clone, Debug, Serialize, Deserialize)] +pub struct AwsCredential { + pub access_key_id: String, + pub secret_access_key: String, +} + +#[derive(Clone, Debug, Serialize, Deserialize)] +pub struct AwsSessionCredential { + pub version: usize, + pub access_key_id: String, + pub secret_access_key: String, + pub session_token: String, + pub expiration: Timestamp, +} diff --git a/src/credentials/mod.rs b/src/credentials/mod.rs new file mode 100644 index 0000000..e566c66 --- /dev/null +++ b/src/credentials/mod.rs @@ -0,0 +1,3 @@ +mod aws; + +pub use aws::{AwsCredential, AwsSessionCredential}; diff --git a/src/db/aws.rs b/src/db/aws.rs new file mode 100644 index 0000000..ad19da2 --- /dev/null +++ b/src/db/aws.rs @@ -0,0 +1,148 @@ +use std::collections::HashMap; +use duckdb::{Error, params}; +use crate::credentials::AwsCredential; +use super::Db; + +impl Db { + pub fn load_aws_credential(&self, name: &str) -> Result { + let conn = self.connection.lock().unwrap(); + conn.query_row( + "SELECT access_key_id, secret_access_key FROM aws_credentials WHERE name = ?", + params![name], + |row| Ok(AwsCredential { access_key_id: row.get(0)?, secret_access_key: row.get(1)? }) + ) + } + + pub fn save_aws_credential(&self, name: &str, cred: &AwsCredential) -> Result<(), Error> { + let conn = self.connection.lock().unwrap(); + let _ = conn.execute( + "INSERT INTO aws_credentials ( + name, + created_at, + updated_at, + access_key_id, + secret_access_key, + ) + VALUES (?, now(), now(), ?, ?) + ON CONFLICT (name) DO UPDATE + SET + updated_at = now(), + access_key_id = EXCLUDED.access_key_id, + secret_access_key = EXCLUDED.secret_access_key", + params![name, cred.access_key_id, cred.secret_access_key], + )?; + Ok(()) + } + + pub fn list_aws_credentials(&self) -> Result, Error> { + let conn = self.connection.lock().unwrap(); + let mut stmt = conn.prepare("SELECT name, access_key_id, secret_access_key FROM aws_credentials")?; + let rows = stmt.query_map([], |row| { + let key: String = row.get(0)?; + let cred = AwsCredential{ + access_key_id: row.get(1)?, + secret_access_key: row.get(2)?, + }; + Ok((key, cred)) + })?; + + rows.collect() + } +} + +#[cfg(test)] +mod tests { + use testresult::TestResult; + use crate::test_data::TestEnv; + use super::*; + + #[test] + fn test_save() -> TestResult { + let env = TestEnv::new()?; + let db = env.db()?; + + let cred = AwsCredential { + access_key_id: "AKIAEXAMPLE".into(), + secret_access_key: "EXAMPLESECRET".into(), + }; + db.save_aws_credential("test", &cred)?; + Ok(()) + } + + #[test] + fn test_load() -> TestResult { + let env = TestEnv::new()?; + let db = env.db()?; + + let cred = AwsCredential { + access_key_id: "AKIAEXAMPLE".into(), + secret_access_key: "EXAMPLESECRET".into(), + }; + db.save_aws_credential("test", &cred)?; + + let loaded = db.load_aws_credential("test")?; + + assert_eq!(loaded.access_key_id, cred.access_key_id); + assert_eq!(loaded.secret_access_key, cred.secret_access_key); + Ok(()) + } + + #[test] + fn test_update() -> TestResult { + let env = TestEnv::new()?; + let db = env.db()?; + + let mut cred = AwsCredential { + access_key_id: "KEY1".into(), + secret_access_key: "EXAMPLESECRET".into(), + }; + db.save_aws_credential("test", &cred)?; + + cred.access_key_id = "KEY2".into(); + db.save_aws_credential("test", &cred)?; + + let loaded = db.load_aws_credential("test")?; + assert_eq!(loaded.access_key_id, "KEY2"); + + // confirm that updated_at was modified, but not created_at + let conn = db.connection.lock().unwrap(); + let (created_at, updated_at): (i64, i64) = conn.query_row( + "SELECT created_at, updated_at FROM aws_credentials WHERE name = 'test'", + [], + |row| Ok((row.get(0)?, row.get(1)?)) + )?; + + assert!(updated_at > created_at); + Ok(()) + } + + #[test] + fn test_list() -> TestResult { + let env = TestEnv::new()?; + let db = env.db()?; + + let cred1 = AwsCredential { + access_key_id: "KEY1".into(), + secret_access_key: "EXAMPLESECRET".into(), + }; + db.save_aws_credential("test", &cred1)?; + + let cred2 = AwsCredential { + access_key_id: "KEY2".into(), + secret_access_key: "EXAMPLESECRET2".into(), + }; + db.save_aws_credential("test2", &cred2)?; + + let creds = db.list_aws_credentials()?; + + let loaded1 = creds.get("test").unwrap(); + assert_eq!(loaded1.access_key_id, cred1.access_key_id); + assert_eq!(loaded1.secret_access_key, cred1.secret_access_key); + + let loaded2 = creds.get("test").unwrap(); + assert_eq!(loaded2.access_key_id, cred1.access_key_id); + assert_eq!(loaded2.secret_access_key, cred1.secret_access_key); + + Ok(()) + } +} diff --git a/src/db/mod.rs b/src/db/mod.rs index 8deeef7..bb219ce 100644 --- a/src/db/mod.rs +++ b/src/db/mod.rs @@ -10,6 +10,7 @@ use duckdb::{ use crate::error::CreddyError; use crate::config::AppConfig; +mod aws; mod config; mod migrations; @@ -46,7 +47,6 @@ impl Db { .into_string() .map_err(|s| CreddyError::InvalidPath(s))?; let key = Db::derive_key(passphrase, &config.db_salt)?; - dbg!(&key); let mut conn = Connection::open_in_memory()?; conn.execute( diff --git a/src/main.rs b/src/main.rs index 7fa2de1..100dc12 100644 --- a/src/main.rs +++ b/src/main.rs @@ -7,6 +7,7 @@ use gpui_omarchy::ActiveTheme; mod assets; mod components; mod config; +mod credentials; mod db; mod error; mod screens;