feat: fetch dhcp leases from network-manager via dbus

docker-compose.dpu.yml

@@ -88,6 +88,20 @@ services:
               '--device-private-key', '/certs/first_private_key.pem',
               '--serial-number', 'first-serial-number']
 
+  agent6:
+    <<: *agent
+    volumes:
+      - /var/run/dbus:/var/run/dbus
+      - client-certs:/certs
+      - /etc/os-release:/etc/os-release
+      - /etc/ssh:/etc/ssh
+    privileged: true
+    command: ['/opi-sztp-agent', 'run',
+              '--bootstrap-trust-anchor-cert', '/certs/opi.pem',
+              '--device-end-entity-cert', '/certs/first_my_cert.pem',
+              '--device-private-key', '/certs/first_private_key.pem',
+              '--serial-number', 'first-serial-number']
+
 volumes:
   client-certs:
   dhcp-leases-folder:

scripts/run_agent.sh

@@ -21,9 +21,10 @@ docker run --rm -it --network=host \
     --mount type=bind,source=/etc/ssh,target=/etc/ssh,readonly \
     --mount type=bind,source=/etc/os-release,target=/etc/os-release,readonly \
     --mount type=bind,source=/var/lib/NetworkManager,target=/var/lib/NetworkManager,readonly \
+    --mount type=bind,source=/var/run/dbus,target=/var/run/dbus,readonly \
+    --privileged \
     ${DOCKER_SZTP_IMAGE} \
     /opi-sztp-agent daemon \
-    --dhcp-lease-file /var/lib/NetworkManager/dhclient-eth0.lease \
     --bootstrap-trust-anchor-cert /mnt/opi.pem \
     --device-end-entity-cert /mnt/opi_cert.pem \
     --device-private-key /mnt/opi_private_key.pem \

sztp-agent/cmd/daemon.go

@@ -43,7 +43,7 @@ func Daemon() *cobra.Command {
 				return fmt.Errorf("'--bootstrap-url' and '--dhcp-lease-file' are mutualy exclusive")
 			}
 			if bootstrapURL == "" && dhcpLeaseFile == "" {
-				return fmt.Errorf("'--bootstrap-url' or '--dhcp-lease-file' is required")
+				fmt.Println("both '--bootstrap-url' and '--dhcp-lease-file' were not provided, will discover the bootstrap URL(s) via NetworkManager")
 			}
 			if dhcpLeaseFile != "" {
 				arrayChecker = append(arrayChecker, dhcpLeaseFile)

sztp-agent/cmd/run.go

@@ -43,7 +43,7 @@ func Run() *cobra.Command {
 				return fmt.Errorf("'--bootstrap-url' and '--dhcp-lease-file' are mutualy exclusive")
 			}
 			if bootstrapURL == "" && dhcpLeaseFile == "" {
-				return fmt.Errorf("'--bootstrap-url' or '--dhcp-lease-file' is required")
+				fmt.Println("both '--bootstrap-url' and '--dhcp-lease-file' were not provided, will discover the bootstrap URL(s) via NetworkManager")
 			}
 			if dhcpLeaseFile != "" {
 				arrayChecker = append(arrayChecker, dhcpLeaseFile)

sztp-agent/go.mod

@@ -15,6 +15,7 @@ require (
 	github.com/StackExchange/wmi v1.2.1 // indirect
 	github.com/ghodss/yaml v1.0.0 // indirect
 	github.com/go-ole/go-ole v1.2.6 // indirect
+	github.com/godbus/dbus v4.1.0+incompatible
 	github.com/inconshreveable/mousetrap v1.1.0 // indirect
 	github.com/jaypipes/pcidb v1.0.0 // indirect
 	github.com/kr/text v0.2.0 // indirect

sztp-agent/go.sum

@@ -17,6 +17,8 @@ github.com/go-ini/ini v1.67.0/go.mod h1:ByCAeIL28uOIIG0E3PJtZPDL8WnHpFKFOtgjp+3I
 github.com/go-ole/go-ole v1.2.5/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiUsvbm0=
 github.com/go-ole/go-ole v1.2.6 h1:/Fpf6oFPoeFik9ty7siob0G6Ke8QvQEuVcuChpwXzpY=
 github.com/go-ole/go-ole v1.2.6/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiUsvbm0=
+github.com/godbus/dbus v4.1.0+incompatible h1:WqqLRTsQic3apZUK9qC5sGNfXthmPXzUZ7nQPrNITa4=
+github.com/godbus/dbus v4.1.0+incompatible/go.mod h1:/YcGZj5zSblfDWMMoOzV4fas9FZnQYTkDnsGvmh2Grw=
 github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8=
 github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw=
 github.com/jaypipes/ghw v0.12.0 h1:xU2/MDJfWmBhJnujHY9qwXQLs3DBsf0/Xa9vECY0Tho=

sztp-agent/pkg/dhcp/dbus.go

@@ -7,3 +7,66 @@ Copyright (C) 2022 Red Hat.
 
 // Package dhcp implements the DHCP client
 package dhcp
+
+import (
+	"fmt"
+	"log"
+
+	"github.com/godbus/dbus"
+)
+
+// GetBootstrapURLsViaNetworkManager returns the sztp_redirect_urls from the active connections managed by NetworkManager
+func GetBootstrapURLsViaNetworkManager() ([]string, error) {
+	conn, err := dbus.SystemBus()
+	if err != nil {
+		return nil, fmt.Errorf("failed to connect to system bus: %v", err)
+	}
+
+	// Get NetworkManager object
+	nm := conn.Object("org.freedesktop.NetworkManager", "/org/freedesktop/NetworkManager")
+
+	var activeConnPaths []dbus.ObjectPath
+	err = nm.Call("org.freedesktop.DBus.Properties.Get", 0, "org.freedesktop.NetworkManager", "ActiveConnections").Store(&activeConnPaths)
+	if err != nil {
+		return nil, fmt.Errorf("failed to get ActiveConnections property: %v", err)
+	}
+
+	log.Println("[INFO] active connection paths: ", activeConnPaths)
+
+	var sztpRedirectURLs []string
+
+	// Iterate over each active connection
+	for _, connPath := range activeConnPaths {
+		// Get Active Connection object
+		connActive := conn.Object("org.freedesktop.NetworkManager", connPath)
+
+		// Get Dhcp4Config property from Active Connection object
+		var dhcpPath dbus.ObjectPath
+		err = connActive.Call("org.freedesktop.DBus.Properties.Get", 0, "org.freedesktop.NetworkManager.Connection.Active", "Dhcp4Config").Store(&dhcpPath)
+		if err != nil {
+			log.Println("[INFO] Dhcp4Config is not available for connection:", connPath, err)
+			continue
+		}
+
+		// Get Options property from DHCP4Config object
+		dhcp := conn.Object("org.freedesktop.NetworkManager", dhcpPath)
+		var options map[string]dbus.Variant
+		err = dhcp.Call("org.freedesktop.DBus.Properties.Get", 0, "org.freedesktop.NetworkManager.DHCP4Config", "Options").Store(&options)
+		if err != nil {
+			log.Println("[INFO] failed to get Options property for connection:", connPath, err)
+			continue
+		}
+
+		// Logging options
+		log.Println("[INFO] Options for connection:", connPath, ": ", options)
+
+		// Check if sztp_redirect_urls option exists and append
+		if variant, ok := options[SZTP_REDIRECT_URLs]; ok {
+			url := variant.Value().(string)
+			log.Println("sztp_redirect_url found for connection:", connPath, ": ", url)
+			sztpRedirectURLs = append(sztpRedirectURLs, url)
+		}
+	}
+
+	return sztpRedirectURLs, nil
+}

sztp-agent/pkg/dhcp/utils.go

@@ -7,3 +7,8 @@ Copyright (C) 2022 Red Hat.
 
 // Package dhcp implements the DHCP client
 package dhcp
+
+const (
+	// SZTP_REDIRECT_URLs (custom dhcp-option 143)
+	SZTP_REDIRECT_URLs = "sztp-redirect-urls" // nolint:all
+)

sztp-agent/pkg/secureagent/agent.go

@@ -12,7 +12,6 @@ package secureagent
 const (
 	CONTENT_TYPE_YANG = "application/yang-data+json"
 	OS_RELEASE_FILE   = "/etc/os-release"
-	SZTP_REDIRECT_URL = "sztp-redirect-urls"
 	ARTIFACTS_PATH    = "/tmp/"
 )
 
@@ -71,7 +70,7 @@ type BootstrapServerErrorOutput struct {
 // Agent is the basic structure to define an agent instance
 type Agent struct {
 	InputBootstrapURL             string                        // Bootstrap complete URL given by USER
-	BootstrapURL                  string                        // Bootstrap complete URL
+	BootstrapURL                  []string                      // Bootstrap complete URL
 	SerialNumber                  string                        // Device's Serial Number
 	DevicePassword                string                        // Device's Password
 	DevicePrivateKey              string                        // Device's private key
@@ -89,7 +88,7 @@ type Agent struct {
 func NewAgent(bootstrapURL, serialNumber, dhcpLeaseFile, devicePassword, devicePrivateKey, deviceEndEntityCert, bootstrapTrustAnchorCert string) *Agent {
 	return &Agent{
 		InputBootstrapURL:             bootstrapURL,
-		BootstrapURL:                  "",
+		BootstrapURL:                  []string{""},
 		SerialNumber:                  GetSerialNumber(serialNumber),
 		DevicePassword:                devicePassword,
 		DevicePrivateKey:              devicePrivateKey,
@@ -104,7 +103,7 @@ func NewAgent(bootstrapURL, serialNumber, dhcpLeaseFile, devicePassword, deviceP
 	}
 }
 
-func (a *Agent) GetBootstrapURL() string {
+func (a *Agent) GetBootstrapURL() []string {
 	return a.BootstrapURL
 }
 
@@ -140,7 +139,7 @@ func (a *Agent) GetProgressJSON() ProgressJSON {
 	return a.ProgressJSON
 }
 
-func (a *Agent) SetBootstrapURL(url string) {
+func (a *Agent) SetBootstrapURL(url []string) {
 	a.BootstrapURL = url
 }