governance: validate client ID check earlier than component/view.rs

penumbra-zone · Sep 16, 2024 · b8571a4 · b8571a4
1 parent 90b0a55
commit b8571a4
Showing 1 changed file with 7 additions and 0 deletions.
diff --git a/crates/core/component/governance/src/proposal.rs b/crates/core/component/governance/src/proposal.rs
@@ -1,5 +1,6 @@
 use anyhow::Context;
 use bytes::Bytes;
+use ibc_types::core::client::ClientId;
 use serde::{Deserialize, Serialize};
 use std::str::FromStr;
 
@@ -144,6 +145,9 @@ impl TryFrom<pb::Proposal> for Proposal {
                     if freeze_ibc_client.client_id.len() > 128 {
                         anyhow::bail!("client ID must be less than 128 bytes");
                     }
+                    // Validation: Check the client ID is valid using the validation inside `ClientId::from_str`.
+                    ClientId::from_str(&freeze_ibc_client.client_id)
+                        .map_err(|e| anyhow::anyhow!("invalid client id: {e}"))?;
                     ProposalPayload::FreezeIbcClient {
                         client_id: freeze_ibc_client.client_id,
                     }
@@ -153,6 +157,9 @@ impl TryFrom<pb::Proposal> for Proposal {
                     if unfreeze_ibc_client.client_id.len() > 128 {
                         anyhow::bail!("client ID must be less than 128 bytes");
                     }
+                    // Validation: Check the client ID is valid using the validation inside `ClientId::from_str`.
+                    ClientId::from_str(&unfreeze_ibc_client.client_id)
+                        .map_err(|e| anyhow::anyhow!("invalid client id: {e}"))?;
                     ProposalPayload::UnfreezeIbcClient {
                         client_id: unfreeze_ibc_client.client_id,
                     }