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.

Sign up for GitHub

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

Jump to bottom

FS-1901: Missing bits for mixed protocol state #3303

Merged
merged 26 commits into from
May 22, 2023
Merged

FS-1901: Missing bits for mixed protocol state #3303

merged 26 commits into from
May 22, 2023
+674 −384

Conversation

smatting
Copy link
Contributor

@smatting smatting commented May 17, 2023 •
edited by pcapriotti
Loading

  • Do not perform client checks for add and remove proposals in mixed conversations
  • Restrict protocol updates to team conversations
  • Disallow MLS application messages in mixed conversations
  • Send remove proposals when users leave mixed conversations
  • More integration tests

https://wearezeta.atlassian.net/browse/FS-1901

Checklist

  • Add a new entry in an appropriate subdirectory of changelog.d
  • Read and follow the PR guidelines

@zebot zebot added the ok-to-test Approved for running tests in CI, overrides not-ok-to-test if both labels exist label May 17, 2023
smatting and others added 21 commits May 19, 2023 13:57
@smatting @pcapriotti
migrate test that adds user via mls
9534a45
@smatting @pcapriotti
mls-test-cli: make show use json
686e036
@smatting @pcapriotti
testlib: assertOne, asByteString
b9b5622
@smatting @pcapriotti
Add test: user leaves -> remove proposal
32ae290
@smatting @pcapriotti
wip test: adding partial client set to mixed
05c85dc
@smatting @pcapriotti
migrate test testAddUserPartial
e54250a
@smatting @pcapriotti
make test fail
b472a1a
@smatting @pcapriotti
wip
f499f73
@smatting @pcapriotti
Use new test parametrization
d018cce
@smatting @pcapriotti
asInt -> asIntegral
8db529e
@smatting @pcapriotti
migrate testRemoveClientsIncomplete
078cdbf
@smatting @pcapriotti
Add HasCallStack to getJSON
fb9d523
@smatting @pcapriotti
Add test for removing partial clients
dc709bc
@smatting @pcapriotti
Refactor: use fields
878a164
@smatting @pcapriotti
integration: rename functions and improve errors
3d35472
@smatting @pcapriotti
Add test: remote backend doesnt know about about mixed protocol convs
2f725fc
@smatting @pcapriotti
Deny application msgs for mixed (with test)
2710b13
@smatting @pcapriotti
fix mixed remote test
1dd72db
@smatting @pcapriotti
Add testFirstCommitAllowsPartialAdds
b883da1
@pcapriotti
fixup! Add testFirstCommitAllowsPartialAdds
5ec16ec
@pcapriotti
Only allow protocol updates for team conversations
9f2cc8b
@pcapriotti pcapriotti marked this pull request as ready for review May 19, 2023 15:02
@smatting smatting mentioned this pull request May 22, 2023
Closed
@pcapriotti pcapriotti merged commit 5f274a6 into mls May 22, 2023
@pcapriotti pcapriotti deleted the FS-1901 branch May 22, 2023 15:09
This was referenced Oct 19, 2023
Closed
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
ok-to-test Approved for running tests in CI, overrides not-ok-to-test if both labels exist
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@smatting @pcapriotti @zebot