Make password reset email field case insensitive

pull/1170/head
David Baker 2016-10-14 13:56:53 +01:00
parent 0061e8744f
commit 62073992c5
2 changed files with 36 additions and 10 deletions

View File

@ -458,17 +458,27 @@ class RegistrationStore(background_updates.BackgroundUpdateStore):
@defer.inlineCallbacks @defer.inlineCallbacks
def get_user_id_by_threepid(self, medium, address): def get_user_id_by_threepid(self, medium, address):
ret = yield self._simple_select_one( def f(txn):
"user_threepids", sql = (
{ "SELECT user_id"
"medium": medium, " FROM user_threepids"
"address": address " WHERE medium = ? AND LOWER(address) = LOWER(?)"
},
['user_id'], True, 'get_user_id_by_threepid'
) )
if ret: txn.execute(sql, (medium, address))
defer.returnValue(ret['user_id']) row = txn.fetchone()
defer.returnValue(None) if not row:
return None
if txn.rowcount > 1:
raise StoreError(500, "More than one row matched")
return {
"user_id": row[0]
}
res = yield self.runInteraction(
"get_user_id_by_threepid", f
)
defer.returnValue(res)
def user_delete_threepids(self, user_id): def user_delete_threepids(self, user_id):
return self._simple_delete( return self._simple_delete(

View File

@ -0,0 +1,16 @@
/* 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.
*/
CREATE INDEX user_threepids_medium_address on user_threepids (medium, LOWER(address));