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 (parent:
b0b91b5
)
Drop unneeded return values (refactoring)
author
Alexander Popov
<alex.popov@linux.com>
Mon, 28 Mar 2022 09:54:47 +0000
(12:54 +0300)
committer
Alexander Popov
<alex.popov@linux.com>
Mon, 28 Mar 2022 09:54:47 +0000
(12:54 +0300)
kconfig_hardened_check/__init__.py
patch
|
blob
|
history
diff --git
a/kconfig_hardened_check/__init__.py
b/kconfig_hardened_check/__init__.py
index 3f7aa19ced429e1951f98817218ab01dc516ef5b..793e7d31be6137ca90d825b2bd74fa7fb6f1ed2d 100644
(file)
--- a/
kconfig_hardened_check/__init__.py
+++ b/
kconfig_hardened_check/__init__.py
@@
-103,10
+103,6
@@
class OptCheck:
else:
self.result = 'FAIL: "' + self.state + '"'
else:
self.result = 'FAIL: "' + self.state + '"'
- if self.result.startswith('OK'):
- return True
- return False
-
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='')
if with_results:
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='')
if with_results:
@@
-142,15
+138,14
@@
class VersionCheck:
def check(self):
if self.ver[0] > self.ver_expected[0]:
self.result = 'OK: version >= ' + str(self.ver_expected[0]) + '.' + str(self.ver_expected[1])
def check(self):
if self.ver[0] > self.ver_expected[0]:
self.result = 'OK: version >= ' + str(self.ver_expected[0]) + '.' + str(self.ver_expected[1])
- return
True
+ return
if self.ver[0] < self.ver_expected[0]:
self.result = 'FAIL: version < ' + str(self.ver_expected[0]) + '.' + str(self.ver_expected[1])
if self.ver[0] < self.ver_expected[0]:
self.result = 'FAIL: version < ' + str(self.ver_expected[0]) + '.' + str(self.ver_expected[1])
- return
False
+ return
if self.ver[1] >= self.ver_expected[1]:
self.result = 'OK: version >= ' + str(self.ver_expected[0]) + '.' + str(self.ver_expected[1])
if self.ver[1] >= self.ver_expected[1]:
self.result = 'OK: version >= ' + str(self.ver_expected[0]) + '.' + str(self.ver_expected[1])
- return
True
+ return
self.result = 'FAIL: version < ' + str(self.ver_expected[0]) + '.' + str(self.ver_expected[1])
self.result = 'FAIL: version < ' + str(self.ver_expected[0]) + '.' + str(self.ver_expected[1])
- return False
def table_print(self, _mode, with_results):
ver_req = 'kernel version >= ' + str(self.ver_expected[0]) + '.' + str(self.ver_expected[1])
def table_print(self, _mode, with_results):
ver_req = 'kernel version >= ' + str(self.ver_expected[0]) + '.' + str(self.ver_expected[1])
@@
-172,9
+167,8
@@
class PresenceCheck:
def check(self):
if self.state is None:
self.result = 'FAIL: not present'
def check(self):
if self.state is None:
self.result = 'FAIL: not present'
- return
False
+ return
self.result = 'OK: is present'
self.result = 'OK: is present'
- return True
def table_print(self, _mode, with_results):
print('{:<91}'.format(self.name + ' is present'), end='')
def table_print(self, _mode, with_results):
print('{:<91}'.format(self.name + ' is present'), end='')
@@
-239,22
+233,19
@@
class OR(ComplexOptCheck):
# Use cases:
# OR(<X_is_hardened>, <X_is_disabled>)
# OR(<X_is_hardened>, <old_X_is_hardened>)
# Use cases:
# OR(<X_is_hardened>, <X_is_disabled>)
# OR(<X_is_hardened>, <old_X_is_hardened>)
-
def check(self):
if not self.opts:
sys.exit('[!] ERROR: invalid OR check')
def check(self):
if not self.opts:
sys.exit('[!] ERROR: invalid OR check')
-
for i, opt in enumerate(self.opts):
for i, opt in enumerate(self.opts):
-
ret =
opt.check()
- if
ret
:
+ opt.check()
+ if
opt.result.startswith('OK')
:
if opt.result == 'OK' and i != 0:
# Simple OK is not enough for additional checks, add more info:
self.result = 'OK: {} "{}"'.format(opt.name, opt.expected)
else:
self.result = opt.result
if opt.result == 'OK' and i != 0:
# Simple OK is not enough for additional checks, add more info:
self.result = 'OK: {} "{}"'.format(opt.name, opt.expected)
else:
self.result = opt.result
- return
True
+ return
self.result = self.opts[0].result
self.result = self.opts[0].result
- return False
class AND(ComplexOptCheck):
class AND(ComplexOptCheck):
@@
-263,14
+254,13
@@
class AND(ComplexOptCheck):
# AND(<suboption>, <main_option>)
# Suboption is not checked if checking of the main_option is failed.
# AND(<X_is_disabled>, <old_X_is_disabled>)
# AND(<suboption>, <main_option>)
# Suboption is not checked if checking of the main_option is failed.
# AND(<X_is_disabled>, <old_X_is_disabled>)
-
def check(self):
for i, opt in reversed(list(enumerate(self.opts))):
def check(self):
for i, opt in reversed(list(enumerate(self.opts))):
-
ret =
opt.check()
+ opt.check()
if i == 0:
self.result = opt.result
if i == 0:
self.result = opt.result
- return
ret
- if not
ret
:
+ return
+ if not
opt.result.startswith('OK')
:
# This FAIL is caused by additional checks,
# and not by the main option that this AND-check is about.
# Describe the reason of the FAIL.
# This FAIL is caused by additional checks,
# and not by the main option that this AND-check is about.
# Describe the reason of the FAIL.
@@
-281,8
+271,7
@@
class AND(ComplexOptCheck):
else:
# This FAIL message is self-explaining.
self.result = opt.result
else:
# This FAIL message is self-explaining.
self.result = opt.result
- return False
-
+ return
sys.exit('[!] ERROR: invalid AND check')
sys.exit('[!] ERROR: invalid AND check')
@@
-772,8
+761,6
@@
def parse_kconfig_file(parsed_options, fname):
if option:
parsed_options[option] = value
if option:
parsed_options[option] = value
- return parsed_options
-
def main():
# Report modes:
def main():
# Report modes: