diff --git a/.github/workflows/fetch.yml b/.github/workflows/fetch.yml index 69773f9..9adb09b 100644 --- a/.github/workflows/fetch.yml +++ b/.github/workflows/fetch.yml @@ -478,7 +478,7 @@ jobs: --health-timeout 5s --health-retries 5 env: - Version: 42.1 42.2 42.3 15.0 15.1 15.2 15.3 15.4 + Version: 42.1 42.2 42.3 15.0 15.1 15.2 15.3 15.4 15.5 15.6 steps: - name: Check out code into the Go module directory uses: actions/checkout@v3 @@ -664,7 +664,7 @@ jobs: --health-timeout 5s --health-retries 5 env: - Version: 3.2 3.3 3.4 3.5 3.6 3.7 3.8 3.9 3.10 3.11 3.12 3.13 3.14 3.15 3.16 3.17 3.18 3.19 + Version: 3.2 3.3 3.4 3.5 3.6 3.7 3.8 3.9 3.10 3.11 3.12 3.13 3.14 3.15 3.16 3.17 3.18 3.19 3.20 steps: - name: Check out code into the Go module directory uses: actions/checkout@v3 diff --git a/GNUmakefile b/GNUmakefile index edc4b71..15f202a 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -90,26 +90,26 @@ clean-integration: -docker rm redis-old redis-new fetch-rdb: - integration/goval-dict.old fetch debian --dbpath=$(PWD)/integration/oval.old.sqlite3 7 8 9 10 11 + integration/goval-dict.old fetch debian --dbpath=$(PWD)/integration/oval.old.sqlite3 7 8 9 10 11 12 integration/goval-dict.old fetch ubuntu --dbpath=$(PWD)/integration/oval.old.sqlite3 14.04 16.04 18.04 20.04 21.04 21.10 22.04 22.10 23.04 23.10 24.04 integration/goval-dict.old fetch redhat --dbpath=$(PWD)/integration/oval.old.sqlite3 5 6 7 8 9 integration/goval-dict.old fetch oracle --dbpath=$(PWD)/integration/oval.old.sqlite3 5 6 7 8 9 integration/goval-dict.old fetch amazon --dbpath=$(PWD)/integration/oval.old.sqlite3 1 2 2022 2023 integration/goval-dict.old fetch alpine --dbpath=$(PWD)/integration/oval.old.sqlite3 3.2 3.3 3.4 3.5 3.6 3.7 3.8 3.9 3.10 3.11 3.12 3.13 3.14 3.15 3.16 3.17 integration/goval-dict.old fetch suse --dbpath=$(PWD)/integration/oval.old.sqlite3 --suse-type opensuse 10.2 10.3 11.0 11.1 11.2 11.3 11.4 12.1 12.2 12.3 13.1 13.2 tumbleweed - 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 opensuse-leap 42.1 42.2 42.3 15.0 15.1 15.2 15.3 15.4 15.5 15.6 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 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 debian --dbpath=$(PWD)/integration/oval.new.sqlite3 7 8 9 10 11 12 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 integration/goval-dict.new fetch redhat --dbpath=$(PWD)/integration/oval.new.sqlite3 5 6 7 8 9 integration/goval-dict.new fetch oracle --dbpath=$(PWD)/integration/oval.new.sqlite3 5 6 7 8 9 integration/goval-dict.new fetch amazon --dbpath=$(PWD)/integration/oval.new.sqlite3 1 2 2022 2023 integration/goval-dict.new fetch alpine --dbpath=$(PWD)/integration/oval.new.sqlite3 3.2 3.3 3.4 3.5 3.6 3.7 3.8 3.9 3.10 3.11 3.12 3.13 3.14 3.15 3.16 3.17 integration/goval-dict.new fetch suse --dbpath=$(PWD)/integration/oval.new.sqlite3 --suse-type opensuse 10.2 10.3 11.0 11.1 11.2 11.3 11.4 12.1 12.2 12.3 13.1 13.2 tumbleweed - 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 opensuse-leap 42.1 42.2 42.3 15.0 15.1 15.2 15.3 15.4 15.5 15.6 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 36 37 38 39 40 @@ -118,32 +118,32 @@ fetch-redis: docker run --name redis-old -d -p 127.0.0.1:6379:6379 redis docker run --name redis-new -d -p 127.0.0.1:6380:6379 redis - integration/goval-dict.old fetch debian --dbtype redis --dbpath "redis://127.0.0.1:6379/0" 7 8 9 10 11 + integration/goval-dict.old fetch debian --dbtype redis --dbpath "redis://127.0.0.1:6379/0" 7 8 9 10 11 12 integration/goval-dict.old fetch ubuntu --dbtype redis --dbpath "redis://127.0.0.1:6379/0" 14.04 16.04 18.04 20.04 21.04 21.10 22.04 22.10 23.04 23.10 24.04 integration/goval-dict.old fetch redhat --dbtype redis --dbpath "redis://127.0.0.1:6379/0" 5 6 7 8 9 integration/goval-dict.old fetch oracle --dbtype redis --dbpath "redis://127.0.0.1:6379/0" 5 6 7 8 9 integration/goval-dict.old fetch amazon --dbtype redis --dbpath "redis://127.0.0.1:6379/0" 1 2 2022 2023 integration/goval-dict.old fetch alpine --dbtype redis --dbpath "redis://127.0.0.1:6379/0" 3.2 3.3 3.4 3.5 3.6 3.7 3.8 3.9 3.10 3.11 3.12 3.13 3.14 3.15 3.16 3.17 integration/goval-dict.old fetch suse --dbtype redis --dbpath "redis://127.0.0.1:6379/0" --suse-type opensuse 10.2 10.3 11.0 11.1 11.2 11.3 11.4 12.1 12.2 12.3 13.1 13.2 tumbleweed - 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 opensuse-leap 42.1 42.2 42.3 15.0 15.1 15.2 15.3 15.4 15.5 15.6 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 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 debian --dbtype redis --dbpath "redis://127.0.0.1:6380/0" 7 8 9 10 11 12 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 integration/goval-dict.new fetch redhat --dbtype redis --dbpath "redis://127.0.0.1:6380/0" 5 6 7 8 9 integration/goval-dict.new fetch oracle --dbtype redis --dbpath "redis://127.0.0.1:6380/0" 5 6 7 8 9 integration/goval-dict.new fetch amazon --dbtype redis --dbpath "redis://127.0.0.1:6380/0" 1 2 2022 2023 integration/goval-dict.new fetch alpine --dbtype redis --dbpath "redis://127.0.0.1:6380/0" 3.2 3.3 3.4 3.5 3.6 3.7 3.8 3.9 3.10 3.11 3.12 3.13 3.14 3.15 3.16 3.17 integration/goval-dict.new fetch suse --dbtype redis --dbpath "redis://127.0.0.1:6380/0" --suse-type opensuse 10.2 10.3 11.0 11.1 11.2 11.3 11.4 12.1 12.2 12.3 13.1 13.2 tumbleweed - 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 opensuse-leap 42.1 42.2 42.3 15.0 15.1 15.2 15.3 15.4 15.5 15.6 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 36 37 38 39 40 diff-cveid: - @ python integration/diff_server_mode.py --sample-rate 0.01 cveid debian 7 8 9 10 11 + @ python integration/diff_server_mode.py --sample-rate 0.01 cveid debian 7 8 9 10 11 12 @ python integration/diff_server_mode.py --sample-rate 0.01 cveid ubuntu 14.04 16.04 18.04 20.04 21.04 21.10 22.04 22.10 23.04 23.10 24.04 @ python integration/diff_server_mode.py --sample-rate 0.01 cveid redhat 5 6 7 8 9 @ python integration/diff_server_mode.py --sample-rate 0.01 cveid oracle 5 6 7 8 9 @@ -153,14 +153,14 @@ diff-cveid: @ python integration/diff_server_mode.py --sample-rate 0.01 --arch aarch64 cveid amazon 2 2022 2023 @ python integration/diff_server_mode.py --sample-rate 0.01 cveid alpine 3.2 3.3 3.4 3.5 3.6 3.7 3.8 3.9 3.10 3.11 3.12 3.13 3.14 3.15 3.16 3.17 @ python integration/diff_server_mode.py --sample-rate 0.01 cveid suse --suse-type opensuse 10.2 10.3 11.0 11.1 11.2 11.3 11.4 12.1 12.2 12.3 13.1 13.2 tumbleweed - @ 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 opensuse.leap 42.1 42.2 42.3 15.0 15.1 15.2 15.3 15.4 15.5 15.6 @ 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 36 37 38 39 40 diff-package: - @ python integration/diff_server_mode.py --sample-rate 0.01 package debian 7 8 9 10 11 + @ python integration/diff_server_mode.py --sample-rate 0.01 package debian 7 8 9 10 11 12 @ python integration/diff_server_mode.py --sample-rate 0.01 package ubuntu 14.04 16.04 18.04 20.04 21.04 21.10 22.04 22.10 23.04 23.10 24.04 @ python integration/diff_server_mode.py --sample-rate 0.01 package redhat 5 6 7 8 9 @ python integration/diff_server_mode.py --sample-rate 0.01 package oracle 5 6 7 8 9 @@ -170,7 +170,7 @@ diff-package: @ python integration/diff_server_mode.py --sample-rate 0.01 --arch aarch64 package amazon 2 2022 2023 @ python integration/diff_server_mode.py --sample-rate 0.01 package alpine 3.2 3.3 3.4 3.5 3.6 3.7 3.8 3.9 3.10 3.11 3.12 3.13 3.14 3.15 3.16 3.17 @ python integration/diff_server_mode.py --sample-rate 0.01 package suse --suse-type opensuse 10.2 10.3 11.0 11.1 11.2 11.3 11.4 12.1 12.2 12.3 13.1 13.2 tumbleweed - @ 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 opensuse.leap 42.1 42.2 42.3 15.0 15.1 15.2 15.3 15.4 15.5 15.6 @ 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 36 37 38 39 40 diff --git a/README.md b/README.md index 056debc..b93acdc 100644 --- a/README.md +++ b/README.md @@ -69,6 +69,7 @@ Available Commands: alpine Fetch Vulnerability dictionary from Alpine secdb amazon Fetch Vulnerability dictionary from Amazon ALAS debian Fetch Vulnerability dictionary from Debian + fedora Fetch Vulnerability dictionary from Fedora oracle Fetch Vulnerability dictionary from Oracle redhat Fetch Vulnerability dictionary from RedHat suse Fetch Vulnerability dictionary from SUSE @@ -104,7 +105,7 @@ $ goval-dictionary fetch redhat 5 6 7 8 9 - [Debian OVAL](https://www.debian.org/security/oval/) ```bash -$ goval-dictionary fetch debian 7 8 9 10 11 +$ goval-dictionary fetch debian 7 8 9 10 11 12 ``` #### Usage: Fetch OVAL data from Ubuntu @@ -144,7 +145,7 @@ Global Flags: ```bash $ goval-dictionary fetch suse --suse-type opensuse 10.2 10.3 11.0 11.1 11.2 11.3 11.4 12.1 12.2 12.3 13.1 13.2 tumbleweed -$ goval-dictionary fetch suse --suse-type opensuse-leap 42.1 42.2 42.3 15.0 15.1 15.2 15.3 +$ goval-dictionary fetch suse --suse-type opensuse-leap 42.1 42.2 42.3 15.0 15.1 15.2 15.3 15.4 15.5 15.6 $ goval-dictionary fetch suse --suse-type suse-enterprise-server 9 10 11 12 15 $ goval-dictionary fetch suse --suse-type suse-enterprise-desktop 10 11 12 15 ``` @@ -164,7 +165,7 @@ alpine-secdb is provided in YAML format and not OVAL, but it is supported by gov See [here](https://secdb.alpinelinux.org/) for a list of supported alpines. ```bash - $ goval-dictionary fetch alpine 3.2 3.3 3.4 3.5 3.6 3.7 3.8 3.9 3.10 3.11 3.12 3.13 3.14 3.15 3.16 3.17 + $ goval-dictionary fetch alpine 3.2 3.3 3.4 3.5 3.6 3.7 3.8 3.9 3.10 3.11 3.12 3.13 3.14 3.15 3.16 3.17 3.18 3.19 3.20 ``` #### Usage: Fetch Amazon ALAS as OVAL data type diff --git a/integration/diff_server_mode.py b/integration/diff_server_mode.py index 2d41382..a14bcc4 100644 --- a/integration/diff_server_mode.py +++ b/integration/diff_server_mode.py @@ -121,7 +121,7 @@ def diff_response(args: Tuple[str, str, str, str, str]): exit(1) if args.ostype == 'debian': - if len(list(set(args.release) - set(['7', '8', '9', '10', '11']))) > 0: + if len(list(set(args.release) - set(['7', '8', '9', '10', '11', '12']))) > 0: logger.error( f'Failed to diff_response..., err: This Release Version({args.release}) does not support test mode') raise NotImplementedError @@ -136,7 +136,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 == 'oracle': - if len(list(set(args.release) - set(['5', '6', '7', '8']))) > 0: + if len(list(set(args.release) - set(['5', '6', '7', '8', '9']))) > 0: logger.error( f'Failed to diff_response..., err: This Release Version({args.release}) does not support test mode') raise NotImplementedError @@ -146,7 +146,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 == 'alpine': - if len(list(set(args.release) - set(['3.2', '3.3', '3.4', '3.5', '3.6', '3.7', '3.8', '3.9', '3.10', '3.11', '3.12', '3.13', '3.14', '3.15', '3.16', '3.17']))) > 0: + if len(list(set(args.release) - set(['3.2', '3.3', '3.4', '3.5', '3.6', '3.7', '3.8', '3.9', '3.10', '3.11', '3.12', '3.13', '3.14', '3.15', '3.16', '3.17', '3.18', '3.19', '3.20']))) > 0: logger.error( f'Failed to diff_response..., err: This Release Version({args.release}) does not support test mode') raise NotImplementedError @@ -157,7 +157,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.suse_type == 'opensuse.leap': - if len(list(set(args.release) - set(['42.1', '42.2', '42.3', '15.0', '15.1', '15.2', '15.3']))) > 0: + if len(list(set(args.release) - set(['42.1', '42.2', '42.3', '15.0', '15.1', '15.2', '15.3', '15.4', '15.5', '15.6']))) > 0: logger.error( f'Failed to diff_response..., err: This Release Version({args.release}) does not support test mode') raise NotImplementedError