Skip to content
This repository has been archived by the owner on Apr 26, 2024. It is now read-only.

make cross signing signature index non-unique #6451

Merged
merged 3 commits into from
Dec 4, 2019
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
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
1 change: 1 addition & 0 deletions changelog.d/6451.bugfix
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Change the index on the `e2e_cross_signing_signatures` table to be non-unique.
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
Change the index on the `e2e_cross_signing_signatures` table to be non-unique.
Fix uploading multiple cross signing signatures for the same user.

Or something. Broadly the changelogs are aimed at admins of servers rather than synapse devs, so should talk about the changes in terms of impact to them.

Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ CREATE TABLE IF NOT EXISTS e2e_cross_signing_signatures (
signature TEXT NOT NULL
);

CREATE UNIQUE INDEX e2e_cross_signing_signatures_idx ON e2e_cross_signing_signatures(user_id, target_user_id, target_device_id);
CREATE INDEX e2e_cross_signing_signatures2_idx ON e2e_cross_signing_signatures(user_id, target_user_id, target_device_id);
Copy link
Member

Choose a reason for hiding this comment

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

I'd either a) comment this out and add a note that this got replaced or b) just leave it and rely on it being cleaned up correctly


-- stream of user signature updates
CREATE TABLE IF NOT EXISTS user_signature_stream (
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
/* Copyright 2019 The Matrix.org Foundation C.I.C.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

/* The cross-signing signatures index should not be a unique index, because a
* user may upload multiple signatures for the same target user. The previous
* index was unique, so delete it if it's there and create a new non-unique
* index. */

DROP INDEX IF EXISTS e2e_cross_signing_signatures_idx; CREATE INDEX IF NOT
EXISTS e2e_cross_signing_signatures2_idx ON e2e_cross_signing_signatures(user_id, target_user_id, target_device_id);