Skip to content

Commit 0b4cc09

Browse files
jrwrenjrwren
committed
lint
* reduce staticcheck warnings
1 parent 18279ed commit 0b4cc09

Some content is hidden

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

45 files changed

+156
-206
lines changed

‎allow_list_test.go‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,14 +25,14 @@ func TestNewAllowListFromConfig(t *testing.T) {
2525
c.Settings["allowlist"] = map[string]any{
2626
"192.168.0.0/16": "abc",
2727
}
28-
r, err = newAllowListFromConfig(c, "allowlist", nil)
28+
_, err = newAllowListFromConfig(c, "allowlist", nil)
2929
require.EqualError(t, err, "config `allowlist` has invalid value (type string): abc")
3030

3131
c.Settings["allowlist"] = map[string]any{
3232
"192.168.0.0/16": true,
3333
"10.0.0.0/8": false,
3434
}
35-
r, err = newAllowListFromConfig(c, "allowlist", nil)
35+
_, err = newAllowListFromConfig(c, "allowlist", nil)
3636
require.EqualError(t, err, "config `allowlist` contains both true and false rules, but no default set for 0.0.0.0/0")
3737

3838
c.Settings["allowlist"] = map[string]any{
@@ -42,7 +42,7 @@ func TestNewAllowListFromConfig(t *testing.T) {
4242
"fd00::/8": true,
4343
"fd00:fd00::/16": false,
4444
}
45-
r, err = newAllowListFromConfig(c, "allowlist", nil)
45+
_, err = newAllowListFromConfig(c, "allowlist", nil)
4646
require.EqualError(t, err, "config `allowlist` contains both true and false rules, but no default set for ::/0")
4747

4848
c.Settings["allowlist"] = map[string]any{
@@ -75,7 +75,7 @@ func TestNewAllowListFromConfig(t *testing.T) {
7575
`docker.*`: "foo",
7676
},
7777
}
78-
lr, err := NewLocalAllowListFromConfig(c, "allowlist")
78+
_, err = NewLocalAllowListFromConfig(c, "allowlist")
7979
require.EqualError(t, err, "config `allowlist.interfaces` has invalid value (type string): foo")
8080

8181
c.Settings["allowlist"] = map[string]any{
@@ -84,15 +84,15 @@ func TestNewAllowListFromConfig(t *testing.T) {
8484
`eth.*`: true,
8585
},
8686
}
87-
lr, err = NewLocalAllowListFromConfig(c, "allowlist")
87+
_, err = NewLocalAllowListFromConfig(c, "allowlist")
8888
require.EqualError(t, err, "config `allowlist.interfaces` values must all be the same true/false value")
8989

9090
c.Settings["allowlist"] = map[string]any{
9191
"interfaces": map[string]any{
9292
`docker.*`: false,
9393
},
9494
}
95-
lr, err = NewLocalAllowListFromConfig(c, "allowlist")
95+
lr, err := NewLocalAllowListFromConfig(c, "allowlist")
9696
if assert.NoError(t, err) {
9797
assert.NotNil(t, lr)
9898
}

‎bits.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ type Bits struct {
1818
func NewBits(bits uint64) *Bits {
1919
return &Bits{
2020
length: bits,
21-
bits: make([]bool, bits, bits),
21+
bits: make([]bool, bits),
2222
current: 0,
2323
lostCounter: metrics.GetOrRegisterCounter("network.packets.lost", nil),
2424
dupeCounter: metrics.GetOrRegisterCounter("network.packets.duplicate", nil),
@@ -28,7 +28,7 @@ func NewBits(bits uint64) *Bits {
2828

2929
func (b *Bits) Check(l logrus.FieldLogger, i uint64) bool {
3030
// If i is the next number, return true.
31-
if i > b.current || (i == 0 && b.firstSeen == false && b.current < b.length) {
31+
if i > b.current || (i == 0 && !b.firstSeen && b.current < b.length) {
3232
return true
3333
}
3434

@@ -51,7 +51,7 @@ func (b *Bits) Update(l *logrus.Logger, i uint64) bool {
5151
// If i is the next number, return true and update current.
5252
if i == b.current+1 {
5353
// Report missed packets, we can only understand what was missed after the first window has been gone through
54-
if i > b.length && b.bits[i%b.length] == false {
54+
if i > b.length && !b.bits[i%b.length] {
5555
b.lostCounter.Inc(1)
5656
}
5757
b.bits[i%b.length] = true
@@ -104,7 +104,7 @@ func (b *Bits) Update(l *logrus.Logger, i uint64) bool {
104104
}
105105

106106
// Allow for the 0 packet to come in within the first window
107-
if i == 0 && b.firstSeen == false && b.current < b.length {
107+
if i == 0 && !b.firstSeen && b.current < b.length {
108108
b.firstSeen = true
109109
b.bits[i%b.length] = true
110110
return true
@@ -122,7 +122,7 @@ func (b *Bits) Update(l *logrus.Logger, i uint64) bool {
122122
return false
123123
}
124124

125-
if b.bits[i%b.length] == true {
125+
if b.bits[i%b.length] {
126126
if l.Level >= logrus.DebugLevel {
127127
l.WithField("receiveWindow", m{"accepted": false, "currentCounter": b.current, "incomingCounter": i, "reason": "old duplicate"}).
128128
Debug("Receive window")

‎cert/cert_v1.go‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,6 @@ import (
2020
"google.golang.org/protobuf/proto"
2121
)
2222

23-
const publicKeyLen = 32
24-
2523
type certificateV1 struct {
2624
details detailsV1
2725
signature []byte

‎cert/cert_v2_test.go‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -113,14 +113,14 @@ func TestCertificateV2_MarshalJSON(t *testing.T) {
113113
signature: []byte("1234567890abcedf1234567890abcedf1234567890abcedf1234567890abcedf"),
114114
}
115115

116-
b, err := nc.MarshalJSON()
116+
_, err := nc.MarshalJSON()
117117
require.ErrorIs(t, err, ErrMissingDetails)
118118

119119
rd, err := nc.details.Marshal()
120120
require.NoError(t, err)
121121

122122
nc.rawDetails = rd
123-
b, err = nc.MarshalJSON()
123+
b, err := nc.MarshalJSON()
124124
require.NoError(t, err)
125125
assert.JSONEq(
126126
t,
@@ -174,8 +174,9 @@ func TestCertificateV2_VerifyPrivateKey(t *testing.T) {
174174
require.ErrorIs(t, err, ErrInvalidPrivateKey)
175175

176176
c, _, priv, _ = NewTestCert(Version2, Curve_P256, ca2, caKey2, "test", time.Time{}, time.Time{}, nil, nil, nil)
177-
rawPriv, b, curve, err = UnmarshalPrivateKeyFromPEM(priv)
178-
177+
_, _, curve, err = UnmarshalPrivateKeyFromPEM(priv)
178+
assert.Equal(t, err, nil)
179+
assert.Equal(t, curve, Curve_P256)
179180
err = c.VerifyPrivateKey(Curve_P256, priv[:16])
180181
require.ErrorIs(t, err, ErrInvalidPrivateKey)
181182

@@ -261,6 +262,7 @@ func TestCertificateV2_marshalForSigningStability(t *testing.T) {
261262
assert.Equal(t, expectedRawDetails, db)
262263

263264
expectedForSigning, err := hex.DecodeString(expectedRawDetailsStr + "00313233343536373839306162636564666768696a313233343536373839306162")
265+
require.NoError(t, err)
264266
b, err := nc.marshalForSigning()
265267
require.NoError(t, err)
266268
assert.Equal(t, expectedForSigning, b)

‎cert/crypto.go‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -227,6 +227,9 @@ func UnmarshalNebulaEncryptedData(b []byte) (*NebulaEncryptedData, error) {
227227
}
228228

229229
func unmarshalArgon2Parameters(params *RawNebulaArgon2Parameters) (*Argon2Parameters, error) {
230+
// Are we testing the compilers types here?
231+
// No value of int32 is lewss than math.MinInt32.
232+
// By definition these checks can never be true.
230233
if params.Version < math.MinInt32 || params.Version > math.MaxInt32 {
231234
return nil, fmt.Errorf("Argon2Parameters Version must be at least %d and no more than %d", math.MinInt32, math.MaxInt32)
232235
}

‎cert/crypto_test.go‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,25 +72,29 @@ qrlJ69wer3ZUHFXA
7272
require.EqualError(t, err, "key was not 64 bytes, is invalid ed25519 private key")
7373
assert.Nil(t, k)
7474
assert.Equal(t, rest, appendByteSlices(invalidBanner, invalidPem))
75+
assert.Equal(t, curve, Curve_CURVE25519)
7576

7677
// Fail due to invalid banner
7778
curve, k, rest, err = DecryptAndUnmarshalSigningPrivateKey(passphrase, rest)
7879
require.EqualError(t, err, "bytes did not contain a proper nebula encrypted Ed25519/ECDSA private key banner")
7980
assert.Nil(t, k)
8081
assert.Equal(t, rest, invalidPem)
82+
assert.Equal(t, curve, Curve_CURVE25519)
8183

8284
// Fail due to ivalid PEM format, because
8385
// it's missing the requisite pre-encapsulation boundary.
8486
curve, k, rest, err = DecryptAndUnmarshalSigningPrivateKey(passphrase, rest)
8587
require.EqualError(t, err, "input did not contain a valid PEM encoded block")
8688
assert.Nil(t, k)
8789
assert.Equal(t, rest, invalidPem)
90+
assert.Equal(t, curve, Curve_CURVE25519)
8891

8992
// Fail due to invalid passphrase
9093
curve, k, rest, err = DecryptAndUnmarshalSigningPrivateKey([]byte("invalid passphrase"), privKey)
9194
require.EqualError(t, err, "invalid passphrase or corrupt private key")
9295
assert.Nil(t, k)
9396
assert.Equal(t, []byte{}, rest)
97+
assert.Equal(t, curve, Curve_CURVE25519)
9498
}
9599

96100
func TestEncryptAndMarshalSigningPrivateKey(t *testing.T) {

‎cert/helper_test.go‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,9 @@ func NewTestCaCert(version Version, curve Curve, before, after time.Time, networ
2121
switch curve {
2222
case Curve_CURVE25519:
2323
pub, priv, err = ed25519.GenerateKey(rand.Reader)
24+
if err != nil {
25+
panic(err)
26+
}
2427
case Curve_P256:
2528
privk, err := ecdsa.GenerateKey(elliptic.P256(), rand.Reader)
2629
if err != nil {

‎cert/pem_test.go‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,19 +97,22 @@ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
9797
// Fail due to short key
9898
k, rest, curve, err = UnmarshalSigningPrivateKeyFromPEM(rest)
9999
assert.Nil(t, k)
100+
assert.Equal(t, Curve_CURVE25519, curve)
100101
assert.Equal(t, rest, appendByteSlices(invalidBanner, invalidPem))
101102
require.EqualError(t, err, "key was not 64 bytes, is invalid Ed25519 private key")
102103

103104
// Fail due to invalid banner
104105
k, rest, curve, err = UnmarshalSigningPrivateKeyFromPEM(rest)
105106
assert.Nil(t, k)
107+
assert.Equal(t, Curve_CURVE25519, curve)
106108
assert.Equal(t, rest, invalidPem)
107109
require.EqualError(t, err, "bytes did not contain a proper Ed25519/ECDSA private key banner")
108110

109111
// Fail due to ivalid PEM format, because
110112
// it's missing the requisite pre-encapsulation boundary.
111113
k, rest, curve, err = UnmarshalSigningPrivateKeyFromPEM(rest)
112114
assert.Nil(t, k)
115+
assert.Equal(t, Curve_CURVE25519, curve)
113116
assert.Equal(t, rest, invalidPem)
114117
require.EqualError(t, err, "input did not contain a valid PEM encoded block")
115118
}
@@ -159,19 +162,22 @@ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=
159162
// Fail due to short key
160163
k, rest, curve, err = UnmarshalPrivateKeyFromPEM(rest)
161164
assert.Nil(t, k)
165+
assert.Equal(t, Curve_CURVE25519, curve)
162166
assert.Equal(t, rest, appendByteSlices(invalidBanner, invalidPem))
163167
require.EqualError(t, err, "key was not 32 bytes, is invalid CURVE25519 private key")
164168

165169
// Fail due to invalid banner
166170
k, rest, curve, err = UnmarshalPrivateKeyFromPEM(rest)
167171
assert.Nil(t, k)
172+
assert.Equal(t, Curve_CURVE25519, curve)
168173
assert.Equal(t, rest, invalidPem)
169174
require.EqualError(t, err, "bytes did not contain a proper private key banner")
170175

171176
// Fail due to ivalid PEM format, because
172177
// it's missing the requisite pre-encapsulation boundary.
173178
k, rest, curve, err = UnmarshalPrivateKeyFromPEM(rest)
174179
assert.Nil(t, k)
180+
assert.Equal(t, Curve_CURVE25519, curve)
175181
assert.Equal(t, rest, invalidPem)
176182
require.EqualError(t, err, "input did not contain a valid PEM encoded block")
177183
}
@@ -275,19 +281,22 @@ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=
275281
// Fail due to short key
276282
k, rest, curve, err = UnmarshalPublicKeyFromPEM(rest)
277283
assert.Nil(t, k)
284+
assert.Equal(t, Curve_CURVE25519, curve)
278285
assert.Equal(t, rest, appendByteSlices(invalidBanner, invalidPem))
279286
require.EqualError(t, err, "key was not 32 bytes, is invalid CURVE25519 public key")
280287

281288
// Fail due to invalid banner
282289
k, rest, curve, err = UnmarshalPublicKeyFromPEM(rest)
283290
assert.Nil(t, k)
291+
assert.Equal(t, Curve_CURVE25519, curve)
284292
require.EqualError(t, err, "bytes did not contain a proper public key banner")
285293
assert.Equal(t, rest, invalidPem)
286294

287295
// Fail due to ivalid PEM format, because
288296
// it's missing the requisite pre-encapsulation boundary.
289297
k, rest, curve, err = UnmarshalPublicKeyFromPEM(rest)
290298
assert.Nil(t, k)
299+
assert.Equal(t, Curve_CURVE25519, curve)
291300
assert.Equal(t, rest, invalidPem)
292301
require.EqualError(t, err, "input did not contain a valid PEM encoded block")
293302
}

‎cert/sign_test.go‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ func TestCertificateV1_Sign(t *testing.T) {
3737
}
3838

3939
pub, priv, err := ed25519.GenerateKey(rand.Reader)
40+
require.NoError(t, err)
4041
c, err := tbs.Sign(&certificateV1{details: detailsV1{notBefore: before, notAfter: after}}, Curve_CURVE25519, priv)
4142
require.NoError(t, err)
4243
assert.NotNil(t, c)

‎cert_test/cert.go‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,9 @@ func NewTestCaCert(version cert.Version, curve cert.Curve, before, after time.Ti
2222
switch curve {
2323
case cert.Curve_CURVE25519:
2424
pub, priv, err = ed25519.GenerateKey(rand.Reader)
25+
if err != nil {
26+
panic(err)
27+
}
2528
case cert.Curve_P256:
2629
privk, err := ecdsa.GenerateKey(elliptic.P256(), rand.Reader)
2730
if err != nil {

0 commit comments

Comments
 (0)