Skip to content

Commit

Permalink
temporary comment for testing
Browse files Browse the repository at this point in the history
  • Loading branch information
cameronvoell committed Apr 4, 2024
1 parent fa33f5e commit 93dc30f
Show file tree
Hide file tree
Showing 3 changed files with 45 additions and 42 deletions.
3 changes: 3 additions & 0 deletions openmls/src/group/errors.rs
Original file line number Diff line number Diff line change
Expand Up @@ -374,6 +374,9 @@ pub enum ProposalValidationError {
/// See [`PskError`] for more details.
#[error(transparent)]
Psk(#[from] PskError),
/// Leaf node
#[error("something with leaf node")]
LeafNodeValidationError,
}

/// External Commit validaton error
Expand Down
52 changes: 26 additions & 26 deletions openmls/src/group/public_group/validation.rs
Original file line number Diff line number Diff line change
Expand Up @@ -315,32 +315,32 @@ impl PublicGroup {
.map_err(|_| ProposalValidationError::InsufficientCapabilities)?;
}

// Check that all extensions are contained in the capabilities.
if !capabilities.contain_extensions(leaf_node.extensions()) {
return Err(ProposalValidationError::InsufficientCapabilities);
}

// Check that the capabilities contain the leaf node's credential type.
if !capabilities.contains_credential(&leaf_node.credential().credential_type()) {
return Err(ProposalValidationError::InsufficientCapabilities);
}

// Check that the credential type is supported by all members of the group.
if !group_leaf_nodes.all(|node| {
node.capabilities()
.contains_credential(&leaf_node.credential().credential_type())
}) {
return Err(ProposalValidationError::InsufficientCapabilities);
}

// Check that the capabilities field of this LeafNode indicates
// support for all the credential types currently in use by other
// members.
if !group_leaf_nodes
.all(|node| capabilities.contains_credential(&node.credential().credential_type()))
{
return Err(ProposalValidationError::InsufficientCapabilities);
}
// // Check that all extensions are contained in the capabilities.
// if !capabilities.contain_extensions(leaf_node.extensions()) {
// return Err(ProposalValidationError::InsufficientCapabilities);
// }

// // Check that the capabilities contain the leaf node's credential type.
// if !capabilities.contains_credential(&leaf_node.credential().credential_type()) {
// return Err(ProposalValidationError::InsufficientCapabilities);
// }

// // Check that the credential type is supported by all members of the group.
// if !group_leaf_nodes.all(|node| {
// node.capabilities()
// .contains_credential(&leaf_node.credential().credential_type())
// }) {
// return Err(ProposalValidationError::InsufficientCapabilities);
// }

// // Check that the capabilities field of this LeafNode indicates
// // support for all the credential types currently in use by other
// // members.
// if !group_leaf_nodes
// .all(|node| capabilities.contains_credential(&node.credential().credential_type()))
// {
// return Err(ProposalValidationError::InsufficientCapabilities);
// }
}
Ok(())
}
Expand Down
32 changes: 16 additions & 16 deletions openmls/src/treesync/node/leaf_node/capabilities.rs
Original file line number Diff line number Diff line change
Expand Up @@ -141,22 +141,22 @@ impl Capabilities {
{
return Err(LeafNodeValidationError::UnsupportedExtensions);
}
// Check if all required proposals are supported.
if required_capabilities
.proposal_types()
.iter()
.any(|p| !(self.proposals().contains(p) || default_proposals().contains(p)))
{
return Err(LeafNodeValidationError::UnsupportedProposals);
}
// Check if all required credential types are supported.
if required_capabilities
.credential_types()
.iter()
.any(|c| !(self.credentials().contains(c) || default_credentials().contains(c)))
{
return Err(LeafNodeValidationError::UnsupportedCredentials);
}
// // Check if all required proposals are supported.
// if required_capabilities
// .proposal_types()
// .iter()
// .any(|p| !(self.proposals().contains(p) || default_proposals().contains(p)))
// {
// return Err(LeafNodeValidationError::UnsupportedProposals);
// }
// // Check if all required credential types are supported.
// if required_capabilities
// .credential_types()
// .iter()
// .any(|c| !(self.credentials().contains(c) || default_credentials().contains(c)))
// {
// return Err(LeafNodeValidationError::UnsupportedCredentials);
// }
Ok(())
}

Expand Down

0 comments on commit 93dc30f

Please sign in to comment.