Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions apps/maple-agent/crates/maple-agent/src/agent/provider.rs
Original file line number Diff line number Diff line change
Expand Up @@ -924,7 +924,6 @@ fn opensecret_error_kind_message(error: maple_sdk::Error) -> String {
ATTESTATION_VERIFICATION_ERROR_MESSAGE.to_string()
}
maple_sdk::Error::Session(_)
| maple_sdk::Error::KeyExchange(_)
| maple_sdk::Error::Encryption(_)
| maple_sdk::Error::Decryption(_)
| maple_sdk::Error::InvalidResponse(_)
Expand Down Expand Up @@ -1067,7 +1066,6 @@ pub(crate) fn opensecret_error_category(error: &maple_sdk::Error) -> &'static st
maple_sdk::Error::Crypto(_) => "crypto",
maple_sdk::Error::AttestationVerificationFailed(_) => "attestation",
maple_sdk::Error::Session(_) => "session",
maple_sdk::Error::KeyExchange(_) => "key_exchange",
maple_sdk::Error::Encryption(_) => "encryption",
maple_sdk::Error::Decryption(_) => "decryption",
maple_sdk::Error::Authentication(_) => "authentication",
Expand Down
1 change: 0 additions & 1 deletion apps/maple-research/frontend/src-tauri/src/native_oauth.rs
Original file line number Diff line number Diff line change
Expand Up @@ -230,7 +230,6 @@ fn map_sdk_error(action: &'static str, error: &maple_sdk::Error) -> String {
maple_sdk::Error::Crypto(_) => "crypto",
maple_sdk::Error::AttestationVerificationFailed(_) => "attestation",
maple_sdk::Error::Session(_) => "session",
maple_sdk::Error::KeyExchange(_) => "key_exchange",
maple_sdk::Error::Encryption(_) => "encryption",
maple_sdk::Error::Decryption(_) => "decryption",
maple_sdk::Error::Authentication(_) => "authentication",
Expand Down
1 change: 0 additions & 1 deletion scripts/ci/build-sdk-publish.sh
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,6 @@ nix develop --no-update-lock-file ./sdk -c bash -euo pipefail -c '
src/lib/test/*.test.ts \
src/lib/test/integration/attestation.test.ts \
src/lib/test/integration/developerHook.test.ts \
src/lib/test/integration/liveAttestation.test.ts \
src/lib/test/integration/pcr.test.ts \
src/lib/test/integration/platformPushSettings.test.ts \
src/lib/test/integration/web.test.ts \
Expand Down
3 changes: 0 additions & 3 deletions sdk/bun.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion sdk/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@
"@peculiar/x509": "1.14.3",
"@stablelib/base64": "2.0.1",
"@stablelib/chacha20poly1305": "2.0.1",
"@stablelib/random": "2.0.1",
"cbor2": "1.12.0",
"openai": "6.0.0",
"tweetnacl": "1.0.3",
Expand Down
125 changes: 5 additions & 120 deletions sdk/rust/src/crypto.rs
Original file line number Diff line number Diff line change
@@ -1,11 +1,5 @@
use crate::error::{Error, Result};
use base64::{engine::general_purpose::STANDARD as BASE64, Engine};
use chacha20poly1305::{
aead::{Aead, KeyInit, Nonce},
ChaCha20Poly1305,
};
use rand_core::{OsRng, RngCore};
use x25519_dalek::{EphemeralSecret, PublicKey as X25519PublicKey, SharedSecret, StaticSecret};
use x25519_dalek::{PublicKey as X25519PublicKey, SharedSecret, StaticSecret};

// Re-export for tests
pub use x25519_dalek::PublicKey;
Expand All @@ -26,132 +20,23 @@ pub fn derive_shared_secret(secret: &StaticSecret, their_public: &X25519PublicKe
secret.diffie_hellman(their_public)
}

pub fn encrypt_message(plaintext: &[u8], key: &[u8; 32]) -> Result<Vec<u8>> {
encrypt_data(key, plaintext)
}

pub fn decrypt_message(ciphertext: &[u8], key: &[u8; 32]) -> Result<Vec<u8>> {
decrypt_data(key, ciphertext)
}

pub fn generate_random_bytes<const N: usize>() -> [u8; N] {
let mut bytes = [0u8; N];
OsRng.fill_bytes(&mut bytes);
bytes
}

pub fn generate_ephemeral_keypair() -> (EphemeralSecret, PublicKey) {
let secret = EphemeralSecret::random_from_rng(OsRng);
let public = PublicKey::from(&secret);
(secret, public)
}

pub fn generate_static_keypair() -> (StaticSecret, PublicKey) {
let secret = StaticSecret::random_from_rng(OsRng);
let public = PublicKey::from(&secret);
(secret, public)
}

pub fn perform_key_exchange(secret: EphemeralSecret, their_public: &PublicKey) -> SharedSecret {
secret.diffie_hellman(their_public)
}

pub fn perform_static_key_exchange(
secret: &StaticSecret,
their_public: &PublicKey,
) -> SharedSecret {
secret.diffie_hellman(their_public)
}

#[allow(deprecated)]
pub fn encrypt_data(key: &[u8; 32], plaintext: &[u8]) -> Result<Vec<u8>> {
let cipher = ChaCha20Poly1305::new_from_slice(key)
.map_err(|e| Error::Crypto(format!("Failed to create cipher: {}", e)))?;

let nonce_bytes = generate_random_bytes::<12>();
let nonce = Nonce::<ChaCha20Poly1305>::from_slice(&nonce_bytes);

let ciphertext = cipher
.encrypt(nonce, plaintext)
.map_err(|e| Error::Encryption(format!("Encryption failed: {}", e)))?;

// Prepend nonce to ciphertext
let mut result = Vec::with_capacity(12 + ciphertext.len());
result.extend_from_slice(&nonce_bytes);
result.extend_from_slice(&ciphertext);

Ok(result)
}

#[allow(deprecated)]
pub fn decrypt_data(key: &[u8; 32], encrypted_data: &[u8]) -> Result<Vec<u8>> {
if encrypted_data.len() < 12 {
return Err(Error::Decryption("Encrypted data too short".to_string()));
}

let (nonce_bytes, ciphertext) = encrypted_data.split_at(12);
let nonce = Nonce::<ChaCha20Poly1305>::from_slice(nonce_bytes);

let cipher = ChaCha20Poly1305::new_from_slice(key)
.map_err(|e| Error::Crypto(format!("Failed to create cipher: {}", e)))?;

cipher
.decrypt(nonce, ciphertext)
.map_err(|e| Error::Decryption(format!("Decryption failed: {}", e)))
}

#[allow(deprecated)]
pub fn decrypt_session_key(shared_secret: &SharedSecret, encrypted_data: &str) -> Result<[u8; 32]> {
let encrypted = BASE64.decode(encrypted_data)?;

if encrypted.len() < 12 {
return Err(Error::Decryption(
"Encrypted session key too short".to_string(),
));
}

let (nonce_bytes, ciphertext) = encrypted.split_at(12);
let nonce = Nonce::<ChaCha20Poly1305>::from_slice(nonce_bytes);

let cipher = ChaCha20Poly1305::new_from_slice(shared_secret.as_bytes())
.map_err(|e| Error::Crypto(format!("Failed to create cipher: {}", e)))?;

let session_key_vec = cipher
.decrypt(nonce, ciphertext)
.map_err(|e| Error::Decryption(format!("Failed to decrypt session key: {}", e)))?;

if session_key_vec.len() != 32 {
return Err(Error::Decryption("Invalid session key length".to_string()));
}

let mut session_key = [0u8; 32];
session_key.copy_from_slice(&session_key_vec);
Ok(session_key)
}

#[cfg(test)]
mod tests {
use super::*;

#[test]
fn test_encrypt_decrypt() {
let key = generate_random_bytes::<32>();
let plaintext = b"Hello, World!";

let encrypted = encrypt_data(&key, plaintext).unwrap();
let decrypted = decrypt_data(&key, &encrypted).unwrap();

assert_eq!(plaintext.to_vec(), decrypted);
}

#[test]
fn test_key_exchange() {
// Use static secrets for testing since ephemeral secrets are consumed
let (alice_secret, alice_public) = generate_static_keypair();
let (bob_secret, bob_public) = generate_static_keypair();
let alice = generate_key_pair();
let bob = generate_key_pair();

let alice_shared = perform_static_key_exchange(&alice_secret, &bob_public);
let bob_shared = perform_static_key_exchange(&bob_secret, &alice_public);
let alice_shared = derive_shared_secret(&alice.secret, &bob.public);
let bob_shared = derive_shared_secret(&bob.secret, &alice.public);

assert_eq!(alice_shared.as_bytes(), bob_shared.as_bytes());
}
Expand Down
3 changes: 0 additions & 3 deletions sdk/rust/src/error.rs
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,6 @@ pub enum Error {
#[error("Session error: {0}")]
Session(String),

#[error("Key exchange failed: {0}")]
KeyExchange(String),

#[error("Encryption error: {0}")]
Encryption(String),

Expand Down
63 changes: 1 addition & 62 deletions sdk/rust/src/session.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
use crate::error::{Error, Result};
use crate::types::{SessionState, TokenPair};
use crate::types::TokenPair;
use std::sync::{Arc, RwLock};
use uuid::Uuid;
use zeroize::Zeroizing;

#[derive(Debug, Clone)]
Expand Down Expand Up @@ -36,21 +35,18 @@ struct CredentialState {
}

pub struct SessionManager {
session: Arc<RwLock<Option<SessionState>>>,
credentials: Arc<RwLock<CredentialState>>,
}

impl SessionManager {
pub fn new() -> Self {
Self {
session: Arc::new(RwLock::new(None)),
credentials: Arc::new(RwLock::new(CredentialState::default())),
}
}

pub fn new_with_api_key(api_key: String) -> Self {
Self {
session: Arc::new(RwLock::new(None)),
credentials: Arc::new(RwLock::new(CredentialState {
api_key: Some(api_key),
generation: 1,
Expand Down Expand Up @@ -90,39 +86,6 @@ impl SessionManager {
Ok(())
}

pub fn set_session(&self, session_id: Uuid, session_key: [u8; 32]) -> Result<()> {
let mut session_guard = self
.session
.write()
.map_err(|e| Error::Session(format!("Failed to acquire session write lock: {}", e)))?;

*session_guard = Some(SessionState {
session_id,
session_key,
});

Ok(())
}

pub fn get_session(&self) -> Result<Option<SessionState>> {
let session_guard = self
.session
.read()
.map_err(|e| Error::Session(format!("Failed to acquire session read lock: {}", e)))?;

Ok(session_guard.clone())
}

pub fn clear_session(&self) -> Result<()> {
let mut session_guard = self
.session
.write()
.map_err(|e| Error::Session(format!("Failed to acquire session write lock: {}", e)))?;

*session_guard = None;
Ok(())
}

pub fn set_tokens(&self, access_token: String, refresh_token: Option<String>) -> Result<()> {
let mut credentials = self.credentials.write().map_err(|e| {
Error::Authentication(format!("Failed to acquire credentials write lock: {}", e))
Expand Down Expand Up @@ -368,7 +331,6 @@ impl SessionManager {
}

pub fn clear_all(&self) -> Result<()> {
self.clear_session()?;
let mut credentials = self.credentials.write().map_err(|e| {
Error::Authentication(format!("Failed to acquire credentials write lock: {}", e))
})?;
Expand All @@ -389,7 +351,6 @@ impl SessionManager {
return Ok(false);
}

self.clear_session()?;
credentials.tokens = None;
credentials.api_key = None;
credentials.generation = credentials.generation.wrapping_add(1);
Expand All @@ -409,28 +370,6 @@ impl Default for SessionManager {
mod tests {
use super::*;

#[test]
fn test_session_management() {
let manager = SessionManager::new();

// Initially empty
assert!(manager.get_session().unwrap().is_none());

// Set session
let session_id = Uuid::new_v4();
let session_key = [0u8; 32];
manager.set_session(session_id, session_key).unwrap();

// Retrieve session
let session = manager.get_session().unwrap().unwrap();
assert_eq!(session.session_id, session_id);
assert_eq!(session.session_key, session_key);

// Clear session
manager.clear_session().unwrap();
assert!(manager.get_session().unwrap().is_none());
}

#[test]
fn test_token_management() {
let manager = SessionManager::new();
Expand Down
3 changes: 1 addition & 2 deletions sdk/rust/src/transport_v2/client.rs
Original file line number Diff line number Diff line change
Expand Up @@ -212,8 +212,7 @@ impl TransportV2Client {
})
}

/// Send exactly one encrypted request. This method never retries or falls
/// back to transport v1.
/// Send exactly one encrypted request. This method never retries.
#[cfg(test)]
pub(crate) async fn send(
&self,
Expand Down
6 changes: 3 additions & 3 deletions sdk/rust/src/transport_v2/mod.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
//! Private, dormant client engine for the second attested transport.
//! Private client engine for Transport V2, the SDK's only attested transport.
//!
//! This module owns only the wire protocol. The existing public SDK remains on
//! transport v1 until a later stack layer deliberately adapts it to this API.
//! This module owns only the wire protocol. `OpenSecretClient` adapts the
//! public SDK API to it.

pub(crate) mod client;
mod crypto;
Expand Down
Loading
Loading