Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge upstream #18

Merged
merged 34 commits into from
Mar 20, 2024
Merged

Merge upstream #18

merged 34 commits into from
Mar 20, 2024

Conversation

neekolas
Copy link

@neekolas neekolas commented Feb 10, 2024

Summary

  • Massive PR merging upstream main

@codecov-commenter
Copy link

Codecov Report

All modified and coverable lines are covered by tests ✅

Comparison is base (0da7dcb) 85.84% compared to head (e5a9575) 85.87%.

Additional details and impacted files
@@            Coverage Diff             @@
##             main      #18      +/-   ##
==========================================
+ Coverage   85.84%   85.87%   +0.02%     
==========================================
  Files         171      171              
  Lines       20035    20016      -19     
==========================================
- Hits        17200    17188      -12     
+ Misses       2835     2828       -7     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

TheDevMinerTV and others added 25 commits February 11, 2024 15:20
Fix typo in documentation: Member -> External

Co-authored-by: raphaelrobert <[email protected]>
Bumps [codecov/codecov-action](https://github.com/codecov/codecov-action) from 3 to 4.
- [Release notes](https://github.com/codecov/codecov-action/releases)
- [Changelog](https://github.com/codecov/codecov-action/blob/main/CHANGELOG.md)
- [Commits](codecov/codecov-action@v3...v4)

---
updated-dependencies:
- dependency-name: codecov/codecov-action
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: raphaelrobert <[email protected]>
This PR addresses issue openmls#1487. The problem is that currently the list of extensions in a GroupContextExtensions proposal is compared against the capabilities of the current members. Instead, it needs to

 -   check that the RequiredCapabilities of the group are satisfied by all members of the group
 -   check that the types of all extensions in the proposal are in the RequiredCapabilities.

This PR also adds a method on the RequiredCapabilitiesExtension for checking whether an extension type is supported. This is needed because the extension types defined in the RFC are supported implicitly, so we also have to compare against the defaults. The defaults are defined close to the Capabilities struct and used to be private to these modules. I made the one for extension types pub(crate) so I can check against it.

---------

Co-authored-by: Jan Winkelmann (keks) <[email protected]>
Co-authored-by: raphaelrobert <[email protected]>
* Improve processing

* Fix typos

Co-authored-by: Jonas Vautherin <[email protected]>

---------

Co-authored-by: Jonas Vautherin <[email protected]>
* Remove unnecessary cloning of proposals

* Remove to_owned()

---------

Co-authored-by: Konrad Kohbrok <[email protected]>
* Cleanup unused CoreGroup methods

* Address review comments
* Introduce InitKey type for KeyPackages

* Address review comments
This commit changes OpenMLS such that it can handle arbitrary credentials, as long as they are encoded as a variable-length vector.
* check for last resort in core_group/new_from_welcome

* test join_multiple_groups_last_resort_extension

* changelog includes PR#1503

---------

Co-authored-by: Joseph Lukefahr <[email protected]>
Co-authored-by: Konrad Kohbrok <[email protected]>
Co-authored-by: Franziskus Kiefer <[email protected]>
This commit adds the above types to make it possible to inspect the content
of a Welcome message before joining a group.

Fixes: openmls#1326 openmls#1506
Co-authored-by: raphaelrobert <[email protected]>
…1525)

This PR adds minimal Wasm bindings and example code, and a github action workflow that measures the size of the built bundle (currently around 1.2MB uncompressed, 450kB gzip'd). It fails when it gets significantly larger.

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: Franziskus Kiefer <[email protected]>
* Improve BasicCredential

* Address review comments

* Fix new CI errors
* add DeserializeBytes impl for MlsMessageIn

* add getter for body of MlsMessageOut

* add getter for MlsGroup extensions

* expose group info extensions and signature

* expose PublicMessage content type

* add convenience function to mark kp as last resort
Co-authored-by: Jan Winkelmann (keks) <[email protected]>
Co-authored-by: raphaelrobert <[email protected]>
* WIP: function probably works

* clear_pendind_proposals made public

* changelog entry for PR#1516

* additional comments warning against use of clear_pending_proposals

* additional logic in clearing pending proposals

* improved grammar and code placement for clear_pending_proposals

---------

Co-authored-by: Joseph Lukefahr <[email protected]>
Co-authored-by: raphaelrobert <[email protected]>
)

In openmls#1506 we not only added the StagedWelcome types, but also made the methods to create them consume an MlsMessageIn instead of a Welcome. This was done at the time because there was the open issue openmls#1326 that asked to do this, and we didn't check whether that really was a good idea.

It wasn't.

This PR keeps StagedWelcome, but makes the method that create these structs a Welcome instead of a MlsMessageIn.

Fixes openmls#1519.
@github-actions github-actions bot removed the size/m label Mar 19, 2024
Copy link

This PR is so big! Please, split it 😊

Copy link

This PR is so big! Please, split it 😊

Copy link

This PR is so big! Please, split it 😊

Copy link

This PR is so big! Please, split it 😊

Copy link

This PR is so big! Please, split it 😊

Copy link

This PR is so big! Please, split it 😊

Copy link

This PR is so big! Please, split it 😊

Copy link

This PR is so big! Please, split it 😊

@zombieobject
Copy link

This PR is so big! Please, split it 😊

This action is quite assertive and tenacious! 🤣

@neekolas
Copy link
Author

@zombieobject I feel so shamed by it

@zombieobject
Copy link

@zombieobject I feel so shamed by it

I called it out in my prior PR and demanded a badge for a life achievement unlocked.

Copy link

@zombieobject zombieobject left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you kindly for the assist! 🫶🏼

@neekolas neekolas merged commit 4eee1fc into main Mar 20, 2024
51 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

10 participants