vault-wrap: Добавлена рабочая конфигурация traefik

vault.go

@@ -195,24 +195,38 @@ func getDataFromHtmlForm(w http.ResponseWriter, r *http.Request) {
 }
 
 func genPassword(w http.ResponseWriter, r *http.Request) {
-	params := mux.Vars(r)
-	passLength := params["passLength"]
+	// params := mux.Vars(r)
+	// passLength := params["passLength"]
+
+    r.ParseForm()
+    passLength := r.FormValue("passlength")
+    if Debug {
+	    log.Printf(r.FormValue("passlength"), passLength)
+    }
+    if len(passLength) == 0 {
+        passLength = "32"
+    }
 	// w.Write([]byte("Длина пароля " + passLength + "/n"))
 	passwordLength, err := strconv.Atoi(passLength)
 	if passwordLength > 1024 {
 		log.Printf("Oversized password length")
-		w.Write([]byte("Oversized password length"))
+		Data = "Превышена длина пароля"
+        getStaticPage(w, r)
 		return
 	}
 	if err != nil {
-		log.Fatal(err)
+		log.Println(err)
 	}
 	res, err := password.Generate(passwordLength, 10, 5, false, true)
 	if err != nil {
-		log.Fatal(err)
+		log.Println(err)
 	}
-	log.Printf(res)
-	w.Write([]byte(res))
+    if Debug {
+	    log.Printf(res)
+    }
+    Data = res
+	// w.Write([]byte(res))
+    	getStaticPage(w, r)
 }
 
 func genPasswordDefault(w http.ResponseWriter, r *http.Request) {
@@ -221,7 +235,10 @@ func genPasswordDefault(w http.ResponseWriter, r *http.Request) {
 		log.Fatal(err)
 	}
 	log.Printf(res)
-	w.Write([]byte(res))
+	// w.Write([]byte(res))
+    Data = res
+	// w.Write([]byte(res))
+    	getStaticPage(w, r)
 }
 
 func main() {
@@ -270,7 +287,7 @@ func main() {
     rtr := mux.NewRouter()
     rtr.HandleFunc("/unwrap", getDataFromHtmlForm)
     rtr.HandleFunc("/genpassword/{passLength:[0-9]+}", genPassword)
-    rtr.HandleFunc("/genpassword", genPasswordDefault)
+    rtr.HandleFunc("/genpassword", genPassword)
     
     rtr.HandleFunc("/", getDataFromHtmlForm)
     rtr.PathPrefix("/").Handler(http.FileServer(http.Dir("./static")))