fix: decrypt raises 'Ciphertext too short' on plaintext files shorter than 4 bytes#1163
Open
yc111233 wants to merge 1 commit intovolcengine:mainfrom
Open
fix: decrypt raises 'Ciphertext too short' on plaintext files shorter than 4 bytes#1163yc111233 wants to merge 1 commit intovolcengine:mainfrom
yc111233 wants to merge 1 commit intovolcengine:mainfrom
Conversation
… than 4 bytes
The decrypt() method checked ciphertext length before checking the magic
header. This caused plaintext files shorter than 4 bytes (including empty
files) to raise InvalidMagicError('Ciphertext too short') before the
'is this plaintext?' check could return them as-is.
Fix: swap the order — check if content starts with OVE1 magic first,
then only check length for actual encrypted content.
This fixes failures when append_file() reads an empty messages.jsonl
session file and tries to decrypt it.
|
Failed to generate code suggestions for PR |
|
yc111233 seems not to be a GitHub user. You need a GitHub account to be able to sign the CLA. If you have already a GitHub account, please add the email address used for this commit to your account. You have signed the CLA already but the status is still pending? Let us recheck it. |
baojun-zhang
approved these changes
Apr 2, 2026
Collaborator
|
Thank you for your submission! We really appreciate it. |
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.
Problem
When encryption is enabled,
FileEncryptor.decrypt()raisesInvalidMagicError("Ciphertext too short")for plaintext files shorter than 4 bytes (including empty files).This happens because the length check (
len(ciphertext) < MAGIC_LENGTH) runs before the magic header check (ciphertext.startswith(MAGIC)). Empty or short plaintext files fail the length check before they can be recognized as unencrypted.Root Cause
In
append_file()(viking_fs.py), when a session'smessages.jsonlis empty (0 bytes) — which happens after VK archives messages — the read-then-decrypt flow hits this bug:_decrypt_content()decrypt()checkslen(b'') < 4→ raises "Ciphertext too short"startswith(MAGIC)check that would return plaintext as-isFix
Swap the order of checks in
decrypt():Testing
Verified that:
b'ab') → returns as-ismemory_store/memory_recall→ work with encryption enabled