infra
/
cryptpad
2
1
Fork 0
Code Issues Pull Requests Projects Releases 1 Activity

Fix custom limit not applied when using a raw edPublic

pull/1/head
yflory 2020-10-07 16:31:49 +02:00 committed by ansuz
parent 145386e944
commit 51e1b9b043
1 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
lib/commands/quota.js
View File

@ -37,13 +37,24 @@ Quota.applyCustomLimits = function (Env) {
var limits = {};
Object.keys(custom).forEach(function (k) {
var user;
try {
user = Keys.parseUser(k);
} catch (err) {
return void Env.Log.error("PARSE_CUSTOM_LIMIT_BLOCK", {
user: k,
error: err.message,
});
// XXX this length (44) is also hardcoded in decrees.js
// before calling Keys.parseUser.
// Maybe we should improve Keys.parseUser to handle this
// option directly
if (k.length === 44) {
user = {
pubkey: Util.unescapeKeyCharacters(k)
}
} else {
try {
user = Keys.parseUser(k);
} catch (err) {
return void Env.Log.error("PARSE_CUSTOM_LIMIT_BLOCK", {
user: k,
error: err.message,
});
}
}
var unsafeKey = user.pubkey;