mirror of
https://github.com/edgelesssys/constellation.git
synced 2025-05-03 23:04:53 -04:00
metadata-api: support dnsmasq (#3115)
This commit is contained in:
3u13r
GitHub
parent
37e46b98c2
commit
21c30ebb76
18 changed files with 304 additions and 270 deletions
|
|
@ -10,7 +10,7 @@ go_library(
|
|||
],
|
||||
visibility = ["//visibility:public"],
|
||||
deps = [
|
||||
"//hack/qemu-metadata-api/virtwrapper",
|
||||
"//hack/qemu-metadata-api/dhcp",
|
||||
"//internal/cloud/metadata",
|
||||
"//internal/role",
|
||||
],
|
||||
|
|
@ -18,22 +18,17 @@ go_library(
|
|||
|
||||
go_test(
|
||||
name = "server_test",
|
||||
srcs = [
|
||||
"server_cgo_test.go",
|
||||
"server_cross_test.go",
|
||||
"server_test.go",
|
||||
],
|
||||
srcs = ["server_test.go"],
|
||||
embed = [":server"],
|
||||
# keep
|
||||
pure = "on",
|
||||
# keep
|
||||
race = "off",
|
||||
deps = [
|
||||
"//hack/qemu-metadata-api/virtwrapper",
|
||||
"//hack/qemu-metadata-api/dhcp",
|
||||
"//internal/cloud/metadata",
|
||||
"//internal/logger",
|
||||
"@com_github_stretchr_testify//assert",
|
||||
"@com_github_stretchr_testify//require",
|
||||
"@org_libvirt_go_libvirt//:libvirt",
|
||||
],
|
||||
)
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@ import (
|
|||
"net/http"
|
||||
"strings"
|
||||
|
||||
"github.com/edgelesssys/constellation/v2/hack/qemu-metadata-api/virtwrapper"
|
||||
"github.com/edgelesssys/constellation/v2/hack/qemu-metadata-api/dhcp"
|
||||
"github.com/edgelesssys/constellation/v2/internal/cloud/metadata"
|
||||
"github.com/edgelesssys/constellation/v2/internal/role"
|
||||
)
|
||||
|
|
@ -22,16 +22,16 @@ import (
|
|||
// Server that provides QEMU metadata.
|
||||
type Server struct {
|
||||
log *slog.Logger
|
||||
virt virConnect
|
||||
dhcpLeaseGetter LeaseGetter
|
||||
network string
|
||||
initSecretHashVal []byte
|
||||
}
|
||||
|
||||
// New creates a new Server.
|
||||
func New(log *slog.Logger, network, initSecretHash string, conn virConnect) *Server {
|
||||
func New(log *slog.Logger, network, initSecretHash string, getter LeaseGetter) *Server {
|
||||
return &Server{
|
||||
log: log,
|
||||
virt: conn,
|
||||
dhcpLeaseGetter: getter,
|
||||
network: network,
|
||||
initSecretHashVal: []byte(initSecretHash),
|
||||
}
|
||||
|
|
@ -139,15 +139,7 @@ func (s *Server) getEndpoint(w http.ResponseWriter, r *http.Request) {
|
|||
log := s.log.With(slog.String("peer", r.RemoteAddr))
|
||||
log.Info("Serving GET request for /endpoint")
|
||||
|
||||
net, err := s.virt.LookupNetworkByName(s.network)
|
||||
if err != nil {
|
||||
log.With(slog.Any("error", err)).Error("Failed to lookup network")
|
||||
http.Error(w, err.Error(), http.StatusInternalServerError)
|
||||
return
|
||||
}
|
||||
defer net.Free()
|
||||
|
||||
leases, err := net.GetDHCPLeases()
|
||||
leases, err := s.dhcpLeaseGetter.GetDHCPLeases()
|
||||
if err != nil {
|
||||
log.With(slog.Any("error", err)).Error("Failed to get DHCP leases")
|
||||
http.Error(w, err.Error(), http.StatusInternalServerError)
|
||||
|
|
@ -172,13 +164,7 @@ func (s *Server) getEndpoint(w http.ResponseWriter, r *http.Request) {
|
|||
|
||||
// listAll returns a list of all active peers.
|
||||
func (s *Server) listAll() ([]metadata.InstanceMetadata, error) {
|
||||
net, err := s.virt.LookupNetworkByName(s.network)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
defer net.Free()
|
||||
|
||||
leases, err := net.GetDHCPLeases()
|
||||
leases, err := s.dhcpLeaseGetter.GetDHCPLeases()
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
|
@ -201,6 +187,7 @@ func (s *Server) listAll() ([]metadata.InstanceMetadata, error) {
|
|||
return peers, nil
|
||||
}
|
||||
|
||||
type virConnect interface {
|
||||
LookupNetworkByName(name string) (*virtwrapper.Network, error)
|
||||
// LeaseGetter is an interface for getting DHCP leases.
|
||||
type LeaseGetter interface {
|
||||
GetDHCPLeases() ([]dhcp.NetworkDHCPLease, error)
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,41 +0,0 @@
|
|||
//go:build cgo
|
||||
|
||||
/*
|
||||
Copyright (c) Edgeless Systems GmbH
|
||||
|
||||
SPDX-License-Identifier: AGPL-3.0-only
|
||||
*/
|
||||
|
||||
package server
|
||||
|
||||
import (
|
||||
"github.com/edgelesssys/constellation/v2/hack/qemu-metadata-api/virtwrapper"
|
||||
"libvirt.org/go/libvirt"
|
||||
)
|
||||
|
||||
type stubNetwork struct {
|
||||
leases []libvirt.NetworkDHCPLease
|
||||
getLeaseErr error
|
||||
}
|
||||
|
||||
func newStubNetwork(leases []virtwrapper.NetworkDHCPLease, getLeaseErr error) stubNetwork {
|
||||
libvirtLeases := make([]libvirt.NetworkDHCPLease, len(leases))
|
||||
for i, l := range leases {
|
||||
libvirtLeases[i] = libvirt.NetworkDHCPLease{
|
||||
IPaddr: l.IPaddr,
|
||||
Hostname: l.Hostname,
|
||||
}
|
||||
}
|
||||
return stubNetwork{
|
||||
leases: libvirtLeases,
|
||||
getLeaseErr: getLeaseErr,
|
||||
}
|
||||
}
|
||||
|
||||
func (n stubNetwork) GetDHCPLeases() ([]libvirt.NetworkDHCPLease, error) {
|
||||
return n.leases, n.getLeaseErr
|
||||
}
|
||||
|
||||
func (n stubNetwork) Free() error {
|
||||
return nil
|
||||
}
|
||||
|
|
@ -1,31 +0,0 @@
|
|||
//go:build !cgo
|
||||
|
||||
/*
|
||||
Copyright (c) Edgeless Systems GmbH
|
||||
|
||||
SPDX-License-Identifier: AGPL-3.0-only
|
||||
*/
|
||||
|
||||
package server
|
||||
|
||||
import "github.com/edgelesssys/constellation/v2/hack/qemu-metadata-api/virtwrapper"
|
||||
|
||||
type stubNetwork struct {
|
||||
leases []virtwrapper.NetworkDHCPLease
|
||||
getLeaseErr error
|
||||
}
|
||||
|
||||
func newStubNetwork(leases []virtwrapper.NetworkDHCPLease, getLeaseErr error) stubNetwork {
|
||||
return stubNetwork{
|
||||
leases: leases,
|
||||
getLeaseErr: getLeaseErr,
|
||||
}
|
||||
}
|
||||
|
||||
func (n stubNetwork) GetDHCPLeases() ([]virtwrapper.NetworkDHCPLease, error) {
|
||||
return n.leases, n.getLeaseErr
|
||||
}
|
||||
|
||||
func (n stubNetwork) Free() error {
|
||||
return nil
|
||||
}
|
||||
|
|
@ -9,13 +9,12 @@ package server
|
|||
import (
|
||||
"context"
|
||||
"encoding/json"
|
||||
"errors"
|
||||
"io"
|
||||
"net/http"
|
||||
"net/http/httptest"
|
||||
"testing"
|
||||
|
||||
"github.com/edgelesssys/constellation/v2/hack/qemu-metadata-api/virtwrapper"
|
||||
"github.com/edgelesssys/constellation/v2/hack/qemu-metadata-api/dhcp"
|
||||
"github.com/edgelesssys/constellation/v2/internal/cloud/metadata"
|
||||
"github.com/edgelesssys/constellation/v2/internal/logger"
|
||||
"github.com/stretchr/testify/assert"
|
||||
|
|
@ -23,15 +22,13 @@ import (
|
|||
)
|
||||
|
||||
func TestListAll(t *testing.T) {
|
||||
someErr := errors.New("error")
|
||||
|
||||
testCases := map[string]struct {
|
||||
wantErr bool
|
||||
connect *stubConnect
|
||||
wantErr bool
|
||||
stubLeaseGetter *stubLeaseGetter
|
||||
}{
|
||||
"success": {
|
||||
connect: &stubConnect{
|
||||
network: newStubNetwork([]virtwrapper.NetworkDHCPLease{
|
||||
stubLeaseGetter: &stubLeaseGetter{
|
||||
leases: []dhcp.NetworkDHCPLease{
|
||||
{
|
||||
IPaddr: "192.0.100.1",
|
||||
Hostname: "control-plane-0",
|
||||
|
|
@ -44,20 +41,12 @@ func TestListAll(t *testing.T) {
|
|||
IPaddr: "192.0.200.1",
|
||||
Hostname: "worker-0",
|
||||
},
|
||||
}, nil),
|
||||
},
|
||||
},
|
||||
},
|
||||
"LookupNetworkByName error": {
|
||||
connect: &stubConnect{
|
||||
getNetworkErr: someErr,
|
||||
},
|
||||
wantErr: true,
|
||||
},
|
||||
"GetDHCPLeases error": {
|
||||
connect: &stubConnect{
|
||||
network: stubNetwork{
|
||||
getLeaseErr: someErr,
|
||||
},
|
||||
stubLeaseGetter: &stubLeaseGetter{
|
||||
getErr: assert.AnError,
|
||||
},
|
||||
wantErr: true,
|
||||
},
|
||||
|
|
@ -67,7 +56,7 @@ func TestListAll(t *testing.T) {
|
|||
t.Run(name, func(t *testing.T) {
|
||||
assert := assert.New(t)
|
||||
|
||||
server := New(logger.NewTest(t), "test", "initSecretHash", tc.connect)
|
||||
server := New(logger.NewTest(t), "test", "initSecretHash", tc.stubLeaseGetter)
|
||||
|
||||
res, err := server.listAll()
|
||||
|
||||
|
|
@ -76,58 +65,56 @@ func TestListAll(t *testing.T) {
|
|||
return
|
||||
}
|
||||
assert.NoError(err)
|
||||
assert.Len(tc.connect.network.leases, len(res))
|
||||
assert.Len(tc.stubLeaseGetter.leases, len(res))
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
func TestListSelf(t *testing.T) {
|
||||
someErr := errors.New("error")
|
||||
|
||||
testCases := map[string]struct {
|
||||
remoteAddr string
|
||||
connect *stubConnect
|
||||
wantErr bool
|
||||
remoteAddr string
|
||||
stubLeaseGetter *stubLeaseGetter
|
||||
wantErr bool
|
||||
}{
|
||||
"success": {
|
||||
remoteAddr: "192.0.100.1:1234",
|
||||
connect: &stubConnect{
|
||||
network: newStubNetwork([]virtwrapper.NetworkDHCPLease{
|
||||
stubLeaseGetter: &stubLeaseGetter{
|
||||
leases: []dhcp.NetworkDHCPLease{
|
||||
{
|
||||
IPaddr: "192.0.100.1",
|
||||
Hostname: "control-plane-0",
|
||||
},
|
||||
}, nil),
|
||||
},
|
||||
},
|
||||
},
|
||||
"listAll error": {
|
||||
remoteAddr: "192.0.100.1:1234",
|
||||
connect: &stubConnect{
|
||||
getNetworkErr: someErr,
|
||||
stubLeaseGetter: &stubLeaseGetter{
|
||||
getErr: assert.AnError,
|
||||
},
|
||||
wantErr: true,
|
||||
},
|
||||
"remoteAddr error": {
|
||||
remoteAddr: "",
|
||||
connect: &stubConnect{
|
||||
network: newStubNetwork([]virtwrapper.NetworkDHCPLease{
|
||||
stubLeaseGetter: &stubLeaseGetter{
|
||||
leases: []dhcp.NetworkDHCPLease{
|
||||
{
|
||||
IPaddr: "192.0.100.1",
|
||||
Hostname: "control-plane-0",
|
||||
},
|
||||
}, nil),
|
||||
},
|
||||
},
|
||||
wantErr: true,
|
||||
},
|
||||
"peer not found": {
|
||||
remoteAddr: "192.0.200.1:1234",
|
||||
connect: &stubConnect{
|
||||
network: newStubNetwork([]virtwrapper.NetworkDHCPLease{
|
||||
stubLeaseGetter: &stubLeaseGetter{
|
||||
leases: []dhcp.NetworkDHCPLease{
|
||||
{
|
||||
IPaddr: "192.0.100.1",
|
||||
Hostname: "control-plane-0",
|
||||
},
|
||||
}, nil),
|
||||
},
|
||||
},
|
||||
wantErr: true,
|
||||
},
|
||||
|
|
@ -138,7 +125,7 @@ func TestListSelf(t *testing.T) {
|
|||
assert := assert.New(t)
|
||||
require := require.New(t)
|
||||
|
||||
server := New(logger.NewTest(t), "test", "initSecretHash", tc.connect)
|
||||
server := New(logger.NewTest(t), "test", "initSecretHash", tc.stubLeaseGetter)
|
||||
|
||||
req, err := http.NewRequestWithContext(context.Background(), http.MethodGet, "http://192.0.0.1/self", nil)
|
||||
require.NoError(err)
|
||||
|
|
@ -157,22 +144,22 @@ func TestListSelf(t *testing.T) {
|
|||
|
||||
var metadata metadata.InstanceMetadata
|
||||
require.NoError(json.Unmarshal(metadataRaw, &metadata))
|
||||
assert.Equal(tc.connect.network.leases[0].Hostname, metadata.Name)
|
||||
assert.Equal(tc.connect.network.leases[0].IPaddr, metadata.VPCIP)
|
||||
assert.Equal(tc.stubLeaseGetter.leases[0].Hostname, metadata.Name)
|
||||
assert.Equal(tc.stubLeaseGetter.leases[0].IPaddr, metadata.VPCIP)
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
func TestListPeers(t *testing.T) {
|
||||
testCases := map[string]struct {
|
||||
remoteAddr string
|
||||
connect *stubConnect
|
||||
wantErr bool
|
||||
remoteAddr string
|
||||
stubNetworkGetter *stubLeaseGetter
|
||||
wantErr bool
|
||||
}{
|
||||
"success": {
|
||||
remoteAddr: "192.0.100.1:1234",
|
||||
connect: &stubConnect{
|
||||
network: newStubNetwork([]virtwrapper.NetworkDHCPLease{
|
||||
stubNetworkGetter: &stubLeaseGetter{
|
||||
leases: []dhcp.NetworkDHCPLease{
|
||||
{
|
||||
IPaddr: "192.0.100.1",
|
||||
Hostname: "control-plane-0",
|
||||
|
|
@ -181,13 +168,13 @@ func TestListPeers(t *testing.T) {
|
|||
IPaddr: "192.0.200.1",
|
||||
Hostname: "worker-0",
|
||||
},
|
||||
}, nil),
|
||||
},
|
||||
},
|
||||
},
|
||||
"listAll error": {
|
||||
remoteAddr: "192.0.100.1:1234",
|
||||
connect: &stubConnect{
|
||||
getNetworkErr: errors.New("error"),
|
||||
stubNetworkGetter: &stubLeaseGetter{
|
||||
getErr: assert.AnError,
|
||||
},
|
||||
wantErr: true,
|
||||
},
|
||||
|
|
@ -198,7 +185,7 @@ func TestListPeers(t *testing.T) {
|
|||
assert := assert.New(t)
|
||||
require := require.New(t)
|
||||
|
||||
server := New(logger.NewTest(t), "test", "initSecretHash", tc.connect)
|
||||
server := New(logger.NewTest(t), "test", "initSecretHash", tc.stubNetworkGetter)
|
||||
|
||||
req, err := http.NewRequestWithContext(context.Background(), http.MethodGet, "http://192.0.0.1/peers", nil)
|
||||
require.NoError(err)
|
||||
|
|
@ -217,22 +204,23 @@ func TestListPeers(t *testing.T) {
|
|||
|
||||
var metadata []metadata.InstanceMetadata
|
||||
require.NoError(json.Unmarshal(metadataRaw, &metadata))
|
||||
assert.Len(metadata, len(tc.connect.network.leases))
|
||||
assert.Len(metadata, len(tc.stubNetworkGetter.leases))
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
func TestInitSecretHash(t *testing.T) {
|
||||
defaultConnect := &stubConnect{
|
||||
network: newStubNetwork([]virtwrapper.NetworkDHCPLease{
|
||||
defaultConnect := &stubLeaseGetter{
|
||||
leases: []dhcp.NetworkDHCPLease{
|
||||
{
|
||||
IPaddr: "192.0.100.1",
|
||||
Hostname: "control-plane-0",
|
||||
},
|
||||
}, nil),
|
||||
},
|
||||
}
|
||||
|
||||
testCases := map[string]struct {
|
||||
connect *stubConnect
|
||||
connect *stubLeaseGetter
|
||||
method string
|
||||
wantHash string
|
||||
wantErr bool
|
||||
|
|
@ -272,11 +260,11 @@ func TestInitSecretHash(t *testing.T) {
|
|||
}
|
||||
}
|
||||
|
||||
type stubConnect struct {
|
||||
network stubNetwork
|
||||
getNetworkErr error
|
||||
type stubLeaseGetter struct {
|
||||
leases []dhcp.NetworkDHCPLease
|
||||
getErr error
|
||||
}
|
||||
|
||||
func (c stubConnect) LookupNetworkByName(_ string) (*virtwrapper.Network, error) {
|
||||
return &virtwrapper.Network{Net: c.network}, c.getNetworkErr
|
||||
func (c stubLeaseGetter) GetDHCPLeases() ([]dhcp.NetworkDHCPLease, error) {
|
||||
return c.leases, c.getErr
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue