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

Reject signatures[*].verified and signatures[*].signature on read errors

Browse Source 
However, don't throw "unhandled promise rejection" when not using these
properties at all, or when they reject before the user has a chance to
handle them.
This commit is contained in:
Daniel Huigens 2018-10-29 11:40:36 +01:00
parent c3419e5cd0
commit 9c82bf491e
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/message.js
View File

@ -549,8 +549,9 @@ Message.prototype.verify = async function(keys, date=new Date(), streaming) {
const signatureList = msg.packets.filterByTag(enums.packet.signature);
if (onePassSigList.length && !signatureList.length && msg.packets.stream) {
onePassSigList.forEach(onePassSig => {
onePassSig.correspondingSig = new Promise(resolve => {
onePassSig.correspondingSig = new Promise((resolve, reject) => {
onePassSig.correspondingSigResolve = resolve;
onePassSig.correspondingSigReject = reject;
});
onePassSig.signatureData = stream.fromAsync(async () => (await onePassSig.correspondingSig).signatureData);
onePassSig.hashed = onePassSig.hash(literalDataList[0], undefined, streaming);
@ -568,10 +569,7 @@ Message.prototype.verify = async function(keys, date=new Date(), streaming) {
await writer.close();
} catch(e) {
onePassSigList.forEach(onePassSig => {
onePassSig.correspondingSigResolve({
tag: enums.packet.signature,
verify: () => undefined
});
onePassSig.correspondingSigReject(e);
});
await writer.abort(e);
}
@ -631,6 +629,13 @@ async function createVerificationObject(signature, literalDataList, keys, date=n
return new Signature(packetlist);
});
// Mark potential promise rejections as "handled". This is needed because in
// some cases, we reject them before the user has a reasonable chance to
// handle them (e.g. `await readToEnd(result.data); await result.verified` and
// the data stream errors).
verifiedSig.signature.catch(() => {});
verifiedSig.verified.catch(() => {});
return verifiedSig;
}

2
test/general/streaming.js
View File

@ -534,7 +534,7 @@ function tests() {
await openpgp.stream.cancel(verified.data, new Error('canceled by test'));
expect(canceled).to.be.true;
expect(verified.signatures).to.exist.and.have.length(1);
expect(await verified.signatures[0].verified).to.be.undefined;
await expect(verified.signatures[0].verified).to.be.rejectedWith('canceled');
} finally {
openpgp.config.aead_protect = aead_protectValue;
openpgp.config.aead_chunk_size_byte = aead_chunk_size_byteValue;