Compare commits

..

4 Commits

Author SHA1 Message Date
Stavros
e1dcbda4ec refactor: no need to handle user escaping in verify cmd 2025-10-06 21:26:31 +03:00
Stavros
fa62ba2e33 chore: apply review suggestions 2025-10-06 21:18:10 +03:00
Stavros
04b075c748 chore: apply suggestion from @Rycochet
Co-authored-by: Ryc O'Chet <Rycochet@users.noreply.github.com>
2025-10-06 21:15:06 +03:00
Stavros
74a360369d refactor: make cli modular 2025-10-06 20:57:18 +03:00
5 changed files with 6 additions and 114 deletions

View File

@@ -45,6 +45,8 @@ FROM alpine:3.22 AS runner
WORKDIR /tinyauth
RUN apk add --no-cache curl
COPY --from=builder /tinyauth/tinyauth ./
EXPOSE 3000

View File

@@ -1,7 +1,7 @@
<div align="center">
<img alt="Tinyauth" title="Tinyauth" width="96" src="assets/logo-rounded.png">
<h1>Tinyauth</h1>
<p>The simplest way to protect your apps with a login screen.</p>
<p>The easiest way to secure your apps with a login screen.</p>
</div>
<div align="center">
@@ -14,7 +14,7 @@
<br />
Tinyauth is a simple authentication middleware that adds a simple login screen or OAuth with Google, Github or any other provider to all of your apps. It supports all the popular proxies like Traefik, Nginx and Caddy.
Tinyauth is a simple authentication middleware that adds a simple login screen or OAuth with Google, Github and any provider to all of your docker apps. It supports all the popular proxies like Traefik, Nginx and Caddy.
![Screenshot](assets/screenshot.png)

View File

@@ -1,109 +0,0 @@
package cmd
import (
"encoding/json"
"errors"
"io"
"net/http"
"tinyauth/internal/config"
"github.com/rs/zerolog"
"github.com/rs/zerolog/log"
"github.com/spf13/cobra"
"github.com/spf13/viper"
)
type healthzResponse struct {
Status string `json:"status"`
Message string `json:"message"`
}
type healthCmd struct {
root *cobra.Command
cmd *cobra.Command
viper *viper.Viper
appUrl string
}
func newHealthCmd(root *cobra.Command) *healthCmd {
return &healthCmd{
root: root,
viper: viper.New(),
}
}
func (c *healthCmd) Register() {
c.cmd = &cobra.Command{
Use: "health",
Short: "Health check",
Long: `Use the health check endpoint to verify that Tinyauth is running and it's healthy.`,
Run: c.run,
}
c.viper.AutomaticEnv()
c.cmd.Flags().StringVar(&c.appUrl, "app-url", "http://localhost:3000", "The URL where the Tinyauth server is running on.")
c.viper.BindEnv("app-url", "APP_URL")
c.viper.BindPFlags(c.cmd.Flags())
if c.root != nil {
c.root.AddCommand(c.cmd)
}
}
func (c *healthCmd) GetCmd() *cobra.Command {
return c.cmd
}
func (c *healthCmd) run(cmd *cobra.Command, args []string) {
log.Logger = log.Level(zerolog.InfoLevel)
appUrl := c.viper.GetString("app-url")
if appUrl == "" {
log.Fatal().Err(errors.New("app-url is required")).Msg("App URL is required")
}
if config.Version == "development" {
log.Warn().Msg("Running in development mode. Overriding the app-url to http://localhost:3000")
appUrl = "http://localhost:3000"
}
log.Info().Msgf("Health check endpoint is available at %s/api/healthz", appUrl)
client := http.Client{}
req, err := http.NewRequest("GET", appUrl+"/api/healthz", nil)
if err != nil {
log.Fatal().Err(err).Msg("Failed to create request")
}
resp, err := client.Do(req)
if err != nil {
log.Fatal().Err(err).Msg("Failed to perform request")
}
if resp.StatusCode != http.StatusOK {
log.Fatal().Err(errors.New("service is not healthy")).Msgf("Service is not healthy. Status code: %d", resp.StatusCode)
}
defer resp.Body.Close()
var healthResp healthzResponse
body, err := io.ReadAll(resp.Body)
if err != nil {
log.Fatal().Err(err).Msg("Failed to read response")
}
err = json.Unmarshal(body, &healthResp)
if err != nil {
log.Fatal().Err(err).Msg("Failed to decode response")
}
log.Info().Interface("response", healthResp).Msg("Service is healthy")
}

View File

@@ -140,7 +140,6 @@ func Run() {
newVerifyUserCmd(userCmd).Register()
newGenerateTotpCmd(totpCmd).Register()
newVersionCmd(root).Register()
newHealthCmd(root).Register()
root.AddCommand(userCmd)
root.AddCommand(totpCmd)

View File

@@ -13,8 +13,8 @@ func NewHealthController(router *gin.RouterGroup) *HealthController {
}
func (controller *HealthController) SetupRoutes() {
controller.router.GET("/healthz", controller.healthHandler)
controller.router.HEAD("/healthz", controller.healthHandler)
controller.router.GET("/health", controller.healthHandler)
controller.router.HEAD("/health", controller.healthHandler)
}
func (controller *HealthController) healthHandler(c *gin.Context) {