Skip to content

Commit 5df4a21

Browse files
github-actions[bot]github-actions[bot]
authored
Merge pull request #1190 from smallstep/dependabot/go_modules/github.com/slackhq/nebula-1.9.3
Bump github.com/slackhq/nebula from 1.8.2 to 1.9.3
2 parents 01b22f4 + a6a4214 commit 5df4a21

File tree

7 files changed

+35
-33
lines changed

7 files changed

+35
-33
lines changed

‎command/ca/renew.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -472,7 +472,7 @@ func (r *renewer) Renew(outFile string) (resp *api.SignResponse, err error) {
472472
return nil, errors.Wrap(err, "error renewing certificate")
473473
}
474474

475-
if resp.CertChainPEM == nil || len(resp.CertChainPEM) == 0 {
475+
if len(resp.CertChainPEM) == 0 {
476476
resp.CertChainPEM = []api.Certificate{resp.ServerPEM, resp.CaPEM}
477477
}
478478
var data []byte
@@ -503,7 +503,7 @@ func (r *renewer) Rekey(priv interface{}, outCert, outKey string, writePrivateKe
503503
if err != nil {
504504
return nil, errors.Wrap(err, "error rekeying certificate")
505505
}
506-
if resp.CertChainPEM == nil || len(resp.CertChainPEM) == 0 {
506+
if len(resp.CertChainPEM) == 0 {
507507
resp.CertChainPEM = []api.Certificate{resp.ServerPEM, resp.CaPEM}
508508
}
509509
var data []byte

‎go.mod‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/smallstep/cli
22

3-
go 1.21
3+
go 1.22.0
44

55
require (
66
github.com/Microsoft/go-winio v0.6.2
@@ -14,7 +14,7 @@ require (
1414
github.com/manifoldco/promptui v0.9.0
1515
github.com/pkg/errors v0.9.1
1616
github.com/pquerna/otp v1.4.0
17-
github.com/slackhq/nebula v1.8.2
17+
github.com/slackhq/nebula v1.9.3
1818
github.com/smallstep/assert v0.0.0-20200723003110-82e2b9b3b262
1919
github.com/smallstep/certificates v0.27.2
2020
github.com/smallstep/certinfo v1.12.2

‎go.sum‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -320,8 +320,8 @@ github.com/shurcooL/sanitized_anchor_name v1.0.0 h1:PdmoCO6wvbs+7yrJyMORt4/BmY5I
320320
github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc=
321321
github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ=
322322
github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
323-
github.com/slackhq/nebula v1.8.2 h1:9lpJlivzjBPWxs9Y2tQqmJ1cP6hq+3kIodw021t3LrQ=
324-
github.com/slackhq/nebula v1.8.2/go.mod h1:SVVwnlGdmLg387U0XQMOSHRrD3VlJeXqd2/x/w/vxPs=
323+
github.com/slackhq/nebula v1.9.3 h1:WK5Oipy4NsVfNm41pywGmdy048F8RRkfSRG+lPHxcJQ=
324+
github.com/slackhq/nebula v1.9.3/go.mod h1:PMJer5rZe0H/O+kUiKOL9AJ/pL9+ryzNXtSN7ABfjfM=
325325
github.com/smallstep/assert v0.0.0-20200723003110-82e2b9b3b262 h1:unQFBIznI+VYD1/1fApl1A+9VcBk+9dcqGfnePY87LY=
326326
github.com/smallstep/assert v0.0.0-20200723003110-82e2b9b3b262/go.mod h1:MyOHs9Po2fbM1LHej6sBUT8ozbxmMOFG+E+rx/GSGuc=
327327
github.com/smallstep/certificates v0.27.2 h1:MrSJvJviS9pCUtGYYguYyB1VQzZBmkL6ngLQZfVwRqU=

‎internal/crlutil/crl_extensions.go‎

Lines changed: 26 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -85,106 +85,110 @@ func (d distributionPoint) FullNames() []string {
8585
type Extension struct {
8686
Name string `json:"-"`
8787
Details []string `json:"-"`
88-
json map[string]interface{}
88+
json map[string]any
8989
}
9090

9191
func (e *Extension) MarshalJSON() ([]byte, error) {
9292
return json.Marshal(e.json)
9393
}
9494

95-
func (e *Extension) AddDetailf(format string, args ...interface{}) {
95+
func (e *Extension) AddDetailf(format string, args ...any) {
9696
e.Details = append(e.Details, fmt.Sprintf(format, args...))
9797
}
9898

99+
func (e *Extension) AddDetail(detail string) {
100+
e.Details = append(e.Details, detail)
101+
}
102+
99103
func newExtension(e pkix.Extension) Extension {
100104
var ext Extension
101105
switch {
102106
case e.Id.Equal(oidExtensionReasonCode):
103107
ext.Name = "X509v3 CRL Reason Code:"
104108
value := parseReasonCode(e.Value)
105-
ext.AddDetailf(value)
106-
ext.json = map[string]interface{}{
109+
ext.AddDetail(value)
110+
ext.json = map[string]any{
107111
"crl_reason_code": value,
108112
}
109113

110114
case e.Id.Equal(oidExtensionCRLNumber):
111115
ext.Name = "X509v3 CRL Number:"
112116
var n *big.Int
113117
if _, err := asn1.Unmarshal(e.Value, &n); err == nil {
114-
ext.AddDetailf(n.String())
115-
ext.json = map[string]interface{}{
118+
ext.AddDetail(n.String())
119+
ext.json = map[string]any{
116120
"crl_number": n.String(),
117121
}
118122
} else {
119-
ext.AddDetailf(sanitizeBytes(e.Value))
120-
ext.json = map[string]interface{}{
123+
ext.AddDetail(sanitizeBytes(e.Value))
124+
ext.json = map[string]any{
121125
"crl_number": e.Value,
122126
}
123127
}
124128

125129
case e.Id.Equal(oidExtensionAuthorityKeyID):
126130
var v authorityKeyID
127131
ext.Name = "X509v3 Authority Key Identifier:"
128-
ext.json = map[string]interface{}{
132+
ext.json = map[string]any{
129133
"authority_key_id": hex.EncodeToString(e.Value),
130134
}
131135
if _, err := asn1.Unmarshal(e.Value, &v); err == nil {
132136
var s string
133137
for _, b := range v.ID {
134138
s += fmt.Sprintf(":%02X", b)
135139
}
136-
ext.AddDetailf("keyid" + s)
140+
ext.AddDetail("keyid" + s)
137141
} else {
138-
ext.AddDetailf(sanitizeBytes(e.Value))
142+
ext.AddDetail(sanitizeBytes(e.Value))
139143
}
140144
case e.Id.Equal(oidExtensionIssuingDistributionPoint):
141145
ext.Name = "X509v3 Issuing Distribution Point:"
142146

143147
var v distributionPoint
144148
if _, err := asn1.Unmarshal(e.Value, &v); err != nil {
145-
ext.AddDetailf(sanitizeBytes(e.Value))
146-
ext.json = map[string]interface{}{
149+
ext.AddDetail(sanitizeBytes(e.Value))
150+
ext.json = map[string]any{
147151
"issuing_distribution_point": e.Value,
148152
}
149153
} else {
150154
names := v.FullNames()
151155
if len(names) > 0 {
152-
ext.AddDetailf("Full Name:")
156+
ext.AddDetail("Full Name:")
153157
for _, n := range names {
154-
ext.AddDetailf(" " + n)
158+
ext.AddDetail(" " + n)
155159
}
156160
}
157-
js := map[string]interface{}{
161+
js := map[string]any{
158162
"full_names": names,
159163
}
160164

161165
// Only one of this should be set to true. But for inspect we
162166
// will allow more than one.
163167
if v.OnlyContainsUserCerts {
164-
ext.AddDetailf("Only User Certificates")
168+
ext.AddDetail("Only User Certificates")
165169
js["only_user_certificates"] = true
166170
}
167171
if v.OnlyContainsCACerts {
168-
ext.AddDetailf("Only CA Certificates")
172+
ext.AddDetail("Only CA Certificates")
169173
js["only_ca_certificates"] = true
170174
}
171175
if v.OnlyContainsAttributeCerts {
172-
ext.AddDetailf("Only Attribute Certificates")
176+
ext.AddDetail("Only Attribute Certificates")
173177
js["only_attribute_certificates"] = true
174178
}
175179
if len(v.OnlySomeReasons.Bytes) > 0 {
176180
ext.AddDetailf("Reasons: %x", v.OnlySomeReasons.Bytes)
177181
js["only_some_reasons"] = v.OnlySomeReasons.Bytes
178182
}
179183

180-
ext.json = map[string]interface{}{
184+
ext.json = map[string]any{
181185
"issuing_distribution_point": js,
182186
}
183187
}
184188
default:
185189
ext.Name = e.Id.String()
186-
ext.AddDetailf(sanitizeBytes(e.Value))
187-
ext.json = map[string]interface{}{
190+
ext.AddDetail(sanitizeBytes(e.Value))
191+
ext.json = map[string]any{
188192
ext.Name: e.Value,
189193
}
190194
}

‎internal/sshutil/sshutil.go‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,7 @@ package sshutil
22

33
import (
44
"crypto"
5-
//nolint:staticcheck // Maintain support for deprecated algorithms.
6-
"crypto/dsa"
5+
"crypto/dsa" // Maintain support for deprecated algorithms.
76
"crypto/ecdsa"
87
"crypto/ed25519"
98
"crypto/elliptic"
@@ -202,7 +201,6 @@ func parseECDSA(in []byte) (*ecdsa.PublicKey, error) {
202201
return nil, errors.Errorf("unsupported curve %s", w.Curve)
203202
}
204203

205-
//nolint:staticcheck // ignore this deprecation warning - golang will fix
206204
key.X, key.Y = elliptic.Unmarshal(key.Curve, w.KeyBytes)
207205
if key.X == nil || key.Y == nil {
208206
return nil, errors.New("invalid curve point")

‎utils/cautils/certificate_flow.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -262,7 +262,7 @@ func (f *CertificateFlow) Sign(ctx *cli.Context, tok string, csr api.Certificate
262262
return err
263263
}
264264

265-
if resp.CertChainPEM == nil || len(resp.CertChainPEM) == 0 {
265+
if len(resp.CertChainPEM) == 0 {
266266
resp.CertChainPEM = []api.Certificate{resp.ServerPEM, resp.CaPEM}
267267
}
268268
var data []byte

‎utils/cautils/client.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@ func NewAdminClient(ctx *cli.Context, opts ...ca.ClientOption) (*ca.AdminClient,
184184
if err != nil {
185185
return nil, err
186186
}
187-
if signResponse.CertChainPEM == nil || len(signResponse.CertChainPEM) == 0 {
187+
if len(signResponse.CertChainPEM) == 0 {
188188
signResponse.CertChainPEM = []api.Certificate{signResponse.ServerPEM, signResponse.CaPEM}
189189
}
190190
adminCert = make([]*x509.Certificate, len(signResponse.CertChainPEM))

0 commit comments

Comments
 (0)