Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

SecComms: Fix flaky tests #2154

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

SecComms: Fix flaky tests #2154

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion src/cloud-api-adaptor/pkg/adaptor/cloud/cloud_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,10 @@ func TestCloudServiceWithSecureComms(t *testing.T) {
kubemgr.InitKubeMgrMock()
test.CreatePKCS8Secret(t)
test.KBSServer("9009")
test.HttpServer(forwarder.DefaultListenPort)
s9009 := test.HttpServer(forwarder.DefaultListenPort)
if s9009 == nil {
t.Error("Failed - not create server")
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this supposed to be Failed - could not create server?

}

// create a podvm
gkc := test.NewGetKeyClient("9019")
Expand Down
10 changes: 5 additions & 5 deletions src/cloud-api-adaptor/pkg/podnetwork/podnetwork_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ func TestWorkerNode(t *testing.T) {
mockTunnelType := "mock"
tunneler.Register(mockTunnelType, newMockWorkerNodeTunneler, newMockPodNodeTunneler)

workerNodeNS := tuntest.NewNamedNS(t, "test-workernode")
workerNodeNS, _ := tuntest.NewNamedNS(t, "test-workernode")
defer tuntest.DeleteNamedNS(t, workerNodeNS)

tuntest.BridgeAdd(t, workerNodeNS, "ens0")
Expand All @@ -59,7 +59,7 @@ func TestWorkerNode(t *testing.T) {
tuntest.AddrAdd(t, workerNodeNS, "ens1", "192.168.1.2/24")
tuntest.RouteAdd(t, workerNodeNS, "", "192.168.0.1", "ens0")

workerPodNS := tuntest.NewNamedNS(t, "test-workerpod")
workerPodNS, _ := tuntest.NewNamedNS(t, "test-workerpod")
defer tuntest.DeleteNamedNS(t, workerPodNS)

tuntest.BridgeAdd(t, workerPodNS, "eth0")
Expand Down Expand Up @@ -122,7 +122,7 @@ func TestPodNode(t *testing.T) {
mockTunnelType := "mock"
tunneler.Register(mockTunnelType, newMockWorkerNodeTunneler, newMockPodNodeTunneler)

podNodeNS := tuntest.NewNamedNS(t, "test-podnode")
podNodeNS, _ := tuntest.NewNamedNS(t, "test-podnode")
defer tuntest.DeleteNamedNS(t, podNodeNS)

tuntest.BridgeAdd(t, podNodeNS, "ens0")
Expand All @@ -149,7 +149,7 @@ func TestPodNode(t *testing.T) {
},
} {

podNS := tuntest.NewNamedNS(t, "test-pod")
podNS, _ := tuntest.NewNamedNS(t, "test-pod")
func() {
defer tuntest.DeleteNamedNS(t, podNS)

Expand Down Expand Up @@ -197,7 +197,7 @@ func TestPodNode(t *testing.T) {
func TestPluginDetectHostInterface(t *testing.T) {
testutils.SkipTestIfNotRoot(t)

hostNS := tuntest.NewNamedNS(t, "test-host")
hostNS, _ := tuntest.NewNamedNS(t, "test-host")
defer tuntest.DeleteNamedNS(t, hostNS)

tuntest.BridgeAdd(t, hostNS, "eth0")
Expand Down
2 changes: 1 addition & 1 deletion src/cloud-api-adaptor/pkg/podnetwork/tunneler/routing/iptables_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import (
func TestIPTables(t *testing.T) {
testutils.SkipTestIfNotRoot(t)

workerNS := tuntest.NewNamedNS(t, "test-host")
workerNS, _ := tuntest.NewNamedNS(t, "test-host")
defer tuntest.DeleteNamedNS(t, workerNS)

ipt, err := iptables.New(iptables.IPFamily(iptables.ProtocolIPv4))
Expand Down
10 changes: 5 additions & 5 deletions src/cloud-api-adaptor/pkg/podnetwork/tuntest/tuntest.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,10 +56,10 @@ func RunTunnelTest(t *testing.T, tunnelType string, newWorkerNodeTunneler, newPo
{podAddr: "10.128.0.3/24", podHwAddr: "0a:58:0a:84:03:cf", podNodePrimaryAddr: "10.10.1.3/16", podNodeSecondaryAddr: "192.168.0.3/24"},
}

bridgeNS := NewNamedNS(t, "test-bridge")
bridgeNS, _ := NewNamedNS(t, "test-bridge")
defer DeleteNamedNS(t, bridgeNS)

workerNS := NewNamedNS(t, "test-worker")
workerNS, _ := NewNamedNS(t, "test-worker")
defer DeleteNamedNS(t, workerNS)

if err := workerNS.Run(func() error {
Expand Down Expand Up @@ -98,7 +98,7 @@ func RunTunnelTest(t *testing.T, tunnelType string, newWorkerNodeTunneler, newPo
pod.workerNodeTunneler = newWorkerNodeTunneler()
pod.podNodeTunneler = newPodNodeTunneler()

pod.workerPodNS = NewNamedNS(t, fmt.Sprintf("test-workerpod%d", i))
pod.workerPodNS, _ = NewNamedNS(t, fmt.Sprintf("test-workerpod%d", i))
defer DeleteNamedNS(t, pod.workerPodNS)

veth := fmt.Sprintf("veth%d", i)
Expand All @@ -109,7 +109,7 @@ func RunTunnelTest(t *testing.T, tunnelType string, newWorkerNodeTunneler, newPo
HwAddrAdd(t, pod.workerPodNS, "eth0", pod.podHwAddr)
RouteAdd(t, pod.workerPodNS, "", gatewayIP, "eth0")

pod.podNodeNS = NewNamedNS(t, fmt.Sprintf("test-podvm%d", i))
pod.podNodeNS, _ = NewNamedNS(t, fmt.Sprintf("test-podvm%d", i))
defer DeleteNamedNS(t, pod.podNodeNS)

vmEth0 := fmt.Sprintf("podvm%d-eth0", i)
Expand All @@ -122,7 +122,7 @@ func RunTunnelTest(t *testing.T, tunnelType string, newWorkerNodeTunneler, newPo
LinkSetMaster(t, bridgeNS, vmEth0, "br0")
LinkSetMaster(t, bridgeNS, vmEth1, "br1")

pod.podNS = NewNamedNS(t, fmt.Sprintf("test-pod%d", i))
pod.podNS, _ = NewNamedNS(t, fmt.Sprintf("test-pod%d", i))
defer DeleteNamedNS(t, pod.podNS)
}

Expand Down
4 changes: 2 additions & 2 deletions src/cloud-api-adaptor/pkg/podnetwork/tuntest/util.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import (
"github.com/confidential-containers/cloud-api-adaptor/src/cloud-api-adaptor/pkg/util/netops"
)

func NewNamedNS(t *testing.T, prefix string) netops.Namespace {
func NewNamedNS(t *testing.T, prefix string) (netops.Namespace, string) {
t.Helper()

var nsPath string
Expand Down Expand Up @@ -54,7 +54,7 @@ func NewNamedNS(t *testing.T, prefix string) netops.Namespace {
t.Fatalf("failed to set the link up: lo")
}

return ns
return ns, name
}

func DeleteNamedNS(t *testing.T, ns netops.Namespace) {
Expand Down
38 changes: 5 additions & 33 deletions src/cloud-api-adaptor/pkg/securecomms/apic/apic_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,48 +2,20 @@ package apic

import (
"context"
"errors"
"fmt"
"io/fs"
"testing"

"github.com/confidential-containers/cloud-api-adaptor/src/cloud-api-adaptor/pkg/podnetwork/tuntest"
"github.com/confidential-containers/cloud-api-adaptor/src/cloud-api-adaptor/test/securecomms/test"
"github.com/google/uuid"
"github.com/vishvananda/netlink"
"github.com/vishvananda/netns"
)

func TestApiC(t *testing.T) {
namespace := uuid.NewString()
nsPath := "/run/netns/" + namespace
// Create a new network namespace
newns, err := netns.NewNamed(namespace)
if err != nil && !errors.Is(err, fs.ErrExist) {
if errors.Is(err, fs.ErrPermission) {
t.Skip("Skip due to missing permissions - run privileged!")
}
t.Errorf("netns.NewNamed(%s) returned err %s", namespace, err.Error())
}
defer func() {
newns.Close()
if err := netns.DeleteNamed(namespace); err != nil {
t.Errorf("failed to delete a named network namespace %s: %v", namespace, err)
}
}()

link, err := netlink.LinkByName("lo")
if err != nil {
t.Fatal(err)
}

// bring the interface up
if err := netlink.LinkSetUp(link); err != nil {
t.Fatal(err)
}
ns, _ := tuntest.NewNamedNS(t, "test-TestApiC")
defer tuntest.DeleteNamedNS(t, ns)

apic := NewApiClient(7700, nsPath)
apic := NewApiClient(7700, ns.Path())

s := test.NamespacedHttpServer(7700, nsPath)
s := test.NamespacedHttpServer(7700, ns.Path())
data, err := apic.GetKey("default/sshclient/publicKey")
if err != nil {
t.Error(err)
Expand Down
3 changes: 3 additions & 0 deletions src/cloud-api-adaptor/pkg/securecomms/ppssh/ppssh_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,6 +208,9 @@ func TestPpssh(t *testing.T) {
}

s := test.HttpServer("7105")
if s == nil {
t.Error("Failed - not create server")
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same here

}

clientSshPeer.Ready()
clientSshPeer.Wait()
Expand Down
49 changes: 17 additions & 32 deletions src/cloud-api-adaptor/pkg/securecomms/sshproxy/sshproxy_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,18 +4,14 @@ import (
"context"
"crypto/rand"
"crypto/rsa"
"errors"
"io/fs"
"net"
"sync"
"testing"
"time"

"github.com/confidential-containers/cloud-api-adaptor/src/cloud-api-adaptor/pkg/podnetwork/tuntest"
"github.com/confidential-containers/cloud-api-adaptor/src/cloud-api-adaptor/pkg/securecomms/sshutil"
"github.com/confidential-containers/cloud-api-adaptor/src/cloud-api-adaptor/test/securecomms/test"
"github.com/google/uuid"
"github.com/vishvananda/netlink"
"github.com/vishvananda/netns"
"golang.org/x/crypto/ssh"
)

Expand Down Expand Up @@ -113,6 +109,9 @@ func TestSshProxy(t *testing.T) {
serverSshPeer.Ready()

s := test.HttpServer("7020")
if s == nil {
t.Error("Failed - not create server")
Copy link
Member

@stevenhorsman stevenhorsman Nov 14, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Okay, as it's in lots of places I think find and replace will be easier than me commenting everywhere.

}
success := test.HttpClient("http://127.0.0.1:7010")
if !success {
t.Error("Failed - not successful")
Expand All @@ -136,32 +135,8 @@ func TestSshProxyWithNamespace(t *testing.T) {

clientSshPeer, serverSshPeer := getPeers(t)

namespace := uuid.NewString()
nsPath := "/run/netns/" + namespace
// Create a new network namespace
newns, err := netns.NewNamed(namespace)
if err != nil && !errors.Is(err, fs.ErrExist) {
if errors.Is(err, fs.ErrPermission) {
t.Skip("Skip due to missing permissions - run privileged!")
}
t.Errorf("netns.NewNamed(%s) returned err %s", namespace, err.Error())
}
defer func() {
newns.Close()
if err := netns.DeleteNamed(namespace); err != nil {
t.Errorf("failed to delete a named network namespace %s: %v", namespace, err)
}
}()

link, err := netlink.LinkByName("lo")
if err != nil {
t.Fatal(err)
}

// bring the interface up
if err := netlink.LinkSetUp(link); err != nil {
t.Fatal(err)
}
ns, namespace := tuntest.NewNamedNS(t, "test-TestSshProxyWithNamespace")
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Are these the right variable names as I assumed that ns was short for namespace?

defer tuntest.DeleteNamedNS(t, ns)

outbounds := Outbounds{}
if err := outbounds.AddTags([]string{"ATTESTATION_PHASE:ABC:127.0.0.1:7020", " "}); err != nil {
Expand All @@ -182,7 +157,11 @@ func TestSshProxyWithNamespace(t *testing.T) {
serverSshPeer.Ready()

s := test.HttpServer("7020")
success := test.HttpClientInNamespace("http://127.0.0.1:7010", nsPath)
if s == nil {
t.Error("Failed - not create server")
return
}
success := test.HttpClientInNamespace("http://127.0.0.1:7010", ns.Path())
if !success {
t.Error("Failed - not successful")
return
Expand Down Expand Up @@ -225,6 +204,9 @@ func TestSshProxyReverse(t *testing.T) {
serverSshPeer.Ready()

s := test.HttpServer("7001")
if s == nil {
t.Error("Failed - not create server")
}
success := test.HttpClient("http://127.0.0.1:7011")
if !success {
t.Error("Failed - not successful")
Expand Down Expand Up @@ -264,6 +246,9 @@ func TestSshProxyReverseKBS(t *testing.T) {
serverSshPeer.Ready()

s := test.HttpServer("7002")
if s == nil {
t.Error("Failed - not create server")
}
success := test.HttpClient("http://127.0.0.1:7012")
if !success {
t.Error("Failed - not successful")
Expand Down
12 changes: 7 additions & 5 deletions src/cloud-api-adaptor/pkg/securecomms/wnssh/wnssh_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,13 @@ func TestSshProxyReverseKBS(t *testing.T) {
sshport := "6003"
kubemgr.InitKubeMgrMock()

test.KBSServer("9001")
test.HttpServer("8053")
test.HttpServer("26443")
test.HttpServer("7121")

s9001 := test.KBSServer("9001")
s8053 := test.HttpServer("8053")
s26443 := test.HttpServer("26443")
s7121 := test.HttpServer("7121")
if s9001 == nil || s8053 == nil || s26443 == nil || s7121 == nil {
t.Error("Failed - not create server")
}
test.CreatePKCS8Secret(t)

// CAA Initialization
Expand Down
11 changes: 9 additions & 2 deletions src/cloud-api-adaptor/test/securecomms/test/httpServer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ package test
import (
"fmt"
"io"
"net"
"net/http"
)

Expand All @@ -24,10 +25,16 @@ func HttpServer(port string) *http.Server {
Addr: "127.0.0.1:" + port,
Handler: mux,
}
ln, err := net.Listen("tcp", s.Addr)
if err != nil {
fmt.Printf("Listen Error %v\n", err)
return nil
}

go func() {
err := s.ListenAndServe()
err = s.Serve(ln)
if err != http.ErrServerClosed { // graceful shutdown
fmt.Printf("ListenAndServe Error %v\n", err)
fmt.Printf("Serve Error %v\n", err)
}
}()
return s
Expand Down
16 changes: 13 additions & 3 deletions src/cloud-api-adaptor/test/securecomms/test/kbs.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ func (p kbsport) getRoot(w http.ResponseWriter, r *http.Request) {
http.Error(w, "Not Found", http.StatusNotFound)
}

func KBSServer(port string) {
func KBSServer(port string) *http.Server {
keys = map[string][]byte{}

p := kbsport(port)
Expand All @@ -50,10 +50,20 @@ func KBSServer(port string) {
Handler: mux,
}

ln, err := net.Listen("tcp", s.Addr)
if err != nil {
fmt.Printf("Listen Error %v\n", err)
return nil
}

go func() {
err := s.ListenAndServe()
fmt.Printf("ListenAndServe Error %v\n", err)
err = s.Serve(ln)
if err != http.ErrServerClosed { // graceful shutdown
fmt.Printf("Serve Error %v\n", err)
}
}()

return s
}

type GetKeyClient struct {
Expand Down
3 changes: 2 additions & 1 deletion src/cloud-api-adaptor/test/securecomms/test/namespacedHttpServer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,10 +53,11 @@ func NamespacedHttpServer(port uint16, nsPath string) *http.Server {
Addr: fmt.Sprintf("127.0.0.1:%s", retPort),
Handler: mux,
}

go func() {
err := http.Serve(tcpListener, mux)
if err != http.ErrServerClosed { // graceful shutdown
fmt.Printf("ListenAndServe Error %v\n", err)
fmt.Printf("Serve Error %v\n", err)
}
}()
return s
Expand Down
Loading