Skip to content

Commit

Permalink
temporary comment for testing
Browse files Browse the repository at this point in the history
  • Loading branch information
@cameronvoell
cameronvoell committed Apr 4, 2024
1 parent fa33f5e commit 9ad9f0a
Show file tree
Hide file tree
Showing 3 changed files with 56 additions and 56 deletions.
12 changes: 6 additions & 6 deletions openmls/src/group/core_group/mod.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -376,12 +376,12 @@ impl CoreGroup {
joiner_key_package: KeyPackage,
signer: &impl Signer,
) -> Result<AuthenticatedContent, CreateAddProposalError> {
if let Some(required_capabilities) = self.required_capabilities() {
joiner_key_package
.leaf_node()
.capabilities()
.supports_required_capabilities(required_capabilities)?;
}
// if let Some(required_capabilities) = self.required_capabilities() {
// joiner_key_package
// .leaf_node()
// .capabilities()
// .supports_required_capabilities(required_capabilities)?;
// }
let add_proposal = AddProposal {
key_package: joiner_key_package,
};
Expand Down
86 changes: 43 additions & 43 deletions openmls/src/group/public_group/validation.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -295,52 +295,52 @@ impl PublicGroup {
for leaf_node in leaf_nodes {
// Check if the ciphersuite and the version of the group are
// supported.
let capabilities = leaf_node.capabilities();
if !capabilities
.ciphersuites()
.contains(&VerifiableCiphersuite::from(self.ciphersuite()))
|| !capabilities.versions().contains(&self.version())
{
return Err(ProposalValidationError::InsufficientCapabilities);
}
// let capabilities = leaf_node.capabilities();
// if !capabilities
// .ciphersuites()
// .contains(&VerifiableCiphersuite::from(self.ciphersuite()))
// || !capabilities.versions().contains(&self.version())
// {
// return Err(ProposalValidationError::InsufficientCapabilities);
// }

// If there is a required capabilities extension, check if that one
// is supported.
if let Some(required_capabilities) =
self.group_context().extensions().required_capabilities()
{
// Check if all required capabilities are supported.
capabilities
.supports_required_capabilities(required_capabilities)
.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);
}
// if let Some(required_capabilities) =
// self.group_context().extensions().required_capabilities()
// {
// // Check if all required capabilities are supported.
// capabilities
// .supports_required_capabilities(required_capabilities)
// .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);
// }
}
Ok(())
}
Expand Down
14 changes: 7 additions & 7 deletions openmls/src/treesync/node/leaf_node/capabilities.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -134,13 +134,13 @@ impl Capabilities {
required_capabilities: &RequiredCapabilitiesExtension,
) -> Result<(), LeafNodeValidationError> {
// Check if all required extensions are supported.
if required_capabilities
.extension_types()
.iter()
.any(|e| !(self.extensions().contains(e) || default_extensions().contains(e)))
{
return Err(LeafNodeValidationError::UnsupportedExtensions);
}
// if required_capabilities
// .extension_types()
// .iter()
// .any(|e| !(self.extensions().contains(e) || default_extensions().contains(e)))
// {
// return Err(LeafNodeValidationError::UnsupportedExtensions);
// }
// Check if all required proposals are supported.
if required_capabilities
.proposal_types()
Expand Down

0 comments on commit 9ad9f0a

Please sign in to comment.