matrix/matrix-js-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-js-sdk.git synced 2025-11-26 17:03:12 +03:00
Code Activity

Do 3pid lookups in lowercase

Browse Source 
Fixes https://github.com/vector-im/riot-web/issues/10754
This commit is contained in:
Travis Ralston
2019-09-07 14:04:30 -06:00
parent 2f8cc75432
commit 0bbc781d0c
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/base-apis.js
View File

@@ -1916,15 +1916,23 @@ MatrixBaseApis.prototype.identityHashedLookup = async function(
// Abuse the olm hashing // Abuse the olm hashing
const olmutil = new global.Olm.Utility(); const olmutil = new global.Olm.Utility();
params["addresses"] = addressPairs.map(p => { params["addresses"] = addressPairs.map(p => {
const hashed = olmutil.sha256(`${p[0]} ${p[1]} ${params['pepper']}`) const addr = p[0].toLowerCase(); // lowercase to get consistent hashes
const med = p[1].toLowerCase();
const hashed = olmutil.sha256(`${addr} ${med} ${params['pepper']}`)
.replace(/\+/g, '-').replace(/\//g, '_'); // URL-safe base64 .replace(/\+/g, '-').replace(/\//g, '_'); // URL-safe base64
// Map the hash to a known (case-sensitive) address. We use the case
// sensitive version because the caller might be expecting that.
localMapping[hashed] = p[0]; localMapping[hashed] = p[0];
return hashed; return hashed;
}); });
params["algorithm"] = "sha256"; params["algorithm"] = "sha256";
} else if (hashes['algorithms'].includes('none')) { } else if (hashes['algorithms'].includes('none')) {
params["addresses"] = addressPairs.map(p => { params["addresses"] = addressPairs.map(p => {
const unhashed = `${p[0]} ${p[1]}`; const addr = p[0].toLowerCase(); // lowercase to get consistent hashes
const med = p[1].toLowerCase();
const unhashed = `${addr} ${med}`;
// Map the ""hash"" to a known (case-sensitive) address. We use the case
// sensitive version because the caller might be expecting that.
localMapping[unhashed] = p[0]; localMapping[unhashed] = p[0];
return unhashed; return unhashed;
}); });