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

Add built-in root certificate fallbacks #3440

Merged
merged 2 commits into from
Dec 7, 2023
Merged

Add built-in root certificate fallbacks #3440

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
40fd911
Add built-in root certificate fallbacks
mem Nov 3, 2023
c89b34d
Removes obsolete lint comment
olegbespalov Dec 6, 2023
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
4 changes: 1 addition & 3 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,7 @@ RUN CGO_ENABLED=0 GOOS=$TARGETOS GOARCH=$TARGETARCH go build -trimpath -o /usr/b
# Runtime stage
FROM alpine:3.18 as release

# hadolint ignore=DL3018
RUN apk add --no-cache ca-certificates && \
adduser -D -u 12345 -g 12345 k6
RUN adduser -D -u 12345 -g 12345 k6
olegbespalov marked this conversation as resolved.
Show resolved Hide resolved
COPY --from=builder /usr/bin/k6 /usr/bin/k6

USER k6
Expand Down
8 changes: 8 additions & 0 deletions cmd/common.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,14 @@ import (
"go.k6.io/k6/cmd/state"
"go.k6.io/k6/errext/exitcodes"
"go.k6.io/k6/lib/types"

// Blank-importing golang.org/x/crypto/x509roots/fallback bundles a set of
// root fallback certificates from Mozilla into the resulting binary. This
// allows the program to run in environments where the system root
// certificates are not available, for example inside a minimal container.
// These are _fallbacks_, meaning that if the system _does have_ a set of
// root certificates, those will be given priority.
_ "golang.org/x/crypto/x509roots/fallback"
)

// Panic if the given error is not nil.
Expand Down
1 change: 1 addition & 0 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ require (
go.opentelemetry.io/otel/trace v1.19.0
go.uber.org/goleak v1.2.1
golang.org/x/crypto v0.14.0
golang.org/x/crypto/x509roots/fallback v0.0.0-20231030152948-74c2ba9521f1
golang.org/x/net v0.17.0
golang.org/x/term v0.13.0
golang.org/x/time v0.3.0
Expand Down
2 changes: 2 additions & 0 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -230,6 +230,8 @@ golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPh
golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
golang.org/x/crypto v0.14.0 h1:wBqGXzWJW6m1XrIKlAH0Hs1JJ7+9KBwnIO8v66Q9cHc=
golang.org/x/crypto v0.14.0/go.mod h1:MVFd36DqK4CsrnJYDkBA3VC4m2GkXAM0PvzMCn4JQf4=
golang.org/x/crypto/x509roots/fallback v0.0.0-20231030152948-74c2ba9521f1 h1:wQ75dCmVn5ExryuIUzbi2MC1/10fUNIL1FP918r4jx8=
golang.org/x/crypto/x509roots/fallback v0.0.0-20231030152948-74c2ba9521f1/go.mod h1:kNa9WdvYnzFwC79zRpLRMJbdEFlhyM5RPFBBZp/wWH8=
golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU=
Expand Down
27 changes: 27 additions & 0 deletions vendor/golang.org/x/crypto/x509roots/fallback/LICENSE
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3,827 changes: 3,827 additions & 0 deletions vendor/golang.org/x/crypto/x509roots/fallback/bundle.go
View file
Open in desktop

Large diffs are not rendered by default.

31 changes: 31 additions & 0 deletions vendor/golang.org/x/crypto/x509roots/fallback/fallback.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions vendor/modules.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -378,6 +378,9 @@ go.uber.org/goleak/internal/stack
golang.org/x/crypto/md4
golang.org/x/crypto/ocsp
golang.org/x/crypto/ripemd160
# golang.org/x/crypto/x509roots/fallback v0.0.0-20231030152948-74c2ba9521f1
## explicit; go 1.20
golang.org/x/crypto/x509roots/fallback
olegbespalov marked this conversation as resolved.
Show resolved Hide resolved
# golang.org/x/net v0.17.0
## explicit; go 1.17
golang.org/x/net/html
Expand Down