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

fix(e2ei): skip upload of MLSPublicKeys for existing clients #5880

Closed
wants to merge 1 commit into from
Closed

fix(e2ei): skip upload of MLSPublicKeys for existing clients #5880

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions packages/core/src/messagingProtocols/mls/MLSService/MLSService.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -812,9 +812,12 @@ export class MLSService extends TypedEventEmitter<Events> {

if (rotateBundle !== undefined) {
// upload the clients public keys
if (!hasActiveCertificate) {
// we only upload public keys for the initial certification process. Renewals do not need to upload new public keys
await this.uploadMLSPublicKeys(client);
// We only upload public keys for the initial certification process AND if they dont exist already.
if (typeof client.mls_public_keys.ed25519 !== 'string' || client.mls_public_keys.ed25519.length === 0) {
Copy link
Contributor

Choose a reason for hiding this comment

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

I think we have a util somewhere that does exactly that 🤔 Isn't it?

// Renewals do not need to upload new public keys
if (!hasActiveCertificate) {
Comment on lines +816 to +818
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
if (typeof client.mls_public_keys.ed25519 !== 'string' || client.mls_public_keys.ed25519.length === 0) {
// Renewals do not need to upload new public keys
if (!hasActiveCertificate) {
if ((typeof client.mls_public_keys.ed25519 !== 'string' || client.mls_public_keys.ed25519.length === 0) && !hasActiveCertificate) {

Can't be like that ?

await this.uploadMLSPublicKeys(client);
}
}
// Remove old key packages
await this.deleteMLSKeyPackages(client.id, rotateBundle.keyPackageRefsToRemove);
Expand Down
Loading