mirror of
https://github.com/postgres/postgres.git
synced 2025-06-23 14:01:44 +03:00
Fix corner case with PGP decompression in pgcrypto
A compressed stream may end with an empty packet, and PGP decompression
finished before reading this empty packet in the remaining stream. This
caused a failure in pgcrypto, handling this case as corrupted data.
This commit makes sure to consume such extra data, avoiding a failure
when decompression the entire stream. This corner case was reproducible
with a data length of 16kB, and existed since its introduction in
e94dd6a
. A cheap regression test is added to cover this case.
Thanks to Jeff Janes for the extra investigation.
Reported-by: Frank Gagnepain
Author: Kyotaro Horiguchi, Michael Paquier
Discussion: https://postgr.es/m/16476-692ef7b84e5fb893@postgresql.org
Backpatch-through: 9.5
This commit is contained in:
@ -28,3 +28,24 @@ select pgp_sym_decrypt(
|
||||
pgp_sym_encrypt('Secret message', 'key',
|
||||
'compress-algo=2, compress-level=0'),
|
||||
'key', 'expect-compress-algo=0');
|
||||
|
||||
-- check corner case involving an input string of 16kB, as per bug #16476.
|
||||
SELECT setseed(0);
|
||||
WITH random_string AS
|
||||
(
|
||||
-- This generates a random string of 16366 bytes. This is chosen
|
||||
-- as random so that it does not get compressed, and the decompression
|
||||
-- would work on a string with the same length as the origin, making the
|
||||
-- test behavior more predictible. lpad() ensures that the generated
|
||||
-- hexadecimal value is completed by extra zero characters if random()
|
||||
-- has generated a value strictly lower than 16.
|
||||
SELECT string_agg(decode(lpad(to_hex((random()*256)::int), 2, '0'), 'hex'), '') as bytes
|
||||
FROM generate_series(0, 16365)
|
||||
)
|
||||
SELECT bytes =
|
||||
pgp_sym_decrypt_bytea(
|
||||
pgp_sym_encrypt_bytea(bytes, 'key',
|
||||
'compress-algo=1,compress-level=1'),
|
||||
'key', 'expect-compress-algo=1')
|
||||
AS is_same
|
||||
FROM random_string;
|
||||
|
Reference in New Issue
Block a user