update http

admin.go

@@ -2,6 +2,9 @@ package main
 
 import (
 	"context"
+	"embed"
+	"html/template"
+	"io/fs"
 	"net/http"
 	"os/signal"
 	"syscall"
@@ -14,9 +17,9 @@ import (
 )
 
 type AdminConfig struct {
-	Users   []User        `json:"users"`
-	Secrets SecretsConfig `json:"secrets"`
-	Addr    string        `json:"addr"`
+	Users   []*User        `json:"users"`
+	Secrets *SecretsConfig `json:"secrets"`
+	Addr    string         `json:"addr"`
 }
 
 type SecretsConfig struct {
@@ -28,26 +31,54 @@ type SecretsConfig struct {
 	ScryptP           int    `json:"scrypt_p"`
 }
 
+//go:embed assets
+var assets embed.FS
+
 func NewAdmin() *AdminConfig {
-	pepper, _ := password.Generate(20, 5, 0, false, false)
-	ctx, _ := password.Generate(20, 5, 0, false, false)
+	log.WithFields(log.Fields{}).Debugf("starting")
+	defer log.WithFields(log.Fields{}).Debugf("done")
 
 	a := &AdminConfig{
-		Addr: "0.0.0.0:8080",
-		Secrets: SecretsConfig{
-			PasswordPepper:    pepper,
-			ContextKey:        ctx,
-			ContextExpiration: 3600,
-			ScryptN:           32768,
-			ScryptR:           8,
-			ScryptP:           1,
-		},
-		Users: make([]User, 0),
+		Addr:    "0.0.0.0:8080",
+		Secrets: NewSecrets(),
+		Users:   make([]*User, 0),
 	}
 
 	return a
 }
 
+func NewSecrets() *SecretsConfig {
+	log.WithFields(log.Fields{}).Debugf("starting")
+	defer log.WithFields(log.Fields{}).Debugf("done")
+
+	pepper, _ := password.Generate(20, 5, 0, false, false)
+	ctx, _ := password.Generate(20, 5, 0, false, false)
+
+	return &SecretsConfig{
+		PasswordPepper:    pepper,
+		ContextKey:        ctx,
+		ContextExpiration: 3600,
+		ScryptN:           32768,
+		ScryptR:           8,
+		ScryptP:           1,
+	}
+}
+
+func (a *AdminConfig) NewAdminUser() {
+	log.WithFields(log.Fields{}).Debugf("starting")
+	defer log.WithFields(log.Fields{}).Debugf("done")
+
+	p, _ := password.Generate(20, 5, 0, false, false)
+	u, _ := NewUser("admin", p)
+
+	a.Users = append(a.Users, u)
+
+	log.WithFields(log.Fields{}).Warnf("Admin user password :  %s", p)
+
+	return
+
+}
+
 func (a *AdminConfig) Run() {
 	log.WithFields(log.Fields{}).Debugf("starting")
 	defer log.WithFields(log.Fields{}).Debugf("done")
@@ -61,6 +92,17 @@ func (a *AdminConfig) Run() {
 	}
 
 	r := gin.Default()
+
+	if t, err := template.ParseFS(assets, "assets/templates/*.html"); err != nil {
+		log.WithFields(log.Fields{"call": "template.ParseFS", "error": err}).Errorf("")
+		return
+	} else {
+		r.SetHTMLTemplate(t)
+	}
+
+	r.GET("/", HttpAnyIndex)
+	r.POST("/", HttpAnyIndex)
+
 	r.GET("/ping", func(c *gin.Context) {
 		c.JSON(http.StatusOK, gin.H{
 			"message": "pong",
@@ -74,6 +116,16 @@ func (a *AdminConfig) Run() {
 		})
 	})
 
+	fsys, _ := fs.Sub(assets, "assets/static")
+	r.StaticFS("/assets", http.FS(fsys))
+
+	protected := r.Group("p", HttpAuth())
+	protected.GET("test", HttpAnyHome)
+
+	unprotected := r.Group("u", HttpNoAuth())
+	unprotected.GET("signin", HttpAnySignIn)
+	unprotected.POST("signin", HttpAnySignIn)
+
 	srv := &http.Server{
 		Addr:    a.Addr,
 		Handler: r,