diff options
Diffstat (limited to 'atuin-common/src')
| -rw-r--r-- | atuin-common/src/api.rs | 70 | ||||
| -rw-r--r-- | atuin-common/src/lib.rs | 5 | ||||
| -rw-r--r-- | atuin-common/src/utils.rs | 29 |
3 files changed, 104 insertions, 0 deletions
diff --git a/atuin-common/src/api.rs b/atuin-common/src/api.rs new file mode 100644 index 00000000..82ee6604 --- /dev/null +++ b/atuin-common/src/api.rs @@ -0,0 +1,70 @@ +use chrono::Utc; + +#[derive(Debug, Serialize, Deserialize)] +pub struct UserResponse { + pub username: String, +} + +#[derive(Debug, Serialize, Deserialize)] +pub struct RegisterRequest { + pub email: String, + pub username: String, + pub password: String, +} + +#[derive(Debug, Serialize, Deserialize)] +pub struct RegisterResponse { + pub session: String, +} + +#[derive(Debug, Serialize, Deserialize)] +pub struct LoginRequest { + pub username: String, + pub password: String, +} + +#[derive(Debug, Serialize, Deserialize)] +pub struct LoginResponse { + pub session: String, +} + +#[derive(Debug, Serialize, Deserialize)] +pub struct AddHistoryRequest { + pub id: String, + pub timestamp: chrono::DateTime<Utc>, + pub data: String, + pub hostname: String, +} + +#[derive(Debug, Serialize, Deserialize)] +pub struct CountResponse { + pub count: i64, +} + +#[derive(Debug, Serialize, Deserialize)] +pub struct SyncHistoryRequest { + pub sync_ts: chrono::DateTime<chrono::FixedOffset>, + pub history_ts: chrono::DateTime<chrono::FixedOffset>, + pub host: String, +} + +#[derive(Debug, Serialize, Deserialize)] +pub struct SyncHistoryResponse { + pub history: Vec<String>, +} + +#[derive(Debug, Serialize, Deserialize)] +pub struct ErrorResponse { + pub reason: String, +} + +impl ErrorResponse { + pub fn reply(reason: &str, status: warp::http::StatusCode) -> impl warp::Reply { + warp::reply::with_status( + warp::reply::json(&ErrorResponse { + reason: String::from(reason), + }), + status, + ) + } +} diff --git a/atuin-common/src/lib.rs b/atuin-common/src/lib.rs new file mode 100644 index 00000000..0a01e10d --- /dev/null +++ b/atuin-common/src/lib.rs @@ -0,0 +1,5 @@ +#[macro_use] +extern crate serde_derive; + +pub mod api; +pub mod utils; diff --git a/atuin-common/src/utils.rs b/atuin-common/src/utils.rs new file mode 100644 index 00000000..ac5738b3 --- /dev/null +++ b/atuin-common/src/utils.rs @@ -0,0 +1,29 @@ +use crypto::digest::Digest; +use crypto::sha2::Sha256; +use sodiumoxide::crypto::pwhash::argon2id13; +use uuid::Uuid; + +pub fn hash_secret(secret: &str) -> String { + sodiumoxide::init().unwrap(); + let hash = argon2id13::pwhash( + secret.as_bytes(), + argon2id13::OPSLIMIT_INTERACTIVE, + argon2id13::MEMLIMIT_INTERACTIVE, + ) + .unwrap(); + let texthash = std::str::from_utf8(&hash.0).unwrap().to_string(); + + // postgres hates null chars. don't do that to postgres + texthash.trim_end_matches('\u{0}').to_string() +} + +pub fn hash_str(string: &str) -> String { + let mut hasher = Sha256::new(); + hasher.input_str(string); + + hasher.result_str() +} + +pub fn uuid_v4() -> String { + Uuid::new_v4().to_simple().to_string() +} |
