suzanne.soy/fork-openpgpjs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #505 from openpgpjs/user_id_formatting

Browse Source 
don't allow leading spaces when generating userid
This commit is contained in:
Bart Butler 2016-12-15 14:15:57 -08:00 committed by GitHub
commit 5ffb532f9e
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/openpgp.js
View File

@ -391,7 +391,11 @@ function formatUserIds(options) {
if (!util.isString(id.name) || (id.email && !util.isEmailAddress(id.email))) { if (!util.isString(id.name) || (id.email && !util.isEmailAddress(id.email))) {
throw new Error('Invalid user id format'); throw new Error('Invalid user id format');
} }
return id.name + ' <' + id.email + '>'; id.name = id.name.trim();
if (id.name.length > 0) {
id.name += ' ';
}
return id.name + '<' + id.email + '>';
}); });
return options; return options;
} }

2
src/util.js
View File

@ -51,7 +51,7 @@ export default {
if (!this.isString(data)) { if (!this.isString(data)) {
return false; return false;
} }
return / </.test(data) && />$/.test(data); return /</.test(data) && />$/.test(data);
}, },
/** /**