Unverified Commit f37cd60e by Alexander Popov Committed by GitHub

add --kernel-version option (#94)

parents 0945ed91 388332cf
...@@ -88,6 +88,9 @@ options: ...@@ -88,6 +88,9 @@ options:
-s SYSCTL, --sysctl SYSCTL -s SYSCTL, --sysctl SYSCTL
check the security hardening options in the sysctl output file check the security hardening options in the sysctl output file
(`sudo sysctl -a > file`) (`sudo sysctl -a > file`)
-v VERSION, --kernel-version VERSION
extract the version from the kernel version file
(contents of /proc/version)
-p {X86_64,X86_32,ARM64,ARM}, --print {X86_64,X86_32,ARM64,ARM} -p {X86_64,X86_32,ARM64,ARM}, --print {X86_64,X86_32,ARM64,ARM}
print the security hardening recommendations for the selected print the security hardening recommendations for the selected
microarchitecture microarchitecture
......
...@@ -48,7 +48,7 @@ def detect_arch(fname, archs): ...@@ -48,7 +48,7 @@ def detect_arch(fname, archs):
def detect_kernel_version(fname): def detect_kernel_version(fname):
with _open(fname, 'rt', encoding='utf-8') as f: with _open(fname, 'rt', encoding='utf-8') as f:
ver_pattern = re.compile("# Linux/.+ Kernel Configuration$") ver_pattern = re.compile("^# Linux/.+ Kernel Configuration$|^Linux version .+")
for line in f.readlines(): for line in f.readlines():
if ver_pattern.match(line): if ver_pattern.match(line):
line = line.strip() line = line.strip()
...@@ -241,6 +241,8 @@ def main(): ...@@ -241,6 +241,8 @@ def main():
help='check the security hardening options in the kernel cmdline file (contents of /proc/cmdline)') help='check the security hardening options in the kernel cmdline file (contents of /proc/cmdline)')
parser.add_argument('-s', '--sysctl', parser.add_argument('-s', '--sysctl',
help='check the security hardening options in the sysctl output file (`sudo sysctl -a > file`)') help='check the security hardening options in the sysctl output file (`sudo sysctl -a > file`)')
parser.add_argument('-v', '--kernel-version',
help='extract the version from the kernel version file (contents of /proc/version)')
parser.add_argument('-p', '--print', choices=supported_archs, parser.add_argument('-p', '--print', choices=supported_archs,
help='print the security hardening recommendations for the selected microarchitecture') help='print the security hardening recommendations for the selected microarchitecture')
parser.add_argument('-g', '--generate', choices=supported_archs, parser.add_argument('-g', '--generate', choices=supported_archs,
...@@ -274,8 +276,13 @@ def main(): ...@@ -274,8 +276,13 @@ def main():
if mode != 'json': if mode != 'json':
print(f'[+] Detected microarchitecture: {arch}') print(f'[+] Detected microarchitecture: {arch}')
kernel_version, msg = detect_kernel_version(args.config) if args.kernel_version:
kernel_version, msg = detect_kernel_version(args.kernel_version)
else:
kernel_version, msg = detect_kernel_version(args.config)
if kernel_version is None: if kernel_version is None:
if not args.kernel_version:
print('[!] Hint: provide the kernel version file through --kernel-version option')
sys.exit(f'[!] ERROR: {msg}') sys.exit(f'[!] ERROR: {msg}')
if mode != 'json': if mode != 'json':
print(f'[+] Detected kernel version: {kernel_version[0]}.{kernel_version[1]}') print(f'[+] Detected kernel version: {kernel_version[0]}.{kernel_version[1]}')
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment