Skip to content

Commit 7e740a6

Browse files
johnmhoranjohnmhoran
committed
Refactor sort and version_class functions and add tests #1287
Reference: #1287 Signed-off-by: John M. Horan <johnmhoran@gmail.com>
1 parent 8333952 commit 7e740a6

5 files changed

Lines changed: 426 additions & 31 deletions

File tree

‎vulnerabilities/tests/test_data/package_sort/input_purls.txt‎

Lines changed: 103 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,103 @@
1+
pkg:alpm/arch/containers-common@1:0.47.4-4?arch=x86_64
2+
pkg:alpm/arch/pacman@6.0.1-1?arch=x86_64
3+
pkg:alpm/arch/python-pip@21.0-1?arch=any
4+
pkg:cargo/clap@3.0.0
5+
pkg:cargo/clap@3.0.1
6+
pkg:cargo/clap@3.0.10
7+
pkg:cargo/clap@3.0.11
8+
pkg:cargo/clap@3.0.2
9+
pkg:cargo/clap@3.0.20
10+
pkg:cargo/rand@0.7.2
11+
pkg:cargo/structopt@0.3.11
12+
pkg:composer/bk2k/bootstrap-package@11.0.2
13+
pkg:composer/bk2k/bootstrap-package@11.0.3
14+
pkg:composer/bk2k/bootstrap-package@7.1.0
15+
pkg:composer/bk2k/bootstrap-package@7.1.1
16+
pkg:composer/bk2k/bootstrap-package@7.1.2
17+
pkg:conan/capnproto@0.15.0
18+
pkg:conan/capnproto@0.15.2
19+
pkg:conan/capnproto@0.7.0
20+
pkg:conan/capnproto@0.8.0
21+
pkg:deb/debian/jackson-databind@2.12.1-1%2Bdeb11u1
22+
pkg:deb/debian/jackson-databind@2.12.1-1%2Bdeb11u1?distro=sid
23+
pkg:deb/debian/jackson-databind@2.13.2.2-1?distro=sid
24+
pkg:deb/debian/jackson-databind@2.13.2.2-1?distro=stretch
25+
pkg:deb/debian/jackson-databind@2.14.0-1?distro=sid
26+
pkg:deb/debian/jackson-databind@2.8.6-1%2Bdeb9u10?distro=stretch
27+
pkg:deb/debian/jackson-databind@2.8.6-1%2Bdeb9u7?distro=stretch
28+
pkg:deb/debian/jackson-databind@2.9.8-3%2Bdeb10u4?distro=sid
29+
pkg:deb/ubuntu/dpkg@1.13.11ubuntu7.2
30+
pkg:deb/ubuntu/dpkg@1.13.11ubuntu7~proposed
31+
pkg:deb/ubuntu/dpkg@1.13.21ubuntu1
32+
pkg:deb/ubuntu/dpkg@1.14.5ubuntu11
33+
pkg:deb/ubuntu/dpkg@1.14.5ubuntu12
34+
pkg:deb/ubuntu/dpkg@1.14.5ubuntu2
35+
pkg:deb/ubuntu/dpkg@1.14.5ubuntu3
36+
pkg:gem/actionpack@3.1.1
37+
pkg:gem/actionpack@3.1.10
38+
pkg:gem/actionpack@3.1.11
39+
pkg:gem/actionpack@3.1.2
40+
pkg:gem/webbynode@1.0.5.beta10
41+
pkg:gem/webbynode@1.0.5.beta2
42+
pkg:gem/webbynode@1.0.5.beta3
43+
pkg:generic/postgresql@10.19.0
44+
pkg:generic/postgresql@10.2.0
45+
pkg:generic/postgresql@10.21.0
46+
pkg:generic/postgresql@10.22.0
47+
pkg:generic/postgresql@10.3.0
48+
pkg:generic/postgresql@10.4.0
49+
pkg:github/istio/istio@0.2.0
50+
pkg:github/istio/istio@0.2.1
51+
pkg:github/istio/istio@0.2.10
52+
pkg:github/istio/istio@0.2.11
53+
pkg:github/istio/istio@0.2.12
54+
pkg:github/istio/istio@0.2.2
55+
pkg:golang/github.com/1Panel-dev/1Panel@1.10.1-lts
56+
pkg:golang/github.com/1Panel-dev/1Panel@1.10.3
57+
pkg:golang/github.com/1Panel-dev/1Panel@1.10.3-lts
58+
pkg:golang/github.com/1Panel-dev/1Panel@1.3.6
59+
pkg:golang/github.com/1Panel-dev/1Panel@1.4.3
60+
pkg:hex/pow@1.0.15
61+
pkg:hex/pow@1.0.16
62+
pkg:hex/pow@1.0.2
63+
pkg:hex/pow@1.0.3
64+
pkg:maven/com.fasterxml.jackson.core/jackson-databind@2.1.1
65+
pkg:maven/com.fasterxml.jackson.core/jackson-databind@2.10.0
66+
pkg:maven/com.fasterxml.jackson.core/jackson-databind@2.12.6.1
67+
pkg:maven/com.fasterxml.jackson.core/jackson-databind@2.13.2
68+
pkg:maven/com.fasterxml.jackson.core/jackson-databind@2.13.2.1
69+
pkg:maven/com.fasterxml.jackson.core/jackson-databind@2.2.1
70+
pkg:maven/io.netty/netty-codec-dns@4.1.101.Final
71+
pkg:maven/io.netty/netty-codec-dns@4.1.97.Final
72+
pkg:maven/io.netty/netty-codec-http@4.1.101.Final
73+
pkg:maven/io.netty/netty-codec-http@4.1.97.Final
74+
pkg:maven/io.netty/netty-codec-http2@4.1.101.Final
75+
pkg:maven/io.netty/netty-codec-http2@4.1.97.Final
76+
pkg:npm/%40budibase/bbui@1.2.44-alpha.1
77+
pkg:npm/%40budibase/bbui@1.2.44-alpha.10
78+
pkg:npm/%40budibase/bbui@1.2.44-alpha.11
79+
pkg:npm/%40budibase/bbui@1.2.44-alpha.2
80+
pkg:npm/%40budibase/bbui@1.2.44-alpha.3
81+
pkg:npm/bootstrap-select@1.13.5
82+
pkg:npm/bootstrap-select@1.13.6
83+
pkg:npm/bootstrap-select@1.6.2
84+
pkg:npm/bootstrap-select@1.6.3
85+
pkg:nuget/adplug@2.3.0-beta17
86+
pkg:nuget/adplug@2.3.0-beta172
87+
pkg:nuget/adplug@2.3.0-beta173
88+
pkg:nuget/adplug@2.3.0-beta18
89+
pkg:nuget/adplug@2.3.0-beta186
90+
pkg:nuget/adplug@2.3.0-beta19
91+
pkg:nuget/adplug@2.3.0-beta190
92+
pkg:pypi/jinja2@2.1
93+
pkg:pypi/jinja2@2.1.1
94+
pkg:pypi/jinja2@2.10
95+
pkg:pypi/jinja2@2.2
96+
pkg:pypi/jinja2@2.2.1
97+
pkg:rpm/redhat/openssl@1.0.1e-30.el6_6?arch=11
98+
pkg:rpm/redhat/openssl@1.0.1e-30.el6_6?arch=12
99+
pkg:rpm/redhat/openssl@1.0.1e-30.el6_6?arch=13
100+
pkg:rpm/redhat/openssl@1.0.1e-30.el6_6?arch=2
101+
pkg:rpm/redhat/openssl@1.0.1e-30.el6_6?arch=5
102+
pkg:rpm/redhat/openssl@1.0.1e-30.el6_6?arch=7
103+
pkg:rpm/redhat/openssl@1.0.1e-30.el6_6?arch=9

‎vulnerabilities/tests/test_data/package_sort/purls_with_excel_sort.txt‎

Lines changed: 132 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,132 @@
1+
pkg:alpm/arch/containers-common@1:0.47.4-4?arch=x86_64
2+
pkg:alpm/arch/pacman@6.0.1-1?arch=x86_64
3+
pkg:alpm/arch/python-pip@21.0-1?arch=any
4+
pkg:apk/alpine/apk@2.12.9-r3?arch=x86
5+
pkg:apk/alpine/curl@7.83.0-r0?arch=x86
6+
pkg:bitbucket/birkenfeld/pygments-main@244fd47e07d1014f0aed9c
7+
pkg:bitnami/wordpress?distro=debian-12
8+
pkg:bitnami/wordpress@6.2.0?arch=arm64&distro=debian-12
9+
pkg:bitnami/wordpress@6.2.0?arch=arm64&distro=photon-4
10+
pkg:bitnami/wordpress@6.2.0?distro=debian-12
11+
pkg:cargo/clap@3.0.0
12+
pkg:cargo/clap@3.0.1
13+
pkg:cargo/clap@3.0.10
14+
pkg:cargo/clap@3.0.11
15+
pkg:cargo/clap@3.0.2
16+
pkg:cargo/clap@3.0.20
17+
pkg:cargo/rand@0.7.2
18+
pkg:cargo/structopt@0.3.11
19+
pkg:cocoapods/AFNetworking@4.0.1
20+
pkg:cocoapods/GoogleUtilities@7.5.2#NSData+zlib
21+
pkg:cocoapods/MapsIndoors@3.24.0
22+
pkg:cocoapods/ShareKit@2.0#Twitter
23+
pkg:composer/bk2k/bootstrap-package@11.0.2
24+
pkg:composer/bk2k/bootstrap-package@11.0.3
25+
pkg:composer/bk2k/bootstrap-package@7.1.0
26+
pkg:composer/bk2k/bootstrap-package@7.1.1
27+
pkg:composer/bk2k/bootstrap-package@7.1.2
28+
pkg:conan/capnproto@0.15.0
29+
pkg:conan/capnproto@0.15.2
30+
pkg:conan/capnproto@0.7.0
31+
pkg:conan/capnproto@0.8.0
32+
pkg:conda/absl-py@0.4.1?build=py36h06a4308_0&channel=main&subdir=linux-64&type=tar.bz2
33+
pkg:conda/openssl@1.0.2l?channel=main&subdir=linux-64&build=h077ae2c_5&type=tar.bz2
34+
pkg:cpan/DROLSKY/DateTime@1.55
35+
pkg:cpan/DROLSKY/DateTime@1.56
36+
pkg:cpan/DROLSKY/DateTime@1.57
37+
pkg:cran/caret@6.0-88
38+
pkg:cran/caret@6.0-89
39+
pkg:cran/caret@6.0-90
40+
pkg:deb/debian/jackson-databind@2.12.1-1%2Bdeb11u1
41+
pkg:deb/debian/jackson-databind@2.12.1-1%2Bdeb11u1?distro=sid
42+
pkg:deb/debian/jackson-databind@2.13.2.2-1?distro=sid
43+
pkg:deb/debian/jackson-databind@2.13.2.2-1?distro=stretch
44+
pkg:deb/debian/jackson-databind@2.14.0-1?distro=sid
45+
pkg:deb/debian/jackson-databind@2.8.6-1%2Bdeb9u10?distro=stretch
46+
pkg:deb/debian/jackson-databind@2.8.6-1%2Bdeb9u7?distro=stretch
47+
pkg:deb/debian/jackson-databind@2.9.8-3%2Bdeb10u4?distro=sid
48+
pkg:deb/ubuntu/dpkg@1.13.11ubuntu7.2
49+
pkg:deb/ubuntu/dpkg@1.13.11ubuntu7~proposed
50+
pkg:deb/ubuntu/dpkg@1.13.21ubuntu1
51+
pkg:deb/ubuntu/dpkg@1.14.5ubuntu11
52+
pkg:deb/ubuntu/dpkg@1.14.5ubuntu12
53+
pkg:deb/ubuntu/dpkg@1.14.5ubuntu2
54+
pkg:deb/ubuntu/dpkg@1.14.5ubuntu3
55+
pkg:docker/cassandra@latest
56+
pkg:docker/customer/dockerimage@sha256%3A244fd47e07d10?repository_url=gcr.io
57+
pkg:docker/smartentry/debian@dc437cc87d10
58+
pkg:gem/actionpack@3.1.1
59+
pkg:gem/actionpack@3.1.10
60+
pkg:gem/actionpack@3.1.11
61+
pkg:gem/actionpack@3.1.2
62+
pkg:gem/webbynode@1.0.5.beta10
63+
pkg:gem/webbynode@1.0.5.beta2
64+
pkg:gem/webbynode@1.0.5.beta3
65+
pkg:generic/postgresql@10.19.0
66+
pkg:generic/postgresql@10.2.0
67+
pkg:generic/postgresql@10.21.0
68+
pkg:generic/postgresql@10.22.0
69+
pkg:generic/postgresql@10.3.0
70+
pkg:generic/postgresql@10.4.0
71+
pkg:github/istio/istio@0.2.0
72+
pkg:github/istio/istio@0.2.1
73+
pkg:github/istio/istio@0.2.10
74+
pkg:github/istio/istio@0.2.11
75+
pkg:github/istio/istio@0.2.12
76+
pkg:github/istio/istio@0.2.2
77+
pkg:golang/github.com/1Panel-dev/1Panel@1.10.1-lts
78+
pkg:golang/github.com/1Panel-dev/1Panel@1.10.3
79+
pkg:golang/github.com/1Panel-dev/1Panel@1.10.3-lts
80+
pkg:golang/github.com/1Panel-dev/1Panel@1.3.6
81+
pkg:golang/github.com/1Panel-dev/1Panel@1.4.3
82+
pkg:hackage/Allure@0.11.0.0
83+
pkg:hackage/Allure@0.9.5.0
84+
pkg:hex/pow@1.0.15
85+
pkg:hex/pow@1.0.16
86+
pkg:hex/pow@1.0.2
87+
pkg:hex/pow@1.0.3
88+
pkg:maven/com.fasterxml.jackson.core/jackson-databind@2.1.1
89+
pkg:maven/com.fasterxml.jackson.core/jackson-databind@2.10.0
90+
pkg:maven/com.fasterxml.jackson.core/jackson-databind@2.12.6.1
91+
pkg:maven/com.fasterxml.jackson.core/jackson-databind@2.13.2
92+
pkg:maven/com.fasterxml.jackson.core/jackson-databind@2.13.2.1
93+
pkg:maven/com.fasterxml.jackson.core/jackson-databind@2.2.1
94+
pkg:maven/io.netty/netty-codec-dns@4.1.101.Final
95+
pkg:maven/io.netty/netty-codec-dns@4.1.97.Final
96+
pkg:maven/io.netty/netty-codec-http@4.1.101.Final
97+
pkg:maven/io.netty/netty-codec-http@4.1.97.Final
98+
pkg:maven/io.netty/netty-codec-http2@4.1.101.Final
99+
pkg:maven/io.netty/netty-codec-http2@4.1.97.Final
100+
pkg:npm/%40budibase/bbui@1.2.44-alpha.1
101+
pkg:npm/%40budibase/bbui@1.2.44-alpha.10
102+
pkg:npm/%40budibase/bbui@1.2.44-alpha.11
103+
pkg:npm/%40budibase/bbui@1.2.44-alpha.2
104+
pkg:npm/%40budibase/bbui@1.2.44-alpha.3
105+
pkg:npm/bootstrap-select@1.13.5
106+
pkg:npm/bootstrap-select@1.13.6
107+
pkg:npm/bootstrap-select@1.6.2
108+
pkg:npm/bootstrap-select@1.6.3
109+
pkg:nuget/adplug@2.3.0-beta17
110+
pkg:nuget/adplug@2.3.0-beta172
111+
pkg:nuget/adplug@2.3.0-beta173
112+
pkg:nuget/adplug@2.3.0-beta18
113+
pkg:nuget/adplug@2.3.0-beta186
114+
pkg:nuget/adplug@2.3.0-beta19
115+
pkg:nuget/adplug@2.3.0-beta190
116+
pkg:pypi/jinja2@2.1
117+
pkg:pypi/jinja2@2.1.1
118+
pkg:pypi/jinja2@2.10
119+
pkg:pypi/jinja2@2.2
120+
pkg:pypi/jinja2@2.2.1
121+
pkg:rpm/redhat/openssl@1.0.1e-30.el6_6?arch=11
122+
pkg:rpm/redhat/openssl@1.0.1e-30.el6_6?arch=12
123+
pkg:rpm/redhat/openssl@1.0.1e-30.el6_6?arch=13
124+
pkg:rpm/redhat/openssl@1.0.1e-30.el6_6?arch=2
125+
pkg:rpm/redhat/openssl@1.0.1e-30.el6_6?arch=5
126+
pkg:rpm/redhat/openssl@1.0.1e-30.el6_6?arch=7
127+
pkg:rpm/redhat/openssl@1.0.1e-30.el6_6?arch=9
128+
pkg:swid/Acme/example.com/Enterprise+Server@1.0.0?tag_id=75b8c285-fa7b-485b-b199-4745e3004d0d
129+
pkg:swid/Adobe+Systems+Incorporated/Adobe+InDesign@CC?tag_id=CreativeCloud-CS6-Win-GM-MUL
130+
pkg:swid/Fedora@29?tag_id=org.fedoraproject.Fedora-29
131+
pkg:swift/github.com/Alamofire/Alamofire@5.4.3
132+
pkg:swift/github.com/RxSwiftCommunity/RxFlow@2.12.4

‎vulnerabilities/tests/test_data/package_sort/sorted_purls.txt‎

Lines changed: 103 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,103 @@
1+
pkg:alpm/arch/containers-common@1:0.47.4-4?arch=x86_64
2+
pkg:alpm/arch/pacman@6.0.1-1?arch=x86_64
3+
pkg:alpm/arch/python-pip@21.0-1?arch=any
4+
pkg:cargo/clap@3.0.0
5+
pkg:cargo/clap@3.0.1
6+
pkg:cargo/clap@3.0.2
7+
pkg:cargo/clap@3.0.10
8+
pkg:cargo/clap@3.0.11
9+
pkg:cargo/clap@3.0.20
10+
pkg:cargo/rand@0.7.2
11+
pkg:cargo/structopt@0.3.11
12+
pkg:composer/bk2k/bootstrap-package@7.1.0
13+
pkg:composer/bk2k/bootstrap-package@7.1.1
14+
pkg:composer/bk2k/bootstrap-package@7.1.2
15+
pkg:composer/bk2k/bootstrap-package@11.0.2
16+
pkg:composer/bk2k/bootstrap-package@11.0.3
17+
pkg:conan/capnproto@0.7.0
18+
pkg:conan/capnproto@0.8.0
19+
pkg:conan/capnproto@0.15.0
20+
pkg:conan/capnproto@0.15.2
21+
pkg:deb/debian/jackson-databind@2.8.6-1%2Bdeb9u7?distro=stretch
22+
pkg:deb/debian/jackson-databind@2.8.6-1%2Bdeb9u10?distro=stretch
23+
pkg:deb/debian/jackson-databind@2.9.8-3%2Bdeb10u4?distro=sid
24+
pkg:deb/debian/jackson-databind@2.12.1-1%2Bdeb11u1
25+
pkg:deb/debian/jackson-databind@2.12.1-1%2Bdeb11u1?distro=sid
26+
pkg:deb/debian/jackson-databind@2.13.2.2-1?distro=sid
27+
pkg:deb/debian/jackson-databind@2.13.2.2-1?distro=stretch
28+
pkg:deb/debian/jackson-databind@2.14.0-1?distro=sid
29+
pkg:deb/ubuntu/dpkg@1.13.11ubuntu7~proposed
30+
pkg:deb/ubuntu/dpkg@1.13.11ubuntu7.2
31+
pkg:deb/ubuntu/dpkg@1.13.21ubuntu1
32+
pkg:deb/ubuntu/dpkg@1.14.5ubuntu2
33+
pkg:deb/ubuntu/dpkg@1.14.5ubuntu3
34+
pkg:deb/ubuntu/dpkg@1.14.5ubuntu11
35+
pkg:deb/ubuntu/dpkg@1.14.5ubuntu12
36+
pkg:gem/actionpack@3.1.1
37+
pkg:gem/actionpack@3.1.2
38+
pkg:gem/actionpack@3.1.10
39+
pkg:gem/actionpack@3.1.11
40+
pkg:gem/webbynode@1.0.5.beta2
41+
pkg:gem/webbynode@1.0.5.beta3
42+
pkg:gem/webbynode@1.0.5.beta10
43+
pkg:generic/postgresql@10.2.0
44+
pkg:generic/postgresql@10.3.0
45+
pkg:generic/postgresql@10.4.0
46+
pkg:generic/postgresql@10.19.0
47+
pkg:generic/postgresql@10.21.0
48+
pkg:generic/postgresql@10.22.0
49+
pkg:github/istio/istio@0.2.0
50+
pkg:github/istio/istio@0.2.1
51+
pkg:github/istio/istio@0.2.2
52+
pkg:github/istio/istio@0.2.10
53+
pkg:github/istio/istio@0.2.11
54+
pkg:github/istio/istio@0.2.12
55+
pkg:golang/github.com/1Panel-dev/1Panel@1.3.6
56+
pkg:golang/github.com/1Panel-dev/1Panel@1.4.3
57+
pkg:golang/github.com/1Panel-dev/1Panel@1.10.1-lts
58+
pkg:golang/github.com/1Panel-dev/1Panel@1.10.3-lts
59+
pkg:golang/github.com/1Panel-dev/1Panel@1.10.3
60+
pkg:hex/pow@1.0.2
61+
pkg:hex/pow@1.0.3
62+
pkg:hex/pow@1.0.15
63+
pkg:hex/pow@1.0.16
64+
pkg:maven/com.fasterxml.jackson.core/jackson-databind@2.1.1
65+
pkg:maven/com.fasterxml.jackson.core/jackson-databind@2.2.1
66+
pkg:maven/com.fasterxml.jackson.core/jackson-databind@2.10.0
67+
pkg:maven/com.fasterxml.jackson.core/jackson-databind@2.12.6.1
68+
pkg:maven/com.fasterxml.jackson.core/jackson-databind@2.13.2
69+
pkg:maven/com.fasterxml.jackson.core/jackson-databind@2.13.2.1
70+
pkg:maven/io.netty/netty-codec-dns@4.1.97.Final
71+
pkg:maven/io.netty/netty-codec-dns@4.1.101.Final
72+
pkg:maven/io.netty/netty-codec-http@4.1.97.Final
73+
pkg:maven/io.netty/netty-codec-http@4.1.101.Final
74+
pkg:maven/io.netty/netty-codec-http2@4.1.97.Final
75+
pkg:maven/io.netty/netty-codec-http2@4.1.101.Final
76+
pkg:npm/bootstrap-select@1.6.2
77+
pkg:npm/bootstrap-select@1.6.3
78+
pkg:npm/bootstrap-select@1.13.5
79+
pkg:npm/bootstrap-select@1.13.6
80+
pkg:npm/%40budibase/bbui@1.2.44-alpha.1
81+
pkg:npm/%40budibase/bbui@1.2.44-alpha.2
82+
pkg:npm/%40budibase/bbui@1.2.44-alpha.3
83+
pkg:npm/%40budibase/bbui@1.2.44-alpha.10
84+
pkg:npm/%40budibase/bbui@1.2.44-alpha.11
85+
pkg:nuget/adplug@2.3.0-beta17
86+
pkg:nuget/adplug@2.3.0-beta172
87+
pkg:nuget/adplug@2.3.0-beta173
88+
pkg:nuget/adplug@2.3.0-beta18
89+
pkg:nuget/adplug@2.3.0-beta186
90+
pkg:nuget/adplug@2.3.0-beta19
91+
pkg:nuget/adplug@2.3.0-beta190
92+
pkg:pypi/jinja2@2.1
93+
pkg:pypi/jinja2@2.1.1
94+
pkg:pypi/jinja2@2.2
95+
pkg:pypi/jinja2@2.2.1
96+
pkg:pypi/jinja2@2.10
97+
pkg:rpm/redhat/openssl@1.0.1e-30.el6_6?arch=11
98+
pkg:rpm/redhat/openssl@1.0.1e-30.el6_6?arch=12
99+
pkg:rpm/redhat/openssl@1.0.1e-30.el6_6?arch=13
100+
pkg:rpm/redhat/openssl@1.0.1e-30.el6_6?arch=2
101+
pkg:rpm/redhat/openssl@1.0.1e-30.el6_6?arch=5
102+
pkg:rpm/redhat/openssl@1.0.1e-30.el6_6?arch=7
103+
pkg:rpm/redhat/openssl@1.0.1e-30.el6_6?arch=9

0 commit comments

Comments
 (0)