diff --git a/tests/test_config.py b/tests/test_config.py index 34a550b..2b0517e 100644 --- a/tests/test_config.py +++ b/tests/test_config.py @@ -47,6 +47,7 @@ DEFAULT_SCAP_DATA_PATH, DEFAULT_SCAP_DATA_URL_PATH, DEFAULT_USER, + DEFAULT_VERSION, Config, EnterpriseSettings, ) @@ -264,7 +265,7 @@ def test_destination_prefix(self): self.assertEqual(values["destination-prefix"], Path("/opt/lib")) self.assertEqual( values["gvmd-data-destination"], - Path("/opt/lib/gvm/data-objects/gvmd/22.04"), + Path(f"/opt/lib/gvm/data-objects/gvmd/{DEFAULT_VERSION}"), ) self.assertEqual(values["notus-destination"], Path("/opt/lib/notus")) self.assertEqual( @@ -278,15 +279,21 @@ def test_destination_prefix(self): ) self.assertEqual( values["report-formats-destination"], - Path("/opt/lib/gvm/data-objects/gvmd/22.04/report-formats"), + Path( + f"/opt/lib/gvm/data-objects/gvmd/{DEFAULT_VERSION}/report-formats" + ), ) self.assertEqual( values["scan-configs-destination"], - Path("/opt/lib/gvm/data-objects/gvmd/22.04/scan-configs"), + Path( + f"/opt/lib/gvm/data-objects/gvmd/{DEFAULT_VERSION}/scan-configs" + ), ) self.assertEqual( values["port-lists-destination"], - Path("/opt/lib/gvm/data-objects/gvmd/22.04/port-lists"), + Path( + f"/opt/lib/gvm/data-objects/gvmd/{DEFAULT_VERSION}/port-lists" + ), ) self.assertEqual( values["openvas-lock-file"], @@ -308,35 +315,35 @@ def test_feed_url(self): self.assertEqual(values["feed-url"], "rsync://foo.bar") self.assertEqual( values["gvmd-data-url"], - "rsync://foo.bar/data-feed/22.04/", + f"rsync://foo.bar/data-feed/{DEFAULT_VERSION}/", ) self.assertEqual( values["notus-url"], - "rsync://foo.bar/vulnerability-feed/22.04/vt-data/notus/", + f"rsync://foo.bar/vulnerability-feed/{DEFAULT_VERSION}/vt-data/notus/", ) self.assertEqual( values["nasl-url"], - "rsync://foo.bar/vulnerability-feed/22.04/vt-data/nasl/", + f"rsync://foo.bar/vulnerability-feed/{DEFAULT_VERSION}/vt-data/nasl/", ) self.assertEqual( values["scap-data-url"], - "rsync://foo.bar/vulnerability-feed/22.04/scap-data/", + f"rsync://foo.bar/vulnerability-feed/{DEFAULT_VERSION}/scap-data/", ) self.assertEqual( values["cert-data-url"], - "rsync://foo.bar/vulnerability-feed/22.04/cert-data/", + f"rsync://foo.bar/vulnerability-feed/{DEFAULT_VERSION}/cert-data/", ) self.assertEqual( values["report-formats-url"], - "rsync://foo.bar/data-feed/22.04/report-formats/", + f"rsync://foo.bar/data-feed/{DEFAULT_VERSION}/report-formats/", ) self.assertEqual( values["scan-configs-url"], - "rsync://foo.bar/data-feed/22.04/scan-configs/", + f"rsync://foo.bar/data-feed/{DEFAULT_VERSION}/scan-configs/", ) self.assertEqual( values["port-lists-url"], - "rsync://foo.bar/data-feed/22.04/port-lists/", + f"rsync://foo.bar/data-feed/{DEFAULT_VERSION}/port-lists/", ) @patch.dict( diff --git a/tests/test_main.py b/tests/test_main.py index 1189075..3c50de0 100644 --- a/tests/test_main.py +++ b/tests/test_main.py @@ -22,6 +22,7 @@ from pontos.testing import temp_directory +from greenbone.feed.sync.config import DEFAULT_VERSION from greenbone.feed.sync.errors import GreenboneFeedSyncError, RsyncError from greenbone.feed.sync.main import ( Sync, @@ -120,12 +121,12 @@ async def test_do_not_run_as_root( [ call( url="rsync://feed.community.greenbone.net/community/" - "vulnerability-feed/22.04/vt-data/notus/", + f"vulnerability-feed/{DEFAULT_VERSION}/vt-data/notus/", destination=temp_dir / "notus", ), call( url="rsync://feed.community.greenbone.net/community/" - "vulnerability-feed/22.04/vt-data/nasl/", + f"vulnerability-feed/{DEFAULT_VERSION}/vt-data/nasl/", destination=temp_dir / "openvas/plugins", ), ] @@ -177,12 +178,12 @@ async def test_sync_nvts(self, rsync_mock: MagicMock): [ call( url="rsync://feed.community.greenbone.net/community/" - "vulnerability-feed/22.04/vt-data/notus/", + f"vulnerability-feed/{DEFAULT_VERSION}/vt-data/notus/", destination=temp_dir / "notus", ), call( url="rsync://feed.community.greenbone.net/community/" - "vulnerability-feed/22.04/vt-data/nasl/", + f"vulnerability-feed/{DEFAULT_VERSION}/vt-data/nasl/", destination=temp_dir / "openvas/plugins", ), ] @@ -222,15 +223,15 @@ async def test_sync_nvts_verbose(self, rsync_mock: MagicMock): call( "Downloading Notus files from " "rsync://feed.community.greenbone.net/community/" - "vulnerability-feed/22.04/vt-data/notus/ to " - f"{temp_dir}/notus" + f"vulnerability-feed/{DEFAULT_VERSION}/vt-data/notus/ " + f"to {temp_dir}/notus" ), call(), call( "Downloading NASL files from " "rsync://feed.community.greenbone.net/community/" - "vulnerability-feed/22.04/vt-data/nasl/ to " - f"{temp_dir}/openvas/plugins" + f"vulnerability-feed/{DEFAULT_VERSION}/vt-data/nasl/ " + f"to {temp_dir}/openvas/plugins" ), call(), call( @@ -244,12 +245,12 @@ async def test_sync_nvts_verbose(self, rsync_mock: MagicMock): [ call( url="rsync://feed.community.greenbone.net/community/" - "vulnerability-feed/22.04/vt-data/notus/", + f"vulnerability-feed/{DEFAULT_VERSION}/vt-data/notus/", destination=temp_dir / "notus", ), call( url="rsync://feed.community.greenbone.net/community/" - "vulnerability-feed/22.04/vt-data/nasl/", + f"vulnerability-feed/{DEFAULT_VERSION}/vt-data/nasl/", destination=temp_dir / "openvas/plugins", ), ] @@ -283,12 +284,12 @@ async def test_sync_nvts_quiet(self, rsync_mock: MagicMock): [ call( url="rsync://feed.community.greenbone.net/community/" - "vulnerability-feed/22.04/vt-data/notus/", + f"vulnerability-feed/{DEFAULT_VERSION}/vt-data/notus/", destination=temp_dir / "notus", ), call( url="rsync://feed.community.greenbone.net/community/" - "vulnerability-feed/22.04/vt-data/nasl/", + f"vulnerability-feed/{DEFAULT_VERSION}/vt-data/nasl/", destination=temp_dir / "openvas/plugins", ), ] @@ -339,7 +340,7 @@ async def test_sync_nvts_rsync_error(self, rsync_mock: MagicMock): [ call( url="rsync://feed.community.greenbone.net/community/" - "vulnerability-feed/22.04/vt-data/notus/", + f"vulnerability-feed/{DEFAULT_VERSION}/vt-data/notus/", destination=temp_dir / "notus", ), ] @@ -396,12 +397,12 @@ def test_sync_nvts(self, rsync_mock: MagicMock, console_mock: MagicMock): [ call( url="rsync://feed.community.greenbone.net/community/" - "vulnerability-feed/22.04/vt-data/notus/", + f"vulnerability-feed/{DEFAULT_VERSION}/vt-data/notus/", destination=temp_dir / "notus", ), call( url="rsync://feed.community.greenbone.net/community/" - "vulnerability-feed/22.04/vt-data/nasl/", + f"vulnerability-feed/{DEFAULT_VERSION}/vt-data/nasl/", destination=temp_dir / "openvas/plugins", ), ] @@ -457,7 +458,7 @@ def test_sync_nvts_error( [ call( url="rsync://feed.community.greenbone.net/community/" - "vulnerability-feed/22.04/vt-data/notus/", + f"vulnerability-feed/{DEFAULT_VERSION}/vt-data/notus/", destination=temp_dir / "notus", ), ] diff --git a/tests/test_parser.py b/tests/test_parser.py index fb46f75..23839fe 100644 --- a/tests/test_parser.py +++ b/tests/test_parser.py @@ -49,6 +49,7 @@ DEFAULT_SCAP_DATA_PATH, DEFAULT_SCAP_DATA_URL_PATH, DEFAULT_USER_CONFIG_FILE, + DEFAULT_VERSION, ) from greenbone.feed.sync.errors import ConfigFileError from greenbone.feed.sync.helper import DEFAULT_FLOCK_WAIT_INTERVAL @@ -742,35 +743,35 @@ def test_feed_url_from_enterprise_feed_key(self): ) self.assertEqual( args.gvmd_data_url, - "ssh://a_user@some.feed.server/enterprise/data-feed/22.04/", + f"ssh://a_user@some.feed.server/enterprise/data-feed/{DEFAULT_VERSION}/", ) self.assertEqual( args.port_lists_url, - "ssh://a_user@some.feed.server/enterprise/data-feed/22.04/port-lists/", + f"ssh://a_user@some.feed.server/enterprise/data-feed/{DEFAULT_VERSION}/port-lists/", ) self.assertEqual( args.report_formats_url, - "ssh://a_user@some.feed.server/enterprise/data-feed/22.04/report-formats/", + f"ssh://a_user@some.feed.server/enterprise/data-feed/{DEFAULT_VERSION}/report-formats/", ) self.assertEqual( args.scan_configs_url, - "ssh://a_user@some.feed.server/enterprise/data-feed/22.04/scan-configs/", + f"ssh://a_user@some.feed.server/enterprise/data-feed/{DEFAULT_VERSION}/scan-configs/", ) self.assertEqual( args.notus_url, - "ssh://a_user@some.feed.server/enterprise/vulnerability-feed/22.04/vt-data/notus/", + f"ssh://a_user@some.feed.server/enterprise/vulnerability-feed/{DEFAULT_VERSION}/vt-data/notus/", ) self.assertEqual( args.nasl_url, - "ssh://a_user@some.feed.server/enterprise/vulnerability-feed/22.04/vt-data/nasl/", + f"ssh://a_user@some.feed.server/enterprise/vulnerability-feed/{DEFAULT_VERSION}/vt-data/nasl/", ) self.assertEqual( args.scap_data_url, - "ssh://a_user@some.feed.server/enterprise/vulnerability-feed/22.04/scap-data/", + f"ssh://a_user@some.feed.server/enterprise/vulnerability-feed/{DEFAULT_VERSION}/scap-data/", ) self.assertEqual( args.cert_data_url, - "ssh://a_user@some.feed.server/enterprise/vulnerability-feed/22.04/cert-data/", + f"ssh://a_user@some.feed.server/enterprise/vulnerability-feed/{DEFAULT_VERSION}/cert-data/", ) def test_ignore_non_existing_enterprise_feed_key(self): @@ -784,35 +785,35 @@ def test_ignore_non_existing_enterprise_feed_key(self): ) self.assertEqual( args.gvmd_data_url, - "rsync://feed.community.greenbone.net/community/data-feed/22.04/", + f"rsync://feed.community.greenbone.net/community/data-feed/{DEFAULT_VERSION}/", ) self.assertEqual( args.port_lists_url, - "rsync://feed.community.greenbone.net/community/data-feed/22.04/port-lists/", + f"rsync://feed.community.greenbone.net/community/data-feed/{DEFAULT_VERSION}/port-lists/", ) self.assertEqual( args.report_formats_url, - "rsync://feed.community.greenbone.net/community/data-feed/22.04/report-formats/", + f"rsync://feed.community.greenbone.net/community/data-feed/{DEFAULT_VERSION}/report-formats/", ) self.assertEqual( args.scan_configs_url, - "rsync://feed.community.greenbone.net/community/data-feed/22.04/scan-configs/", + f"rsync://feed.community.greenbone.net/community/data-feed/{DEFAULT_VERSION}/scan-configs/", ) self.assertEqual( args.notus_url, - "rsync://feed.community.greenbone.net/community/vulnerability-feed/22.04/vt-data/notus/", + f"rsync://feed.community.greenbone.net/community/vulnerability-feed/{DEFAULT_VERSION}/vt-data/notus/", ) self.assertEqual( args.nasl_url, - "rsync://feed.community.greenbone.net/community/vulnerability-feed/22.04/vt-data/nasl/", + f"rsync://feed.community.greenbone.net/community/vulnerability-feed/{DEFAULT_VERSION}/vt-data/nasl/", ) self.assertEqual( args.scap_data_url, - "rsync://feed.community.greenbone.net/community/vulnerability-feed/22.04/scap-data/", + f"rsync://feed.community.greenbone.net/community/vulnerability-feed/{DEFAULT_VERSION}/scap-data/", ) self.assertEqual( args.cert_data_url, - "rsync://feed.community.greenbone.net/community/vulnerability-feed/22.04/cert-data/", + f"rsync://feed.community.greenbone.net/community/vulnerability-feed/{DEFAULT_VERSION}/cert-data/", ) @patch.object(sys, "argv", ["greenbone-nvt-sync"])