mirror of
https://git.anonymousland.org/anonymousland/synapse-product.git
synced 2024-09-08 07:12:04 +00:00
Merge pull request #6185 from matrix-org/erikj/fix_censored_evnets
Fix inserting bytes as text in `censor_redactions`
This commit is contained in:
commit
def5413480
1
changelog.d/6185.bugfix
Normal file
1
changelog.d/6185.bugfix
Normal file
@ -0,0 +1 @@
|
|||||||
|
Fix bug where redacted events were sometimes incorrectly censored in the database, breaking APIs that attempted to fetch such events.
|
@ -23,7 +23,7 @@ from functools import wraps
|
|||||||
from six import iteritems, text_type
|
from six import iteritems, text_type
|
||||||
from six.moves import range
|
from six.moves import range
|
||||||
|
|
||||||
from canonicaljson import encode_canonical_json, json
|
from canonicaljson import json
|
||||||
from prometheus_client import Counter, Histogram
|
from prometheus_client import Counter, Histogram
|
||||||
|
|
||||||
from twisted.internet import defer
|
from twisted.internet import defer
|
||||||
@ -1632,9 +1632,7 @@ class EventsStore(
|
|||||||
and original_event.internal_metadata.is_redacted()
|
and original_event.internal_metadata.is_redacted()
|
||||||
):
|
):
|
||||||
# Redaction was allowed
|
# Redaction was allowed
|
||||||
pruned_json = encode_canonical_json(
|
pruned_json = encode_json(prune_event_dict(original_event.get_dict()))
|
||||||
prune_event_dict(original_event.get_dict())
|
|
||||||
)
|
|
||||||
else:
|
else:
|
||||||
# Redaction wasn't allowed
|
# Redaction wasn't allowed
|
||||||
pruned_json = None
|
pruned_json = None
|
||||||
|
@ -0,0 +1,26 @@
|
|||||||
|
/* 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.
|
||||||
|
*/
|
||||||
|
|
||||||
|
|
||||||
|
-- There was a bug where we may have updated censored redactions as bytes,
|
||||||
|
-- which can (somehow) cause json to be inserted hex encoded. This goes and
|
||||||
|
-- undoes any such hex encoded JSON.
|
||||||
|
UPDATE event_json SET json = convert_from(json::bytea, 'utf8')
|
||||||
|
WHERE event_id IN (
|
||||||
|
SELECT event_json.event_id
|
||||||
|
FROM event_json
|
||||||
|
INNER JOIN redactions ON (event_json.event_id = redacts)
|
||||||
|
WHERE have_censored AND json NOT LIKE '{%'
|
||||||
|
);
|
Loading…
Reference in New Issue
Block a user