Skip to content

Update Office file detection and error logging #3200

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
doomedraven wants to merge 2 commits into
base: master
Choose a base branch
from
+12 −4
Open

Update Office file detection and error logging #3200

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
81fff43
Update Office file detection and error logging
doomedraven Sep 1, 2026
f1ab2b9
Fix logic for checking password-protected Office files
doomedraven Sep 2, 2026
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
16 changes: 12 additions & 4 deletions lib/cuckoo/common/demux.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,11 @@
"Microsoft OOXML",
]

MS_EXCLUDE = [
"MSI Installer",
"Microsoft Cabinet archive"
]


IGNORABLE_PATTERNS = (
re.compile(br"msvcp\d+\.dll$", re.IGNORECASE),
Expand Down Expand Up @@ -487,15 +492,18 @@ def demux_sample(
magic = File(filename).get_type() or ""

# --- 3. Handle Password-Protected Office Files ---
is_office = ("Microsoft" in magic or any(x in magic for x in OFFICE_TYPES)) and "MSI Installer" not in magic
is_office = ("Microsoft" in magic or any(x in magic for x in OFFICE_TYPES)) and not any(x in magic for x in MS_EXCLUDE)
if is_office and use_sflock:
password = options2passwd(options)
if HAS_SFLOCK and password:
if use_sflock and password:
retlist = demux_office(filename, password, platform)
return retlist, error_list
# elif use_sflock:
# retlist = demux_office(filename, "", platform)
# return retlist, error_list
else:
log.error("Detected password protected office file, but no sflock is installed.")
return [], [{os.path.basename(filename).decode(errors='ignore'): "Detected password protected office file, but no sflock is installed"}]
log.error("Detected password protected office file, but no sflock is installed. Magic: %s, Password:%s", magic, str(password))
return [], [{os.path.basename(filename).decode(errors='ignore'): f"Detected password protected office file, but no sflock is installed. Magic: {magic}. Password: {password}"}]

# --- 4. Skip Extraction for specific types ---
ignored_signatures = [
Expand Down
Loading