Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(fetcher/fedora): fix archive version #395

Merged
merged 1 commit into from
Jun 13, 2024
Merged

fix(fetcher/fedora): fix archive version #395

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/fetch.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
12 changes: 6 additions & 6 deletions GNUmakefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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:
Expand All @@ -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 &
Expand Down
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion fetcher/fedora/fedora.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion integration/diff_server_mode.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading