Throw on decryption of messages that don't contain any encrypted data packet (#1529)
Calling `openpgp.decrypt` with a message that contains encrypted session keys followed by a non-encrypted packet (e.g. Literal or Compressed Data packet) used to succeed, even if a wrong passphrase/key was provided. With this change, the operation will always fail, and the user is warned that the data was not encrypted. NB: a message that did not contain any encrypted session key packet would fail to decrypt even prior to this change.
This commit is contained in:
larabr
GitHub
parent
ef066183dd
commit
6c32b62ef3
|
|
@ -116,7 +116,7 @@ export class Message {
|
||||||
);
|
);
|
||||||
|
|
||||||
if (symEncryptedPacketlist.length === 0) {
|
if (symEncryptedPacketlist.length === 0) {
|
||||||
return this;
|
throw new Error('No encrypted data found');
|
||||||
}
|
}
|
||||||
|
|
||||||
const symEncryptedPacket = symEncryptedPacketlist[0];
|
const symEncryptedPacket = symEncryptedPacketlist[0];
|
||||||
|
|
|
||||||
|
|
@ -3825,6 +3825,128 @@ amnR6g==
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
|
it('should fail to decrypt a message containing a literal packet (and no session key)', async function() {
|
||||||
|
const message = await openpgp.createMessage({ text: 'plaintext' });
|
||||||
|
await expect(openpgp.decrypt({ message, passwords: 'password' })).to.be.rejectedWith(/Error decrypting message/);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should fail to decrypt a message containing a literal packet (and a session key)', async function() {
|
||||||
|
const skeskPlusLiteralData = `-----BEGIN PGP MESSAGE-----
|
||||||
|
|
||||||
|
wy4ECQMIjvrInhvTxJwAbkqXp+KWFdBcjoPn03jCdyspVi9qXBDbyGaP1lrM
|
||||||
|
habAyxd1AGKaNp1wbGFpbnRleHQgbWVzc2FnZQ==
|
||||||
|
=XoUx
|
||||||
|
-----END PGP MESSAGE-----
|
||||||
|
`;
|
||||||
|
|
||||||
|
const message = await openpgp.readMessage({ armoredMessage: skeskPlusLiteralData });
|
||||||
|
await expect(openpgp.decrypt({ message, passwords: 'password' })).to.be.rejectedWith(/No encrypted data found/);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should fail to decrypt non-integrity-protected message by default', async function() {
|
||||||
|
const key = await openpgp.readKey({
|
||||||
|
armoredKey: `-----BEGIN PGP PRIVATE KEY BLOCK-----
|
||||||
|
|
||||||
|
xVgEYD9r8xYJKwYBBAHaRw8BAQdApTaQJ6R/uooTqAuscoxYwbLrtoKndnsX
|
||||||
|
ydhqMybJqh0AAQCxNwi9Pezy03OQE0XOooBWaHiuhBtKA1eAuqjJFuuLuQ/+
|
||||||
|
zQDCjAQQFgoAHQUCYD9r8wQLCQcIAxUICgQWAgEAAhkBAhsDAh4BACEJEIkB
|
||||||
|
BTiDwpvwFiEEvRnmOby6fJ/OxUhSiQEFOIPCm/BidgEAq05ZiPseRsMTxNm7
|
||||||
|
IFQwQjmIFiWgLeQ0gKIvfl3SjBAA/iSPyTgWxSY98utXNuq+WoxVOzx3dJwG
|
||||||
|
2cflR/UFUlEPx10EYD9r8xIKKwYBBAGXVQEFAQEHQCASw+tMPvnXi904WASv
|
||||||
|
wRDUQofh0M7CpgQFqoOXvGlLAwEIBwAA/3gEimwdIet0gXb/hRRyBqOlcq32
|
||||||
|
lNREh+n+vZKJyXWYEjrCeAQYFggACQUCYD9r8wIbDAAhCRCJAQU4g8Kb8BYh
|
||||||
|
BL0Z5jm8unyfzsVIUokBBTiDwpvwHpEBAObHllPrJu0DqYyt4FKPkijgRpXC
|
||||||
|
ESqhlK5rrbc62SmfAQDVf5l1B6IDASBCKtC0VPPpYiK6AUcEISpaSXOa+pNI
|
||||||
|
Bw==
|
||||||
|
=3Fja
|
||||||
|
-----END PGP PRIVATE KEY BLOCK-----`
|
||||||
|
});
|
||||||
|
const message = await openpgp.readMessage({
|
||||||
|
armoredMessage: `-----BEGIN PGP MESSAGE-----
|
||||||
|
|
||||||
|
wV4D+3VwOibHmagSAQdATlMJlvrkaq46zMkbIuKBOJO5X3ugVwZpEyAterQC
|
||||||
|
/RUw0OPWeO+4swh/U7ZurV8cRr/fPnyGUUKI7rI+va3kWUZv4RRpUs7eYE57
|
||||||
|
OUr3yoMNyaQEBwu6VXiQrsBN8TyUbXQxb63p7EHFXIgvVDIvOG7bQptrrKlM
|
||||||
|
kKcB+fz5hb6mT/tl+cPcYHDOjocQ92pNVm+FilQhiATRxV8ah1DCOIZZ6tgq
|
||||||
|
rWwIiEQEBPt+tXOuVF4Peumovp3WgziudrJa5Jxt2Dz+8nicBglbZLXTsZNu
|
||||||
|
bsZgJWVlAa5eil6J9ePX2xbo1vVAkLQdzE9+1jL+l7PRIZuVBQ==
|
||||||
|
=T4iR
|
||||||
|
-----END PGP MESSAGE-----`
|
||||||
|
});
|
||||||
|
await expect(
|
||||||
|
openpgp.decrypt({ message, decryptionKeys: key, verificationKeys: key })
|
||||||
|
).to.be.rejectedWith('Error decrypting message: Message is not authenticated.');
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should allow decrypting non-integrity-protected message when enabled', async function() {
|
||||||
|
const key = await openpgp.readKey({
|
||||||
|
armoredKey: `-----BEGIN PGP PRIVATE KEY BLOCK-----
|
||||||
|
|
||||||
|
xVgEYD9r8xYJKwYBBAHaRw8BAQdApTaQJ6R/uooTqAuscoxYwbLrtoKndnsX
|
||||||
|
ydhqMybJqh0AAQCxNwi9Pezy03OQE0XOooBWaHiuhBtKA1eAuqjJFuuLuQ/+
|
||||||
|
zQDCjAQQFgoAHQUCYD9r8wQLCQcIAxUICgQWAgEAAhkBAhsDAh4BACEJEIkB
|
||||||
|
BTiDwpvwFiEEvRnmOby6fJ/OxUhSiQEFOIPCm/BidgEAq05ZiPseRsMTxNm7
|
||||||
|
IFQwQjmIFiWgLeQ0gKIvfl3SjBAA/iSPyTgWxSY98utXNuq+WoxVOzx3dJwG
|
||||||
|
2cflR/UFUlEPx10EYD9r8xIKKwYBBAGXVQEFAQEHQCASw+tMPvnXi904WASv
|
||||||
|
wRDUQofh0M7CpgQFqoOXvGlLAwEIBwAA/3gEimwdIet0gXb/hRRyBqOlcq32
|
||||||
|
lNREh+n+vZKJyXWYEjrCeAQYFggACQUCYD9r8wIbDAAhCRCJAQU4g8Kb8BYh
|
||||||
|
BL0Z5jm8unyfzsVIUokBBTiDwpvwHpEBAObHllPrJu0DqYyt4FKPkijgRpXC
|
||||||
|
ESqhlK5rrbc62SmfAQDVf5l1B6IDASBCKtC0VPPpYiK6AUcEISpaSXOa+pNI
|
||||||
|
Bw==
|
||||||
|
=3Fja
|
||||||
|
-----END PGP PRIVATE KEY BLOCK-----`
|
||||||
|
});
|
||||||
|
const message = await openpgp.readMessage({
|
||||||
|
armoredMessage: `-----BEGIN PGP MESSAGE-----
|
||||||
|
|
||||||
|
wV4D+3VwOibHmagSAQdATlMJlvrkaq46zMkbIuKBOJO5X3ugVwZpEyAterQC
|
||||||
|
/RUw0OPWeO+4swh/U7ZurV8cRr/fPnyGUUKI7rI+va3kWUZv4RRpUs7eYE57
|
||||||
|
OUr3yoMNyaQEBwu6VXiQrsBN8TyUbXQxb63p7EHFXIgvVDIvOG7bQptrrKlM
|
||||||
|
kKcB+fz5hb6mT/tl+cPcYHDOjocQ92pNVm+FilQhiATRxV8ah1DCOIZZ6tgq
|
||||||
|
rWwIiEQEBPt+tXOuVF4Peumovp3WgziudrJa5Jxt2Dz+8nicBglbZLXTsZNu
|
||||||
|
bsZgJWVlAa5eil6J9ePX2xbo1vVAkLQdzE9+1jL+l7PRIZuVBQ==
|
||||||
|
=T4iR
|
||||||
|
-----END PGP MESSAGE-----`
|
||||||
|
});
|
||||||
|
const decrypted = await openpgp.decrypt({ message, decryptionKeys: key, verificationKeys: key, config: { allowUnauthenticatedMessages: true } });
|
||||||
|
expect(decrypted.data).to.equal('test');
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should allow stream-decrypting non-integrity-protected message when enabled', async function() {
|
||||||
|
const key = await openpgp.readKey({
|
||||||
|
armoredKey: `-----BEGIN PGP PRIVATE KEY BLOCK-----
|
||||||
|
|
||||||
|
xVgEYD9r8xYJKwYBBAHaRw8BAQdApTaQJ6R/uooTqAuscoxYwbLrtoKndnsX
|
||||||
|
ydhqMybJqh0AAQCxNwi9Pezy03OQE0XOooBWaHiuhBtKA1eAuqjJFuuLuQ/+
|
||||||
|
zQDCjAQQFgoAHQUCYD9r8wQLCQcIAxUICgQWAgEAAhkBAhsDAh4BACEJEIkB
|
||||||
|
BTiDwpvwFiEEvRnmOby6fJ/OxUhSiQEFOIPCm/BidgEAq05ZiPseRsMTxNm7
|
||||||
|
IFQwQjmIFiWgLeQ0gKIvfl3SjBAA/iSPyTgWxSY98utXNuq+WoxVOzx3dJwG
|
||||||
|
2cflR/UFUlEPx10EYD9r8xIKKwYBBAGXVQEFAQEHQCASw+tMPvnXi904WASv
|
||||||
|
wRDUQofh0M7CpgQFqoOXvGlLAwEIBwAA/3gEimwdIet0gXb/hRRyBqOlcq32
|
||||||
|
lNREh+n+vZKJyXWYEjrCeAQYFggACQUCYD9r8wIbDAAhCRCJAQU4g8Kb8BYh
|
||||||
|
BL0Z5jm8unyfzsVIUokBBTiDwpvwHpEBAObHllPrJu0DqYyt4FKPkijgRpXC
|
||||||
|
ESqhlK5rrbc62SmfAQDVf5l1B6IDASBCKtC0VPPpYiK6AUcEISpaSXOa+pNI
|
||||||
|
Bw==
|
||||||
|
=3Fja
|
||||||
|
-----END PGP PRIVATE KEY BLOCK-----`
|
||||||
|
});
|
||||||
|
const message = await openpgp.readMessage({
|
||||||
|
armoredMessage: stream.toStream(`-----BEGIN PGP MESSAGE-----
|
||||||
|
|
||||||
|
wV4D+3VwOibHmagSAQdATlMJlvrkaq46zMkbIuKBOJO5X3ugVwZpEyAterQC
|
||||||
|
/RUw0OPWeO+4swh/U7ZurV8cRr/fPnyGUUKI7rI+va3kWUZv4RRpUs7eYE57
|
||||||
|
OUr3yoMNyaQEBwu6VXiQrsBN8TyUbXQxb63p7EHFXIgvVDIvOG7bQptrrKlM
|
||||||
|
kKcB+fz5hb6mT/tl+cPcYHDOjocQ92pNVm+FilQhiATRxV8ah1DCOIZZ6tgq
|
||||||
|
rWwIiEQEBPt+tXOuVF4Peumovp3WgziudrJa5Jxt2Dz+8nicBglbZLXTsZNu
|
||||||
|
bsZgJWVlAa5eil6J9ePX2xbo1vVAkLQdzE9+1jL+l7PRIZuVBQ==
|
||||||
|
=T4iR
|
||||||
|
-----END PGP MESSAGE-----`)
|
||||||
|
});
|
||||||
|
const decrypted = await openpgp.decrypt({ message, decryptionKeys: key, verificationKeys: key, config: { allowUnauthenticatedMessages: true } });
|
||||||
|
const data = await stream.readToEnd(decrypted.data);
|
||||||
|
expect(data).to.equal('test');
|
||||||
|
});
|
||||||
|
|
||||||
describe('Sign and verify with each curve', function() {
|
describe('Sign and verify with each curve', function() {
|
||||||
const curves = ['secp256k1' , 'p256', 'p384', 'p521', 'curve25519', 'brainpoolP256r1', 'brainpoolP384r1', 'brainpoolP512r1'];
|
const curves = ['secp256k1' , 'p256', 'p384', 'p521', 'curve25519', 'brainpoolP256r1', 'brainpoolP384r1', 'brainpoolP512r1'];
|
||||||
curves.forEach(curve => {
|
curves.forEach(curve => {
|
||||||
|
|
@ -3837,110 +3959,6 @@ amnR6g==
|
||||||
expect(await verified.signatures[0].verified).to.be.true;
|
expect(await verified.signatures[0].verified).to.be.true;
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
it('should fail to decrypt non-integrity-protected message by default', async function() {
|
|
||||||
const key = await openpgp.readKey({
|
|
||||||
armoredKey: `-----BEGIN PGP PRIVATE KEY BLOCK-----
|
|
||||||
|
|
||||||
xVgEYD9r8xYJKwYBBAHaRw8BAQdApTaQJ6R/uooTqAuscoxYwbLrtoKndnsX
|
|
||||||
ydhqMybJqh0AAQCxNwi9Pezy03OQE0XOooBWaHiuhBtKA1eAuqjJFuuLuQ/+
|
|
||||||
zQDCjAQQFgoAHQUCYD9r8wQLCQcIAxUICgQWAgEAAhkBAhsDAh4BACEJEIkB
|
|
||||||
BTiDwpvwFiEEvRnmOby6fJ/OxUhSiQEFOIPCm/BidgEAq05ZiPseRsMTxNm7
|
|
||||||
IFQwQjmIFiWgLeQ0gKIvfl3SjBAA/iSPyTgWxSY98utXNuq+WoxVOzx3dJwG
|
|
||||||
2cflR/UFUlEPx10EYD9r8xIKKwYBBAGXVQEFAQEHQCASw+tMPvnXi904WASv
|
|
||||||
wRDUQofh0M7CpgQFqoOXvGlLAwEIBwAA/3gEimwdIet0gXb/hRRyBqOlcq32
|
|
||||||
lNREh+n+vZKJyXWYEjrCeAQYFggACQUCYD9r8wIbDAAhCRCJAQU4g8Kb8BYh
|
|
||||||
BL0Z5jm8unyfzsVIUokBBTiDwpvwHpEBAObHllPrJu0DqYyt4FKPkijgRpXC
|
|
||||||
ESqhlK5rrbc62SmfAQDVf5l1B6IDASBCKtC0VPPpYiK6AUcEISpaSXOa+pNI
|
|
||||||
Bw==
|
|
||||||
=3Fja
|
|
||||||
-----END PGP PRIVATE KEY BLOCK-----`
|
|
||||||
});
|
|
||||||
const message = await openpgp.readMessage({
|
|
||||||
armoredMessage: `-----BEGIN PGP MESSAGE-----
|
|
||||||
|
|
||||||
wV4D+3VwOibHmagSAQdATlMJlvrkaq46zMkbIuKBOJO5X3ugVwZpEyAterQC
|
|
||||||
/RUw0OPWeO+4swh/U7ZurV8cRr/fPnyGUUKI7rI+va3kWUZv4RRpUs7eYE57
|
|
||||||
OUr3yoMNyaQEBwu6VXiQrsBN8TyUbXQxb63p7EHFXIgvVDIvOG7bQptrrKlM
|
|
||||||
kKcB+fz5hb6mT/tl+cPcYHDOjocQ92pNVm+FilQhiATRxV8ah1DCOIZZ6tgq
|
|
||||||
rWwIiEQEBPt+tXOuVF4Peumovp3WgziudrJa5Jxt2Dz+8nicBglbZLXTsZNu
|
|
||||||
bsZgJWVlAa5eil6J9ePX2xbo1vVAkLQdzE9+1jL+l7PRIZuVBQ==
|
|
||||||
=T4iR
|
|
||||||
-----END PGP MESSAGE-----`
|
|
||||||
});
|
|
||||||
await expect(
|
|
||||||
openpgp.decrypt({ message, decryptionKeys: key, verificationKeys: key })
|
|
||||||
).to.be.rejectedWith('Error decrypting message: Message is not authenticated.');
|
|
||||||
});
|
|
||||||
|
|
||||||
it('should allow decrypting non-integrity-protected message when enabled', async function() {
|
|
||||||
const key = await openpgp.readKey({
|
|
||||||
armoredKey: `-----BEGIN PGP PRIVATE KEY BLOCK-----
|
|
||||||
|
|
||||||
xVgEYD9r8xYJKwYBBAHaRw8BAQdApTaQJ6R/uooTqAuscoxYwbLrtoKndnsX
|
|
||||||
ydhqMybJqh0AAQCxNwi9Pezy03OQE0XOooBWaHiuhBtKA1eAuqjJFuuLuQ/+
|
|
||||||
zQDCjAQQFgoAHQUCYD9r8wQLCQcIAxUICgQWAgEAAhkBAhsDAh4BACEJEIkB
|
|
||||||
BTiDwpvwFiEEvRnmOby6fJ/OxUhSiQEFOIPCm/BidgEAq05ZiPseRsMTxNm7
|
|
||||||
IFQwQjmIFiWgLeQ0gKIvfl3SjBAA/iSPyTgWxSY98utXNuq+WoxVOzx3dJwG
|
|
||||||
2cflR/UFUlEPx10EYD9r8xIKKwYBBAGXVQEFAQEHQCASw+tMPvnXi904WASv
|
|
||||||
wRDUQofh0M7CpgQFqoOXvGlLAwEIBwAA/3gEimwdIet0gXb/hRRyBqOlcq32
|
|
||||||
lNREh+n+vZKJyXWYEjrCeAQYFggACQUCYD9r8wIbDAAhCRCJAQU4g8Kb8BYh
|
|
||||||
BL0Z5jm8unyfzsVIUokBBTiDwpvwHpEBAObHllPrJu0DqYyt4FKPkijgRpXC
|
|
||||||
ESqhlK5rrbc62SmfAQDVf5l1B6IDASBCKtC0VPPpYiK6AUcEISpaSXOa+pNI
|
|
||||||
Bw==
|
|
||||||
=3Fja
|
|
||||||
-----END PGP PRIVATE KEY BLOCK-----`
|
|
||||||
});
|
|
||||||
const message = await openpgp.readMessage({
|
|
||||||
armoredMessage: `-----BEGIN PGP MESSAGE-----
|
|
||||||
|
|
||||||
wV4D+3VwOibHmagSAQdATlMJlvrkaq46zMkbIuKBOJO5X3ugVwZpEyAterQC
|
|
||||||
/RUw0OPWeO+4swh/U7ZurV8cRr/fPnyGUUKI7rI+va3kWUZv4RRpUs7eYE57
|
|
||||||
OUr3yoMNyaQEBwu6VXiQrsBN8TyUbXQxb63p7EHFXIgvVDIvOG7bQptrrKlM
|
|
||||||
kKcB+fz5hb6mT/tl+cPcYHDOjocQ92pNVm+FilQhiATRxV8ah1DCOIZZ6tgq
|
|
||||||
rWwIiEQEBPt+tXOuVF4Peumovp3WgziudrJa5Jxt2Dz+8nicBglbZLXTsZNu
|
|
||||||
bsZgJWVlAa5eil6J9ePX2xbo1vVAkLQdzE9+1jL+l7PRIZuVBQ==
|
|
||||||
=T4iR
|
|
||||||
-----END PGP MESSAGE-----`
|
|
||||||
});
|
|
||||||
const decrypted = await openpgp.decrypt({ message, decryptionKeys: key, verificationKeys: key, config: { allowUnauthenticatedMessages: true } });
|
|
||||||
expect(decrypted.data).to.equal('test');
|
|
||||||
});
|
|
||||||
|
|
||||||
it('should allow stream-decrypting non-integrity-protected message when enabled', async function() {
|
|
||||||
const key = await openpgp.readKey({
|
|
||||||
armoredKey: `-----BEGIN PGP PRIVATE KEY BLOCK-----
|
|
||||||
|
|
||||||
xVgEYD9r8xYJKwYBBAHaRw8BAQdApTaQJ6R/uooTqAuscoxYwbLrtoKndnsX
|
|
||||||
ydhqMybJqh0AAQCxNwi9Pezy03OQE0XOooBWaHiuhBtKA1eAuqjJFuuLuQ/+
|
|
||||||
zQDCjAQQFgoAHQUCYD9r8wQLCQcIAxUICgQWAgEAAhkBAhsDAh4BACEJEIkB
|
|
||||||
BTiDwpvwFiEEvRnmOby6fJ/OxUhSiQEFOIPCm/BidgEAq05ZiPseRsMTxNm7
|
|
||||||
IFQwQjmIFiWgLeQ0gKIvfl3SjBAA/iSPyTgWxSY98utXNuq+WoxVOzx3dJwG
|
|
||||||
2cflR/UFUlEPx10EYD9r8xIKKwYBBAGXVQEFAQEHQCASw+tMPvnXi904WASv
|
|
||||||
wRDUQofh0M7CpgQFqoOXvGlLAwEIBwAA/3gEimwdIet0gXb/hRRyBqOlcq32
|
|
||||||
lNREh+n+vZKJyXWYEjrCeAQYFggACQUCYD9r8wIbDAAhCRCJAQU4g8Kb8BYh
|
|
||||||
BL0Z5jm8unyfzsVIUokBBTiDwpvwHpEBAObHllPrJu0DqYyt4FKPkijgRpXC
|
|
||||||
ESqhlK5rrbc62SmfAQDVf5l1B6IDASBCKtC0VPPpYiK6AUcEISpaSXOa+pNI
|
|
||||||
Bw==
|
|
||||||
=3Fja
|
|
||||||
-----END PGP PRIVATE KEY BLOCK-----`
|
|
||||||
});
|
|
||||||
const message = await openpgp.readMessage({
|
|
||||||
armoredMessage: stream.toStream(`-----BEGIN PGP MESSAGE-----
|
|
||||||
|
|
||||||
wV4D+3VwOibHmagSAQdATlMJlvrkaq46zMkbIuKBOJO5X3ugVwZpEyAterQC
|
|
||||||
/RUw0OPWeO+4swh/U7ZurV8cRr/fPnyGUUKI7rI+va3kWUZv4RRpUs7eYE57
|
|
||||||
OUr3yoMNyaQEBwu6VXiQrsBN8TyUbXQxb63p7EHFXIgvVDIvOG7bQptrrKlM
|
|
||||||
kKcB+fz5hb6mT/tl+cPcYHDOjocQ92pNVm+FilQhiATRxV8ah1DCOIZZ6tgq
|
|
||||||
rWwIiEQEBPt+tXOuVF4Peumovp3WgziudrJa5Jxt2Dz+8nicBglbZLXTsZNu
|
|
||||||
bsZgJWVlAa5eil6J9ePX2xbo1vVAkLQdzE9+1jL+l7PRIZuVBQ==
|
|
||||||
=T4iR
|
|
||||||
-----END PGP MESSAGE-----`)
|
|
||||||
});
|
|
||||||
const decrypted = await openpgp.decrypt({ message, decryptionKeys: key, verificationKeys: key, config: { allowUnauthenticatedMessages: true } });
|
|
||||||
const data = await stream.readToEnd(decrypted.data);
|
|
||||||
expect(data).to.equal('test');
|
|
||||||
});
|
|
||||||
});
|
});
|
||||||
|
|
||||||
describe('Errors', function() {
|
describe('Errors', function() {
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue
Block a user