Valset: validate metadata website to start with http:// or https://

confio · Feb 9, 2022 · 6f6af3e · 6f6af3e
1 parent 3543caf
commit 6f6af3e
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/contracts/tgrade-valset/src/error.rs b/contracts/tgrade-valset/src/error.rs
@@ -75,6 +75,9 @@ pub enum ContractError {
         min: usize,
         max: usize,
     },
+
+    #[error("Invalid metadata - website needs to start with http:// or https://")]
+    InvalidMetadataWebsitePrefix {},
 }
 
 impl From<Ed25519PubkeyConversionError> for ContractError {

diff --git a/contracts/tgrade-valset/src/msg.rs b/contracts/tgrade-valset/src/msg.rs
@@ -308,6 +308,8 @@ impl ValidatorMetadata {
                     min: MIN_METADATA_SIZE,
                     max: MAX_METADATA_SIZE,
                 });
+            } else if !website.starts_with("https://") && !website.starts_with("http://") {
+                return Err(ContractError::InvalidMetadataWebsitePrefix {});
             }
         }
         if let Some(security_contract) = &self.security_contact {
@@ -595,7 +597,7 @@ mod test {
         );
 
         let meta = ValidatorMetadata {
-            website: Some("website".to_owned()),
+            website: Some("https://website".to_owned()),
             ..meta
         };
         let resp = meta.validate().unwrap_err();
@@ -654,7 +656,7 @@ mod test {
         );
 
         let meta = ValidatorMetadata {
-            website: Some("website".to_owned()),
+            website: Some("http://website".to_owned()),
             ..meta
         };
         let resp = meta.validate().unwrap_err();
@@ -680,5 +682,12 @@ mod test {
             },
             resp
         );
+
+        let meta = ValidatorMetadata {
+            website: Some("website".to_owned()),
+            ..meta
+        };
+        let resp = meta.validate().unwrap_err();
+        assert_eq!(ContractError::InvalidMetadataWebsitePrefix {}, resp);
     }
 }