simonvareille/keyserver
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Allow lookup only by key ids with at least 16 chars

Browse Source
This commit is contained in:
Tankred Hase
2016-06-07 16:22:17 +02:00
parent f54b86f79a
commit bdde8e44d5
4 changed files with 32 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/route/hkp.js
View File

@@ -80,7 +80,7 @@ class HKP {
if (['get','index','vindex'].indexOf(params.op) === -1) {
ctx.throw(501, 'Not implemented!');
} else if (!params.keyid && !params.email) {
ctx.throw(400, 'Invalid request!');
ctx.throw(501, 'Not implemented!');
}
return params;
@@ -88,7 +88,7 @@ class HKP {
/**
* Checks for a valid key id in the query string. A key must be prepended
* with '0x' and can be between 8 and 40 hex characters long.
* with '0x' and can be between 16 and 40 hex characters long.
* @param {String} keyid The key id
* @return {Boolean} If the key id is valid
*/
@@ -96,7 +96,7 @@ class HKP {
if (!util.isString(keyid)) {
return false;
}
return /^0x[a-fA-F0-9]{8,40}$/.test(keyid);
return /^0x[a-fA-F0-9]{16,40}$/.test(keyid);
}
/**

4
src/service/util.js
View File

@@ -42,7 +42,7 @@ exports.isTrue = function(data) {
};
/**
* Checks for a valid key id which is between 8 and 40 hex chars.
* Checks for a valid key id which is between 16 and 40 hex chars.
* @param {string} data The key id
* @return {boolean} If the key id if valid
*/
@@ -50,7 +50,7 @@ exports.validateKeyId = function(data) {
if (!this.isString(data)) {
return false;
}
return /^[a-fA-F0-9]{8,40}$/.test(data);
return /^[a-fA-F0-9]{16,40}$/.test(data);
};
/**