From 9f302fb4573bbaf4c4c3f79248ac42d1698e6ee9 Mon Sep 17 00:00:00 2001 From: Erik Brakkee Date: Sat, 10 Aug 2024 17:49:04 +0200 Subject: [PATCH] nov showing a message that the rendez-vous id is generated. --- cmd/converge/usage.go | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/cmd/converge/usage.go b/cmd/converge/usage.go index 9b57eb6..8858c2d 100644 --- a/cmd/converge/usage.go +++ b/cmd/converge/usage.go @@ -17,13 +17,11 @@ func generateCLIExammple(w http.ResponseWriter, r *http.Request) { http.Error(w, "Error parsing form", http.StatusBadRequest) return } - ids := r.Form["rendez-vous-id"] - id := "" - if len(ids) > 0 { - id = strings.TrimSpace(ids[0]) - } + id := r.FormValue("rendez-vous-id") + generatedId := false if id == "" { id = strconv.Itoa(rand.Int() % 1000000) + generatedId = true } remoteShells := r.Form["remote-shell"] @@ -36,6 +34,9 @@ func generateCLIExammple(w http.ResponseWriter, r *http.Request) { sshPublicKeys := strings.Split(keysString, "\n") usageInputs := templates.NewUsageInputs(id, sshPublicKeys, remoteShells, localShells, downloadCommand, certificateValidation) + if generatedId { + usageInputs.ErrorMessages = append(usageInputs.ErrorMessages, "rendez-vous id is randomly generated, changes on every page refresh") + } matched, _ := regexp.MatchString("^[a-zA-Z0-9-_]+$", id) if !matched { usageInputs.ErrorMessages = append(usageInputs.ErrorMessages, "ID may consist only of alphanumeric characters, '-', and '_'")