Added validations for cred_def

Signed-off-by: DenisRybas <[email protected]>
hyperledger · Feb 7, 2024 · 088456e · 088456e
1 parent c430485
commit 088456e
Show file tree

Hide file tree

Showing 5 changed files with 55 additions and 9 deletions.
diff --git a/vdr/src/contracts/cl/credential_definition_registry.rs b/vdr/src/contracts/cl/credential_definition_registry.rs
@@ -39,7 +39,7 @@ pub async fn build_create_credential_definition_transaction(
     id: &CredentialDefinitionId,
     credential_definition: &CredentialDefinition,
 ) -> VdrResult<Transaction> {
-    // TODO: validate credential definition
+    credential_definition.validate()?;
     let identity = Address::try_from(&credential_definition.issuer_id)?;
     TransactionBuilder::new()
         .set_contract(CONTRACT_NAME)
@@ -70,6 +70,7 @@ pub async fn build_create_credential_definition_endorsing_data(
     id: &CredentialDefinitionId,
     credential_definition: &CredentialDefinition,
 ) -> VdrResult<TransactionEndorsingData> {
+    credential_definition.validate()?;
     let identity = Address::try_from(&credential_definition.issuer_id)?;
     TransactionEndorsingDataBuilder::new()
         .set_contract(CONTRACT_NAME)
@@ -104,7 +105,7 @@ pub async fn build_create_credential_definition_signed_transaction(
     credential_definition: &CredentialDefinition,
     signature: &SignatureData,
 ) -> VdrResult<Transaction> {
-    // TODO: validate credential definition
+    credential_definition.validate()?;
     let identity = Address::try_from(&credential_definition.issuer_id)?;
     TransactionBuilder::new()
         .set_contract(CONTRACT_NAME)
@@ -207,7 +208,6 @@ pub fn parse_credential_definition_created_event(
     client: &LedgerClient,
     log: &EventLog,
 ) -> VdrResult<CredentialDefinitionCreatedEvent> {
-    // TODO: validate schema
     EventParser::new()
         .set_contract(CONTRACT_NAME)
         .set_event(EVENT_CREDENTIAL_DEFINITION_CREATED)
@@ -248,6 +248,8 @@ pub async fn resolve_credential_definition(
     }
 
     let cred_def = parse_credential_definition_created_event(client, &events[0])?.cred_def;
+    cred_def.matches_id(id)?;
+
     Ok(cred_def)
 }
 

diff --git a/vdr/src/contracts/cl/schema_registry.rs b/vdr/src/contracts/cl/schema_registry.rs
@@ -68,6 +68,7 @@ pub async fn build_create_schema_endorsing_data(
     id: &SchemaId,
     schema: &Schema,
 ) -> VdrResult<TransactionEndorsingData> {
+    schema.validate()?;
     let identity = Address::try_from(&schema.issuer_id)?;
     TransactionEndorsingDataBuilder::new()
         .set_contract(CONTRACT_NAME)
@@ -101,6 +102,7 @@ pub async fn build_create_schema_signed_transaction(
     schema: &Schema,
     signature: &SignatureData,
 ) -> VdrResult<Transaction> {
+    schema.validate()?;
     let identity = Address::try_from(&schema.issuer_id)?;
     TransactionBuilder::new()
         .set_contract(CONTRACT_NAME)

diff --git a/vdr/src/contracts/cl/types/credential_definition.rs b/vdr/src/contracts/cl/types/credential_definition.rs
@@ -1,4 +1,4 @@
-use crate::{error::VdrError, types::ContractParam, Address};
+use crate::{error::VdrError, types::ContractParam, Address, CredentialDefinitionId, VdrResult};
 
 use crate::{
     contracts::{cl::types::schema_id::SchemaId, did::types::did::DID},
@@ -24,6 +24,45 @@ pub enum CredentialDefinitionTypes {
     CL,
 }
 
+impl CredentialDefinition {
+    pub fn id(&self) -> CredentialDefinitionId {
+        CredentialDefinitionId::build(&self.issuer_id, &self.schema_id.to_string(), &self.tag)
+    }
+
+    pub fn matches_id(&self, expected_id: &CredentialDefinitionId) -> VdrResult<()> {
+        let actual_id = self.id();
+
+        if expected_id.to_string() != actual_id.to_string() {
+            return Err(VdrError::InvalidCredDef(format!(
+                "Id built from cred_def: {} != provided id: {}",
+                actual_id.to_string(),
+                expected_id.to_string()
+            )));
+        }
+
+        Ok(())
+    }
+
+    pub fn validate(&self) -> VdrResult<()> {
+        if self.cred_def_type != CredentialDefinitionTypes::CL {
+            Err(VdrError::InvalidCredDef(format!(
+                "Unsupported type: {}",
+                self.cred_def_type.as_ref()
+            )))
+        }
+
+        if self.tag.is_empty() {
+            Err(VdrError::InvalidCredDef("Tag is not provided".to_string()))
+        }
+
+        if self.value.is_empty() {
+            Err(VdrError::InvalidCredDef("Value is not provided".to_string()))
+        }
+
+        Ok(())
+    }
+}
+
 impl AsRef<str> for CredentialDefinitionTypes {
     fn as_ref(&self) -> &str {
         match self {

diff --git a/vdr/src/contracts/cl/types/schema.rs b/vdr/src/contracts/cl/types/schema.rs
@@ -22,14 +22,14 @@ impl Schema {
         SchemaId::build(&self.issuer_id, &self.name, &self.version)
     }
 
-    pub fn matches_id(&self, expected_schema_id: &SchemaId) -> VdrResult<()> {
-        let actual_schema_id = self.id();
+    pub fn matches_id(&self, expected_id: &SchemaId) -> VdrResult<()> {
+        let actual_id = self.id();
 
-        if expected_schema_id.to_string() != actual_schema_id.to_string() {
+        if expected_id.to_string() != actual_id.to_string() {
             return Err(VdrError::InvalidSchema(format!(
                 "Id built from schema: {} != provided id: {}",
-                actual_schema_id.to_string(),
-                expected_schema_id.to_string()
+                actual_id.to_string(),
+                expected_id.to_string()
             )));
         }
 

diff --git a/vdr/src/error/mod.rs b/vdr/src/error/mod.rs
@@ -60,6 +60,9 @@ pub enum VdrError {
 
     #[error("Invalid schema: {}", _0)]
     InvalidSchema(String),
+
+    #[error("Invalid credential definition: {}", _0)]
+    InvalidCredDef(String),
 }
 
 pub type VdrResult<T> = Result<T, VdrError>;