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

Do not include checksum values in error messages when armor integrity check fails (#1428)

Browse Source
This commit is contained in:
larabr 2021-10-21 16:14:46 +02:00 committed by GitHub
parent 88b1380a54
commit cfeef41d61
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/encoding/armor.js
View File

@ -328,8 +328,7 @@ export function unarmor(input, config = defaultConfig) {
try { try {
const checksumVerifiedString = (await checksumVerified).replace('\n', ''); const checksumVerifiedString = (await checksumVerified).replace('\n', '');
if (checksum !== checksumVerifiedString && (checksum || config.checksumRequired)) { if (checksum !== checksumVerifiedString && (checksum || config.checksumRequired)) {
throw new Error("Ascii armor integrity check on message failed: '" + checksum + "' should be '" + throw new Error('Ascii armor integrity check failed');
checksumVerifiedString + "'");
} }
await writer.ready; await writer.ready;
await writer.close(); await writer.close();

12
test/general/armor.js
View File

@ -170,11 +170,11 @@ module.exports = () => describe('ASCII armor', function() {
].join('\n'); ].join('\n');
// try with default config // try with default config
await expect(openpgp.readKey({ armoredKey: privKey })).to.be.rejectedWith(/Ascii armor integrity check on message failed/); await expect(openpgp.readKey({ armoredKey: privKey })).to.be.rejectedWith(/Ascii armor integrity check failed/);
// try opposite config // try opposite config
openpgp.config.checksumRequired = !openpgp.config.checksumRequired; openpgp.config.checksumRequired = !openpgp.config.checksumRequired;
await expect(openpgp.readKey({ armoredKey: privKey })).to.be.rejectedWith(/Ascii armor integrity check on message failed/); await expect(openpgp.readKey({ armoredKey: privKey })).to.be.rejectedWith(/Ascii armor integrity check failed/);
// back to default // back to default
openpgp.config.checksumRequired = !openpgp.config.checksumRequired; openpgp.config.checksumRequired = !openpgp.config.checksumRequired;
@ -234,7 +234,7 @@ module.exports = () => describe('ASCII armor', function() {
// try with default config // try with default config
if (openpgp.config.checksumRequired) { if (openpgp.config.checksumRequired) {
await expect(openpgp.readKey({ armoredKey: privKeyNoCheckSum })).to.be.rejectedWith(/Ascii armor integrity check on message failed/); await expect(openpgp.readKey({ armoredKey: privKeyNoCheckSum })).to.be.rejectedWith(/Ascii armor integrity check failed/);
} else { } else {
await openpgp.readKey({ armoredKey: privKeyNoCheckSum }); await openpgp.readKey({ armoredKey: privKeyNoCheckSum });
} }
@ -242,7 +242,7 @@ module.exports = () => describe('ASCII armor', function() {
// try opposite config // try opposite config
openpgp.config.checksumRequired = !openpgp.config.checksumRequired; openpgp.config.checksumRequired = !openpgp.config.checksumRequired;
if (openpgp.config.checksumRequired) { if (openpgp.config.checksumRequired) {
await expect(openpgp.readKey({ armoredKey: privKeyNoCheckSum })).to.be.rejectedWith(/Ascii armor integrity check on message failed/); await expect(openpgp.readKey({ armoredKey: privKeyNoCheckSum })).to.be.rejectedWith(/Ascii armor integrity check failed/);
} else { } else {
await openpgp.readKey({ armoredKey: privKeyNoCheckSum }); await openpgp.readKey({ armoredKey: privKeyNoCheckSum });
} }
@ -274,7 +274,7 @@ module.exports = () => describe('ASCII armor', function() {
// try with default config // try with default config
if (openpgp.config.checksumRequired) { if (openpgp.config.checksumRequired) {
await expect(openpgp.readKey({ armoredKey: privKeyNoCheckSumWithTrailingNewline })).to.be.rejectedWith(/Ascii armor integrity check on message failed/); await expect(openpgp.readKey({ armoredKey: privKeyNoCheckSumWithTrailingNewline })).to.be.rejectedWith(/Ascii armor integrity check failed/);
} else { } else {
await openpgp.readKey({ armoredKey: privKeyNoCheckSumWithTrailingNewline }); await openpgp.readKey({ armoredKey: privKeyNoCheckSumWithTrailingNewline });
} }
@ -282,7 +282,7 @@ module.exports = () => describe('ASCII armor', function() {
// try opposite config // try opposite config
openpgp.config.checksumRequired = !openpgp.config.checksumRequired; openpgp.config.checksumRequired = !openpgp.config.checksumRequired;
if (openpgp.config.checksumRequired) { if (openpgp.config.checksumRequired) {
await expect(openpgp.readKey({ armoredKey: privKeyNoCheckSumWithTrailingNewline })).to.be.rejectedWith(/Ascii armor integrity check on message failed/); await expect(openpgp.readKey({ armoredKey: privKeyNoCheckSumWithTrailingNewline })).to.be.rejectedWith(/Ascii armor integrity check failed/);
} else { } else {
await openpgp.readKey({ armoredKey: privKeyNoCheckSumWithTrailingNewline }); await openpgp.readKey({ armoredKey: privKeyNoCheckSumWithTrailingNewline });
} }

4
test/general/openpgp.js
View File

@ -2795,7 +2795,7 @@ aOU=
stepReached = 2; stepReached = 2;
await stream.readToEnd(decrypted); await stream.readToEnd(decrypted);
} catch (e) { } catch (e) {
expect(e.message).to.match(/Ascii armor integrity check on message failed/); expect(e.message).to.match(/Ascii armor integrity check failed/);
expect(stepReached).to.equal( expect(stepReached).to.equal(
j === 0 ? 0 : j === 0 ? 0 :
(openpgp.config.aeadChunkSizeByte === 0 && (j === 2 || util.detectNode() || util.getHardwareConcurrency() < 8)) || (!openpgp.config.aeadProtect && openpgp.config.allowUnauthenticatedStream) ? 2 : (openpgp.config.aeadChunkSizeByte === 0 && (j === 2 || util.detectNode() || util.getHardwareConcurrency() < 8)) || (!openpgp.config.aeadProtect && openpgp.config.allowUnauthenticatedStream) ? 2 :
@ -2803,7 +2803,7 @@ aOU=
); );
return; return;
} }
throw new Error(`Expected "Ascii armor integrity check on message failed" error in subtest ${i}.${j}`); throw new Error(`Expected "Ascii armor integrity check failed" error in subtest ${i}.${j}`);
})); }));
})); }));
} }

6
test/general/streaming.js
View File

@ -479,7 +479,7 @@ function tests() {
const reader = stream.getReader(decrypted.data); const reader = stream.getReader(decrypted.data);
expect(await reader.peekBytes(1024)).not.to.deep.equal(plaintext[0]); expect(await reader.peekBytes(1024)).not.to.deep.equal(plaintext[0]);
dataArrived(); dataArrived();
await expect(reader.readToEnd()).to.be.rejectedWith('Ascii armor integrity check on message failed'); await expect(reader.readToEnd()).to.be.rejectedWith('Ascii armor integrity check failed');
expect(decrypted.signatures).to.exist.and.have.length(1); expect(decrypted.signatures).to.exist.and.have.length(1);
} finally { } finally {
openpgp.config.allowUnauthenticatedStream = allowUnauthenticatedStreamValue; openpgp.config.allowUnauthenticatedStream = allowUnauthenticatedStreamValue;
@ -515,7 +515,7 @@ function tests() {
const reader = stream.getReader(decrypted.data); const reader = stream.getReader(decrypted.data);
expect(await reader.peekBytes(1024)).not.to.deep.equal(plaintext[0]); expect(await reader.peekBytes(1024)).not.to.deep.equal(plaintext[0]);
dataArrived(); dataArrived();
await expect(reader.readToEnd()).to.be.rejectedWith('Ascii armor integrity check on message failed'); await expect(reader.readToEnd()).to.be.rejectedWith('Ascii armor integrity check failed');
expect(decrypted.signatures).to.exist.and.have.length(1); expect(decrypted.signatures).to.exist.and.have.length(1);
await expect(decrypted.signatures[0].verified).to.be.eventually.rejectedWith(/Could not find signing key/); await expect(decrypted.signatures[0].verified).to.be.eventually.rejectedWith(/Could not find signing key/);
} finally { } finally {
@ -549,7 +549,7 @@ function tests() {
const reader = stream.getReader(verified.data); const reader = stream.getReader(verified.data);
expect(await reader.peekBytes(1024)).not.to.deep.equal(plaintext[0]); expect(await reader.peekBytes(1024)).not.to.deep.equal(plaintext[0]);
dataArrived(); dataArrived();
await expect(reader.readToEnd()).to.be.rejectedWith('Ascii armor integrity check on message failed'); await expect(reader.readToEnd()).to.be.rejectedWith('Ascii armor integrity check failed');
expect(verified.signatures).to.exist.and.have.length(1); expect(verified.signatures).to.exist.and.have.length(1);
}); });