feat(backend): fix login, fetch users from config

Signed-off-by: roman-kiselenko <roman.kiselenko.dev@gmail.com>

Author: roman-kiselenko

AGENTS.md

@@ -1,9 +1,11 @@
 # AGENTS.md file for smolgit
 
 ## Overview
+
 smolgit is a minimalist Git server written in Go with a React/TS frontend. It exposes a REST API over HTTP and an SSH interface.
 
 ## Directory layout
+
 - `cmd/` – main entry point.
 - `pkg/` – core libraries: ssh, git, config, model, route, etc.
 - `frontend/` – React/TS UI, built into `dist/` and embedded via `go:embed`.
@@ -13,22 +15,23 @@ smolgit is a minimalist Git server written in Go with a React/TS frontend. It ex
 
 ## Build & Run
 
-| Target | Description | Command |
-|--------|-------------|---------|
-| `build` | Compile Go binary into `bin/smolgit` | `make build` |
-| `build-frontend` | Build React assets into `dist/` | `make build-frontend` |
-| `build-docker` | Build Docker image | `make build-docker` |
-| `run` | Run compiled binary locally | `make run` |
-| `run-docker` | Run smolgit in a container | `make run-docker` |
-| `config` | Generate default config to stdout | `make config` |
-| `config-docker` | Generate config for Docker | `make config-docker` |
-| `clean` | Remove build artifacts | `make clean` |
-| `lint` | Run golangci-lint on Go code | `make lint` |
-| `test` | Run Go unit tests | `make test` |
-| `integration-test` | Run Bats integration tests | `make integration-test` |
-| `help` | Show available make targets | `make help` |
+| Target             | Description                          | Command                 |
+| ------------------ | ------------------------------------ | ----------------------- |
+| `build`            | Compile Go binary into `bin/smolgit` | `make build`            |
+| `build-frontend`   | Build React assets into `dist/`      | `make build-frontend`   |
+| `build-docker`     | Build Docker image                   | `make build-docker`     |
+| `run`              | Run compiled binary locally          | `make run`              |
+| `run-docker`       | Run smolgit in a container           | `make run-docker`       |
+| `config`           | Generate default config to stdout    | `make config`           |
+| `config-docker`    | Generate config for Docker           | `make config-docker`    |
+| `clean`            | Remove build artifacts               | `make clean`            |
+| `lint`             | Run golangci-lint on Go code         | `make lint`             |
+| `test`             | Run Go unit tests                    | `make test`             |
+| `integration-test` | Run Bats integration tests           | `make integration-test` |
+| `help`             | Show available make targets          | `make help`             |
 
 ### Docker usage
+
 ```sh
 # Build image
 make build-docker
@@ -52,35 +55,41 @@ A minimal example:
 
 ```yaml
 log:
+  # Color log output
   color: true
+  # Log as json
   json: false
+  # Log level (INFO, DEBUG, TRACE, WARN)
   level: DEBUG
 server:
-  disabled: false
-  jwt_key: "your-secret-key"
+  jwt_key: "super-salt"
   auth_disabled: false
+  # Disable web server
+  disabled: false
+  # Web server address
   addr: ":3080"
+  # Navbar brand string
   brand: "smolgit"
-  auth:
-    enabled: false
-    accounts:
-      - login: user
-        password: pass
 ssh:
+  # SSH server address
   addr: ":3081"
 git:
-  path: /tmp/smolgit
+  # Folder to save git repositories
+  path: ./tmp
+  # Base for clone string formating
+  # (e.g. ssh://git@my-git-server.lan/myuser/project.git)
   base: "git@my-git-server.lan"
   users:
     - name: "bob"
-      permissions: "*"
+      password: "$2y$05$US7wXbew8P9d2h8qL3aC6OMhVcwO.1W6U.hVFBGNj9o9YQO.cSqd2" # htpasswd -nbB admin MySecret123
+      role: "admin"
       keys:
-        - ssh-rsa AAAAB3...
+        - ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQ... developer@mail.com
 ```
 
-* `server.jwt_key` is mandatory – without it the server will refuse to start.
-* `git.path` can point to a local `git` binary; if omitted the binary defaults to `/usr/local/bin/git`.
-* `git.users` controls SSH access; each user has a list of public keys and a permissions string.
+- `server.jwt_key` is mandatory – without it the server will refuse to start.
+- `git.path` can point to a local `git` binary; if omitted the binary defaults to `/usr/local/bin/git`.
+- `git.users` controls SSH access; each user has a list of public keys and a role string.
 
 ## Frontend
 
@@ -104,11 +113,13 @@ pnpm run lint
 ## Testing
 
 ### Go unit tests
+
 ```sh
 make test
 ```
 
 ### Bats integration tests
+
 ```sh
 make integration-test
 ```
@@ -118,22 +129,23 @@ The Bats tests start a temporary smolgit instance, exercise the CLI, and verify
 ### CI
 
 GitHub Actions runs:
-* `make build`
-* `make lint`
-* `make config`
-* `make integration-test`
+
+- `make build`
+- `make lint`
+- `make config`
+- `make integration-test`
 
 See `.github/workflows/test.yml` for details.
 
 ## Naming & Coding Conventions
 
-| Area | Convention |
-|------|------------|
-| Go packages | lowercase, no underscores |
+| Area           | Convention                                             |
+| -------------- | ------------------------------------------------------ |
+| Go packages    | lowercase, no underscores                              |
 | Go identifiers | camelCase for variables, PascalCase for exported types |
-| Go structs | Tags use `koanf` style |
-| Frontend | PascalCase components, camelCase props |
-| Paths | Use relative paths in imports (e.g. `smolgit/pkg/git`) |
+| Go structs     | Tags use `koanf` style                                 |
+| Frontend       | PascalCase components, camelCase props                 |
+| Paths          | Use relative paths in imports (e.g. `smolgit/pkg/git`) |
 
 ## Gotchas
 
@@ -154,7 +166,9 @@ make test
 before pushing. Use the PR title format `[smolgit] <Title>`.
 
 ## Commit Messages
+
 Follow Conventional Commits:
+
 - `feat`: A new feature
 - `fix`: A bug fix
 - `docs`: Documentation only changes

Dockerfile

@@ -10,7 +10,7 @@ ADD . ./
 
 RUN GOOS=$TARGETOS GOARCH=$TARGETARCH go build -v -o /build/smolgit
 
-FROM --platform=$BUILDPLATFORM alpine/git:v2.49.0 AS runner
+FROM alpine/git:v2.49.0 AS runner
 
 COPY --from=builder /build/smolgit /usr/bin/smolgit
 

README.md

@@ -64,17 +64,10 @@ log:
   # Log level (INFO, DEBUG, TRACE, WARN)
   level: DEBUG
 server:
+  jwt_key: "super-salt"
+  auth_disabled: false
   # Disable web server
   disabled: false
-  # Enable basic http auth
-  auth:
-    enabled: false
-    # Credentials for basic auth
-    accounts:
-      - login: user2
-        password: bar
-      - login: user1
-        password: foo
   # Web server address
   addr: ":3080"
   # Navbar brand string
@@ -84,21 +77,16 @@ ssh:
   addr: ":3081"
 git:
   # Folder to save git repositories
-  path: /tmp/smolgit
+  path: ./tmp
   # Base for clone string formating
   # (e.g. ssh://git@my-git-server.lan/myuser/project.git)
   base: "git@my-git-server.lan"
   users:
-    # User name used for folder in git.path
     - name: "bob"
-      # Permissions, wildcard or regex
-      # User to check access for other repositories
-      # '*' - access for all repositories
-      # 'admin' - access for admin's repositories
-      # '(admin|billy)' - access for admin's and billy's repositories
-      permissions: "*"
+      password: "$2y$05$US7wXbew8P9d2h8qL3aC6OMhVcwO.1W6U.hVFBGNj9o9YQO.cSqd2" # htpasswd -nbB admin MySecret123
+      role: "admin"
       keys:
-        - ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCq9rD9b8tYyuSLsTECHCn... developer@mail.com
+        - ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQ... developer@mail.com
 ```
 
 cli options:

cmd/app.go

@@ -125,6 +125,11 @@ func (a *App) initWebServer(staticFiles embed.FS) error {
 			"message": "pong",
 		})
 	})
+	router.GET("/healthz", func(c *gin.Context) {
+		c.JSON(http.StatusOK, gin.H{
+			"message": "ok",
+		})
+	})
 	router.GET("/api/auth_disabled", func(c *gin.Context) {
 		c.JSON(http.StatusOK, gin.H{
 			"message": a.Config.ServiceAuthDisabled,
@@ -142,6 +147,7 @@ func (a *App) initWebServer(staticFiles embed.FS) error {
 	})
 
 	router.GET("/api/repos", r.Repos)
+	router.POST("/api/login", r.Login)
 	router.GET("/api/repos/files/:user/:path", r.Files)
 
 	addr := a.Config.ServerAddr

frontend/src/components/pages/Start.tsx

@@ -28,7 +28,7 @@ export function StartPage() {
 
     const interval = setInterval(() => {
       fetchData();
-    }, 2000);
+    }, 5000);
 
     return () => clearInterval(interval);
   }, [fetchData]);

frontend/src/context/AuthProvider.tsx

@@ -83,7 +83,7 @@ export const AuthProvider: React.FC<{ children: React.ReactNode }> = ({ children
 
   return (
     <AuthContext.Provider
-      value={{ user, token, login, logout, isAuthenticated: true, AuthDisabled: !!authDisabled }}
+      value={{ user, token, login, logout, isAuthenticated: !!token, AuthDisabled: !!authDisabled }}
     >
       {children}
     </AuthContext.Provider>

frontend/src/store/repositories.ts

@@ -8,15 +8,15 @@ export const repositoriesState = hookstate<{ repos: object[] }>({
 
 export async function getRepos(query: string) {
   try {
-    let { repos } = await call<any[]>('repos');
+    let { items } = await call<any[]>('repos');
     if (query !== '') {
-      repos = repos.filter((c) => {
+      items = items.filter((c) => {
         return String(c.path || '')
           .toLowerCase()
           .includes(query.toLowerCase());
       });
     }
-    repositoriesState.repos.set(repos);
+    repositoriesState.repos.set(items);
   } catch (error: any) {
     toast.error('Error! Cant load repos\n' + error.message);
     console.error('Error! Cant load repos\n' + error.message);

pkg/config/config.TEMPLATE.yaml

@@ -26,11 +26,7 @@ git:
   users:
     # User name used for folder in git.path
     - name: "bob"
-      # Permissions, wildcard or regex
-      # User to check access for other repositories
-      # '*' - access for all repositories
-      # 'admin' - access for admin's repositories
-      # '(admin|billy)' - access for admin's and billy's repositories
-      permissions: "*"
+      password: "" # htpasswd -nbB admin MySecret123
+      role: "admin"
       keys:
         - ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCq9rD9b8tYyuSLsTECHCn... developer@mail.com

pkg/config/config.go

@@ -5,6 +5,7 @@ import (
 	_ "embed"
 	"errors"
 	"html/template"
+	"strings"
 
 	"smolgit/pkg/model"
 )
@@ -19,48 +20,34 @@ type Config struct {
 	ServerAddr          string              `koanf:"server.addr"`
 	ServerAuthAccounts  []map[string]string `koanf:"server.auth.accounts"`
 	ServerBrand         string              `koanf:"server.brand"`
-	Users               []User              `koanf:"users"`
+	Users               []model.User        `koanf:"git.users"`
 	SSHAddr             string              `koanf:"ssh.addr"`
 	GitPath             string              `koanf:"git.path"`
 	GitBase             string              `koanf:"git.base"`
 	Version             string
 }
 
-type User struct {
-	Username string `yaml:"username"`
-	Password string `yaml:"password"`
-	Role     string `yaml:"role"`
-}
-
 type Users struct {
-	Users map[string]User
+	Users map[string]model.User
 }
 
 func (c *Config) FindUserByKey(key string) (model.User, error) {
-	// for _, u := range c.GitUsers {
-	// 	for _, k := range u["keys"].([]interface{}) {
-	// 		p, _ := u["permissions"].(string)
-	// 		if strings.HasPrefix(k.(string), key) {
-	// 			return model.User{
-	// 				Name:        u["name"].(string),
-	// 				Permissions: p,
-	// 			}, nil
-	// 		}
-	// 	}
-	// }
+	for _, u := range c.Users {
+		for _, k := range u.Keys {
+			if strings.HasPrefix(k, key) {
+				return u, nil
+			}
+		}
+	}
 	return model.User{}, errors.New("user not found")
 }
 
 func (c *Config) FindUserByName(name string) (model.User, error) {
-	// for _, u := range c.GitUsers {
-	// 	if u["name"].(string) == name {
-	// 		p, _ := u["permissions"].(string)
-	// 		return model.User{
-	// 			Name:        u["name"].(string),
-	// 			Permissions: p,
-	// 		}, nil
-	// 	}
-	// }
+	for _, u := range c.Users {
+		if u.Name == name {
+			return u, nil
+		}
+	}
 	return model.User{}, errors.New("user not found")
 }
 

pkg/model/model.go

@@ -6,6 +6,8 @@ import (
 
 type User struct {
 	Name        string        `json:"name,omitempty"`
+	Password    string        `json:"password,omitempty"`
+	Role        string        `json:"role,omitempty"`
 	Permissions string        `json:"permissions,omitempty"`
 	Repos       []*Repository `json:"repos,omitempty"`
 	Keys        []string      `json:"keys,omitempty"`