fix: agent func arg type, minor fixes

Signed-off-by: Bhoopesh <[email protected]>

scripts/run_agent.sh

@@ -21,7 +21,6 @@ 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/NetworkManager,target=/var/run/NetworkManager,readonly \
     --mount type=bind,source=/var/run/dbus,target=/var/run/dbus,readonly \
     --privileged \
     ${DOCKER_SZTP_IMAGE} \

sztp-agent/Dockerfile

@@ -21,4 +21,4 @@ RUN apk add --no-cache --no-check-certificate curl && rm -rf /var/cache/apk/*
 
 COPY --from=builder /opi-sztp-agent /
 
-CMD ["/opi-sztp-agent"]
+CMD [ "/opi-sztp-agent" ]

sztp-agent/NetworkManager.conf

@@ -0,0 +1,9 @@
+[main]
+plugins=keyfile
+dhcp=dhclient
+
+[ifupdown]
+managed=false
+
+[device]
+wifi.scan-rand-mac-address=no

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 == "" {
-				fmt.Println("both '--bootstrap-url' and '--dhcp-lease-file' were not provided, trying to get the bootstrap URL via NetworkManager")
+				fmt.Println("both '--bootstrap-url' and '--dhcp-lease-file' were not provided, will try to get the bootstrap URL via NetworkManager")
 			}
 			if dhcpLeaseFile != "" {
 				arrayChecker = append(arrayChecker, dhcpLeaseFile)
@@ -59,7 +59,7 @@ func Daemon() *cobra.Command {
 					return fmt.Errorf("must not be folder: %q", filePath)
 				}
 			}
-			a := secureagent.NewAgent([]string{bootstrapURL}, serialNumber, dhcpLeaseFile, devicePassword, devicePrivateKey, deviceEndEntityCert, bootstrapTrustAnchorCert)
+			a := secureagent.NewAgent(bootstrapURL, serialNumber, dhcpLeaseFile, devicePassword, devicePrivateKey, deviceEndEntityCert, bootstrapTrustAnchorCert)
 			return a.RunCommandDaemon()
 		},
 	}

sztp-agent/cmd/disable.go

@@ -34,7 +34,7 @@ func Disable() *cobra.Command {
 		Use:   "disable",
 		Short: "Run the disable command",
 		RunE: func(_ *cobra.Command, _ []string) error {
-			a := secureagent.NewAgent([]string{bootstrapURL}, serialNumber, dhcpLeaseFile, devicePassword, devicePrivateKey, deviceEndEntityCert, bootstrapTrustAnchorCert)
+			a := secureagent.NewAgent(bootstrapURL, serialNumber, dhcpLeaseFile, devicePassword, devicePrivateKey, deviceEndEntityCert, bootstrapTrustAnchorCert)
 			return a.RunCommandDisable()
 		},
 	}

sztp-agent/cmd/enable.go

@@ -34,7 +34,7 @@ func Enable() *cobra.Command {
 		Use:   "enable",
 		Short: "Run the enable command",
 		RunE: func(_ *cobra.Command, _ []string) error {
-			a := secureagent.NewAgent([]string{bootstrapURL}, serialNumber, dhcpLeaseFile, devicePassword, devicePrivateKey, deviceEndEntityCert, bootstrapTrustAnchorCert)
+			a := secureagent.NewAgent(bootstrapURL, serialNumber, dhcpLeaseFile, devicePassword, devicePrivateKey, deviceEndEntityCert, bootstrapTrustAnchorCert)
 			return a.RunCommandEnable()
 		},
 	}

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 == "" {
-				fmt.Println("both '--bootstrap-url' and '--dhcp-lease-file' were not provided, trying to get the bootstrap URL via NetworkManager")
+				fmt.Println("both '--bootstrap-url' and '--dhcp-lease-file' were not provided, will try to get the bootstrap URL via NetworkManager")
 			}
 			if dhcpLeaseFile != "" {
 				arrayChecker = append(arrayChecker, dhcpLeaseFile)
@@ -59,7 +59,7 @@ func Run() *cobra.Command {
 					return fmt.Errorf("must not be folder: %q", filePath)
 				}
 			}
-			a := secureagent.NewAgent([]string{bootstrapURL}, serialNumber, dhcpLeaseFile, devicePassword, devicePrivateKey, deviceEndEntityCert, bootstrapTrustAnchorCert)
+			a := secureagent.NewAgent(bootstrapURL, serialNumber, dhcpLeaseFile, devicePassword, devicePrivateKey, deviceEndEntityCert, bootstrapTrustAnchorCert)
 			return a.RunCommand()
 		},
 	}

sztp-agent/cmd/status.go

@@ -34,7 +34,7 @@ func Status() *cobra.Command {
 		Use:   "status",
 		Short: "Run the status command",
 		RunE: func(_ *cobra.Command, _ []string) error {
-			a := secureagent.NewAgent([]string{bootstrapURL}, serialNumber, dhcpLeaseFile, devicePassword, devicePrivateKey, deviceEndEntityCert, bootstrapTrustAnchorCert)
+			a := secureagent.NewAgent(bootstrapURL, serialNumber, dhcpLeaseFile, devicePassword, devicePrivateKey, deviceEndEntityCert, bootstrapTrustAnchorCert)
 			return a.RunCommandStatus()
 		},
 	}

sztp-agent/pkg/dhcp/dhcp_lease.go

@@ -14,14 +14,14 @@ import (
 	"os"
 )
 
-const sztpRedirectUrls = "sztp-redirect-urls"
+const sztpRedirectURL = "sztp-redirect-urls"
 
-// getBootstrapURLViaLeaseFile returns the sztp redirect URL via DHCP lease file
-func getBootstrapURLViaLeaseFile(dhcpLeaseFile string) (string, error) {
+// GetBootstrapURLViaLeaseFile returns the sztp redirect URL via DHCP lease file
+func GetBootstrapURLViaLeaseFile(dhcpLeaseFile string) (string, error) {
 	var line string
 	if _, err := os.Stat(dhcpLeaseFile); err == nil {
 		for {
-			line = LinesInFileContains(dhcpLeaseFile, sztpRedirectUrls)
+			line = LinesInFileContains(dhcpLeaseFile, sztpRedirectURL)
 			if line != "" {
 				break
 			}

sztp-agent/pkg/dhcp/dhcp_lease_test.go

@@ -42,7 +42,7 @@ func TestGetBootstrapURLViaLeaseFile(t *testing.T) {
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			got, err := getBootstrapURLViaLeaseFile(tt.fields.DhcpLeaseFile)
+			got, err := GetBootstrapURLViaLeaseFile(tt.fields.DhcpLeaseFile)
 			if (err != nil) != tt.wantErr {
 				t.Errorf("GetBootstrapURLViaLeaseFile() error = %v, wantErr %v", err, tt.wantErr)
 			} else if got != tt.want {

sztp-agent/pkg/dhcp/network_manager.go

@@ -15,8 +15,8 @@ import (
 	"github.com/godbus/dbus/v5"
 )
 
-// getBootstrapURLViaNetworkManager returns the sztp redirect URL via NetworkManager
-func getBootstrapURLViaNetworkManager() ([]string, error) {
+// GetBootstrapURLViaNetworkManager returns the sztp redirect URL via NetworkManager
+func GetBootstrapURLViaNetworkManager() ([]string, error) {
 	conn, err := dbus.SystemBus()
 	if err != nil {
 		return nil, fmt.Errorf("failed to connect to system bus: %v", err)
@@ -45,25 +45,29 @@ func getBootstrapURLViaNetworkManager() ([]string, error) {
 			continue
 		}
 
-		dhcp := conn.Object("org.freedesktop.NetworkManager", dhcpPath)
+		connDhcp := 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)
+		err = connDhcp.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 in DHCP4Config ", dhcpPath, ": ", err)
+			log.Println("[INFO] failed to get Options property: ", err)
 			continue
 		}
 
-		if variant, ok := options["sztp_redirect_urls"]; ok {
+		if variant, ok := options[sztpRedirectURL]; ok {
 			if variant.Signature().String() == "s" {
-				sztpRedirectURL := variant.Value().(string)
-				log.Println("[INFO] sztp_redirect_url found: ", sztpRedirectURLs)
-				sztpRedirectURLs = append(sztpRedirectURLs, sztpRedirectURL)
+				url := variant.Value().(string)
+				log.Println("[INFO] sztp_redirect_url found: ", url)
+				sztpRedirectURLs = append(sztpRedirectURLs, url)
 				continue
 			}
 			log.Println("[INFO] sztp_redirect_urls is not a string in DHCP4Config ", dhcpPath)
 		} else {
 			log.Println("[INFO] sztp_redirect_urls not found in DHCP4Config ", dhcpPath)
 		}
 	}
-	return sztpRedirectURLs, fmt.Errorf("sztp_redirect_urls not found in any active connection")
+	if len(sztpRedirectURLs) == 0 {
+		return nil, fmt.Errorf("sztp_redirect_urls not found in any active connection")
+	}
+	return sztpRedirectURLs, nil
 }

sztp-agent/pkg/secureagent/agent.go

@@ -84,9 +84,9 @@ type Agent struct {
 
 }
 
-func NewAgent(bootstrapURL []string, serialNumber, dhcpLeaseFile, devicePassword, devicePrivateKey, deviceEndEntityCert, bootstrapTrustAnchorCert string) *Agent {
+func NewAgent(bootstrapURL string, serialNumber, dhcpLeaseFile, devicePassword, devicePrivateKey, deviceEndEntityCert, bootstrapTrustAnchorCert string) *Agent {
 	return &Agent{
-		BootstrapURL:                  bootstrapURL,
+		BootstrapURL:                  []string{bootstrapURL},
 		SerialNumber:                  GetSerialNumber(serialNumber),
 		DevicePassword:                devicePassword,
 		DevicePrivateKey:              devicePrivateKey,

sztp-agent/pkg/secureagent/agent_test.go

@@ -821,7 +821,7 @@ func TestAgent_SetSerialNumber(t *testing.T) {
 
 func TestNewAgent(t *testing.T) {
 	type args struct {
-		bootstrapURL             []string
+		bootstrapURL             string
 		serialNumber             string
 		dhcpLeaseFile            string
 		devicePassword           string
@@ -837,7 +837,7 @@ func TestNewAgent(t *testing.T) {
 		{
 			name: "Test Constructor",
 			args: args{
-				bootstrapURL:             []string{"TestBootstrap"},
+				bootstrapURL:             "TestBootstrap",
 				serialNumber:             "TestSerialNumber",
 				dhcpLeaseFile:            "TestDhcpLeaseFile",
 				devicePassword:           "TestDevicePassword",

sztp-agent/pkg/secureagent/daemon.go

@@ -57,16 +57,15 @@ func (a *Agent) RunCommandDaemon() error {
 
 func (a *Agent) performBootstrapSequence() error {
 	var err error
-	// check if empty
+	// check if the bootstrap URL is already set
 	if len(a.GetBootstrapURL()) == 1 && a.GetBootstrapURL()[0] == "" {
-		log.Println("lmao")
 		err = a.getBootstrapURL()
 		if err != nil {
 			return err
 		}
 	}
-	log.Println("Bootstrap URL: ", a.GetBootstrapURL())
 	bootstrapURLs := a.GetBootstrapURL()
+	log.Println("Bootstrap URL: ", bootstrapURLs)
 	for _, bootstrapURL := range bootstrapURLs {
 		bootstrapURLCopy := bootstrapURL
 		err = a.doRequestBootstrapServerOnboardingInfo(&bootstrapURLCopy)
@@ -106,16 +105,21 @@ func (a *Agent) performBootstrapSequence() error {
 }
 
 func (a *Agent) getBootstrapURL() error {
-	log.Println("[INFO] Get the Bootstrap URL from DHCP client")
-
-	sztpRedirectUrls, err := dhcp.GetBootstrapURL(a.DhcpLeaseFile)
+	if a.DhcpLeaseFile != "" {
+		log.Println("[INFO] Get the Bootstrap URL from DHCP client")
+		bootstrapURL, err := dhcp.GetBootstrapURLViaLeaseFile(a.DhcpLeaseFile)
+		if err != nil {
+			return err
+		}
+		a.SetBootstrapURL([]string{bootstrapURL})
+		return nil
+	}
+	log.Println("[INFO] Get the Bootstrap URL Via Network Manager")
+	bootstrapURLs, err := dhcp.GetBootstrapURLViaNetworkManager()
 	if err != nil {
-		log.Println("[ERROR] ", err.Error())
 		return err
 	}
-	a.SetBootstrapURL(sztpRedirectUrls)
-	// log.Println("[INFO] Bootstrap URL retrieved successfully: " + a.GetBootstrapURL())
-	log.Println("[INFO] Bootstrap URL retrieved successfully")
+	a.SetBootstrapURL(bootstrapURLs)
 	return nil
 }