projects
/
kconfig-hardened-check.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
db71a9e
)
Refactoring of the argument parsing
author
Alexander Popov
<alex.popov@linux.com>
Mon, 12 Jun 2023 13:50:54 +0000
(16:50 +0300)
committer
Alexander Popov
<alex.popov@linux.com>
Mon, 12 Jun 2023 14:38:01 +0000
(17:38 +0300)
kconfig_hardened_check/__init__.py
patch
|
blob
|
history
diff --git
a/kconfig_hardened_check/__init__.py
b/kconfig_hardened_check/__init__.py
index b59835780700638105666f0db365c2af7d2373db..b2cee8feb8273d33429a79680f72ff3e84eb6bb9 100644
(file)
--- a/
kconfig_hardened_check/__init__.py
+++ b/
kconfig_hardened_check/__init__.py
@@
-165,14
+165,14
@@
def parse_kconfig_file(parsed_options, fname):
if opt_is_on.match(line):
option, value = line.split('=', 1)
if value == 'is not set':
if opt_is_on.match(line):
option, value = line.split('=', 1)
if value == 'is not set':
- sys.exit(f'[!] ERROR: bad enabled
k
config option "{line}"')
+ sys.exit(f'[!] ERROR: bad enabled
K
config option "{line}"')
elif opt_is_off.match(line):
option, value = line[2:].split(' ', 1)
if value != 'is not set':
elif opt_is_off.match(line):
option, value = line[2:].split(' ', 1)
if value != 'is not set':
- sys.exit(f'[!] ERROR: bad disabled
k
config option "{line}"')
+ sys.exit(f'[!] ERROR: bad disabled
K
config option "{line}"')
if option in parsed_options:
if option in parsed_options:
- sys.exit(f'[!] ERROR:
k
config option "{line}" exists multiple times')
+ sys.exit(f'[!] ERROR:
K
config option "{line}" exists multiple times')
if option:
parsed_options[option] = value
if option:
parsed_options[option] = value
@@
-200,7
+200,7
@@
def parse_cmdline_file(parsed_options, fname):
def main():
# Report modes:
# * verbose mode for
def main():
# Report modes:
# * verbose mode for
- # - reporting about unknown kernel options in the
k
config
+ # - reporting about unknown kernel options in the
K
config
# - verbose printing of ComplexOptCheck items
# * json mode for printing the results in JSON format
report_modes = ['verbose', 'json', 'show_ok', 'show_fail']
# - verbose printing of ComplexOptCheck items
# * json mode for printing the results in JSON format
report_modes = ['verbose', 'json', 'show_ok', 'show_fail']
@@
-208,14
+208,14
@@
def main():
parser = ArgumentParser(prog='kconfig-hardened-check',
description='A tool for checking the security hardening options of the Linux kernel')
parser.add_argument('--version', action='version', version='%(prog)s ' + __version__)
parser = ArgumentParser(prog='kconfig-hardened-check',
description='A tool for checking the security hardening options of the Linux kernel')
parser.add_argument('--version', action='version', version='%(prog)s ' + __version__)
- parser.add_argument('-
p', '--print', choices=supported_arch
s,
- help='
print the security hardening recommendations for the selected microarchitectur
e')
+ parser.add_argument('-
m', '--mode', choices=report_mode
s,
+ help='
choose the report mod
e')
parser.add_argument('-c', '--config',
parser.add_argument('-c', '--config',
- help='check the security hardening options in the kernel
k
config file (also supports *.gz files)')
+ help='check the security hardening options in the kernel
K
config file (also supports *.gz files)')
parser.add_argument('-l', '--cmdline',
help='check the security hardening options in the kernel cmdline file')
parser.add_argument('-l', '--cmdline',
help='check the security hardening options in the kernel cmdline file')
- parser.add_argument('-
m', '--mode', choices=report_mode
s,
- help='
choose the report mod
e')
+ parser.add_argument('-
p', '--print', choices=supported_arch
s,
+ help='
print the security hardening recommendations for the selected microarchitectur
e')
args = parser.parse_args()
mode = None
args = parser.parse_args()
mode = None
@@
-254,14
+254,14
@@
def main():
else:
print(f'[-] Can\'t detect the compiler: {msg}')
else:
print(f'[-] Can\'t detect the compiler: {msg}')
- # add relevant
k
config checks to the checklist
+ # add relevant
K
config checks to the checklist
add_kconfig_checks(config_checklist, arch)
if args.cmdline:
# add relevant cmdline checks to the checklist
add_cmdline_checks(config_checklist, arch)
add_kconfig_checks(config_checklist, arch)
if args.cmdline:
# add relevant cmdline checks to the checklist
add_cmdline_checks(config_checklist, arch)
- # populate the checklist with the parsed
k
config data
+ # populate the checklist with the parsed
K
config data
parsed_kconfig_options = OrderedDict()
parse_kconfig_file(parsed_kconfig_options, args.config)
populate_with_data(config_checklist, parsed_kconfig_options, 'kconfig')
parsed_kconfig_options = OrderedDict()
parse_kconfig_file(parsed_kconfig_options, args.config)
populate_with_data(config_checklist, parsed_kconfig_options, 'kconfig')
@@
-295,10
+295,11
@@
def main():
sys.exit(0)
elif args.cmdline:
sys.exit(0)
elif args.cmdline:
- sys.exit('[!] ERROR: checking cmdline doesn\'t work without checking
k
config')
+ sys.exit('[!] ERROR: checking cmdline doesn\'t work without checking
K
config')
if args.print:
if args.print:
- if mode in ('show_ok', 'show_fail'):
+ assert(args.config is None and args.cmdline is None), 'unexpected args'
+ if mode and mode not in ('verbose', 'json'):
sys.exit(f'[!] ERROR: wrong mode "{mode}" for --print')
arch = args.print
add_kconfig_checks(config_checklist, arch)
sys.exit(f'[!] ERROR: wrong mode "{mode}" for --print')
arch = args.print
add_kconfig_checks(config_checklist, arch)