Skip to content

Commit d8cfe86

Browse files
openshift-merge-bot[bot]openshift-merge-bot[bot]
authored
Merge pull request #780 from everettraven/cve/OCPBUGS-32856
OCPBUGS-32856: bump go-jose to v2.6.3
2 parents 81e34cb + 9afde4a commit d8cfe86

File tree

296 files changed

+52675
-18994
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

296 files changed

+52675
-18994
lines changed

‎forks/go-jose/.gitignore

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
*~
2+
.*.swp
3+
*.out
4+
*.test
5+
*.pem
6+
*.cov
7+
jose-util/jose-util
8+
jose-util.t.err

‎forks/go-jose/.travis.yml

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
language: go
2+
3+
sudo: false
4+
5+
matrix:
6+
fast_finish: true
7+
allow_failures:
8+
- go: tip
9+
10+
go:
11+
- '1.14.x'
12+
- '1.15.x'
13+
- tip
14+
15+
go_import_path: gopkg.in/square/go-jose.v2
16+
17+
before_script:
18+
- export PATH=$HOME/.local/bin:$PATH
19+
20+
before_install:
21+
# Install encrypted gitcookies to get around bandwidth-limits
22+
# that is causing Travis-CI builds to fail. For more info, see
23+
# https://github.com/golang/go/issues/12933
24+
- openssl aes-256-cbc -K $encrypted_1528c3c2cafd_key -iv $encrypted_1528c3c2cafd_iv -in .gitcookies.sh.enc -out .gitcookies.sh -d || true
25+
- bash .gitcookies.sh || true
26+
- go get github.com/wadey/gocovmerge
27+
- go get github.com/mattn/goveralls
28+
- go get github.com/stretchr/testify/assert
29+
- go get github.com/stretchr/testify/require
30+
- go get github.com/google/go-cmp/cmp
31+
- go get golang.org/x/tools/cmd/cover || true
32+
- go get code.google.com/p/go.tools/cmd/cover || true
33+
- pip install cram --user
34+
35+
script:
36+
- go test . -v -covermode=count -coverprofile=profile.cov
37+
- go test ./cipher -v -covermode=count -coverprofile=cipher/profile.cov
38+
- go test ./jwt -v -covermode=count -coverprofile=jwt/profile.cov
39+
- go test ./json -v # no coverage for forked encoding/json package
40+
- cd jose-util && go build && PATH=$PWD:$PATH cram -v jose-util.t # cram tests jose-util
41+
- cd ..
42+
43+
after_success:
44+
- gocovmerge *.cov */*.cov > merged.coverprofile
45+
- $HOME/gopath/bin/goveralls -coverprofile merged.coverprofile -service=travis-ci

‎forks/go-jose/CHANGELOG.md

Lines changed: 84 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,84 @@
1+
# v4.0.1
2+
3+
## Fixed
4+
5+
- An attacker could send a JWE containing compressed data that used large
6+
amounts of memory and CPU when decompressed by `Decrypt` or `DecryptMulti`.
7+
Those functions now return an error if the decompressed data would exceed
8+
250kB or 10x the compressed size (whichever is larger). Thanks to
9+
Enze Wang@Alioth and Jianjun Chen@Zhongguancun Lab (@zer0yu and @chenjj)
10+
for reporting.
11+
12+
# v4.0.0
13+
14+
This release makes some breaking changes in order to more thoroughly
15+
address the vulnerabilities discussed in [Three New Attacks Against JSON Web
16+
Tokens][1], "Sign/encrypt confusion", "Billion hash attack", and "Polyglot
17+
token".
18+
19+
## Changed
20+
21+
- Limit JWT encryption types (exclude password or public key types) (#78)
22+
- Enforce minimum length for HMAC keys (#85)
23+
- jwt: match any audience in a list, rather than requiring all audiences (#81)
24+
- jwt: accept only Compact Serialization (#75)
25+
- jws: Add expected algorithms for signatures (#74)
26+
- Require specifying expected algorithms for ParseEncrypted,
27+
ParseSigned, ParseDetached, jwt.ParseEncrypted, jwt.ParseSigned,
28+
jwt.ParseSignedAndEncrypted (#69, #74)
29+
- Usually there is a small, known set of appropriate algorithms for a program
30+
to use and it's a mistake to allow unexpected algorithms. For instance the
31+
"billion hash attack" relies in part on programs accepting the PBES2
32+
encryption algorithm and doing the necessary work even if they weren't
33+
specifically configured to allow PBES2.
34+
- Revert "Strip padding off base64 strings" (#82)
35+
- The specs require base64url encoding without padding.
36+
- Minimum supported Go version is now 1.21
37+
38+
## Added
39+
40+
- ParseSignedCompact, ParseSignedJSON, ParseEncryptedCompact, ParseEncryptedJSON.
41+
- These allow parsing a specific serialization, as opposed to ParseSigned and
42+
ParseEncrypted, which try to automatically detect which serialization was
43+
provided. It's common to require a specific serialization for a specific
44+
protocol - for instance JWT requires Compact serialization.
45+
46+
[1]: https://i.blackhat.com/BH-US-23/Presentations/US-23-Tervoort-Three-New-Attacks-Against-JSON-Web-Tokens.pdf
47+
48+
# v3.0.3
49+
50+
## Fixed
51+
52+
- Limit decompression output size to prevent a DoS. Backport from v4.0.1.
53+
54+
# v3.0.2
55+
56+
## Fixed
57+
58+
- DecryptMulti: handle decompression error (#19)
59+
60+
## Changed
61+
62+
- jwe/CompactSerialize: improve performance (#67)
63+
- Increase the default number of PBKDF2 iterations to 600k (#48)
64+
- Return the proper algorithm for ECDSA keys (#45)
65+
66+
## Added
67+
68+
- Add Thumbprint support for opaque signers (#38)
69+
70+
# v3.0.1
71+
72+
## Fixed
73+
74+
- Security issue: an attacker specifying a large "p2c" value can cause
75+
JSONWebEncryption.Decrypt and JSONWebEncryption.DecryptMulti to consume large
76+
amounts of CPU, causing a DoS. Thanks to Matt Schwager (@mschwager) for the
77+
disclosure and to Tom Tervoort for originally publishing the category of attack.
78+
https://i.blackhat.com/BH-US-23/Presentations/US-23-Tervoort-Three-New-Attacks-Against-JSON-Web-Tokens.pdf
79+
80+
# v2.6.3
81+
82+
## Fixed
83+
84+
- Limit decompression output size to prevent a DoS. Backport from v4.0.1.

‎forks/go-jose/CONTRIBUTING.md

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
# Contributing
2+
3+
If you would like to contribute code to go-jose you can do so through GitHub by
4+
forking the repository and sending a pull request.
5+
6+
When submitting code, please make every effort to follow existing conventions
7+
and style in order to keep the code as readable as possible. Please also make
8+
sure all tests pass by running `go test`, and format your code with `go fmt`.
9+
We also recommend using `golint` and `errcheck`.
10+
11+
Before your code can be accepted into the project you must also sign the
12+
[Individual Contributor License Agreement][1].
13+
14+
[1]: https://spreadsheets.google.com/spreadsheet/viewform?formkey=dDViT2xzUHAwRkI3X3k5Z0lQM091OGc6MQ&ndplr=1

‎forks/go-jose/LICENSE

Lines changed: 202 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,202 @@
1+
2+
Apache License
3+
Version 2.0, January 2004
4+
http://www.apache.org/licenses/
5+
6+
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
7+
8+
1. Definitions.
9+
10+
"License" shall mean the terms and conditions for use, reproduction,
11+
and distribution as defined by Sections 1 through 9 of this document.
12+
13+
"Licensor" shall mean the copyright owner or entity authorized by
14+
the copyright owner that is granting the License.
15+
16+
"Legal Entity" shall mean the union of the acting entity and all
17+
other entities that control, are controlled by, or are under common
18+
control with that entity. For the purposes of this definition,
19+
"control" means (i) the power, direct or indirect, to cause the
20+
direction or management of such entity, whether by contract or
21+
otherwise, or (ii) ownership of fifty percent (50%) or more of the
22+
outstanding shares, or (iii) beneficial ownership of such entity.
23+
24+
"You" (or "Your") shall mean an individual or Legal Entity
25+
exercising permissions granted by this License.
26+
27+
"Source" form shall mean the preferred form for making modifications,
28+
including but not limited to software source code, documentation
29+
source, and configuration files.
30+
31+
"Object" form shall mean any form resulting from mechanical
32+
transformation or translation of a Source form, including but
33+
not limited to compiled object code, generated documentation,
34+
and conversions to other media types.
35+
36+
"Work" shall mean the work of authorship, whether in Source or
37+
Object form, made available under the License, as indicated by a
38+
copyright notice that is included in or attached to the work
39+
(an example is provided in the Appendix below).
40+
41+
"Derivative Works" shall mean any work, whether in Source or Object
42+
form, that is based on (or derived from) the Work and for which the
43+
editorial revisions, annotations, elaborations, or other modifications
44+
represent, as a whole, an original work of authorship. For the purposes
45+
of this License, Derivative Works shall not include works that remain
46+
separable from, or merely link (or bind by name) to the interfaces of,
47+
the Work and Derivative Works thereof.
48+
49+
"Contribution" shall mean any work of authorship, including
50+
the original version of the Work and any modifications or additions
51+
to that Work or Derivative Works thereof, that is intentionally
52+
submitted to Licensor for inclusion in the Work by the copyright owner
53+
or by an individual or Legal Entity authorized to submit on behalf of
54+
the copyright owner. For the purposes of this definition, "submitted"
55+
means any form of electronic, verbal, or written communication sent
56+
to the Licensor or its representatives, including but not limited to
57+
communication on electronic mailing lists, source code control systems,
58+
and issue tracking systems that are managed by, or on behalf of, the
59+
Licensor for the purpose of discussing and improving the Work, but
60+
excluding communication that is conspicuously marked or otherwise
61+
designated in writing by the copyright owner as "Not a Contribution."
62+
63+
"Contributor" shall mean Licensor and any individual or Legal Entity
64+
on behalf of whom a Contribution has been received by Licensor and
65+
subsequently incorporated within the Work.
66+
67+
2. Grant of Copyright License. Subject to the terms and conditions of
68+
this License, each Contributor hereby grants to You a perpetual,
69+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
70+
copyright license to reproduce, prepare Derivative Works of,
71+
publicly display, publicly perform, sublicense, and distribute the
72+
Work and such Derivative Works in Source or Object form.
73+
74+
3. Grant of Patent License. Subject to the terms and conditions of
75+
this License, each Contributor hereby grants to You a perpetual,
76+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
77+
(except as stated in this section) patent license to make, have made,
78+
use, offer to sell, sell, import, and otherwise transfer the Work,
79+
where such license applies only to those patent claims licensable
80+
by such Contributor that are necessarily infringed by their
81+
Contribution(s) alone or by combination of their Contribution(s)
82+
with the Work to which such Contribution(s) was submitted. If You
83+
institute patent litigation against any entity (including a
84+
cross-claim or counterclaim in a lawsuit) alleging that the Work
85+
or a Contribution incorporated within the Work constitutes direct
86+
or contributory patent infringement, then any patent licenses
87+
granted to You under this License for that Work shall terminate
88+
as of the date such litigation is filed.
89+
90+
4. Redistribution. You may reproduce and distribute copies of the
91+
Work or Derivative Works thereof in any medium, with or without
92+
modifications, and in Source or Object form, provided that You
93+
meet the following conditions:
94+
95+
(a) You must give any other recipients of the Work or
96+
Derivative Works a copy of this License; and
97+
98+
(b) You must cause any modified files to carry prominent notices
99+
stating that You changed the files; and
100+
101+
(c) You must retain, in the Source form of any Derivative Works
102+
that You distribute, all copyright, patent, trademark, and
103+
attribution notices from the Source form of the Work,
104+
excluding those notices that do not pertain to any part of
105+
the Derivative Works; and
106+
107+
(d) If the Work includes a "NOTICE" text file as part of its
108+
distribution, then any Derivative Works that You distribute must
109+
include a readable copy of the attribution notices contained
110+
within such NOTICE file, excluding those notices that do not
111+
pertain to any part of the Derivative Works, in at least one
112+
of the following places: within a NOTICE text file distributed
113+
as part of the Derivative Works; within the Source form or
114+
documentation, if provided along with the Derivative Works; or,
115+
within a display generated by the Derivative Works, if and
116+
wherever such third-party notices normally appear. The contents
117+
of the NOTICE file are for informational purposes only and
118+
do not modify the License. You may add Your own attribution
119+
notices within Derivative Works that You distribute, alongside
120+
or as an addendum to the NOTICE text from the Work, provided
121+
that such additional attribution notices cannot be construed
122+
as modifying the License.
123+
124+
You may add Your own copyright statement to Your modifications and
125+
may provide additional or different license terms and conditions
126+
for use, reproduction, or distribution of Your modifications, or
127+
for any such Derivative Works as a whole, provided Your use,
128+
reproduction, and distribution of the Work otherwise complies with
129+
the conditions stated in this License.
130+
131+
5. Submission of Contributions. Unless You explicitly state otherwise,
132+
any Contribution intentionally submitted for inclusion in the Work
133+
by You to the Licensor shall be under the terms and conditions of
134+
this License, without any additional terms or conditions.
135+
Notwithstanding the above, nothing herein shall supersede or modify
136+
the terms of any separate license agreement you may have executed
137+
with Licensor regarding such Contributions.
138+
139+
6. Trademarks. This License does not grant permission to use the trade
140+
names, trademarks, service marks, or product names of the Licensor,
141+
except as required for reasonable and customary use in describing the
142+
origin of the Work and reproducing the content of the NOTICE file.
143+
144+
7. Disclaimer of Warranty. Unless required by applicable law or
145+
agreed to in writing, Licensor provides the Work (and each
146+
Contributor provides its Contributions) on an "AS IS" BASIS,
147+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
148+
implied, including, without limitation, any warranties or conditions
149+
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
150+
PARTICULAR PURPOSE. You are solely responsible for determining the
151+
appropriateness of using or redistributing the Work and assume any
152+
risks associated with Your exercise of permissions under this License.
153+
154+
8. Limitation of Liability. In no event and under no legal theory,
155+
whether in tort (including negligence), contract, or otherwise,
156+
unless required by applicable law (such as deliberate and grossly
157+
negligent acts) or agreed to in writing, shall any Contributor be
158+
liable to You for damages, including any direct, indirect, special,
159+
incidental, or consequential damages of any character arising as a
160+
result of this License or out of the use or inability to use the
161+
Work (including but not limited to damages for loss of goodwill,
162+
work stoppage, computer failure or malfunction, or any and all
163+
other commercial damages or losses), even if such Contributor
164+
has been advised of the possibility of such damages.
165+
166+
9. Accepting Warranty or Additional Liability. While redistributing
167+
the Work or Derivative Works thereof, You may choose to offer,
168+
and charge a fee for, acceptance of support, warranty, indemnity,
169+
or other liability obligations and/or rights consistent with this
170+
License. However, in accepting such obligations, You may act only
171+
on Your own behalf and on Your sole responsibility, not on behalf
172+
of any other Contributor, and only if You agree to indemnify,
173+
defend, and hold each Contributor harmless for any liability
174+
incurred by, or claims asserted against, such Contributor by reason
175+
of your accepting any such warranty or additional liability.
176+
177+
END OF TERMS AND CONDITIONS
178+
179+
APPENDIX: How to apply the Apache License to your work.
180+
181+
To apply the Apache License to your work, attach the following
182+
boilerplate notice, with the fields enclosed by brackets "[]"
183+
replaced with your own identifying information. (Don't include
184+
the brackets!) The text should be enclosed in the appropriate
185+
comment syntax for the file format. We also recommend that a
186+
file or class name and description of purpose be included on the
187+
same "printed page" as the copyright notice for easier
188+
identification within third-party archives.
189+
190+
Copyright [yyyy] [name of copyright owner]
191+
192+
Licensed under the Apache License, Version 2.0 (the "License");
193+
you may not use this file except in compliance with the License.
194+
You may obtain a copy of the License at
195+
196+
http://www.apache.org/licenses/LICENSE-2.0
197+
198+
Unless required by applicable law or agreed to in writing, software
199+
distributed under the License is distributed on an "AS IS" BASIS,
200+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
201+
See the License for the specific language governing permissions and
202+
limitations under the License.

‎forks/go-jose/README.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
# go-jose v2
2+
3+
Version 2 of this library is no longer supported. [Please use v4
4+
instead](https://pkg.go.dev/github.com/go-jose/go-jose/v4).

0 commit comments

Comments
 (0)