fix(crypto): rotate the backups v1.39.x stored as one stream

A weekly or uploaded backup written by v1.39.x is a single ~hlgcm1. stream
in data_backups.data. Its key id sits behind the stream marker, which the
string codec's parser does not read, so key rotation filed every such row
as legacy, failed to decrypt it and counted it as an error. On a host that
ran v1.39.x that was every weekly copy, and the rotation never finished
clean.

Rotation now reads the key id of a streamed value and re-seals it as a
stream under the active key, without touching what it holds.
This commit is contained in:
Marc-André Bombeck committed 2026-09-25 23:54:34 +02:00
1 parent fabd691128
commit b0f9bbe530
4 files changed
+91 -3

No files matched your search

+11
View File
@@ -578,6 +578,17 @@ export function decryptStream(stored: string): Buffer {
return decryptRawStream(Buffer.from(rest.slice(dot + 1), "base64"), key);
}
/**
* Re-seal a streamed ciphertext under the active key, as a streamed
* ciphertext. Used by rotation for the backups v1.39.1 stored in this form;
* the plaintext is the backup's gzip bytes and is never inspected.
*/
export function reencryptStreamToActive(stored: string): string {
const plaintext = decryptStream(stored);
const encryptor = createStreamEncryptor();
return `${encryptor.header}${encryptor.update(plaintext)}${encryptor.final()}`;
}
/** The key id a streamed ciphertext was written under, or null when unparsable. */
export function extractStreamKeyId(stored: string): string | null {
if (!isStreamCiphertext(stored)) return null;