Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-02 06:38:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge remote-tracking branch 'origin/topic/timw/python-magic-numbers'

Browse source 
* origin/topic/timw/python-magic-numbers:
  Move python signatures to a separate file
  Add signatures for Python bytecode for 3.8-3.14
This commit is contained in:
Tim Wojtulewicz 2024-12-09 12:08:21 -07:00
commit 832b9b6cf0
6 changed files with 138 additions and 64 deletions
Download patch file Download diff file Expand all files Collapse all files

19
CHANGES
View file

@ -1,3 +1,22 @@
7.1.0-dev.707 | 2024-12-09 12:08:21 -0700
* Move python signatures to a separate file (Tim Wojtulewicz, Corelight)
* Add signatures for Python bytecode for 3.8-3.14 (Tim Wojtulewicz, Corelight)
* Bump pre-commit hooks (Benjamin Bannier, Corelight)
* Bump typos pre-commit hooks (Benjamin Bannier, Corelight)
This now picks up additional typical misspellings, but also triggers on
more identifiers we use. I opted for fixing the obvious misspellings and
updated the allowlist for anything else.
* Bump clang-format pre-commit hooks (Benjamin Bannier, Corelight)
This brings in slightly better formatting around uniform initialization,
and comments after blocks not surrounded by `{ .. }`.
7.1.0-dev.700 | 2024-12-09 14:03:29 +0100
* ScriptOpt: Fail compilation if known exprs/stmts is outdated (Arne Welzel, Corelight)

2
VERSION
View file

@ -1 +1 @@
7.1.0-dev.700
7.1.0-dev.707

1
scripts/base/frameworks/files/magic/__load__.zeek
View file

@ -7,6 +7,7 @@
@load-sigs ./java
@load-sigs ./office
@load-sigs ./programming
@load-sigs ./python
@load-sigs ./video
@load-sigs ./libmagic

63
scripts/base/frameworks/files/magic/executable.sig
View file

@ -41,66 +41,3 @@ signature file-elc {
file-mime "application/x-elc", 10
file-magic /\x3bELC[\x00\x01\x02\x03\x04\x05\x06\x07\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f\x10\x11\x12\x13\x14\x15\x16\x17\x18\x19\x1a\x1b\x1c\x1d\x1e\x1f\x80\x81\x82\x83\x84\x85\x86\x87\x88\x89\x8a\x8b\x8c\x8d\x8e\x8f\x90\x91\x92\x93\x94\x95\x96\x97\x98\x99\x9a\x9b\x9c\x9d\x9e\x9f\xa0\xa1\xa2\xa3\xa4\xa5\xa6\xa7\xa8\xa9\xaa\xab\xac\xad\xae\xaf\xb0\xb1\xb2\xb3\xb4\xb5\xb6\xb7\xb8\xb9\xba\xbb\xbc\xbd\xbe\xbf\xc0\xc1\xc2\xc3\xc4\xc5\xc6\xc7\xc8\xc9\xca\xcb\xcc\xcd\xce\xcf\xd0\xd1\xd2\xd3\xd4\xd5\xd6\xd7\xd8\xd9\xda\xdb\xdc\xdd\xde\xdf\xe0\xe1\xe2\xe3\xe4\xe5\xe6\xe7\xe8\xe9\xea\xeb\xec\xed\xee\xef\xf0\xf1\xf2\xf3\xf4\xf5\xf6\xf7\xf8\xf9\xfa\xfb\xfc\xfd\xfe\xff]/
}
# Python 1 bytecode
signature file-pyc-1 {
file-magic /^(\xfc\xc4|\x99\x4e)\x0d\x0a/
file-mime "application/x-python-bytecode", 80
}
# Python 2 bytecode
signature file-pyc-2 {
file-magic /^(\x87\xc6|[\x2a\x2d]\xed|[\x3b\x45\x59\x63\x6d\x77\x81\x8b\x8c\x95\x9f\xa9\xb3\xc7\xd1\xdb\xe5\xef\xf9]\xf2|\x03\xf3)\x0d\x0a/
file-mime "application/x-python-bytecode", 80
}
# Python 3.0 bytecode
signature file-pyc-3-0 {
file-magic /^([\xb8\xc2\xcc\xd6\xe0\xea\xf4\xf5\xff]\x0b|[\x09\x13\x1d\x1f\x27\x3b]\x0c)\x0d\x0a/
file-mime "application/x-python-bytecode", 80
}
# Python 3.1 bytecode
signature file-pyc-3-1 {
file-magic /^[\x45\x4f]\x0c\x0d\x0a/
file-mime "application/x-python-bytecode", 80
}
# Python 3.2 bytecode
signature file-pyc-3-2 {
file-magic /^[\x58\x62\x6c]\x0c\x0d\x0a/
file-mime "application/x-python-bytecode", 80
}
# Python 3.3 bytecode
signature file-pyc-3-3 {
file-magic /^[\x76\x80\x94\x9e]\x0c\x0d\x0a/
file-mime "application/x-python-bytecode", 80
}
# Python 3.4 bytecode
signature file-pyc-3-4 {
file-magic /^[\xb2\xcc\xc6\xd0\xda\xe4\xee]\x0c\x0d\x0a/
file-mime "application/x-python-bytecode", 80
}
# Python 3.5 bytecode
signature file-pyc-3-5 {
file-magic /^(\xf8\x0c|[\x02\x0c\x16\x17]\x0d)\x0d\x0a/
file-mime "application/x-python-bytecode", 80
}
# Python 3.6 bytecode
signature file-pyc-3-6 {
file-magic /^[\x20\x21\x2a-\x2d\x2f-\x33]\x0d\x0d\x0a/
file-mime "application/x-python-bytecode", 80
}
# Python 3.7 bytecode
signature file-pyc-3-7 {
file-magic /^[\x3e-\x42]\x0d\x0d\x0a/
file-mime "application/x-python-bytecode", 80
}

111
scripts/base/frameworks/files/magic/python.sig Normal file
View file

@ -0,0 +1,111 @@
# Python magic numbers can be updated/added by looking at the list at
# https://github.com/python/cpython/blob/main/Include/internal/pycore_magic_number.h
# The numbers in the list are converted to little-endian and then to hex for the
# file-magic entries below.
# Python 1 bytecode
signature file-pyc-1 {
file-magic /^(\xfc\xc4|\x99\x4e)\x0d\x0a/
file-mime "application/x-python-bytecode", 80
}
# Python 2 bytecode
signature file-pyc-2 {
file-magic /^(\x87\xc6|[\x2a\x2d]\xed|[\x3b\x45\x59\x63\x6d\x77\x81\x8b\x8c\x95\x9f\xa9\xb3\xc7\xd1\xdb\xe5\xef\xf9]\xf2|\x03\xf3)\x0d\x0a/
file-mime "application/x-python-bytecode", 80
}
# Python 3.0 bytecode
signature file-pyc-3-0 {
file-magic /^([\xb8\xc2\xcc\xd6\xe0\xea\xf4\xf5\xff]\x0b|[\x09\x13\x1d\x1f\x27\x3b]\x0c)\x0d\x0a/
file-mime "application/x-python-bytecode", 80
}
# Python 3.1 bytecode
signature file-pyc-3-1 {
file-magic /^[\x45\x4f]\x0c\x0d\x0a/
file-mime "application/x-python-bytecode", 80
}
# Python 3.2 bytecode
signature file-pyc-3-2 {
file-magic /^[\x58\x62\x6c]\x0c\x0d\x0a/
file-mime "application/x-python-bytecode", 80
}
# Python 3.3 bytecode
signature file-pyc-3-3 {
file-magic /^[\x76\x80\x94\x9e]\x0c\x0d\x0a/
file-mime "application/x-python-bytecode", 80
}
# Python 3.4 bytecode
signature file-pyc-3-4 {
file-magic /^[\xb2\xcc\xc6\xd0\xda\xe4\xee]\x0c\x0d\x0a/
file-mime "application/x-python-bytecode", 80
}
# Python 3.5 bytecode
signature file-pyc-3-5 {
file-magic /^(\xf8\x0c|[\x02\x0c\x16\x17]\x0d)\x0d\x0a/
file-mime "application/x-python-bytecode", 80
}
# Python 3.6 bytecode
signature file-pyc-3-6 {
file-magic /^[\x20\x21\x2a-\x2d\x2f-\x33]\x0d\x0d\x0a/
file-mime "application/x-python-bytecode", 80
}
# Python 3.7 bytecode
signature file-pyc-3-7 {
file-magic /^[\x3e-\x42]\x0d\x0d\x0a/
file-mime "application/x-python-bytecode", 80
}
# Python 3.8 bytecode
signature file-pyc-3-8 {
file-magic /^[\x48\x49\x52-\x55]\x0d\x0d\x0a/
file-mime "application/x-python-bytecode", 80
}
# Python 3.9 bytecode
signature file-pyc-3-9 {
file-magic /^[\x5c-\x61]\x0d\x0d\x0a/
file-mime "application/x-python-bytecode", 80
}
# Python 3.10 bytecode
signature file-pyc-3-10 {
file-magic /^[\x66-\x6f]\x0d\x0d\x0a/
file-mime "application/x-python-bytecode", 80
}
# Python 3.11 bytecode
signature file-pyc-3-11 {
file-magic /^[\x7a-\xa7]\x0d\x0d\x0a/
file-mime "application/x-python-bytecode", 80
}
# Python 3.12 bytecode
signature file-pyc-3-12 {
file-magic /^[\xac-\xcb]\x0d\x0d\x0a/
file-mime "application/x-python-bytecode", 80
}
# Python 3.13 bytecode
signature file-pyc-3-13 {
file-magic /^[\xde-\xf3]\x0d\x0d\x0a/
file-mime "application/x-python-bytecode", 80
}
# Python 3.14 bytecode
# This is in pre-release at this time, and may need to be updated as new
# versions come out.
signature file-pyc-3-14 {
file-magic /^[\x10-\x19]\x0e\x0d\x0a/
file-mime "application/x-python-bytecode", 80
}

6
testing/btest/Baseline/plugins.hooks/output
View file

@ -632,6 +632,7 @@
0.000000 MetaHookPost LoadFile(1, ./libmagic, <...>/libmagic.sig) -> -1
0.000000 MetaHookPost LoadFile(1, ./office, <...>/office.sig) -> -1
0.000000 MetaHookPost LoadFile(1, ./programming, <...>/programming.sig) -> -1
0.000000 MetaHookPost LoadFile(1, ./python, <...>/python.sig) -> -1
0.000000 MetaHookPost LoadFile(1, ./video, <...>/video.sig) -> -1
0.000000 MetaHookPost LoadFile(1, s2, ./s2.sig) -> -1
0.000000 MetaHookPost LoadFileExtended(0, ./CPP-load.bif.zeek, <...>/CPP-load.bif.zeek) -> (-1, <no content>)
@ -936,6 +937,7 @@
0.000000 MetaHookPost LoadFileExtended(1, ./libmagic, <...>/libmagic.sig) -> (-1, <no content>)
0.000000 MetaHookPost LoadFileExtended(1, ./office, <...>/office.sig) -> (-1, <no content>)
0.000000 MetaHookPost LoadFileExtended(1, ./programming, <...>/programming.sig) -> (-1, <no content>)
0.000000 MetaHookPost LoadFileExtended(1, ./python, <...>/python.sig) -> (-1, <no content>)
0.000000 MetaHookPost LoadFileExtended(1, ./video, <...>/video.sig) -> (-1, <no content>)
0.000000 MetaHookPost LoadFileExtended(1, s2, ./s2.sig) -> (-1, <no content>)
0.000000 MetaHookPost QueueEvent(zeek_init()) -> false
@ -1572,6 +1574,7 @@
0.000000 MetaHookPre LoadFile(1, ./libmagic, <...>/libmagic.sig)
0.000000 MetaHookPre LoadFile(1, ./office, <...>/office.sig)
0.000000 MetaHookPre LoadFile(1, ./programming, <...>/programming.sig)
0.000000 MetaHookPre LoadFile(1, ./python, <...>/python.sig)
0.000000 MetaHookPre LoadFile(1, ./video, <...>/video.sig)
0.000000 MetaHookPre LoadFile(1, s2, ./s2.sig)
0.000000 MetaHookPre LoadFileExtended(0, ./CPP-load.bif.zeek, <...>/CPP-load.bif.zeek)
@ -1876,6 +1879,7 @@
0.000000 MetaHookPre LoadFileExtended(1, ./libmagic, <...>/libmagic.sig)
0.000000 MetaHookPre LoadFileExtended(1, ./office, <...>/office.sig)
0.000000 MetaHookPre LoadFileExtended(1, ./programming, <...>/programming.sig)
0.000000 MetaHookPre LoadFileExtended(1, ./python, <...>/python.sig)
0.000000 MetaHookPre LoadFileExtended(1, ./video, <...>/video.sig)
0.000000 MetaHookPre LoadFileExtended(1, s2, ./s2.sig)
0.000000 MetaHookPre QueueEvent(zeek_init())
@ -2384,6 +2388,7 @@
0.000000 | HookLoadFile ./pools <...>/pools.zeek
0.000000 | HookLoadFile ./postprocessors <...>/postprocessors
0.000000 | HookLoadFile ./programming <...>/programming.sig
0.000000 | HookLoadFile ./python <...>/python.sig
0.000000 | HookLoadFile ./removal-hooks <...>/removal-hooks.zeek
0.000000 | HookLoadFile ./reporter.bif.zeek <...>/reporter.bif.zeek
0.000000 | HookLoadFile ./scp <...>/scp.zeek
@ -2688,6 +2693,7 @@
0.000000 | HookLoadFileExtended ./pools <...>/pools.zeek
0.000000 | HookLoadFileExtended ./postprocessors <...>/postprocessors
0.000000 | HookLoadFileExtended ./programming <...>/programming.sig
0.000000 | HookLoadFileExtended ./python <...>/python.sig
0.000000 | HookLoadFileExtended ./removal-hooks <...>/removal-hooks.zeek
0.000000 | HookLoadFileExtended ./reporter.bif.zeek <...>/reporter.bif.zeek
0.000000 | HookLoadFileExtended ./scp <...>/scp.zeek