Skip to content

fix: decrypt raises 'Ciphertext too short' on plaintext files shorter than 4 bytes #1163

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
yc111233 wants to merge 1 commit into
base: main
Choose a base branch
from
+6 −4
Open

fix: decrypt raises 'Ciphertext too short' on plaintext files shorter than 4 bytes #1163

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions openviking/crypto/encryptor.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,14 +108,16 @@ async def decrypt(self, account_id: str, ciphertext: bytes) -> bytes:
Returns:
Decrypted plaintext content
"""
# 1. Check magic number
if len(ciphertext) < MAGIC_LENGTH:
raise InvalidMagicError("Ciphertext too short")

# 1. Check magic number (check prefix first, before length)
# This ensures plaintext files (including empty/short ones) are
# returned as-is instead of raising "Ciphertext too short".
if not ciphertext.startswith(MAGIC):
# Unencrypted file, return directly
return ciphertext

if len(ciphertext) < MAGIC_LENGTH:
raise InvalidMagicError("Ciphertext too short")

try:
# 2. Parse Envelope
(
Expand Down
Loading