merge: Merge pull request #14 from arunaengine/feat/0.7_rework

Version 0.7 rework

Author: das-Abroxas

Cargo.lock

@@ -6,7 +6,18 @@ resolver = "2"
 
 [workspace.package]
 version = "0.6.0"
-authors = ["Sebastian Beyvers <sb@pus.de>"]
-edition = "2021"
-repository = "https://github.com/ArunaStorage/aruna-file"
-license = "MIT OR Apache-2.0"
+authors = ["Jannis Schlegel <das_Abroxas@proton.me>", "Sebastian Beyvers <sb@pus.de>"]
+edition = "2024"
+repository = "https://github.com/arunaengine/pithos"
+license = "MIT OR Apache-2.0"
+
+[workspace.dependencies]
+thiserror = "2.0.16"
+tracing = "0.1.41"
+tracing-subscriber = { version = "0.3.20", features = [
+    "env-filter",
+    "time",
+    "fmt",
+    "registry",
+] }
+x25519-dalek = { version = "2.0.1", features = ["static_secrets"] }

Cargo.toml

@@ -21,7 +21,7 @@
 
 ## Description
 
-Pithos (a large ancient greek storage container) is a packaging file format for arbitrary data that enhances the use of Object Storage for (research) data management. This is done by combining multiple existing file standards with new enhancements. A format specification can be found [[here]](./spec/SPECIFICATION.md).
+Pithos (a large ancient greek storage container) is a packaging file format for arbitrary data that enhances the use of Object Storage for (research) data management. This is done by combining multiple existing file standards with new enhancements. A format specification can be found [[here]](./spec/PITHOS_1.0.0_draft.md).
 
 ## Features
 

README.md

@@ -1,33 +1,17 @@
 [package]
 name = "pithos"
-description = "Client for the Pithos object storage file format"
-version = "0.6.2"
+description = "CLI for the Pithos container file format"
+version = "0.7.0"
 authors.workspace = true
 edition.workspace = true
 repository.workspace = true
 license.workspace = true
 
 [dependencies]
-anyhow = "1.0.98"
-async-channel = "2.3.1"
-async-trait = "0.1.88"
-base64 = "0.22.1"
-borsh = { version = "1.5.7", features = ["std", "derive"] }
-bytes = "1.10.1"
-chacha20poly1305 = "0.10.1"
-clap = { version = "4.5.38", features = ["derive"] }
-crypto_kx = { version = "0.2.1", features = ["serde"] }
-dotenvy = "0.15.7"
-futures = "0.3.31"
-futures-util = "0.3.31"
-openssl = "0.10.72"
-pithos_lib = { path = "../pithos_lib", version = "0.6.2" }
-rand = "0.9.1"
-serde_json = "1.0.140"
-tokio = { version = "1.45.0", features = ["full"] }
-tokio-stream = "0.1.17"
-tokio-util = "0.7.15"
-tracing = "0.1.41"
-tracing-subscriber = { version = "0.3.19", features = ["env-filter", "time"] }
-x25519-dalek = "2.0.1"
-indicatif = "0.17.11"
+clap = { version = "4.5.21", features = ["derive"] }
+pithos_lib = { path = "../pithos_lib" }
+thiserror = { workspace = true }
+tracing = "0.1.40"
+tracing-subscriber = {version = "0.3.18", features = ["env-filter", "time"]}
+x25519-dalek = {workspace = true}
+#indicatif = "0.17.9"

crates/pithos/Cargo.toml

@@ -1,51 +1,25 @@
-use anyhow::Result;
-use openssl::pkey::{Id, PKey};
+use pithos_lib::error::PithosError;
 use std::fs::File;
 use std::io::Read;
 use std::path::PathBuf;
+use x25519_dalek::{PublicKey, StaticSecret};
 
-//TODO: Try to load openSSL pem and if fails try to load Crypt4GH pem
-pub fn load_key_from_pem(filepath: &PathBuf, private: bool) -> Result<[u8; 32]> {
+pub fn load_private_key_from_pem(filepath: &PathBuf) -> Result<StaticSecret, PithosError> {
     // Open file handle and read file bytes
     let mut file = File::open(filepath)?;
     let mut file_content = vec![0u8; file.metadata()?.len() as usize];
     file.read_exact(&mut file_content)?;
 
-    // Parse into key
-    let mut key_bytes: [u8; 32] = [0; 32];
-    if private {
-        key_bytes.copy_from_slice(
-            PKey::private_key_from_pem(&file_content)?
-                .raw_private_key()?
-                .as_slice(),
-        );
-    } else {
-        key_bytes.copy_from_slice(
-            PKey::public_key_from_pem(&file_content)?
-                .raw_public_key()?
-                .as_slice(),
-        );
-    }
-
-    Ok(key_bytes)
+    Ok(pithos_lib::helpers::x25519_keys::private_key_from_pem_bytes(&file_content)?)
 }
 
-pub fn _load_key_from_string(key_bytes: &[u8], private: bool) -> Result<[u8; 32]> {
-    // Parse into key
-    let mut x25519_key_bytes: [u8; 32] = [0; 32];
-    if private {
-        x25519_key_bytes.copy_from_slice(
-            PKey::private_key_from_raw_bytes(key_bytes, Id::X25519)?
-                .raw_private_key()?
-                .as_slice(),
-        );
-    } else {
-        x25519_key_bytes.copy_from_slice(
-            PKey::public_key_from_raw_bytes(key_bytes, Id::X25519)?
-                .raw_public_key()?
-                .as_slice(),
-        );
-    }
+pub fn load_public_key_from_pem(filepath: &PathBuf) -> Result<PublicKey, PithosError> {
+    // Open file handle and read file bytes
+    let mut file = File::open(filepath)?;
+    let mut file_content = vec![0u8; file.metadata()?.len() as usize];
+    file.read_exact(&mut file_content)?;
 
-    Ok(x25519_key_bytes)
+    Ok(pithos_lib::helpers::x25519_keys::public_key_from_pem_bytes(
+        &file_content,
+    )?)
 }