feat(encryption) [2/N] Support encryption: Add streaming encryption/decryption#2286
Open
xanderbailey wants to merge 2 commits intoapache:mainfrom
Open
feat(encryption) [2/N] Support encryption: Add streaming encryption/decryption#2286xanderbailey wants to merge 2 commits intoapache:mainfrom
xanderbailey wants to merge 2 commits intoapache:mainfrom
Conversation
5ce9c66 to
aed1755
Compare
Contributor
Author
|
cc: @mbutrovich |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Which issue does this PR close?
Part of #2034
What changes are included in this PR?
Summary
This PR adds AGS1 stream encryption/decryption support for Iceberg, building on the core crypto primitives merged in #2026. It implements the block-based AES-GCM stream format used by Iceberg for encrypting manifest lists and manifest files, byte-compatible with Java's
AesGcmInputStream/AesGcmOutputStream.Motivation
The previous PR provided low-level
AesGcmCipherencrypt/decrypt operations. This PR layers the AGS1 streaming format on top, enabling encryption of arbitrarily large files with random-access read support, this is a prerequisite for encrypting Iceberg metadata and data files.Changes
New Module:
encryption/stream.rs— AGS1 stream format implementationAesGcmFileRead: ImplementsFileReadfor transparent random-access decryption. Maps plaintext byte ranges to encrypted blocks, reads and decrypts them in a single I/O call, and returns the requested plaintext slice.AesGcmFileWrite: ImplementsFileWritefor transparent streaming encryption. Buffers plaintext, emits encrypted AGS1 blocks when full, and finalizes on close.stream_block_aad(): Constructs per-block AAD matching Java'sCiphers.streamBlockAAD().PLAIN_BLOCK_SIZE(1 MiB),CIPHER_BLOCK_SIZE,GCM_STREAM_MAGIC, etc.New Module:
encryption/file_decryptor.rs— File-level decryption helperAesGcmFileDecryptor: Holds decryption material (DEK + AAD prefix) and wraps aFileReadfor transparent decryption.New Module:
encryption/file_encryptor.rs— File-level encryption helperAesGcmFileEncryptor: Write-side counterpart; wraps aFileWritefor transparent encryption.AGS1 File Format:
Each block's AAD:
aad_prefix || block_index (4 bytes, LE)Java Compatibility
AesGcmInputStreamAesGcmFileReadAesGcmOutputStreamAesGcmFileWriteCiphers.streamBlockAAD()stream_block_aad()Ciphers.PLAIN_BLOCK_SIZEPLAIN_BLOCK_SIZEFuture Work
Upcoming PRs will add:
KeyManagementClienttrait)EncryptionManagerimplementationInputFile/OutputFileAre these changes tested?
Yes