Various performance and security fixes

CLAUDE.md

@@ -114,5 +114,5 @@ The SDK follows a client-centric design with `Aptos` as the main entry point:
 
 - Unit tests are co-located with source code or in `src/tests/` directories
 - E2E tests require running Aptos localnet (`aptos node run-localnet`)
-- Behavioral specification tests in `specifications/tests/rust/`
+- Behavioral tests in `crates/aptos-sdk/tests/behavioral/`
 - Property-based testing with `proptest` for crypto components (via `fuzzing` feature)

crates/aptos-sdk-macros/src/codegen.rs

@@ -6,6 +6,104 @@ use proc_macro2::TokenStream;
 use quote::{format_ident, quote};
 use syn::Ident;
 
+/// Validates that a string is a valid Rust identifier before using it with `format_ident!`.
+///
+/// # Security
+///
+/// Prevents panics from `proc_macro2::Ident::new` when ABI contains names with
+/// invalid characters (e.g., `::`, newlines, Unicode).
+fn validate_rust_ident(name: &str) -> Result<(), String> {
+    if name.is_empty() {
+        return Err("identifier cannot be empty".to_string());
+    }
+    let first = name.chars().next().unwrap();
+    if !first.is_ascii_alphabetic() && first != '_' {
+        return Err(format!(
+            "identifier '{name}' must start with a letter or underscore"
+        ));
+    }
+    if !name.chars().all(|c| c.is_ascii_alphanumeric() || c == '_') {
+        return Err(format!(
+            "identifier '{name}' contains invalid characters (only ASCII alphanumeric and underscore allowed)"
+        ));
+    }
+    Ok(())
+}
+
+/// Returns true if `name` is a Rust keyword that would panic in `Ident::new`.
+fn is_rust_keyword(name: &str) -> bool {
+    matches!(
+        name,
+        "as" | "break"
+            | "const"
+            | "continue"
+            | "crate"
+            | "else"
+            | "enum"
+            | "extern"
+            | "false"
+            | "fn"
+            | "for"
+            | "if"
+            | "impl"
+            | "in"
+            | "let"
+            | "loop"
+            | "match"
+            | "mod"
+            | "move"
+            | "mut"
+            | "pub"
+            | "ref"
+            | "return"
+            | "self"
+            | "Self"
+            | "static"
+            | "struct"
+            | "super"
+            | "trait"
+            | "true"
+            | "type"
+            | "unsafe"
+            | "use"
+            | "where"
+            | "while"
+            | "async"
+            | "await"
+            | "dyn"
+            | "abstract"
+            | "become"
+            | "box"
+            | "do"
+            | "final"
+            | "macro"
+            | "override"
+            | "priv"
+            | "try"
+            | "typeof"
+            | "unsized"
+            | "virtual"
+            | "yield"
+    )
+}
+
+/// Safely creates an `Ident` from a string, returning a compile error if invalid.
+///
+/// Uses raw identifiers (`r#name`) for Rust keywords to avoid panics.
+fn safe_format_ident(name: &str) -> Result<proc_macro2::Ident, TokenStream> {
+    if let Err(e) = validate_rust_ident(name) {
+        return Err(syn::Error::new(proc_macro2::Span::call_site(), e).to_compile_error());
+    }
+    if is_rust_keyword(name) {
+        Ok(proc_macro2::Ident::new_raw(
+            name,
+            proc_macro2::Span::call_site(),
+        ))
+    } else {
+        Ok(format_ident!("{}", name))
+    }
+}
+
 /// Generates the contract implementation.
 pub fn generate_contract_impl(
     name: &Ident,
@@ -118,15 +216,25 @@ fn generate_structs(structs: &[MoveStructDef]) -> TokenStream {
 
 /// Generates a single struct definition.
 fn generate_struct(struct_def: &MoveStructDef) -> TokenStream {
-    let name = format_ident!("{}", to_pascal_case(&struct_def.name));
+    let pascal_name = to_pascal_case(&struct_def.name);
+    // SECURITY: Validate identifier before format_ident! to prevent panics on malformed ABI
+    let name = match safe_format_ident(&pascal_name) {
+        Ok(ident) => ident,
+        Err(err) => return err,
+    };
     let abilities = struct_def.abilities.join(", ");
     let doc = format!("Move struct with abilities: {}", abilities);
 
     let fields: Vec<_> = struct_def
         .fields
         .iter()
         .map(|f| {
-            let field_name = format_ident!("{}", to_snake_case(&f.name));
+            let snake_name = to_snake_case(&f.name);
+            // SECURITY: Validate field name before format_ident!
+            let field_name = match safe_format_ident(&snake_name) {
+                Ok(ident) => ident,
+                Err(err) => return err,
+            };
             let field_type = move_type_to_rust(&f.typ);
             quote! {
                 pub #field_name: #field_type
@@ -167,7 +275,12 @@ fn generate_entry_function(
     module: &str,
     source_info: Option<&MoveSourceInfo>,
 ) -> TokenStream {
-    let fn_name = format_ident!("{}", to_snake_case(&func.name));
+    let snake_fn = to_snake_case(&func.name);
+    // SECURITY: Validate function name before format_ident!
+    let fn_name = match safe_format_ident(&snake_fn) {
+        Ok(ident) => ident,
+        Err(err) => return err,
+    };
     let func_name_str = &func.name;
 
     // Get enriched param info
@@ -259,8 +372,18 @@ fn generate_view_function(
     module: &str,
     source_info: Option<&MoveSourceInfo>,
 ) -> TokenStream {
-    let fn_name = format_ident!("view_{}", to_snake_case(&func.name));
-    let fn_name_json = format_ident!("view_{}_json", to_snake_case(&func.name));
+    let snake_fn = to_snake_case(&func.name);
+    let view_name = format!("view_{snake_fn}");
+    let view_json_name = format!("view_{snake_fn}_json");
+    // SECURITY: Validate function names before format_ident!
+    let fn_name = match safe_format_ident(&view_name) {
+        Ok(ident) => ident,
+        Err(err) => return err,
+    };
+    let fn_name_json = match safe_format_ident(&view_json_name) {
+        Ok(ident) => ident,
+        Err(err) => return err,
+    };
     let func_name_str = &func.name;
 
     // Get enriched param info

crates/aptos-sdk-macros/src/lib.rs

@@ -112,7 +112,25 @@ pub fn aptos_contract_file(input: TokenStream) -> TokenStream {
 
     // Read the file content at compile time
     let manifest_dir = std::env::var("CARGO_MANIFEST_DIR").unwrap_or_else(|_| ".".to_string());
-    let file_path = std::path::Path::new(&manifest_dir).join(&input.path);
+    let manifest_path = std::path::Path::new(&manifest_dir);
+    let file_path = manifest_path.join(&input.path);
+
+    // SECURITY: Verify the resolved path is under CARGO_MANIFEST_DIR to prevent
+    // path traversal attacks (e.g., "../../../../etc/passwd")
+    if let (Ok(canonical_manifest), Ok(canonical_file)) =
+        (manifest_path.canonicalize(), file_path.canonicalize())
+        && !canonical_file.starts_with(&canonical_manifest)
+    {
+        return syn::Error::new(
+            input.name.span(),
+            format!(
+                "ABI file path '{}' resolves outside the project directory",
+                input.path
+            ),
+        )
+        .to_compile_error()
+        .into();
+    }
 
     let abi_content = match std::fs::read_to_string(&file_path) {
         Ok(content) => content,

crates/aptos-sdk/examples/account_management.rs

@@ -67,9 +67,14 @@ async fn main() -> anyhow::Result<()> {
     println!("\n--- 6. Loading from Private Key ---");
 
     // Get the private key bytes and convert to hex
+    // WARNING: This prints the private key for demonstration purposes ONLY.
+    // NEVER print, log, or expose private keys in production code!
     let pk_bytes = random_account.private_key().to_bytes();
     let pk_hex = const_hex::encode(pk_bytes);
-    println!("Private key (hex): {}", pk_hex);
+    println!(
+        "[DEMO ONLY - NEVER DO THIS IN PRODUCTION] Private key (hex): {}",
+        pk_hex
+    );
 
     // Recreate account from private key hex
     let restored_account = Ed25519Account::from_private_key_hex(&pk_hex)?;

crates/aptos-sdk/src/account/keyless.rs

@@ -132,23 +132,58 @@ impl OidcProvider {
     }
 
     /// Infers a provider from an issuer URL.
+    ///
+    /// # Security
+    ///
+    /// For unknown issuers, the JWKS URL is constructed as `{issuer}/.well-known/jwks.json`.
+    /// Non-HTTPS issuers are accepted at construction time but will produce an empty
+    /// JWKS URL, causing a clear error at JWKS fetch time. This prevents SSRF via
+    /// `http://`, `file://`, or other dangerous URL schemes without changing the
+    /// function signature. Callers controlling issuer input should additionally
+    /// validate the host (e.g., block private IP ranges) if SSRF is a concern.
     pub fn from_issuer(issuer: &str) -> Self {
         match issuer {
             "https://accounts.google.com" => OidcProvider::Google,
             "https://appleid.apple.com" => OidcProvider::Apple,
             "https://login.microsoftonline.com/common/v2.0" => OidcProvider::Microsoft,
-            _ => OidcProvider::Custom {
-                issuer: issuer.to_string(),
-                jwks_url: format!("{issuer}/.well-known/jwks.json"),
-            },
+            _ => {
+                // SECURITY: Only accept HTTPS issuers to prevent SSRF attacks.
+                // A malicious JWT could set `iss` to an internal URL (e.g.,
+                // http://169.254.169.254/) causing the SDK to make requests to
+                // attacker-chosen endpoints when fetching JWKS.
+                let jwks_url = if issuer.starts_with("https://") {
+                    format!("{issuer}/.well-known/jwks.json")
+                } else {
+                    // Non-HTTPS issuers get an invalid JWKS URL that will fail
+                    // at fetch time with a clear error rather than making requests
+                    // to potentially dangerous endpoints.
+                    String::new()
+                };
+                OidcProvider::Custom {
+                    issuer: issuer.to_string(),
+                    jwks_url,
+                }
+            }
         }
     }
 }
 
 /// Pepper bytes used in keyless address derivation.
-#[derive(Clone, Debug, PartialEq, Eq)]
+///
+/// # Security
+///
+/// The pepper is secret material used to derive keyless account addresses.
+/// It is automatically zeroized when dropped to prevent key material from
+/// lingering in memory.
+#[derive(Clone, PartialEq, Eq, zeroize::Zeroize, zeroize::ZeroizeOnDrop)]
 pub struct Pepper(Vec<u8>);
 
+impl std::fmt::Debug for Pepper {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        write!(f, "Pepper(REDACTED)")
+    }
+}
+
 impl Pepper {
     /// Creates a new pepper from raw bytes.
     pub fn new(bytes: Vec<u8>) -> Self {
@@ -267,7 +302,12 @@ impl PepperService for HttpPepperService {
                 .await?
                 .error_for_status()?;
 
-            let payload: PepperResponse = response.json().await?;
+            // SECURITY: Stream body with size limit to prevent OOM
+            let bytes =
+                crate::config::read_response_bounded(response, MAX_JWKS_RESPONSE_SIZE).await?;
+            let payload: PepperResponse = serde_json::from_slice(&bytes).map_err(|e| {
+                AptosError::InvalidJwt(format!("failed to parse pepper response: {e}"))
+            })?;
             Pepper::from_hex(&payload.pepper)
         })
     }
@@ -329,7 +369,12 @@ impl ProverService for HttpProverService {
                 .await?
                 .error_for_status()?;
 
-            let payload: ProverResponse = response.json().await?;
+            // SECURITY: Stream body with size limit to prevent OOM
+            let bytes =
+                crate::config::read_response_bounded(response, MAX_JWKS_RESPONSE_SIZE).await?;
+            let payload: ProverResponse = serde_json::from_slice(&bytes).map_err(|e| {
+                AptosError::InvalidJwt(format!("failed to parse prover response: {e}"))
+            })?;
             ZkProof::from_hex(&payload.proof)
         })
     }
@@ -715,6 +760,9 @@ impl AudClaim {
 /// Default timeout for JWKS fetch requests (10 seconds).
 const JWKS_FETCH_TIMEOUT: std::time::Duration = std::time::Duration::from_secs(10);
 
+/// Maximum JWKS response size: 1 MB (JWKS payloads are typically under 10 KB).
+const MAX_JWKS_RESPONSE_SIZE: usize = 1024 * 1024;
+
 /// Fetches the JWKS (JSON Web Key Set) from an OIDC provider.
 ///
 /// # Errors
@@ -725,6 +773,18 @@ const JWKS_FETCH_TIMEOUT: std::time::Duration = std::time::Duration::from_secs(1
 /// - The JWKS endpoint returns a non-success status code
 /// - The response cannot be parsed as valid JWKS JSON
 async fn fetch_jwks(client: &reqwest::Client, jwks_url: &str) -> AptosResult<JwkSet> {
+    // SECURITY: Validate the JWKS URL scheme to prevent SSRF.
+    // The issuer comes from an untrusted JWT, so the derived JWKS URL could
+    // point to internal services (e.g., cloud metadata endpoints).
+    let parsed_url = Url::parse(jwks_url)
+        .map_err(|e| AptosError::InvalidJwt(format!("invalid JWKS URL: {e}")))?;
+    if parsed_url.scheme() != "https" {
+        return Err(AptosError::InvalidJwt(format!(
+            "JWKS URL must use HTTPS scheme, got: {}",
+            parsed_url.scheme()
+        )));
+    }
+
     // Note: timeout is configured on the client, not per-request
     let response = client.get(jwks_url).send().await?;
 
@@ -735,7 +795,11 @@ async fn fetch_jwks(client: &reqwest::Client, jwks_url: &str) -> AptosResult<Jwk
         )));
     }
 
-    let jwks: JwkSet = response.json().await?;
+    // SECURITY: Stream body with size limit to prevent OOM from a
+    // compromised or malicious JWKS endpoint (including chunked encoding).
+    let bytes = crate::config::read_response_bounded(response, MAX_JWKS_RESPONSE_SIZE).await?;
+    let jwks: JwkSet = serde_json::from_slice(&bytes)
+        .map_err(|e| AptosError::InvalidJwt(format!("failed to parse JWKS: {e}")))?;
     Ok(jwks)
 }