set serial num in network discovery

Author: mirkoCrobu

debian/arduino-app-cli/etc/sudoers.d/20-arduino-ssh

@@ -1 +1 @@
-arduino ALL=(ALL) NOPASSWD: /usr/sbin/dpkg-reconfigure openssh-server, /usr/bin/systemctl enable ssh, /usr/bin/systemctl start ssh, /usr/bin/systemctl disable ssh, /usr/bin/systemctl stop ssh, /usr/bin/systemctl disable avahi-daemon, /usr/bin/systemctl stop avahi-daemon, /usr/bin/systemctl enable avahi-daemon, /usr/bin/systemctl start avahi-daemon
+arduino ALL=(ALL) NOPASSWD: /usr/sbin/dpkg-reconfigure openssh-server, /usr/bin/systemctl enable ssh, /usr/bin/systemctl start ssh, /usr/bin/systemctl disable ssh, /usr/bin/systemctl stop ssh, /usr/bin/systemctl disable avahi-daemon, /usr/bin/systemctl stop avahi-daemon, /usr/bin/systemctl enable avahi-daemon, /usr/bin/systemctl start avahi-daemon, /usr/bin/mv /tmp/avahi_arduino_conf.service /etc/avahi/services/arduino.service, /usr/bin/chmod 0600 /etc/avahi/services/arduino.service

pkg/board/board.go

@@ -353,9 +353,8 @@ func EnableNetworkMode(ctx context.Context, conn remote.RemoteConn) error {
 		{"sudo", "systemctl", "enable", "avahi-daemon"},
 		{"sudo", "systemctl", "start", "avahi-daemon"},
 	}
-
 	if sn, err := getSerial(&local.LocalConnection{}); err == nil {
-		if err := setSerialNumber(sn, "/etc/avahi/services/arduino.service"); err != nil {
+		if err := setSerialNumber(ctx, conn, sn, "/etc/avahi/services/arduino.service"); err != nil {
 			slog.Warn("failed to set serial number for network mode", slog.Any("error", err))
 		}
 	}
@@ -369,38 +368,55 @@ func EnableNetworkMode(ctx context.Context, conn remote.RemoteConn) error {
 	return nil
 }
 
-func setSerialNumber(serialNumber, filePath string) error {
+func setSerialNumber(ctx context.Context, conn remote.RemoteConn, serialNumber, filePath string) error {
 	serialCheckRegex := regexp.MustCompile(`<\s*txt-record\s*>\s*serial_number=\S+\s*<\s*/txt-record\s*>`)
 	serviceEndTag := regexp.MustCompile(`</service>`)
 	newSerialTemplate := `<txt-record>serial_number=%s</txt-record>
 `
 	if serialNumber == "" {
 		return errors.New("missing or empty serial number")
 	}
-
 	data, err := os.ReadFile(filePath)
 	if err != nil {
 		if os.IsNotExist(err) {
+			slog.Warn("service file does not exist, skipping serial number setup", slog.String("filePath", filePath))
 			return nil
 		}
 		return err
 	}
-
 	if serialCheckRegex.Match(data) {
 		return nil
 	}
-
 	loc := serviceEndTag.FindIndex(data)
 	if loc == nil {
 		return errors.New(" </service> tag not found in the service file")
 	}
 
 	var buf bytes.Buffer
-	buf.Write(data[:loc[0]])
-	buf.WriteString(fmt.Sprintf(newSerialTemplate, serialNumber))
-	buf.Write(data[loc[0]:])
+	_, err = buf.Write(data[:loc[0]])
+	if err != nil {
+		return err
+	}
+	_, err = buf.WriteString(fmt.Sprintf(newSerialTemplate, serialNumber))
+	if err != nil {
+		return err
+	}
+	_, err = buf.Write(data[loc[0]:])
+	if err != nil {
+		return err
+	}
 
-	return os.WriteFile(filePath, buf.Bytes(), 0600)
+	tmpPath := "/tmp/avahi_arduino_conf.service"
+	if err := conn.WriteFile(bytes.NewReader(buf.Bytes()), tmpPath); err != nil {
+		return fmt.Errorf("failed to write temporary file on remote: %w", err)
+	}
+	if out, err := conn.GetCmd("sudo", "mv", tmpPath, filePath).Output(ctx); err != nil {
+		return fmt.Errorf("failed to move file into place with sudo mv: %w: %s", err, string(out))
+	}
+	if out, err := conn.GetCmd("sudo", "chmod", "0644", filePath).Output(ctx); err != nil {
+		slog.Warn("failed to set permissions on remote service file", "file", filePath, "error", err, "output", string(out))
+	}
+	return nil
 }
 
 func NetworkModeStatus(ctx context.Context, conn remote.RemoteConn) (bool, error) {