Skip to content

Commit 2fa4b08

Browse files
committed
Update vulnerable deps
Signed-off-by: Tamal Saha <tamal@appscode.com>
1 parent 2c846f5 commit 2fa4b08

File tree

134 files changed

+14040
-1630
lines changed

Some content is hidden

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

134 files changed

+14040
-1630
lines changed

go.mod

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ require (
77
github.com/robfig/cron/v3 v3.0.1
88
github.com/spf13/cobra v1.5.0
99
github.com/spf13/pflag v1.0.5
10-
go.bytebuilders.dev/license-verifier v0.11.0
10+
go.bytebuilders.dev/license-verifier v0.12.1
1111
gomodules.xyz/logs v0.0.6
1212
gomodules.xyz/pointer v0.1.0
1313
gomodules.xyz/x v0.0.14
@@ -17,11 +17,11 @@ require (
1717
k8s.io/client-go v0.25.1
1818
k8s.io/klog/v2 v2.80.1
1919
kmodules.xyz/authorizer v0.25.0
20-
kmodules.xyz/client-go v0.25.6
20+
kmodules.xyz/client-go v0.25.12
2121
kmodules.xyz/custom-resources v0.25.0
2222
kmodules.xyz/resource-metrics v0.25.0
2323
sigs.k8s.io/controller-runtime v0.13.0
24-
stash.appscode.dev/apimachinery v0.23.0
24+
stash.appscode.dev/apimachinery v0.23.1-0.20221211083833-8be49b48f769
2525
)
2626

2727
require (
@@ -107,12 +107,12 @@ require (
107107
go.uber.org/multierr v1.6.0 // indirect
108108
go.uber.org/zap v1.21.0 // indirect
109109
golang.org/x/crypto v0.0.0-20220315160706-3147a52a75dd // indirect
110-
golang.org/x/net v0.0.0-20220909164309-bea034e7d591 // indirect
110+
golang.org/x/net v0.4.1-0.20221210045730-e1ec361d0b39 // indirect
111111
golang.org/x/oauth2 v0.0.0-20220223155221-ee480838109b // indirect
112112
golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4 // indirect
113-
golang.org/x/sys v0.0.0-20220906135438-9e1f76180b77 // indirect
114-
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 // indirect
115-
golang.org/x/text v0.3.7 // indirect
113+
golang.org/x/sys v0.3.0 // indirect
114+
golang.org/x/term v0.3.0 // indirect
115+
golang.org/x/text v0.5.0 // indirect
116116
golang.org/x/time v0.0.0-20220722155302-e5dcc9cfc0b9 // indirect
117117
gomodules.xyz/clock v0.0.0-20200817085942-06523dba733f // indirect
118118
gomodules.xyz/encoding v0.0.7 // indirect
@@ -134,7 +134,7 @@ require (
134134
k8s.io/component-helpers v0.25.1 // indirect
135135
k8s.io/kube-openapi v0.0.0-20220803162953-67bda5d908f1 // indirect
136136
k8s.io/utils v0.0.0-20220823124924-e9cbc92d1a73 // indirect
137-
kmodules.xyz/objectstore-api v0.25.0 // indirect
137+
kmodules.xyz/objectstore-api v0.25.1-0.20221104003322-f0289b5b6ca2 // indirect
138138
kmodules.xyz/offshoot-api v0.25.0 // indirect
139139
kmodules.xyz/prober v0.25.0 // indirect
140140
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.32 // indirect

go.sum

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -494,8 +494,8 @@ github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de
494494
github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
495495
github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
496496
github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
497-
go.bytebuilders.dev/license-verifier v0.11.0 h1:hCu0TZJz6nWgFYj20l5AZuwAvOvB1++awrHyMfVjXQ8=
498-
go.bytebuilders.dev/license-verifier v0.11.0/go.mod h1:k7d5itEzk8O81PBbIrHXe8oXIm0sajrRvPyTXkINrjs=
497+
go.bytebuilders.dev/license-verifier v0.12.1 h1:2bQJ8naHTv0a04/x+luoabCGQ37VuaccA7Yz5fVPHaU=
498+
go.bytebuilders.dev/license-verifier v0.12.1/go.mod h1:47HPt3RVp9gsujYpOeXi28IsTV5lilZ+EOpuhz/DIJM=
499499
go.etcd.io/bbolt v1.3.2/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU=
500500
go.etcd.io/bbolt v1.3.6 h1:/ecaJf0sk1l4l6V4awd65v2C3ILy7MSj+s/x1ADCIMU=
501501
go.etcd.io/etcd/api/v3 v3.5.4 h1:OHVyt3TopwtUQ2GKdd5wu3PmmipR4FTwCqoEjSyRdIc=
@@ -645,8 +645,8 @@ golang.org/x/net v0.0.0-20210525063256-abc453219eb5/go.mod h1:9nx3DQGgdP8bBQD5qx
645645
golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
646646
golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
647647
golang.org/x/net v0.0.0-20220225172249-27dd8689420f/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
648-
golang.org/x/net v0.0.0-20220909164309-bea034e7d591 h1:D0B/7al0LLrVC8aWF4+oxpv/m8bc7ViFfVS8/gXGdqI=
649-
golang.org/x/net v0.0.0-20220909164309-bea034e7d591/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
648+
golang.org/x/net v0.4.1-0.20221210045730-e1ec361d0b39 h1:h6TDUk/ULS3xaEwMrL72O9H+aKq9TZF668Thx2lI0zk=
649+
golang.org/x/net v0.4.1-0.20221210045730-e1ec361d0b39/go.mod h1:MBQ8lrhLObU/6UmLb4fmbmk5OcyYmqtbGd/9yIeKjEE=
650650
golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
651651
golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
652652
golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
@@ -739,11 +739,12 @@ golang.org/x/sys v0.0.0-20210908233432-aa78b53d3365/go.mod h1:oPkhp1MJrh7nUepCBc
739739
golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
740740
golang.org/x/sys v0.0.0-20220114195835-da31bd327af9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
741741
golang.org/x/sys v0.0.0-20220412211240-33da011f77ad/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
742-
golang.org/x/sys v0.0.0-20220906135438-9e1f76180b77 h1:C1tElbkWrsSkn3IRl1GCW/gETw1TywWIPgwZtXTZbYg=
743-
golang.org/x/sys v0.0.0-20220906135438-9e1f76180b77/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
742+
golang.org/x/sys v0.3.0 h1:w8ZOecv6NaNa/zC8944JTU3vz4u6Lagfk4RPQxv92NQ=
743+
golang.org/x/sys v0.3.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
744744
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
745-
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 h1:JGgROgKl9N8DuW20oFS5gxc+lE67/N3FcwmBPMe7ArY=
746745
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
746+
golang.org/x/term v0.3.0 h1:qoo4akIqOcDME5bhc/NgxUdovd6BSS2uMsVjB56q1xI=
747+
golang.org/x/term v0.3.0/go.mod h1:q750SLmJuPmVoN1blW3UFBPREJfb1KmY3vwxfr+nFDA=
747748
golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
748749
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
749750
golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
@@ -752,8 +753,9 @@ golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
752753
golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
753754
golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
754755
golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
755-
golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk=
756756
golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
757+
golang.org/x/text v0.5.0 h1:OLmvp0KP+FVG99Ct/qFiL/Fhk4zp4QQnZ7b2U+5piUM=
758+
golang.org/x/text v0.5.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
757759
golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
758760
golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
759761
golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
@@ -1038,13 +1040,13 @@ k8s.io/utils v0.0.0-20220823124924-e9cbc92d1a73 h1:H9TCJUUx+2VA0ZiD9lvtaX8fthFsM
10381040
k8s.io/utils v0.0.0-20220823124924-e9cbc92d1a73/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA=
10391041
kmodules.xyz/authorizer v0.25.0 h1:yRrLtMOdlU1p4mLzaSz5pmSLpBLsVXLQHkUfiME12iQ=
10401042
kmodules.xyz/authorizer v0.25.0/go.mod h1:Jb99YsLRJE4R4d8F5fFtlxEaxk0prdSk2LApZl4JdyI=
1041-
kmodules.xyz/client-go v0.25.6 h1:59mMNoanKrqOFYqDMtqYU5caFxd+7YrfNqpvyKYWqNE=
1042-
kmodules.xyz/client-go v0.25.6/go.mod h1:NgLAVr+IEAFpI9g7FhZF5qG0SG+SBADxknWu5jp0m8M=
1043+
kmodules.xyz/client-go v0.25.12 h1:Ym/YUZzA/B3n+4v9dRw77Z2O06cvzzQcpqwRzJKgCQI=
1044+
kmodules.xyz/client-go v0.25.12/go.mod h1:6VSRxDP2UqoWUcF0aSpWu3m/56bEUzuuvZUrAxSFBr8=
10431045
kmodules.xyz/crd-schema-fuzz v0.25.0 h1:c5ZxNRqJak1bkGhECmyrKpzKGThFMB4088Kynyvngbc=
10441046
kmodules.xyz/custom-resources v0.25.0 h1:5JQTEuiv6lC/+VVFNKqzfX4YtJCmN5E7mcNtGnHGVQM=
10451047
kmodules.xyz/custom-resources v0.25.0/go.mod h1:ULwzvLmOqZJcPSXKI7iLclYL5eYRlKx8Nbex28Ht19E=
1046-
kmodules.xyz/objectstore-api v0.25.0 h1:xT7+SXBqAMtVkfOdp4espHAfZ6MYUC4G1OgzTkURNnU=
1047-
kmodules.xyz/objectstore-api v0.25.0/go.mod h1:X5aCkyU91p9TOn4jcWw0cfcJL0HCKd/Z6FJHdzKz1ZU=
1048+
kmodules.xyz/objectstore-api v0.25.1-0.20221104003322-f0289b5b6ca2 h1:efc0glYeBw+ok5s5ZecKdB9zgnRo/IvsLlSaQUPQjZE=
1049+
kmodules.xyz/objectstore-api v0.25.1-0.20221104003322-f0289b5b6ca2/go.mod h1:X5aCkyU91p9TOn4jcWw0cfcJL0HCKd/Z6FJHdzKz1ZU=
10481050
kmodules.xyz/offshoot-api v0.25.0 h1:Svq9da/+sg5afOjpgo9vx2J/Lu90Mo0aFxkdQmgKnGI=
10491051
kmodules.xyz/offshoot-api v0.25.0/go.mod h1:ysEBn7LJuT3+s8ynAQA/OG0BSsJugXa6KGtDLMRjlKo=
10501052
kmodules.xyz/prober v0.25.0 h1:R5uRLHJEvEtEoogj+vaTAob0Btph6+PX5IlS6hPh8PA=
@@ -1069,5 +1071,5 @@ sigs.k8s.io/structured-merge-diff/v4 v4.2.3/go.mod h1:qjx8mGObPmV2aSZepjQjbmb2ih
10691071
sigs.k8s.io/yaml v1.2.0/go.mod h1:yfXDCHCao9+ENCvLSE62v9VSji2MKu5jeNfTrofGhJc=
10701072
sigs.k8s.io/yaml v1.3.0 h1:a2VclLzOGrwOHDiV8EfBGhvjHvP46CtW5j6POvhYGGo=
10711073
sigs.k8s.io/yaml v1.3.0/go.mod h1:GeOyir5tyXNByN85N/dRIT9es5UQNerPYEKK56eTBm8=
1072-
stash.appscode.dev/apimachinery v0.23.0 h1:wEOxoVsnF7LtOFxgQyvW+5dlVe8bw6kLhUm2LrQM41s=
1073-
stash.appscode.dev/apimachinery v0.23.0/go.mod h1:Tb1y/+h1r3+YdBvI5RYIC0tW1b8S+0pIb3iG0X7BOjo=
1074+
stash.appscode.dev/apimachinery v0.23.1-0.20221211083833-8be49b48f769 h1:tu1/RYM8IYnzG50MUvvfHk0kQaxWngGe+lhAsCbVzoc=
1075+
stash.appscode.dev/apimachinery v0.23.1-0.20221211083833-8be49b48f769/go.mod h1:AdK7wfKZXqlL5g30ceuMw/7nEVW3AOemQVWjc03sI3k=
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
/*
2+
Copyright AppsCode Inc. and Contributors
3+
4+
Licensed under the Apache License, Version 2.0 (the "License");
5+
you may not use this file except in compliance with the License.
6+
You may obtain a copy of the License at
7+
8+
http://www.apache.org/licenses/LICENSE-2.0
9+
10+
Unless required by applicable law or agreed to in writing, software
11+
distributed under the License is distributed on an "AS IS" BASIS,
12+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
See the License for the specific language governing permissions and
14+
limitations under the License.
15+
*/
16+
17+
package licenses
18+
19+
// GroupName is the group name use in this package
20+
const GroupName = "licenses.appscode.com"

vendor/go.bytebuilders.dev/license-verifier/info/lib.go

Lines changed: 60 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,22 @@ limitations under the License.
1717
package info
1818

1919
import (
20+
"bytes"
21+
"crypto/x509"
22+
"encoding/pem"
23+
"errors"
24+
"io"
25+
"net/http"
2026
"net/url"
2127
"path"
2228
"strconv"
2329
"strings"
2430
"unicode"
2531

32+
"go.bytebuilders.dev/license-verifier/apis/licenses"
33+
34+
apierrors "k8s.io/apimachinery/pkg/api/errors"
35+
"k8s.io/apimachinery/pkg/runtime/schema"
2636
"k8s.io/apimachinery/pkg/util/sets"
2737
)
2838

@@ -36,9 +46,10 @@ var (
3646
ProductName string // This has been renamed to Features
3747
ProductUID string
3848

39-
prodAddress = "https://byte.builders"
40-
qaAddress = "https://appscode.ninja"
41-
registrationAPIPath = "api/v1/register"
49+
prodAddress = "https://byte.builders"
50+
qaAddress = "https://appscode.ninja"
51+
registrationAPIPath = "api/v1/register"
52+
LicenseIssuerAPIPath = "api/v1/license/issue"
4253
)
4354

4455
func Features() []string {
@@ -63,6 +74,12 @@ func RegistrationAPIEndpoint() string {
6374
return u.String()
6475
}
6576

77+
func LicenseIssuerAPIEndpoint() string {
78+
u := APIServerAddress()
79+
u.Path = path.Join(u.Path, LicenseIssuerAPIPath)
80+
return u.String()
81+
}
82+
6683
func APIServerAddress() *url.URL {
6784
if SkipLicenseVerification() {
6885
u, _ := url.Parse(qaAddress)
@@ -71,3 +88,43 @@ func APIServerAddress() *url.URL {
7188
u, _ := url.Parse(prodAddress)
7289
return u
7390
}
91+
92+
func LoadLicenseCA() ([]byte, error) {
93+
if LicenseCA != "" {
94+
return []byte(LicenseCA), nil
95+
}
96+
97+
resp, err := http.Get("https://licenses.appscode.com/certificates/ca.crt")
98+
if err != nil {
99+
return nil, err
100+
}
101+
defer resp.Body.Close()
102+
103+
var buf bytes.Buffer
104+
_, err = io.Copy(&buf, resp.Body)
105+
if err != nil {
106+
return nil, err
107+
}
108+
109+
if resp.StatusCode != http.StatusOK {
110+
return nil, apierrors.NewGenericServerResponse(
111+
resp.StatusCode,
112+
http.MethodPost,
113+
schema.GroupResource{Group: licenses.GroupName, Resource: "License"},
114+
"LicenseCA",
115+
buf.String(),
116+
0,
117+
false,
118+
)
119+
}
120+
return buf.Bytes(), nil
121+
}
122+
123+
func ParseCertificate(data []byte) (*x509.Certificate, error) {
124+
block, _ := pem.Decode(data)
125+
if block == nil {
126+
// This probably is a JWT token, should be check for that when ready
127+
return nil, errors.New("failed to parse certificate PEM")
128+
}
129+
return x509.ParseCertificate(block.Bytes)
130+
}

vendor/golang.org/x/net/http2/headermap.go

Lines changed: 18 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/golang.org/x/net/http2/hpack/encode.go

Lines changed: 5 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)