Matrix-Mirrors/forked-synapse
1
0
Fork 0
mirror of https://mau.dev/maunium/synapse.git synced 2024-07-17 08:32:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'rav/null_default_device_displayname' into develop

Browse Source
This commit is contained in:
Richard van der Hoff 2016-08-03 14:30:32 +01:00
commit 530bc862dc
4 changed files with 23 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
synapse/handlers/device.py
View File

@ -29,7 +29,7 @@ class DeviceHandler(BaseHandler):
@defer.inlineCallbacks @defer.inlineCallbacks
def check_device_registered(self, user_id, device_id, def check_device_registered(self, user_id, device_id,
initial_device_display_name): initial_device_display_name=None):
""" """
If the given device has not been registered, register it with the If the given device has not been registered, register it with the
supplied display name. supplied display name.

4
synapse/rest/client/v2_alpha/keys.py
View File

@ -130,9 +130,7 @@ class KeyUploadServlet(RestServlet):
# old access_token without an associated device_id. Either way, we # old access_token without an associated device_id. Either way, we
# need to double-check the device is registered to avoid ending up with # need to double-check the device is registered to avoid ending up with
# keys without a corresponding device. # keys without a corresponding device.
self.device_handler.check_device_registered( self.device_handler.check_device_registered(user_id, device_id)
user_id, device_id, "unknown device"
)
result = yield self.store.count_e2e_one_time_keys(user_id, device_id) result = yield self.store.count_e2e_one_time_keys(user_id, device_id)
defer.returnValue((200, {"one_time_key_counts": result})) defer.returnValue((200, {"one_time_key_counts": result}))

2
synapse/storage/schema/delta/33/devices_for_e2e_keys.sql
View File

@ -16,4 +16,4 @@
-- make sure that we have a device record for each set of E2E keys, so that the -- make sure that we have a device record for each set of E2E keys, so that the
-- user can delete them if they like. -- user can delete them if they like.
INSERT INTO devices INSERT INTO devices
SELECT user_id, device_id, 'unknown device' FROM e2e_device_keys_json; SELECT user_id, device_id, NULL FROM e2e_device_keys_json;

20
synapse/storage/schema/delta/33/devices_for_e2e_keys_clear_unknown_device.sql Normal file
View File

@ -0,0 +1,20 @@
/* Copyright 2016 OpenMarket Ltd
*
* 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.
*/
-- a previous version of the "devices_for_e2e_keys" delta set all the device
-- names to "unknown device". This wasn't terribly helpful
UPDATE devices
SET display_name = NULL
WHERE display_name = 'unknown device';