From 9f6d66b3feb090d99e998907d0ee1e808fdf71dd Mon Sep 17 00:00:00 2001 From: MaineK00n Date: Thu, 13 Jun 2024 14:45:22 +0900 Subject: [PATCH] fix(fetcher/fedora): fix archive version --- .github/workflows/fetch.yml | 2 +- GNUmakefile | 12 ++++++------ README.md | 2 +- fetcher/fedora/fedora.go | 2 +- integration/diff_server_mode.py | 2 +- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/fetch.yml b/.github/workflows/fetch.yml index 9450ffc9..69773f91 100644 --- a/.github/workflows/fetch.yml +++ b/.github/workflows/fetch.yml @@ -354,7 +354,7 @@ jobs: --health-timeout 5s --health-retries 5 env: - Version: 32 33 34 35 36 37 38 39 + Version: 32 33 34 35 36 37 38 39 40 steps: - name: Check out code into the Go module directory uses: actions/checkout@v3 diff --git a/GNUmakefile b/GNUmakefile index 79ea8bba..edc4b71b 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -100,7 +100,7 @@ fetch-rdb: integration/goval-dict.old fetch suse --dbpath=$(PWD)/integration/oval.old.sqlite3 --suse-type opensuse-leap 42.1 42.2 42.3 15.0 15.1 15.2 15.3 integration/goval-dict.old fetch suse --dbpath=$(PWD)/integration/oval.old.sqlite3 --suse-type suse-enterprise-server 9 10 11 12 15 integration/goval-dict.old fetch suse --dbpath=$(PWD)/integration/oval.old.sqlite3 --suse-type suse-enterprise-desktop 10 11 12 15 - integration/goval-dict.old fetch fedora --dbpath=$(PWD)/integration/oval.old.sqlite3 32 33 34 35 + integration/goval-dict.old fetch fedora --dbpath=$(PWD)/integration/oval.old.sqlite3 32 33 34 35 36 37 38 39 40 integration/goval-dict.new fetch debian --dbpath=$(PWD)/integration/oval.new.sqlite3 7 8 9 10 11 integration/goval-dict.new fetch ubuntu --dbpath=$(PWD)/integration/oval.new.sqlite3 14.04 16.04 18.04 20.04 21.04 21.10 22.04 22.10 23.04 23.10 24.04 @@ -112,7 +112,7 @@ fetch-rdb: integration/goval-dict.new fetch suse --dbpath=$(PWD)/integration/oval.new.sqlite3 --suse-type opensuse-leap 42.1 42.2 42.3 15.0 15.1 15.2 15.3 integration/goval-dict.new fetch suse --dbpath=$(PWD)/integration/oval.new.sqlite3 --suse-type suse-enterprise-server 9 10 11 12 15 integration/goval-dict.new fetch suse --dbpath=$(PWD)/integration/oval.new.sqlite3 --suse-type suse-enterprise-desktop 10 11 12 15 - integration/goval-dict.new fetch fedora --dbpath=$(PWD)/integration/oval.new.sqlite3 32 33 34 35 + integration/goval-dict.new fetch fedora --dbpath=$(PWD)/integration/oval.new.sqlite3 32 33 34 35 36 37 38 39 40 fetch-redis: docker run --name redis-old -d -p 127.0.0.1:6379:6379 redis @@ -128,7 +128,7 @@ fetch-redis: integration/goval-dict.old fetch suse --dbtype redis --dbpath "redis://127.0.0.1:6379/0" --suse-type opensuse-leap 42.1 42.2 42.3 15.0 15.1 15.2 15.3 integration/goval-dict.old fetch suse --dbtype redis --dbpath "redis://127.0.0.1:6379/0" --suse-type suse-enterprise-server 9 10 11 12 15 integration/goval-dict.old fetch suse --dbtype redis --dbpath "redis://127.0.0.1:6379/0" --suse-type suse-enterprise-desktop 10 11 12 15 - integration/goval-dict.old fetch fedora --dbtype redis --dbpath "redis://127.0.0.1:6379/0" 32 33 34 35 + integration/goval-dict.old fetch fedora --dbtype redis --dbpath "redis://127.0.0.1:6379/0" 32 33 34 35 36 37 38 39 40 integration/goval-dict.new fetch debian --dbtype redis --dbpath "redis://127.0.0.1:6380/0" 7 8 9 10 11 integration/goval-dict.new fetch ubuntu --dbtype redis --dbpath "redis://127.0.0.1:6380/0" 14.04 16.04 18.04 20.04 21.04 21.10 22.04 22.10 23.04 23.10 24.04 @@ -140,7 +140,7 @@ fetch-redis: integration/goval-dict.new fetch suse --dbtype redis --dbpath "redis://127.0.0.1:6380/0" --suse-type opensuse-leap 42.1 42.2 42.3 15.0 15.1 15.2 15.3 integration/goval-dict.new fetch suse --dbtype redis --dbpath "redis://127.0.0.1:6380/0" --suse-type suse-enterprise-server 9 10 11 12 15 integration/goval-dict.new fetch suse --dbtype redis --dbpath "redis://127.0.0.1:6380/0" --suse-type suse-enterprise-desktop 10 11 12 15 - integration/goval-dict.new fetch fedora --dbtype redis --dbpath "redis://127.0.0.1:6380/0" 32 33 34 35 + integration/goval-dict.new fetch fedora --dbtype redis --dbpath "redis://127.0.0.1:6380/0" 32 33 34 35 36 37 38 39 40 diff-cveid: @ python integration/diff_server_mode.py --sample-rate 0.01 cveid debian 7 8 9 10 11 @@ -156,7 +156,7 @@ diff-cveid: @ python integration/diff_server_mode.py --sample-rate 0.01 cveid suse --suse-type opensuse.leap 42.1 42.2 42.3 15.0 15.1 15.2 15.3 @ python integration/diff_server_mode.py --sample-rate 0.01 cveid suse --suse-type suse.linux.enterprise.server 9 10 11 12 15 @ python integration/diff_server_mode.py --sample-rate 0.01 cveid suse --suse-type suse.linux.enterprise.desktop 10 11 12 15 - @ python integration/diff_server_mode.py --sample-rate 0.01 cveid fedora 32 33 34 35 + @ python integration/diff_server_mode.py --sample-rate 0.01 cveid fedora 32 33 34 35 36 37 38 39 40 diff-package: @@ -173,7 +173,7 @@ diff-package: @ python integration/diff_server_mode.py --sample-rate 0.01 package suse --suse-type opensuse.leap 42.1 42.2 42.3 15.0 15.1 15.2 15.3 @ python integration/diff_server_mode.py --sample-rate 0.01 package suse --suse-type suse.linux.enterprise.server 9 10 11 12 15 @ python integration/diff_server_mode.py --sample-rate 0.01 package suse --suse-type suse.linux.enterprise.desktop 10 11 12 15 - @ python integration/diff_server_mode.py --sample-rate 0.01 package fedora 32 33 34 35 + @ python integration/diff_server_mode.py --sample-rate 0.01 package fedora 32 33 34 35 36 37 38 39 40 diff-server-rdb: integration/goval-dict.old server --dbpath=$(PWD)/integration/oval.old.sqlite3 --port 1325 > /dev/null 2>&1 & diff --git a/README.md b/README.md index 9ecde3eb..056debc2 100644 --- a/README.md +++ b/README.md @@ -180,7 +180,7 @@ Amazon ALAS provideis Vulnerability data as `no-OVAL-format`, but it is supporte - [Fedora Updates](https://dl.fedoraproject.org/pub/fedora/linux/updates/) ```bash -$ goval-dictionary fetch fedora 32 33 34 35 36 37 38 +$ goval-dictionary fetch fedora 32 33 34 35 36 37 38 39 40 ``` ### Usage: select oval by package name diff --git a/fetcher/fedora/fedora.go b/fetcher/fedora/fedora.go index 9095e1ab..e0ace76c 100644 --- a/fetcher/fedora/fedora.go +++ b/fetcher/fedora/fedora.go @@ -89,7 +89,7 @@ func newFedoraFetchRequests(target []string, arch string) (reqs []util.FetchRequ case n < 32: log15.Warn("Skip fedora because no vulnerability information provided.", "version", v) continue - case n < 37: + case n < 39: updateURL = archiveUpdateURL moduleURL = archiveModuleURL default: diff --git a/integration/diff_server_mode.py b/integration/diff_server_mode.py index 057287c4..2d41382b 100644 --- a/integration/diff_server_mode.py +++ b/integration/diff_server_mode.py @@ -172,7 +172,7 @@ def diff_response(args: Tuple[str, str, str, str, str]): f'Failed to diff_response..., err: This Release Version({args.release}) does not support test mode') raise NotImplementedError elif args.ostype == 'fedora': - if len(list(set(args.release) - set(['32', '33', '34', '35']))) > 0: + if len(list(set(args.release) - set(['32', '33', '34', '35', '36', '37', '38', '39', '40']))) > 0: logger.error( f'Failed to diff_response..., err: This Release Version({args.release}) does not support test mode') raise NotImplementedError