refactor: improve clarity_mark_key and clarity_metadata request parsing

Author: hugoclrd

clarity/src/vm/representations.rs

@@ -51,6 +51,8 @@ lazy_static! {
         "({})|({})",
         *STANDARD_PRINCIPAL_REGEX_STRING, *CONTRACT_PRINCIPAL_REGEX_STRING
     );
+    static ref CLARITY_NAME_NO_BOUNDARIES_REGEX_STRING: String =
+        "[a-zA-Z]([a-zA-Z0-9]|[-_!?+<>=/*])*|[-+=/*]|[<>]=?".into();
     pub static ref CLARITY_NAME_REGEX_STRING: String =
         "^[a-zA-Z]([a-zA-Z0-9]|[-_!?+<>=/*])*$|^[-+=/*]$|^[<>]=?$".into();
     pub static ref CLARITY_NAME_REGEX: Regex =
@@ -65,16 +67,17 @@ lazy_static! {
             .unwrap()
     };
     pub static ref MARF_KEY_FOR_TRIP_REGEX_STRING: String = format!(
-        r"vm::{}::\d+::.*",
+        r"vm::{}::\d+::({})",
         *CONTRACT_PRINCIPAL_REGEX_STRING,
+        *CLARITY_NAME_NO_BOUNDARIES_REGEX_STRING,
     );
     pub static ref MARF_KEY_FOR_QUAD_REGEX_STRING: String = format!(
-        r"{}::.*",
+        r"{}::[0-9a-fA-F]+",
         *MARF_KEY_FOR_TRIP_REGEX_STRING,
     );
     pub static ref METADATA_KEY_REGEX_STRING: String = format!(
-        r"vm-metadata::\d+::.*",
-
+        r"vm-metadata::\d+::(contract|contract-size|contract-src|contract-data-size|({}))",
+        *CLARITY_NAME_NO_BOUNDARIES_REGEX_STRING,
     );
 }
 

stackslib/src/net/api/getclaritymarfvalue.rs

@@ -86,7 +86,7 @@ impl HttpRequest for RPCGetClarityMarfValueRequestHandler {
             ));
         }
 
-        let marf_key = request::get_key(captures, "clarity_marf_key")?;
+        let marf_key = request::get_clarity_key(captures, "clarity_marf_key")?;
 
         self.clarity_marf_key = Some(marf_key);
 

stackslib/src/net/api/getclaritymetadata.rs

@@ -89,7 +89,7 @@ impl HttpRequest for RPCGetClarityMetadataRequestHandler {
         }
 
         let contract_identifier = request::get_contract_address(captures, "address", "contract")?;
-        let metadata_key = request::get_key(captures, "clarity_metadata_key")?;
+        let metadata_key = request::get_clarity_key(captures, "clarity_metadata_key")?;
 
         self.contract_identifier = Some(contract_identifier);
         self.clarity_metadata_key = Some(metadata_key);

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

@@ -128,7 +128,7 @@ fn test_try_make_response() {
 
     // existing data
     let response = responses.remove(0);
-    println!(
+    debug!(
         "Response:\n{}\n",
         std::str::from_utf8(&response.try_serialize().unwrap()).unwrap()
     );

stackslib/src/net/httpcore.rs

@@ -247,15 +247,15 @@ pub mod request {
         Ok(txid)
     }
 
-    /// Get and parse a MARF key from a path's captures, given the name of the regex field.
-    pub fn get_key(captures: &Captures, key: &str) -> Result<String, HttpError> {
-        let marf_key = if let Some(marf_key_str) = captures.name(key) {
-            marf_key_str.as_str().to_string()
+    /// Get a clarity key (MARF or Metadata) from a path's captures, given the name of the regex field.
+    pub fn get_clarity_key(captures: &Captures, clarity_key: &str) -> Result<String, HttpError> {
+        let key = if let Some(key_str) = captures.name(clarity_key) {
+            key_str.as_str().to_string()
         } else {
-            return Err(HttpError::Http(404, format!("Missing `{}`", key)));
+            return Err(HttpError::Http(404, format!("Missing `{}`", clarity_key)));
         };
 
-        Ok(marf_key)
+        Ok(key)
     }
 
     /// Get and parse a Clarity name from a path's captures, given the name of the regex field.