add prefix node ID to workUnit ID, validation for node ID and add doc…

…s for node ID validation
ansible · Oct 31, 2024 · 4f6d051 · 4f6d051
1 parent e810de0
commit 4f6d051
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 5 deletions.
diff --git a/docs/source/user_guide/configuration_options.rst b/docs/source/user_guide/configuration_options.rst
@@ -130,7 +130,7 @@ Node
       - Default value
       - Type
     * - ``id``
-      - Node ID
+      - Node ID can only contain a-z, A-Z, 0-9 or special characters . - _
       - local hostname
       - string
     * - ``datadir``

diff --git a/pkg/types/main.go b/pkg/types/main.go
@@ -4,6 +4,7 @@ import (
 	"context"
 	"fmt"
 	"os"
+	"regexp"
 	"strings"
 
 	"github.com/ansible/receptor/pkg/controlsvc"
@@ -34,6 +35,16 @@ func (cfg NodeCfg) Init() error {
 			return fmt.Errorf("no node ID specified and local host name is localhost")
 		}
 		cfg.ID = host
+	} else {
+		submitIDRegex := regexp.MustCompile(`^[.\-_a-zA-Z0-9]*$`)
+		match := submitIDRegex.FindSubmatch([]byte(cfg.ID))
+		for _, m := range match {
+			fmt.Println("HERE: " + string(m))
+			fmt.Println(cfg.ID)
+		}
+		if match == nil {
+			return fmt.Errorf("node id can only contain a-z, A-Z, 0-9 or special characters . - _ but received: %s", cfg.ID)
+		}
 	}
 	if strings.ToLower(cfg.ID) == "localhost" {
 		return fmt.Errorf("node ID \"localhost\" is reserved")

diff --git a/pkg/workceptor/remote_work.go b/pkg/workceptor/remote_work.go
@@ -181,12 +181,15 @@ func (rw *remoteUnit) startRemoteUnit(ctx context.Context, conn net.Conn, reader
 	if err != nil {
 		return fmt.Errorf("read error reading from %s: %s", red.RemoteNode, err)
 	}
-	submitIDRegex := regexp.MustCompile(`with ID ([a-zA-Z0-9]+)\.`)
+	submitIDRegex := regexp.MustCompile(`([.\-_a-zA-Z0-9]+)~([a-zA-Z0-9]+){8}`)
 	match := submitIDRegex.FindSubmatch([]byte(response))
-	if match == nil || len(match) != 2 {
+	for _, m := range match {
+		fmt.Println("HERE: " + string(m))
+	}
+	if match == nil || len(match) != 3 {
 		return fmt.Errorf("could not parse response: %s", strings.TrimRight(response, "\n"))
 	}
-	red.RemoteUnitID = string(match[1])
+	red.RemoteUnitID = string(match[0])
 	rw.UpdateFullStatus(func(status *StatusFileData) {
 		ed := status.ExtraData.(*RemoteExtraData)
 		ed.RemoteUnitID = red.RemoteUnitID

diff --git a/pkg/workceptor/workceptor.go b/pkg/workceptor/workceptor.go
@@ -161,7 +161,9 @@ func (w *Workceptor) generateUnitID(lock bool, workUnitID string) (string, error
 	var ident string
 	for {
 		if workUnitID == "" {
-			ident = randstr.RandomString(8)
+			rstr := randstr.RandomString(8)
+			nid := w.nc.NodeID()
+			ident = fmt.Sprintf("%s~%s", nid, rstr)
 		} else {
 			ident = workUnitID
 			unitdir := path.Join(w.dataDir, ident)