Skip to content

Commit 26d4671

Browse files
authored
PLT-1183: fix: Ensure auth options are passed into the Cosign Verifier (#166)
* fix: ensure auth options for private registries are passed into Cosign Verifier * chore: address govulncheck issues * chore: ignore github.com/alibabacloud-go/cr-20160607 in golicense check * chore: use github.com/alibabacloud-go/cr-20160607/v2 v2.0.0 * chore: revert back to v1.0.1 of github.com/alibabacloud-go/cr-20160607
1 parent 58806a5 commit 26d4671

File tree

7 files changed

+313
-22
lines changed

7 files changed

+313
-22
lines changed

.github/workflows/bulwark-golicenses.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,4 +28,4 @@ jobs:
2828

2929
- name: golicense-scan
3030
run: |
31-
go-licenses check ./...
31+
go-licenses check ./... --ignore github.com/alibabacloud-go/cr-20160607

config/samples/ocivalidator-private-registry.yaml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,3 +23,14 @@ spec:
2323
host: "745150053801.dkr.ecr.us-east-1.amazonaws.com"
2424
auth:
2525
secretName: ecr-credentials
26+
27+
# private oci registry with signature verification enabled
28+
- name: "private oci registry with signature verification enabled"
29+
host: "registry.hub.docker.com"
30+
artifacts:
31+
- ref: "ahmadibraspectrocloud/validator-plugin-oci:signed"
32+
layerValidation: true
33+
signatureVerification:
34+
secretName: "cosign-public-keys"
35+
auth:
36+
secretName: dockerhub-credentials

config/samples/ocivalidator-public-registry.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ spec:
2222
- name: "public oci registry with signature verification enabled"
2323
host: "registry.hub.docker.com"
2424
artifacts:
25-
- ref: "ahmadibraspectrocloud/validator-plugin-oci:signed"
25+
- ref: "ahmadibraspectrocloud/kb-guestbook:signed"
2626
layerValidation: true
2727
signatureVerification:
2828
secretName: "cosign-public-keys"

go.mod

Lines changed: 48 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,27 +22,59 @@ require (
2222
)
2323

2424
require (
25+
cloud.google.com/go/compute v1.23.3 // indirect
26+
cloud.google.com/go/compute/metadata v0.2.3 // indirect
27+
github.com/AliyunContainerService/ack-ram-tool/pkg/credentials/alibabacloudsdkgo/helper v0.2.0 // indirect
28+
github.com/Azure/azure-sdk-for-go v68.0.0+incompatible // indirect
29+
github.com/Azure/go-autorest v14.2.0+incompatible // indirect
30+
github.com/Azure/go-autorest/autorest v0.11.29 // indirect
31+
github.com/Azure/go-autorest/autorest/adal v0.9.23 // indirect
32+
github.com/Azure/go-autorest/autorest/azure/auth v0.5.12 // indirect
33+
github.com/Azure/go-autorest/autorest/azure/cli v0.4.6 // indirect
34+
github.com/Azure/go-autorest/autorest/date v0.3.0 // indirect
35+
github.com/Azure/go-autorest/logger v0.2.1 // indirect
36+
github.com/Azure/go-autorest/tracing v0.6.0 // indirect
37+
github.com/ProtonMail/go-crypto v0.0.0-20230923063757-afb1ddc0824c // indirect
38+
github.com/ThalesIgnite/crypto11 v1.2.5 // indirect
39+
github.com/alibabacloud-go/alibabacloud-gateway-spi v0.0.4 // indirect
40+
github.com/alibabacloud-go/cr-20160607 v1.0.1 // indirect
41+
github.com/alibabacloud-go/cr-20181201 v1.0.10 // indirect
42+
github.com/alibabacloud-go/darabonba-openapi v0.2.1 // indirect
43+
github.com/alibabacloud-go/debug v1.0.0 // indirect
44+
github.com/alibabacloud-go/endpoint-util v1.1.1 // indirect
45+
github.com/alibabacloud-go/openapi-util v0.1.0 // indirect
46+
github.com/alibabacloud-go/tea v1.2.1 // indirect
47+
github.com/alibabacloud-go/tea-utils v1.4.5 // indirect
48+
github.com/alibabacloud-go/tea-xml v1.1.3 // indirect
49+
github.com/aliyun/credentials-go v1.3.1 // indirect
2550
github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect
2651
github.com/aws/aws-sdk-go-v2 v1.26.0 // indirect
2752
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.15.4 // indirect
2853
github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.4 // indirect
2954
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.4 // indirect
3055
github.com/aws/aws-sdk-go-v2/internal/ini v1.8.0 // indirect
56+
github.com/aws/aws-sdk-go-v2/service/ecrpublic v1.18.2 // indirect
3157
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.11.1 // indirect
3258
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.11.6 // indirect
3359
github.com/aws/aws-sdk-go-v2/service/sso v1.20.3 // indirect
3460
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.23.3 // indirect
3561
github.com/aws/aws-sdk-go-v2/service/sts v1.28.5 // indirect
3662
github.com/aws/smithy-go v1.20.1 // indirect
63+
github.com/awslabs/amazon-ecr-credential-helper/ecr-login v0.0.0-20231024185945-8841054dbdb8 // indirect
3764
github.com/beorn7/perks v1.0.1 // indirect
3865
github.com/blang/semver v3.5.1+incompatible // indirect
3966
github.com/blang/semver/v4 v4.0.0 // indirect
4067
github.com/cespare/xxhash/v2 v2.2.0 // indirect
68+
github.com/chrismellard/docker-credential-acr-env v0.0.0-20230304212654-82a0ddb27589 // indirect
69+
github.com/clbanning/mxj/v2 v2.7.0 // indirect
70+
github.com/cloudflare/circl v1.3.7 // indirect
71+
github.com/common-nighthawk/go-figure v0.0.0-20210622060536-734e95fb86be // indirect
4172
github.com/containerd/stargz-snapshotter/estargz v0.14.3 // indirect
4273
github.com/cyberphone/json-canonicalization v0.0.0-20231011164504-785e29786b46 // indirect
4374
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
4475
github.com/digitorus/pkcs7 v0.0.0-20230818184609-3a137a874352 // indirect
4576
github.com/digitorus/timestamp v0.0.0-20231217203849-220c5c2851b7 // indirect
77+
github.com/dimchansky/utfbom v1.1.1 // indirect
4678
github.com/docker/cli v24.0.7+incompatible // indirect
4779
github.com/docker/distribution v2.8.3+incompatible // indirect
4880
github.com/docker/docker v24.0.7+incompatible // indirect
@@ -66,15 +98,20 @@ require (
6698
github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect
6799
github.com/gobuffalo/flect v1.0.2 // indirect
68100
github.com/gogo/protobuf v1.3.2 // indirect
101+
github.com/golang-jwt/jwt/v4 v4.5.0 // indirect
69102
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
70103
github.com/golang/protobuf v1.5.4 // indirect
71104
github.com/golang/snappy v0.0.4 // indirect
72105
github.com/google/certificate-transparency-go v1.1.7 // indirect
73106
github.com/google/gnostic-models v0.6.9-0.20230804172637-c7be7c783f49 // indirect
74107
github.com/google/go-cmp v0.6.0 // indirect
108+
github.com/google/go-github/v55 v55.0.0 // indirect
109+
github.com/google/go-querystring v1.1.0 // indirect
75110
github.com/google/gofuzz v1.2.0 // indirect
76111
github.com/google/pprof v0.0.0-20231023181126-ff6d637d2a7b // indirect
77112
github.com/google/uuid v1.6.0 // indirect
113+
github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
114+
github.com/hashicorp/go-retryablehttp v0.7.5 // indirect
78115
github.com/hashicorp/hcl v1.0.1-vault-5 // indirect
79116
github.com/imdario/mergo v0.3.16 // indirect
80117
github.com/in-toto/in-toto-golang v0.9.0 // indirect
@@ -88,10 +125,12 @@ require (
88125
github.com/magiconair/properties v1.8.7 // indirect
89126
github.com/mailru/easyjson v0.7.7 // indirect
90127
github.com/matttproud/golang_protobuf_extensions/v2 v2.0.0 // indirect
128+
github.com/miekg/pkcs11 v1.1.1 // indirect
91129
github.com/mitchellh/go-homedir v1.1.0 // indirect
92130
github.com/mitchellh/mapstructure v1.5.0 // indirect
93131
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
94132
github.com/modern-go/reflect2 v1.0.2 // indirect
133+
github.com/mozillazg/docker-credential-acr-helper v0.3.0 // indirect
95134
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
96135
github.com/nozzle/throttler v0.0.0-20180817012639-2ea982251481 // indirect
97136
github.com/oklog/ulid v1.3.1 // indirect
@@ -121,25 +160,28 @@ require (
121160
github.com/spf13/viper v1.18.2 // indirect
122161
github.com/subosito/gotenv v1.6.0 // indirect
123162
github.com/syndtr/goleveldb v1.0.1-0.20220721030215-126854af5e6d // indirect
163+
github.com/thales-e-security/pool v0.0.2 // indirect
124164
github.com/theupdateframework/go-tuf v0.7.0 // indirect
125165
github.com/titanous/rocacheck v0.0.0-20171023193734-afe73141d399 // indirect
166+
github.com/tjfoc/gmsm v1.4.1 // indirect
126167
github.com/transparency-dev/merkle v0.0.2 // indirect
127168
github.com/vbatts/tar-split v0.11.5 // indirect
169+
github.com/xanzy/go-gitlab v0.96.0 // indirect
128170
go.mongodb.org/mongo-driver v1.13.1 // indirect
129171
go.opentelemetry.io/otel v1.22.0 // indirect
130172
go.opentelemetry.io/otel/metric v1.22.0 // indirect
131173
go.opentelemetry.io/otel/trace v1.22.0 // indirect
132174
go.uber.org/multierr v1.11.0 // indirect
133175
go.uber.org/zap v1.26.0 // indirect
134-
golang.org/x/crypto v0.20.0 // indirect
176+
golang.org/x/crypto v0.23.0 // indirect
135177
golang.org/x/exp v0.0.0-20240119083558-1b970713d09a // indirect
136178
golang.org/x/mod v0.14.0 // indirect
137-
golang.org/x/net v0.21.0 // indirect
179+
golang.org/x/net v0.25.0 // indirect
138180
golang.org/x/oauth2 v0.17.0 // indirect
139181
golang.org/x/sync v0.6.0 // indirect
140-
golang.org/x/sys v0.17.0 // indirect
141-
golang.org/x/term v0.17.0 // indirect
142-
golang.org/x/text v0.14.0 // indirect
182+
golang.org/x/sys v0.20.0 // indirect
183+
golang.org/x/term v0.20.0 // indirect
184+
golang.org/x/text v0.15.0 // indirect
143185
golang.org/x/time v0.5.0 // indirect
144186
golang.org/x/tools v0.17.0 // indirect
145187
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
@@ -156,6 +198,7 @@ require (
156198
k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 // indirect
157199
k8s.io/utils v0.0.0-20230726121419-3b25d923346b // indirect
158200
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
201+
sigs.k8s.io/release-utils v0.7.7 // indirect
159202
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
160203
sigs.k8s.io/yaml v1.4.0 // indirect
161204
)

0 commit comments

Comments
 (0)