Skip to content

dont allow secret key for IAW flow #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 27, 2025
Merged

dont allow secret key for IAW flow #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 1 addition & 1 deletion server/src/http/error.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ impl ApiEngineError {
},
EngineError::VaultError { .. } => StatusCode::INTERNAL_SERVER_ERROR,
EngineError::IawError { error } => match error {
thirdweb_core::iaw::IAWError::ApiError(_) => StatusCode::INTERNAL_SERVER_ERROR,
thirdweb_core::iaw::IAWError::ApiError { .. } => StatusCode::INTERNAL_SERVER_ERROR,
thirdweb_core::iaw::IAWError::SerializationError { .. } => StatusCode::BAD_REQUEST,
thirdweb_core::iaw::IAWError::NetworkError { .. } => StatusCode::BAD_REQUEST,
thirdweb_core::iaw::IAWError::AuthError(_) => StatusCode::UNAUTHORIZED,
Expand Down
59 changes: 28 additions & 31 deletions server/src/http/extractors.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,46 +99,43 @@ where
.get("x-wallet-access-token")
.and_then(|v| v.to_str().ok())
{
// Extract ThirdwebAuth for billing purposes
let thirdweb_auth = if let Some(secret_key) = parts
// Try client ID and service key combination
let client_id = parts
.headers
.get("x-thirdweb-secret-key")
.get("x-thirdweb-client-id")
.and_then(|v| v.to_str().ok())
{
ThirdwebAuth::SecretKey(secret_key.to_string())
} else {
// Try client ID and service key combination
let client_id = parts
.headers
.get("x-thirdweb-client-id")
.and_then(|v| v.to_str().ok())
.ok_or_else(|| {
ApiEngineError(EngineError::ValidationError {
message: "Missing x-thirdweb-client-id header when using IAW".to_string(),
})
})?;

let service_key = parts
.headers
.get("x-thirdweb-service-key")
.and_then(|v| v.to_str().ok())
.ok_or_else(|| {
ApiEngineError(EngineError::ValidationError {
message: "Missing x-thirdweb-service-key header when using IAW".to_string(),
})
})?;

ThirdwebAuth::ClientIdServiceKey(thirdweb_core::auth::ThirdwebClientIdAndServiceKey {
.ok_or_else(|| {
ApiEngineError(EngineError::ValidationError {
message:
"Missing x-thirdweb-client-id header when using x-wallet-access-token"
.to_string(),
})
})?;

let service_key = parts
.headers
.get("x-thirdweb-service-key")
.and_then(|v| v.to_str().ok())
.ok_or_else(|| {
ApiEngineError(EngineError::ValidationError {
message:
"Missing x-thirdweb-service-key header when using x-wallet-access-token"
.to_string(),
})
})?;

let thirdweb_auth = ThirdwebAuth::ClientIdServiceKey(
thirdweb_core::auth::ThirdwebClientIdAndServiceKey {
client_id: client_id.to_string(),
service_key: service_key.to_string(),
})
};
},
);

return Ok(SigningCredentialsExtractor(SigningCredential::Iaw {
auth_token: wallet_token.to_string(),
thirdweb_auth,
}));
}
};

// Fall back to Vault credentials
let vault_access_token = parts
Expand Down
114 changes: 66 additions & 48 deletions thirdweb-core/src/iaw/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@ pub type AuthToken = String;
)]
#[serde(tag = "type", rename_all = "SCREAMING_SNAKE_CASE")]
pub enum IAWError {
#[error("API error: {0}")]
ApiError(String),
#[error("API error: {message}")]
ApiError { message: String },
#[error("Serialization error: {message}")]
SerializationError { message: String },
#[error("Network error: {error}")]
Expand Down Expand Up @@ -197,14 +197,16 @@ impl IAWClient {
.await?;

if !response.status().is_success() {
return Err(IAWError::ApiError(format!(
"Failed to sign message - {} {}",
response.status(),
response
.status()
.canonical_reason()
.unwrap_or("Unknown error")
)));
return Err(IAWError::ApiError {
message: format!(
"Failed to sign message - {} {}",
response.status(),
response
.status()
.canonical_reason()
.unwrap_or("Unknown error")
),
});
}

// Parse the response
Expand All @@ -214,7 +216,9 @@ impl IAWClient {
let signature = signed_response
.get("signature")
.and_then(|s| s.as_str())
.ok_or_else(|| IAWError::ApiError("No signature in response".to_string()))?;
.ok_or_else(|| IAWError::ApiError {
message: "No signature in response".to_string(),
})?;

Ok(SignMessageData {
signature: signature.to_string(),
Expand Down Expand Up @@ -262,14 +266,16 @@ impl IAWClient {
.await?;

if !response.status().is_success() {
return Err(IAWError::ApiError(format!(
"Failed to sign typed data - {} {}",
response.status(),
response
.status()
.canonical_reason()
.unwrap_or("Unknown error")
)));
return Err(IAWError::ApiError {
message: format!(
"Failed to sign typed data - {} {}",
response.status(),
response
.status()
.canonical_reason()
.unwrap_or("Unknown error")
),
});
}

// Parse the response
Expand All @@ -279,7 +285,9 @@ impl IAWClient {
let signature = signed_response
.get("signature")
.and_then(|s| s.as_str())
.ok_or_else(|| IAWError::ApiError("No signature in response".to_string()))?;
.ok_or_else(|| IAWError::ApiError {
message: "No signature in response".to_string(),
})?;

Ok(SignTypedDataData {
signature: signature.to_string(),
Expand Down Expand Up @@ -328,14 +336,16 @@ impl IAWClient {
.await?;

if !response.status().is_success() {
return Err(IAWError::ApiError(format!(
"Failed to sign transaction - {} {}",
response.status(),
response
.status()
.canonical_reason()
.unwrap_or("Unknown error")
)));
return Err(IAWError::ApiError {
message: format!(
"Failed to sign transaction - {} {}",
response.status(),
response
.status()
.canonical_reason()
.unwrap_or("Unknown error")
),
});
}

// Parse the response
Expand All @@ -345,7 +355,9 @@ impl IAWClient {
let signature = signed_response
.get("signature")
.and_then(|s| s.as_str())
.ok_or_else(|| IAWError::ApiError("No signature in response".to_string()))?;
.ok_or_else(|| IAWError::ApiError {
message: "No signature in response".to_string(),
})?;

Ok(SignTransactionData {
signature: signature.to_string(),
Expand Down Expand Up @@ -397,14 +409,16 @@ impl IAWClient {
.await?;

if !response.status().is_success() {
return Err(IAWError::ApiError(format!(
"Failed to sign authorization - {} {}",
response.status(),
response
.status()
.canonical_reason()
.unwrap_or("Unknown error")
)));
return Err(IAWError::ApiError {
message: format!(
"Failed to sign authorization - {} {}",
response.status(),
response
.status()
.canonical_reason()
.unwrap_or("Unknown error")
),
});
}

// Parse the response
Expand All @@ -414,8 +428,8 @@ impl IAWClient {
let signed_authorization: SignedAuthorization = serde_json::from_value(
signed_response
.get("signedAuthorization")
.ok_or_else(|| {
IAWError::ApiError("No signedAuthorization in response".to_string())
.ok_or_else(|| IAWError::ApiError {
message: "No signedAuthorization in response".to_string(),
})?
.clone(),
)?;
Expand Down Expand Up @@ -483,14 +497,16 @@ impl IAWClient {
.await?;

if !response.status().is_success() {
return Err(IAWError::ApiError(format!(
"Failed to sign userop - {} {}",
response.status(),
response
.status()
.canonical_reason()
.unwrap_or("Unknown error")
)));
return Err(IAWError::ApiError {
message: format!(
"Failed to sign userop - {} {}",
response.status(),
response
.status()
.canonical_reason()
.unwrap_or("Unknown error")
),
});
}

// Parse the response
Expand All @@ -500,7 +516,9 @@ impl IAWClient {
let signature = signed_response
.get("signature")
.and_then(|s| s.as_str())
.ok_or_else(|| IAWError::ApiError("No signature in response".to_string()))?;
.ok_or_else(|| IAWError::ApiError {
message: "No signature in response".to_string(),
})?;

Ok(SignUserOpData {
signature: signature.to_string(),
Expand Down