mirror of
https://github.com/steveiliop56/tinyauth.git
synced 2026-01-18 05:12:29 +00:00
53bd413046
* Refactor logging to use centralized logger utility - Removed direct usage of zerolog in multiple files and replaced it with a centralized logging utility in the `utils` package. - Introduced `Loggers` struct to manage different loggers (Audit, HTTP, App) with configurable levels and outputs. - Updated all relevant files to utilize the new logging structure, ensuring consistent logging practices across the application. - Enhanced error handling and logging messages for better traceability and debugging. * refactor: update logging implementation to use new logger structure * Refactor logging to use tlog package - Replaced instances of utils logging with tlog in various controllers, services, and middleware. - Introduced audit logging for login success, login failure, and logout events. - Created tlog package with structured logging capabilities using zerolog. - Added tests for the new tlog logger functionality. * refactor: update logging configuration in environment files * fix: adding coderabbit suggestions * fix: ensure correct audit caller * fix: include reason in audit login failure logs
96 lines
2.4 KiB
Go
96 lines
2.4 KiB
Go
package main
|
|
|
|
import (
|
|
"errors"
|
|
"fmt"
|
|
"strings"
|
|
|
|
"github.com/charmbracelet/huh"
|
|
"github.com/steveiliop56/tinyauth/internal/utils/tlog"
|
|
"github.com/traefik/paerser/cli"
|
|
"golang.org/x/crypto/bcrypt"
|
|
)
|
|
|
|
type CreateUserConfig struct {
|
|
Interactive bool `description:"Create a user interactively."`
|
|
Docker bool `description:"Format output for docker."`
|
|
Username string `description:"Username."`
|
|
Password string `description:"Password."`
|
|
}
|
|
|
|
func NewCreateUserConfig() *CreateUserConfig {
|
|
return &CreateUserConfig{
|
|
Interactive: false,
|
|
Docker: false,
|
|
Username: "",
|
|
Password: "",
|
|
}
|
|
}
|
|
|
|
func createUserCmd() *cli.Command {
|
|
tCfg := NewCreateUserConfig()
|
|
|
|
loaders := []cli.ResourceLoader{
|
|
&cli.FlagLoader{},
|
|
}
|
|
|
|
return &cli.Command{
|
|
Name: "create",
|
|
Description: "Create a user",
|
|
Configuration: tCfg,
|
|
Resources: loaders,
|
|
Run: func(_ []string) error {
|
|
tlog.NewSimpleLogger().Init()
|
|
|
|
if tCfg.Interactive {
|
|
form := huh.NewForm(
|
|
huh.NewGroup(
|
|
huh.NewInput().Title("Username").Value(&tCfg.Username).Validate((func(s string) error {
|
|
if s == "" {
|
|
return errors.New("username cannot be empty")
|
|
}
|
|
return nil
|
|
})),
|
|
huh.NewInput().Title("Password").Value(&tCfg.Password).Validate((func(s string) error {
|
|
if s == "" {
|
|
return errors.New("password cannot be empty")
|
|
}
|
|
return nil
|
|
})),
|
|
huh.NewSelect[bool]().Title("Format the output for Docker?").Options(huh.NewOption("Yes", true), huh.NewOption("No", false)).Value(&tCfg.Docker),
|
|
),
|
|
)
|
|
|
|
var baseTheme *huh.Theme = huh.ThemeBase()
|
|
|
|
err := form.WithTheme(baseTheme).Run()
|
|
|
|
if err != nil {
|
|
return fmt.Errorf("failed to run interactive prompt: %w", err)
|
|
}
|
|
}
|
|
|
|
if tCfg.Username == "" || tCfg.Password == "" {
|
|
return errors.New("username and password cannot be empty")
|
|
}
|
|
|
|
tlog.App.Info().Str("username", tCfg.Username).Msg("Creating user")
|
|
|
|
passwd, err := bcrypt.GenerateFromPassword([]byte(tCfg.Password), bcrypt.DefaultCost)
|
|
if err != nil {
|
|
return fmt.Errorf("failed to hash password: %w", err)
|
|
}
|
|
|
|
// If docker format is enabled, escape the dollar sign
|
|
passwdStr := string(passwd)
|
|
if tCfg.Docker {
|
|
passwdStr = strings.ReplaceAll(passwdStr, "$", "$$")
|
|
}
|
|
|
|
tlog.App.Info().Str("user", fmt.Sprintf("%s:%s", tCfg.Username, passwdStr)).Msg("User created")
|
|
|
|
return nil
|
|
},
|
|
}
|
|
}
|