refactor: fix unbounded regex and add tests

Author: hugoclrd

stackslib/src/net/api/getclaritymetadata.rs

@@ -16,7 +16,9 @@
 use clarity::vm::clarity::ClarityConnection;
 use clarity::vm::database::clarity_db::ContractDataVarName;
 use clarity::vm::database::StoreType;
-use clarity::vm::representations::{CONTRACT_NAME_REGEX_STRING, STANDARD_PRINCIPAL_REGEX_STRING};
+use clarity::vm::representations::{
+    CONTRACT_NAME_REGEX_STRING, MAX_STRING_LEN, STANDARD_PRINCIPAL_REGEX_STRING,
+};
 use clarity::vm::types::QualifiedContractIdentifier;
 use clarity::vm::ContractName;
 use lazy_static::lazy_static;
@@ -35,10 +37,12 @@ use crate::net::httpcore::{
 use crate::net::{Error as NetError, StacksNodeState, TipRequest};
 
 lazy_static! {
-    static ref CLARITY_NAME_NO_BOUNDARIES_REGEX_STRING: String =
-        "[a-zA-Z]([a-zA-Z0-9]|[-_!?+<>=/*])*|[-+=/*]|[<>]=?".into();
+    static ref CLARITY_NAME_NO_BOUNDARIES_REGEX_STRING: String = format!(
+        "([a-zA-Z]([a-zA-Z0-9]|[-_!?+<>=/*])*|[-+=/*]|[<>]=?){{1,{}}}",
+        MAX_STRING_LEN
+    );
     static ref METADATA_KEY_REGEX_STRING: String = format!(
-        r"vm-metadata::(?P<data_type>(\d{{1,2}}))::(?P<var_name>(contract|contract-size|contract-src|contract-data-size|({})))",
+        r"vm-metadata::(?P<data_type>(\d{{1,2}}))::(?P<var_name>(contract|contract-size|contract-src|contract-data-size|{}))",
         *CLARITY_NAME_NO_BOUNDARIES_REGEX_STRING,
     );
 }

stackslib/src/net/api/tests/getclaritymetadata.rs

@@ -15,8 +15,10 @@
 
 use std::net::{IpAddr, Ipv4Addr, SocketAddr};
 
-use clarity::vm::types::{QualifiedContractIdentifier, StacksAddressExtensions};
+use clarity::vm::database::{ClaritySerializable, DataMapMetadata, DataVariableMetadata};
+use clarity::vm::types::{QualifiedContractIdentifier, StacksAddressExtensions, TypeSignature};
 use clarity::vm::{ClarityName, ContractName};
+use serde_json::json;
 use stacks_common::codec::StacksMessageCodec;
 use stacks_common::types::chainstate::StacksAddress;
 use stacks_common::types::net::PeerHost;
@@ -211,7 +213,7 @@ fn test_try_make_response() {
 
     let mut requests = vec![];
 
-    // query existing
+    // query existing contract size metadata
     let request = StacksHttpRequest::new_getclaritymetadata(
         addr.into(),
         StacksAddress::from_string("ST2DS4MSWSGJ3W9FBC6BVT0Y92S345HY8N3T6AV7R").unwrap(),
@@ -221,16 +223,51 @@ fn test_try_make_response() {
     );
     requests.push(request);
 
+    // query existing data var metadata
+    let request = StacksHttpRequest::new_getclaritymetadata(
+        addr.into(),
+        StacksAddress::from_string("ST2DS4MSWSGJ3W9FBC6BVT0Y92S345HY8N3T6AV7R").unwrap(),
+        "hello-world".try_into().unwrap(),
+        "vm-metadata::5::test-map".to_string(),
+        TipRequest::UseLatestAnchoredTip,
+    );
+    requests.push(request);
+
+    // query existing data map metadata
+    let request = StacksHttpRequest::new_getclaritymetadata(
+        addr.into(),
+        StacksAddress::from_string("ST2DS4MSWSGJ3W9FBC6BVT0Y92S345HY8N3T6AV7R").unwrap(),
+        "hello-world".try_into().unwrap(),
+        "vm-metadata::6::bar".to_string(),
+        TipRequest::UseLatestAnchoredTip,
+    );
+    requests.push(request);
+
     let mut responses = test_rpc(function_name!(), requests);
 
-    // latest data
+    // contract size metadata
     let response = responses.remove(0);
-
     assert_eq!(
         response.preamble().get_canonical_stacks_tip_height(),
         Some(1)
     );
-
     let resp = response.decode_clarity_metadata_response().unwrap();
     assert_eq!(resp.data, "1432");
+
+    // data map metadata
+    let response = responses.remove(0);
+    let resp = response.decode_clarity_metadata_response().unwrap();
+    let expected = DataMapMetadata {
+        key_type: TypeSignature::UIntType,
+        value_type: TypeSignature::UIntType,
+    };
+    assert_eq!(resp.data, expected.serialize());
+
+    // data var metadata
+    let response = responses.remove(0);
+    let resp = response.decode_clarity_metadata_response().unwrap();
+    let expected = DataVariableMetadata {
+        value_type: TypeSignature::IntType,
+    };
+    assert_eq!(resp.data, expected.serialize());
 }