class OptCheck:
def __init__(self, reason, decision, name, expected):
assert(name and name == name.strip() and len(name.split()) == 1), \
- 'invalid name "{}" for {}'.format(name, self.__class__.__name__)
+ f'invalid name "{name}" for {self.__class__.__name__}'
self.name = name
assert(decision and decision == decision.strip() and len(decision.split()) == 1), \
- 'invalid decision "{}" for "{}" check'.format(decision, name)
+ f'invalid decision "{decision}" for "{name}" check'
self.decision = decision
assert(reason and reason == reason.strip() and len(reason.split()) == 1), \
- 'invalid reason "{}" for "{}" check'.format(reason, name)
+ f'invalid reason "{reason}" for "{name}" check'
self.reason = reason
assert(expected and expected == expected.strip()), \
- 'invalid expected value "{}" for "{}" check (1)'.format(expected, name)
+ f'invalid expected value "{expected}" for "{name}" check (1)'
val_len = len(expected.split())
if val_len == 3:
assert(expected in ('is not set', 'is not off')), \
- 'invalid expected value "{}" for "{}" check (2)'.format(expected, name)
+ f'invalid expected value "{expected}" for "{name}" check (2)'
elif val_len == 2:
assert(expected == 'is present'), \
- 'invalid expected value "{}" for "{}" check (3)'.format(expected, name)
+ f'invalid expected value "{expected}" for "{name}" check (3)'
else:
assert(val_len == 1), \
- 'invalid expected value "{}" for "{}" check (4)'.format(expected, name)
+ f'invalid expected value "{expected}" for "{name}" check (4)'
self.expected = expected
self.state = None
self.result = 'FAIL: "' + self.state + '"'
def table_print(self, _mode, with_results):
- print('{:<40}|{:^7}|{:^12}|{:^10}|{:^18}'.format(self.name, self.type, self.expected, self.decision, self.reason), end='')
+ print(f'{self.name:<40}|{self.type:^7}|{self.expected:^12}|{self.decision:^10}|{self.reason:^18}', end='')
if with_results:
- print('| {}'.format(self.result), end='')
+ print(f'| {self.result}', end='')
def json_dump(self, with_results):
dump = [self.name, self.type, self.expected, self.decision, self.reason]
class VersionCheck:
def __init__(self, ver_expected):
assert(ver_expected and isinstance(ver_expected, tuple) and len(ver_expected) == 2), \
- 'invalid version "{}" for VersionCheck'.format(ver_expected)
+ f'invalid version "{ver_expected}" for VersionCheck'
self.ver_expected = ver_expected
self.ver = ()
self.result = None
def table_print(self, _mode, with_results):
ver_req = 'kernel version >= ' + str(self.ver_expected[0]) + '.' + str(self.ver_expected[1])
- print('{:<91}'.format(ver_req), end='')
+ print(f'{ver_req:<91}', end='')
if with_results:
- print('| {}'.format(self.result), end='')
+ print(f'| {self.result}', end='')
class ComplexOptCheck:
def __init__(self, *opts):
self.opts = opts
assert(self.opts), \
- 'empty {} check'.format(self.__class__.__name__)
+ f'empty {self.__class__.__name__} check'
assert(len(self.opts) != 1), \
- 'useless {} check: {}'.format(self.__class__.__name__, opts)
+ f'useless {self.__class__.__name__} check: {opts}'
assert(isinstance(opts[0], (KconfigCheck, CmdlineCheck))), \
- 'invalid {} check: {}'.format(self.__class__.__name__, opts)
+ f'invalid {self.__class__.__name__} check: {opts}'
self.result = None
@property
def table_print(self, mode, with_results):
if mode == 'verbose':
- print(' {:87}'.format('<<< ' + self.__class__.__name__ + ' >>>'), end='')
+ print(f" {'<<< ' + self.__class__.__name__ + ' >>>':87}", end='')
if with_results:
- print('| {}'.format(self.result), end='')
+ print(f'| {self.result}', end='')
for o in self.opts:
print()
o.table_print(mode, with_results)
o = self.opts[0]
o.table_print(mode, False)
if with_results:
- print('| {}'.format(self.result), end='')
+ print(f'| {self.result}', end='')
def json_dump(self, with_results):
dump = self.opts[0].json_dump(False)
else:
# VersionCheck provides enough info
assert(opt.result.startswith('OK: version')), \
- 'unexpected OK description "{}"'.format(opt.result)
+ f'unexpected OK description "{opt.result}"'
return
self.result = self.opts[0].result
# VersionCheck provides enough info
self.result = opt.result
assert(opt.result.startswith('FAIL: version')), \
- 'unexpected FAIL description "{}"'.format(opt.result)
+ f'unexpected FAIL description "{opt.result}"'
return
continue
for o3 in o2.opts:
assert(o3.type != 'complex'), \
- 'unexpected ComplexOptCheck inside {}'.format(o2.name)
+ f'unexpected ComplexOptCheck inside {o2.name}'
if hasattr(o3, 'name'):
known_options.append(o3.name)
for option, value in parsed_options.items():
if option not in known_options:
- print('[?] No check for option {} ({})'.format(option, value))
+ print(f'[?] No check for option {option} ({value})')
def print_checklist(mode, checklist, with_results):
if with_results:
sep_line_len += 30
print('=' * sep_line_len)
- print('{:^40}|{:^7}|{:^12}|{:^10}|{:^18}'.format('option name', 'type', 'desired val', 'decision', 'reason'), end='')
+ print(f"{'option name':^40}|{'type':^7}|{'desired val':^12}|{'decision':^10}|{'reason':^18}", end='')
if with_results:
- print('| {}'.format('check result'), end='')
+ print('| check result', end='')
print()
print('=' * sep_line_len)
if mode == 'show_fail':
ok_suppressed = ' (suppressed in output)'
if mode != 'json':
- print('[+] Config check is finished: \'OK\' - {}{} / \'FAIL\' - {}{}'.format(ok_count, ok_suppressed, fail_count, fail_suppressed))
+ print(f'[+] Config check is finished: \'OK\' - {ok_count}{ok_suppressed} / \'FAIL\' - {fail_count}{fail_suppressed}')
def populate_simple_opt_with_data(opt, data, data_type):
assert(opt.type != 'complex'), \
- 'unexpected ComplexOptCheck "{}"'.format(opt.name)
+ f'unexpected ComplexOptCheck "{opt.name}"'
assert(opt.type in SIMPLE_OPTION_TYPES), \
- 'invalid opt type "{}"'.format(opt.type)
+ f'invalid opt type "{opt.type}"'
assert(data_type in SIMPLE_OPTION_TYPES), \
- 'invalid data type "{}"'.format(data_type)
+ f'invalid data type "{data_type}"'
if data_type != opt.type:
return
opt.state = data.get(opt.name, None)
else:
assert(data_type == 'version'), \
- 'unexpected data type "{}"'.format(data_type)
+ f'unexpected data type "{data_type}"'
opt.ver = data
populate_simple_opt_with_data(o, data, data_type)
else:
assert(opt.type in ('kconfig', 'cmdline')), \
- 'bad type "{}" for a simple check'.format(opt.type)
+ f'bad type "{opt.type}" for a simple check'
populate_simple_opt_with_data(opt, data, data_type)
if args.mode:
mode = args.mode
if mode != 'json':
- print('[+] Special report mode: {}'.format(mode))
+ print(f'[+] Special report mode: {mode}')
config_checklist = []
sys.exit('[!] ERROR: --config and --print can\'t be used together')
if mode != 'json':
- print('[+] Kconfig file to check: {}'.format(args.config))
+ print(f'[+] Kconfig file to check: {args.config}')
if args.cmdline:
- print('[+] Kernel cmdline file to check: {}'.format(args.cmdline))
+ print(f'[+] Kernel cmdline file to check: {args.cmdline}')
arch, msg = detect_arch(args.config, supported_archs)
if not arch:
sys.exit('[!] ERROR: {}'.format(msg))
if mode != 'json':
- print('[+] Detected architecture: {}'.format(arch))
+ print(f'[+] Detected architecture: {arch}')
kernel_version, msg = detect_kernel_version(args.config)
if not kernel_version:
sys.exit('[!] ERROR: {}'.format(msg))
if mode != 'json':
- print('[+] Detected kernel version: {}.{}'.format(kernel_version[0], kernel_version[1]))
+ print(f'[+] Detected kernel version: {kernel_version[0]}.{kernel_version[1]}')
compiler, msg = detect_compiler(args.config)
if mode != 'json':
if compiler:
- print('[+] Detected compiler: {}'.format(compiler))
+ print(f'[+] Detected compiler: {compiler}')
else:
- print('[-] Can\'t detect the compiler: {}'.format(msg))
+ print(f'[-] Can\'t detect the compiler: {msg}')
# add relevant kconfig checks to the checklist
add_kconfig_checks(config_checklist, arch)
add_kconfig_checks(config_checklist, arch)
add_cmdline_checks(config_checklist, arch)
if mode != 'json':
- print('[+] Printing kernel security hardening preferences for {}...'.format(arch))
+ print(f'[+] Printing kernel security hardening preferences for {arch}...')
print_checklist(mode, config_checklist, False)
sys.exit(0)
projects / kconfig-hardened-check.git / blobdiff