sendnrw/netbird
2
0
Fork 0
mirror of https://github.com/netbirdio/netbird.git synced 2026-10-13 08:59:08 +02:00
Code Issues Packages Projects Releases Wiki Activity

Return error from gateApproval and log at the caller

Browse Source
This commit is contained in:
Viktor Liu
2026-05-23 19:50:27 +02:00
parent 5344b2cf8a
commit 03cf48f8cc
3 changed files with 36 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
client/vnc/server/server_test.go
+10 -5
View File
@@ -405,7 +405,8 @@ func TestGateApproval_Disabled_NoApproverCall(t *testing.T) {
defer conn.Close()
header := &connectionHeader{mode: ModeAttach}
allowed, _ := srv.gateApproval(conn, header, srv.log)
_, err := srv.gateApproval(conn, header)
allowed := err == nil
assert.True(t, allowed, "gate must pass through when requireApproval is false")
assert.Equal(t, int32(0), app.calls.Load(), "approver must not be called when disabled")
}
@@ -439,7 +440,8 @@ func TestGateApproval_Enabled_NilApproverDenies(t *testing.T) {
}()
header := &connectionHeader{mode: ModeAttach}
allowed, _ := srv.gateApproval(srvConn, header, srv.log)
_, err := srv.gateApproval(srvConn, header)
allowed := err == nil
assert.False(t, allowed, "missing approver MUST deny; never silently pass")
select {
@@ -472,7 +474,8 @@ func TestGateApproval_ApproverDenies(t *testing.T) {
defer conn.Close()
header := &connectionHeader{mode: ModeAttach}
allowed, _ := srv.gateApproval(conn, header, srv.log)
_, err := srv.gateApproval(conn, header)
allowed := err == nil
assert.False(t, allowed, "approver error %v must deny", tc.err)
assert.Equal(t, int32(1), app.calls.Load())
})
@@ -489,7 +492,8 @@ func TestGateApproval_ApproverAccepts(t *testing.T) {
defer conn.Close()
header := &connectionHeader{mode: ModeAttach, username: "alice"}
allowed, _ := srv.gateApproval(conn, header, srv.log)
_, err := srv.gateApproval(conn, header)
allowed := err == nil
assert.True(t, allowed, "approver returning nil must let the gate pass")
assert.Equal(t, int32(1), app.calls.Load())
assert.Equal(t, "alice", app.lastIn.Username, "header username must reach the approver")
@@ -510,7 +514,8 @@ func TestGateApproval_PassesPubKeyHex(t *testing.T) {
pub[i] = byte(i)
}
header := &connectionHeader{mode: ModeAttach, clientStatic: pub}
allowed, _ := srv.gateApproval(conn, header, srv.log)
_, err := srv.gateApproval(conn, header)
allowed := err == nil
assert.True(t, allowed)
assert.Equal(t, hex.EncodeToString(pub), app.lastIn.PeerPubKey)
}