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

Fix armor error handling (#1541)

Browse Source 
Fix unhandled promise rejections when parsing armor with malformed footers.
This commit is contained in:
Daniel Huigens 2022-06-29 20:09:30 +02:00 committed by GitHub
parent 449ec3a367
commit e69d8b24fc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
package-lock.json generated
View File

@ -267,9 +267,9 @@
"dev": true
},
"@openpgp/web-stream-tools": {
"version": "0.0.10",
"resolved": "https://registry.npmjs.org/@openpgp/web-stream-tools/-/web-stream-tools-0.0.10.tgz",
"integrity": "sha512-1ONZADML0fb0RJR5UiGYPnRf9VaYBYUBc1gF9jyq57sHkr58cp5/BQHS+ivrqbRw21Sb70FKTssmJbRe71V+kw==",
"version": "0.0.11",
"resolved": "https://registry.npmjs.org/@openpgp/web-stream-tools/-/web-stream-tools-0.0.11.tgz",
"integrity": "sha512-52NMPRmlXIVajd5dhpDNsG7WJRCdlcS1wXY03OGH1rxm7p6i3QzJvTVyKEAcW0T9KojvLKakV2uTICceELqSMw==",
"dev": true,
"requires": {
"@mattiasbuelens/web-streams-adapter": "~0.1.0",

2
package.json
View File

@ -59,7 +59,7 @@
"@openpgp/pako": "^1.0.12",
"@openpgp/seek-bzip": "^1.0.5-git",
"@openpgp/tweetnacl": "^1.0.3",
"@openpgp/web-stream-tools": "^0.0.10",
"@openpgp/web-stream-tools": "^0.0.11",
"@rollup/plugin-commonjs": "^11.1.0",
"@rollup/plugin-node-resolve": "^7.1.3",
"@rollup/plugin-replace": "^2.3.2",

11
test/general/armor.js
View File

@ -119,6 +119,17 @@ module.exports = () => describe('ASCII armor', function() {
}));
});
it('Exception if improperly formatted armor footer', async function () {
await expect(openpgp.readCleartextMessage({ cleartextMessage: [
'-----BEGIN PGP SIGNED MESSAGE-----',
'Hash: SHA256',
'',
'-----BEGIN PGP SIGNATURE-----',
'',
'-----OOPS'
].join('\n') })).to.be.rejectedWith(Error, /Misformed armored text/);
});
it('Ignore unknown armor header - signature section', async function () {
const validHeaders = ['Version: BCPG C# v1.7.4114.6375', 'Independent Reserve Pty. Ltd. 2017: 1.0.0.0'];
expect(await openpgp.readCleartextMessage({ cleartextMessage: getArmor(['Hash: SHA1'], validHeaders) })).to.be.an.instanceof(openpgp.CleartextMessage);