mirrors/nebula
1
Fork 0
mirror of https://github.com/slackhq/nebula.git synced 2025-12-06 02:30:57 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix golangci-lint issues

Browse source
This commit is contained in:
Ulrich Hornung 2025-05-16 11:17:01 +02:00
parent 767669651d
commit 31c3f6d9da
No known key found for this signature in database
4 changed files with 83 additions and 80 deletions
Download patch file Download diff file Expand all files Collapse all files

65
port_forwarder/config_test.go
View file

@ -6,19 +6,20 @@ import (
"github.com/sirupsen/logrus"
"github.com/slackhq/nebula/config"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
)
func TestEmptyConfig(t *testing.T) {
l := logrus.New()
c := config.NewC(l)
err := c.LoadString("bla:")
assert.Nil(t, err)
require.NoError(t, err)
fwd_list := NewPortForwardingList()
err = ParseConfig(l, c, fwd_list)
assert.Nil(t, err)
require.NoError(t, err)
assert.Len(t, fwd_list.configPortForwardings, 0)
assert.Empty(t, fwd_list.configPortForwardings)
assert.True(t, fwd_list.IsEmpty())
}
@ -36,13 +37,13 @@ port_forwarding:
dial_address: 127.0.0.1:5599
protocols: []
`)
assert.Nil(t, err)
require.NoError(t, err)
fwd_list := NewPortForwardingList()
err = ParseConfig(l, c, fwd_list)
assert.Nil(t, err)
require.NoError(t, err)
assert.Len(t, fwd_list.configPortForwardings, 0)
assert.Empty(t, fwd_list.configPortForwardings)
assert.True(t, fwd_list.IsEmpty())
}
@ -60,13 +61,13 @@ port_forwarding:
dial_address: 127.0.0.1:5599
# protocols: [tc, udp]
`)
assert.Nil(t, err)
require.NoError(t, err)
fwd_list := NewPortForwardingList()
err = ParseConfig(l, c, fwd_list)
assert.Nil(t, err)
require.NoError(t, err)
assert.Len(t, fwd_list.configPortForwardings, 0)
assert.Empty(t, fwd_list.configPortForwardings)
assert.True(t, fwd_list.IsEmpty())
}
@ -76,13 +77,13 @@ func TestConfigWithNoProtocols_missing_in_out(t *testing.T) {
err := c.LoadString(`
port_forwarding:
`)
assert.Nil(t, err)
require.NoError(t, err)
fwd_list := NewPortForwardingList()
err = ParseConfig(l, c, fwd_list)
assert.Nil(t, err)
require.NoError(t, err)
assert.Len(t, fwd_list.configPortForwardings, 0)
assert.Empty(t, fwd_list.configPortForwardings)
assert.True(t, fwd_list.IsEmpty())
}
@ -100,19 +101,19 @@ port_forwarding:
dial_address: 127.0.0.1:5599
protocols: [tcp]
`)
assert.Nil(t, err)
require.NoError(t, err)
fwd_list := NewPortForwardingList()
err = ParseConfig(l, c, fwd_list)
assert.Nil(t, err)
require.NoError(t, err)
assert.Len(t, fwd_list.configPortForwardings, 1)
assert.False(t, fwd_list.IsEmpty())
fwd1 := fwd_list.configPortForwardings["inbound.tcp.5580.127.0.0.1:5599"].(ForwardConfigIncomingTcp)
assert.NotNil(t, fwd1)
assert.Equal(t, fwd1.forwardLocalAddress, "127.0.0.1:5599")
assert.Equal(t, int(fwd1.port), 5580)
assert.Equal(t, "127.0.0.1:5599", fwd1.forwardLocalAddress)
assert.Equal(t, 5580, int(fwd1.port))
}
func TestConfigWithTcpOut(t *testing.T) {
@ -129,19 +130,19 @@ port_forwarding:
dial_address: 127.0.0.1:5599
protocols: []
`)
assert.Nil(t, err)
require.NoError(t, err)
fwd_list := NewPortForwardingList()
err = ParseConfig(l, c, fwd_list)
assert.Nil(t, err)
require.NoError(t, err)
assert.Len(t, fwd_list.configPortForwardings, 1)
assert.False(t, fwd_list.IsEmpty())
fwd1 := fwd_list.configPortForwardings["outbound.tcp.127.0.0.1:3399.192.168.100.92:4499"].(ForwardConfigOutgoingTcp)
assert.NotNil(t, fwd1)
assert.Equal(t, fwd1.localListen, "127.0.0.1:3399")
assert.Equal(t, fwd1.remoteConnect, "192.168.100.92:4499")
assert.Equal(t, "127.0.0.1:3399", fwd1.localListen)
assert.Equal(t, "192.168.100.92:4499", fwd1.remoteConnect)
}
func TestConfigWithUdpIn(t *testing.T) {
@ -158,19 +159,19 @@ port_forwarding:
dial_address: 127.0.0.1:5599
protocols: [udp]
`)
assert.Nil(t, err)
require.NoError(t, err)
fwd_list := NewPortForwardingList()
err = ParseConfig(l, c, fwd_list)
assert.Nil(t, err)
require.NoError(t, err)
assert.Len(t, fwd_list.configPortForwardings, 1)
assert.False(t, fwd_list.IsEmpty())
fwd1 := fwd_list.configPortForwardings["inbound.udp.5580.127.0.0.1:5599"].(ForwardConfigIncomingUdp)
assert.NotNil(t, fwd1)
assert.Equal(t, fwd1.forwardLocalAddress, "127.0.0.1:5599")
assert.Equal(t, int(fwd1.port), 5580)
assert.Equal(t, "127.0.0.1:5599", fwd1.forwardLocalAddress)
assert.Equal(t, 5580, int(fwd1.port))
}
func TestConfigWithUdpOut(t *testing.T) {
@ -187,19 +188,19 @@ port_forwarding:
dial_address: 127.0.0.1:5599
protocols: []
`)
assert.Nil(t, err)
require.NoError(t, err)
fwd_list := NewPortForwardingList()
err = ParseConfig(l, c, fwd_list)
assert.Nil(t, err)
require.NoError(t, err)
assert.Len(t, fwd_list.configPortForwardings, 1)
assert.False(t, fwd_list.IsEmpty())
fwd1 := fwd_list.configPortForwardings["outbound.udp.127.0.0.1:3399.192.168.100.92:4499"].(ForwardConfigOutgoingUdp)
assert.NotNil(t, fwd1)
assert.Equal(t, fwd1.localListen, "127.0.0.1:3399")
assert.Equal(t, fwd1.remoteConnect, "192.168.100.92:4499")
assert.Equal(t, "127.0.0.1:3399", fwd1.localListen)
assert.Equal(t, "192.168.100.92:4499", fwd1.remoteConnect)
}
func TestConfigWithMultipleMixed(t *testing.T) {
@ -222,11 +223,11 @@ port_forwarding:
dial_address: 127.0.0.1:5555
protocols: [udp]
`)
assert.Nil(t, err)
require.NoError(t, err)
fwd_list := NewPortForwardingList()
err = ParseConfig(l, c, fwd_list)
assert.Nil(t, err)
require.NoError(t, err)
assert.Len(t, fwd_list.configPortForwardings, 6)
assert.False(t, fwd_list.IsEmpty())
@ -259,11 +260,11 @@ port_forwarding:
dial_address: 127.0.0.1:5599
protocols: [udp, udp]
`)
assert.Nil(t, err)
require.NoError(t, err)
fwd_list := NewPortForwardingList()
err = ParseConfig(l, c, fwd_list)
assert.Nil(t, err)
require.NoError(t, err)
assert.Len(t, fwd_list.configPortForwardings, 4)
assert.False(t, fwd_list.IsEmpty())

72
port_forwarder/port_forwarder_tcp_test.go
View file

@ -43,8 +43,8 @@ func doTestTcpCommunication(
fmt.Println("sending ...")
t.Log("sending ...")
n, err = senderConn.Write(data_sent)
require.Nil(t, err)
assert.Equal(t, n, len(data_sent))
require.NoError(t, err)
assert.Len(t, data_sent, n)
fmt.Println("receiving ...")
t.Log("receiving ...")
@ -56,8 +56,8 @@ func doTestTcpCommunication(
}
fmt.Println("DONE")
t.Log("DONE")
require.Nil(t, err)
assert.Equal(t, n, len(data_sent))
require.NoError(t, err)
assert.Len(t, data_sent, n)
assert.Equal(t, data_sent, buf[:n])
}
@ -72,12 +72,12 @@ func doTestTcpCommunicationFail(
if err != nil {
return
}
require.Nil(t, err)
assert.Equal(t, n, len(data_sent))
require.NoError(t, err)
assert.Len(t, data_sent, n)
buf := make([]byte, 100)
_, err = receiverConn.Read(buf)
assert.NotNil(t, err)
assert.Error(t, err)
}
func tcpListenerNAccept(t *testing.T, listener *net.TCPListener, n int) <-chan net.Conn {
@ -88,7 +88,9 @@ func tcpListenerNAccept(t *testing.T, listener *net.TCPListener, n int) <-chan n
r <- true
for range n {
conn, err := listener.Accept()
require.Nil(t, err)
if err != nil {
return
}
c <- conn
}
}()
@ -108,7 +110,7 @@ port_forwarding:
dial_address: 127.0.0.1:5595
protocols: [tcp]
`)
require.Nil(t, err)
require.NoError(t, err)
assert.Len(t, server_pf.portForwardings, 1)
@ -119,22 +121,22 @@ port_forwarding:
dial_address: 10.0.0.1:4495
protocols: [tcp]
`)
require.Nil(t, err)
require.NoError(t, err)
assert.Len(t, client_pf.portForwardings, 1)
client_conn_addr, err := net.ResolveTCPAddr("tcp", "127.0.0.1:3395")
require.Nil(t, err)
require.NoError(t, err)
server_conn_addr, err := net.ResolveTCPAddr("tcp", "127.0.0.1:5595")
require.Nil(t, err)
require.NoError(t, err)
server_listen_conn, err := net.ListenTCP("tcp", server_conn_addr)
require.Nil(t, err)
require.NoError(t, err)
defer server_listen_conn.Close()
server_listen_conn_accepts := tcpListenerNAccept(t, server_listen_conn, 2)
client1_conn, err := net.DialTCP("tcp", nil, client_conn_addr)
require.Nil(t, err)
require.NoError(t, err)
defer client1_conn.Close()
client1_rcv_chan := startReadToChannel(client1_conn)
@ -142,7 +144,7 @@ port_forwarding:
client1_server_side_rcv_chan := startReadToChannel(client1_server_side_conn)
client2_conn, err := net.DialTCP("tcp", nil, client_conn_addr)
require.Nil(t, err)
require.NoError(t, err)
defer client2_conn.Close()
client2_rcv_chan := startReadToChannel(client2_conn)
@ -176,7 +178,7 @@ port_forwarding:
dial_address: 127.0.0.1:5597
protocols: [tcp]
`)
require.Nil(t, err)
require.NoError(t, err)
assert.Len(t, server_pf.portForwardings, 1)
@ -187,23 +189,23 @@ port_forwarding:
dial_address: 10.0.0.1:4497
protocols: [tcp]
`)
require.Nil(t, err)
require.NoError(t, err)
assert.Len(t, client_pf.portForwardings, 1)
client_conn_addr, err := net.ResolveTCPAddr("tcp", "127.0.0.1:3397")
require.Nil(t, err)
require.NoError(t, err)
server_conn_addr, err := net.ResolveTCPAddr("tcp", "127.0.0.1:5597")
require.Nil(t, err)
require.NoError(t, err)
server_listen_conn, err := net.ListenTCP("tcp", server_conn_addr)
require.Nil(t, err)
require.NoError(t, err)
defer server_listen_conn.Close()
server_listen_conn_accepts := tcpListenerNAccept(t, server_listen_conn, 1)
client1_conn, err := net.DialTCP("tcp", nil, client_conn_addr)
require.Nil(t, err)
require.NoError(t, err)
defer client1_conn.Close()
client1_rcv_chan := startReadToChannel(client1_conn)
@ -229,7 +231,7 @@ port_forwarding:
dial_address: 127.0.0.1:5596
protocols: [tcp]
`)
require.Nil(t, err)
require.NoError(t, err)
assert.Len(t, server_pf.portForwardings, 1)
@ -240,10 +242,10 @@ port_forwarding:
dial_address: 10.0.0.1:4496
protocols: [tcp]
`)
require.Nil(t, err)
require.NoError(t, err)
err = client_pf.ApplyChangesByNewFwdList(new_client_fwd_list)
require.Nil(t, err)
require.NoError(t, err)
doTestTcpCommunicationFail(t, "Hello from client 1 side!",
client1_conn, client1_server_side_conn)
@ -252,7 +254,7 @@ port_forwarding:
client1_server_side_conn, client1_conn)
err = server_pf.ApplyChangesByNewFwdList(new_server_fwd_list)
require.Nil(t, err)
require.NoError(t, err)
doTestTcpCommunicationFail(t, "Hello from client 1 side!",
client1_conn, client1_server_side_conn)
@ -271,7 +273,7 @@ port_forwarding:
dial_address: 127.0.0.1:5599
protocols: [tcp]
`)
require.Nil(t, err)
require.NoError(t, err)
assert.Len(t, server_pf.portForwardings, 1)
@ -282,22 +284,22 @@ port_forwarding:
dial_address: 10.0.0.1:4499
protocols: [tcp]
`)
require.Nil(t, err)
require.NoError(t, err)
assert.Len(t, client_pf.portForwardings, 1)
client_conn_addr, err := net.ResolveTCPAddr("tcp", "127.0.0.1:3399")
require.Nil(t, err)
require.NoError(t, err)
server_conn_addr, err := net.ResolveTCPAddr("tcp", "127.0.0.1:5599")
require.Nil(t, err)
require.NoError(t, err)
server_listen_conn, err := net.ListenTCP("tcp", server_conn_addr)
require.Nil(t, err)
require.NoError(t, err)
defer server_listen_conn.Close()
server_listen_conn_accepts := tcpListenerNAccept(t, server_listen_conn, 1)
client1_conn, err := net.DialTCP("tcp", nil, client_conn_addr)
require.Nil(t, err)
require.NoError(t, err)
defer client1_conn.Close()
client1_rcv_chan := startReadToChannel(client1_conn)
@ -323,7 +325,7 @@ port_forwarding:
dial_address: 127.0.0.1:5598
protocols: [tcp]
`)
require.Nil(t, err)
require.NoError(t, err)
assert.Len(t, server_pf.portForwardings, 1)
@ -334,10 +336,10 @@ port_forwarding:
dial_address: 10.0.0.1:4498
protocols: [tcp]
`)
require.Nil(t, err)
require.NoError(t, err)
err = server_pf.ApplyChangesByNewFwdList(new_server_fwd_list)
require.Nil(t, err)
require.NoError(t, err)
doTestTcpCommunicationFail(t, "Hello from client 1 side!",
client1_conn, client1_server_side_conn)
@ -346,7 +348,7 @@ port_forwarding:
client1_server_side_conn, client1_conn)
err = client_pf.ApplyChangesByNewFwdList(new_client_fwd_list)
require.Nil(t, err)
require.NoError(t, err)
doTestTcpCommunicationFail(t, "Hello from client 1 side!",
client1_conn, client1_server_side_conn)

20
port_forwarder/port_forwarder_udp_test.go
View file

@ -66,11 +66,11 @@ func doTestUdpCommunication(
} else {
n, err = senderConn.Write(data_sent)
}
require.Nil(t, err)
assert.Equal(t, n, len(data_sent))
require.NoError(t, err)
assert.Len(t, data_sent, n)
pair := <-receiverConn
require.Nil(t, err)
require.NoError(t, err)
assert.Equal(t, data_sent, pair.a)
return pair.b
}
@ -108,7 +108,7 @@ port_forwarding:
dial_address: 127.0.0.1:5599
protocols: [udp]
`)
require.Nil(t, err)
require.NoError(t, err)
assert.Len(t, server_pf.portForwardings, 1)
@ -119,27 +119,27 @@ port_forwarding:
dial_address: 10.0.0.1:4499
protocols: [udp]
`)
require.Nil(t, err)
require.NoError(t, err)
assert.Len(t, client_pf.portForwardings, 1)
client_conn_addr, err := net.ResolveUDPAddr("udp", "127.0.0.1:3399")
require.Nil(t, err)
require.NoError(t, err)
server_conn_addr, err := net.ResolveUDPAddr("udp", "127.0.0.1:5599")
require.Nil(t, err)
require.NoError(t, err)
server_listen_conn, err := net.ListenUDP("udp", server_conn_addr)
require.Nil(t, err)
require.NoError(t, err)
defer server_listen_conn.Close()
server_listen_rcv_chan := readUdpConnectionToChannel(server_listen_conn)
client1_conn, err := net.DialUDP("udp", nil, client_conn_addr)
require.Nil(t, err)
require.NoError(t, err)
defer client1_conn.Close()
client1_rcv_chan := readUdpConnectionToChannel(client1_conn)
client2_conn, err := net.DialUDP("udp", nil, client_conn_addr)
require.Nil(t, err)
require.NoError(t, err)
defer client2_conn.Close()
client2_rcv_chan := readUdpConnectionToChannel(client2_conn)

6
timeout_test.go
View file

@ -14,7 +14,7 @@ func TestNewTimerWheel(t *testing.T) {
tw := NewTimerWheel[firewall.Packet](time.Second, time.Second*10)
assert.Equal(t, 12, tw.wheelLen)
assert.Equal(t, 0, tw.current)
assert.Equal(t, false, tw.lastTickValid)
assert.False(t, tw.lastTickValid)
assert.Equal(t, time.Second*1, tw.tickDuration)
assert.Equal(t, time.Second*10, tw.wheelDuration)
assert.Len(t, tw.wheel, 12)
@ -110,9 +110,9 @@ func TestTimerWheel_Add(t *testing.T) {
func TestTimerWheel_Purge(t *testing.T) {
// First advance should set the lastTick and do nothing else
tw := NewTimerWheel[firewall.Packet](time.Second, time.Second*10)
assert.Equal(t, false, tw.lastTickValid)
assert.False(t, tw.lastTickValid)
tw.Advance(time.Now())
assert.Equal(t, true, tw.lastTickValid)
assert.True(t, tw.lastTickValid)
assert.Equal(t, 0, tw.current)
fps := []firewall.Packet{