Skip to content

Commit

Permalink
Add a console script for verify-rpm
Browse files Browse the repository at this point in the history
This makes it possible to use the verification script from the console.

Signed-off-by: Patrick Uiterwijk <[email protected]>
  • Loading branch information
puiterwijk committed Aug 20, 2021
1 parent cda61da commit b1bf283
Show file tree
Hide file tree
Showing 4 changed files with 17 additions and 6 deletions.
2 changes: 2 additions & 0 deletions python-rpm-head-signing.spec
Original file line number Diff line number Diff line change
Expand Up @@ -139,13 +139,15 @@ PYTHONPATH=%{buildroot}%{python3_sitearch} SKIP_IMA_LIVE_CHECK=true python3 test
%license LICENSE
%{python2_sitearch}/%{srcname}/
%{python2_sitearch}/%{srcname}-%{version}-py%{python2_version}.egg-info/
%{_bindir}/verify-rpm-ima-signatures
%endif

%if %{with python3}
%files -n python%{python3_pkgversion}-%{pkgname}
%license LICENSE
%{python3_sitearch}/%{srcname}/
%{python3_sitearch}/%{srcname}-%{version}-py%{python3_version}.egg-info/
%{_bindir}/verify-rpm-ima-signatures
%endif


Expand Down
6 changes: 5 additions & 1 deletion verify_rpm.py → rpm_head_signing/verify_rpm.py
Original file line number Diff line number Diff line change
Expand Up @@ -191,11 +191,15 @@ def manual_sigcheck(file_path, correct_keyid, pubkey):
)


if __name__ == "__main__":
def __main__():
args = get_args().parse_args()
if args.debug:
logging.basicConfig(level=logging.DEBUG)
else:
logging.basicConfig(level=logging.INFO)
if not main(args):
raise Exception("At least one exception was thrown during validation")


if __name__ == "__main__":
__main__()
5 changes: 5 additions & 0 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -38,4 +38,9 @@
"rpm",
"pyxattr",
],
entry_points={
"console_scripts": [
"verify-rpm-ima-signatures=rpm_head_signing.verify_rpm:__main__",
],
},
)
10 changes: 5 additions & 5 deletions test.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
import unittest

import rpm_head_signing
import verify_rpm
import rpm_head_signing.verify_rpm


class TestRpmHeadSigning(unittest.TestCase):
Expand Down Expand Up @@ -179,8 +179,8 @@ def test_verify_rpm(self):
args = self._get_verify_rpm_args()
args.extend([os.path.join(self.asset_dir, "testpkg-1.rpm")])

args = verify_rpm.get_args().parse_args(args)
self.assertFalse(verify_rpm.main(args))
args = rpm_head_signing.verify_rpm.get_args().parse_args(args)
self.assertFalse(rpm_head_signing.verify_rpm.main(args))

def test_insert_ima_valgrind_normal(self):
self._test_insert_ima_valgrind("normal", "15f712be")
Expand Down Expand Up @@ -305,8 +305,8 @@ def _ima_insertion_test(self, insert_command, rpm_keyid, nonhdrsigned=False):
args = self._get_verify_rpm_args()
args.extend(rpm_paths)

args = verify_rpm.get_args().parse_args(args)
self.assertTrue(verify_rpm.main(args))
args = rpm_head_signing.verify_rpm.get_args().parse_args(args)
self.assertTrue(rpm_head_signing.verify_rpm.main(args))

def _get_verify_rpm_args(self):
args = []
Expand Down

0 comments on commit b1bf283

Please sign in to comment.