never publish pointer payloads on message bus (#411)

Bumps the golang group with 3 updates: [golang.org/x/crypto](https://github.com/golang/crypto), [golang.org/x/oauth2](https://github.com/golang/oauth2) and [golang.org/x/sys](https://github.com/golang/sys).


Updates `golang.org/x/crypto` from 0.36.0 to 0.37.0
- [Commits](https://github.com/golang/crypto/compare/v0.36.0...v0.37.0)

Updates `golang.org/x/oauth2` from 0.28.0 to 0.29.0
- [Commits](https://github.com/golang/oauth2/compare/v0.28.0...v0.29.0)

Updates `golang.org/x/sys` from 0.31.0 to 0.32.0
- [Commits](https://github.com/golang/sys/compare/v0.31.0...v0.32.0)

---
updated-dependencies:
- dependency-name: golang.org/x/crypto
  dependency-version: 0.37.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: golang
- dependency-name: golang.org/x/oauth2
  dependency-version: 0.29.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: golang
- dependency-name: golang.org/x/sys
  dependency-version: 0.32.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: golang
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

.github/ISSUE_TEMPLATE/bug_report.md

@@ -5,7 +5,7 @@ labels: bug
 
 ---
 <!-- Tip: you can use code blocks
-for better better formatting of yaml config or logs
+for better formatting of yaml config or logs
 
 ```yaml
 # config.yaml

Dockerfile

@@ -20,7 +20,7 @@ RUN npm run build
 ######
 # Build backend
 ######
-FROM --platform=${BUILDPLATFORM} golang:1.23-alpine AS builder
+FROM --platform=${BUILDPLATFORM} golang:1.24-alpine AS builder
 # Set the working directory
 WORKDIR /build
 # Download dependencies

README.md

@@ -29,7 +29,7 @@ The configuration portal supports using a database (SQLite, MySQL, MsSQL or Post
 ## Features
 
 * Self-hosted - the whole application is a single binary
-* Responsive multi-language web UI written in Vue.JS
+* Responsive multi-language web UI written in Vue.js
 * Automatically selects IP from the network pool assigned to the client
 * QR-Code for convenient mobile client configuration
 * Sends email to the client with QR-code and client config
@@ -42,8 +42,9 @@ The configuration portal supports using a database (SQLite, MySQL, MsSQL or Post
 * Support for multiple WireGuard interfaces
 * Peer Expiry Feature
 * Handles route and DNS settings like wg-quick does
-* Exposes Prometheus metrics for monitoring and alertingt
+* Exposes Prometheus metrics for monitoring and alerting
 * REST API for management and client deployment
+* Webhook for custom actions on peer, interface or user updates
 
 <!-- Text to this line # is included in docs/documentation/overview.md -->
 ![Screenshot](docs/assets/images/screenshot.png)
@@ -52,10 +53,6 @@ The configuration portal supports using a database (SQLite, MySQL, MsSQL or Post
 
 For the complete documentation visit [wgportal.org](https://wgportal.org).
 
-## V2 TODOs
-
-* Audit UI
-
 ## What is out of scope
 
 * Automatic generation or application of any `iptables` or `nftables` rules.
@@ -65,9 +62,8 @@ For the complete documentation visit [wgportal.org](https://wgportal.org).
 ## Application stack
 
 * [wgctrl-go](https://github.com/WireGuard/wgctrl-go) and [netlink](https://github.com/vishvananda/netlink) for interface handling
-* [Gin](https://github.com/gin-gonic/gin), HTTP web framework written in Go
 * [Bootstrap](https://getbootstrap.com/), for the HTML templates
-* [Vue.JS](https://vuejs.org/), for the frontend
+* [Vue.js](https://vuejs.org/), for the frontend
 
 ## License
 

SECURITY.md

@@ -4,17 +4,17 @@ If you believe you've found a security issue in one of the supported versions of
 
 ## Supported Versions
 
-| Version | Supported            |
-| ------- | -------------------- |
-| v2.x    | :white_check_mark:   |
-| v1.x    | :white_check_mark:   |
+| Version | Supported          |
+|---------|--------------------|
+| v2.x    | :white_check_mark: |
+| v1.x    | :white_check_mark: |
 
 ## Reporting a Vulnerability
 
 Please do not report security vulnerabilities through public GitHub issues. 
 
-Instead, we encourage you to submit a report through Github [private vulnerability reporting](https://github.com/h44z/wg-portal/security).
-If you prefer to submit a report without logging in to Github, please email *info (at) wgportal.org*. 
+Instead, we encourage you to submit a report through GitHub [private vulnerability reporting](https://github.com/h44z/wg-portal/security).
+If you prefer to submit a report without logging in to GitHub, please email *info (at) wgportal.org*. 
 We will respond as soon as possible, but as only two people currently maintain this project, we cannot guarantee specific response times.
 
 We prefer all communications to be in English.

cmd/api_build_tool/main.go

@@ -9,7 +9,7 @@ import (
 
 	"github.com/swaggo/swag"
 	"github.com/swaggo/swag/gen"
-	"gopkg.in/yaml.v2"
+	"gopkg.in/yaml.v3"
 )
 
 var apiRootPath = "/internal/app/api"
@@ -100,7 +100,7 @@ func copyDocForMkdocs(workingDir, basePath, version string) error {
 }
 
 func removeAuthorizeButton(input []byte) ([]byte, error) {
-	var swagger map[string]interface{}
+	var swagger map[string]any
 	err := yaml.Unmarshal(input, &swagger)
 	if err != nil {
 		return nil, fmt.Errorf("error while unmarshalling swagger file: %w", err)

cmd/wg-portal/main.go

@@ -2,12 +2,19 @@ package main
 
 import (
 	"context"
+	"log/slog"
 	"os"
-	"strings"
 	"syscall"
 	"time"
 
+	"github.com/go-playground/validator/v10"
+	evbus "github.com/vardius/message-bus"
+
+	"github.com/h44z/wg-portal/internal"
+	"github.com/h44z/wg-portal/internal/adapters"
+	"github.com/h44z/wg-portal/internal/app"
 	"github.com/h44z/wg-portal/internal/app/api/core"
+	backendV0 "github.com/h44z/wg-portal/internal/app/api/v0/backend"
 	handlersV0 "github.com/h44z/wg-portal/internal/app/api/v0/handlers"
 	backendV1 "github.com/h44z/wg-portal/internal/app/api/v1/backend"
 	handlersV1 "github.com/h44z/wg-portal/internal/app/api/v1/handlers"
@@ -17,26 +24,20 @@ import (
 	"github.com/h44z/wg-portal/internal/app/mail"
 	"github.com/h44z/wg-portal/internal/app/route"
 	"github.com/h44z/wg-portal/internal/app/users"
+	"github.com/h44z/wg-portal/internal/app/webhooks"
 	"github.com/h44z/wg-portal/internal/app/wireguard"
-
-	"github.com/h44z/wg-portal/internal"
-	"github.com/h44z/wg-portal/internal/adapters"
-	"github.com/h44z/wg-portal/internal/app"
 	"github.com/h44z/wg-portal/internal/config"
-	"github.com/sirupsen/logrus"
-	evbus "github.com/vardius/message-bus"
 )
 
 // main entry point for WireGuard Portal
 func main() {
 	ctx := internal.SignalAwareContext(context.Background(), syscall.SIGHUP, syscall.SIGINT, syscall.SIGTERM)
 
-	logrus.Infof("Starting WireGuard Portal V2...")
-	logrus.Infof("WireGuard Portal version: %s", internal.Version)
+	slog.Info("Starting WireGuard Portal V2...", "version", internal.Version)
 
 	cfg, err := config.GetConfig()
 	internal.AssertNoError(err)
-	setupLogging(cfg)
+	internal.SetupLogging(cfg.Advanced.LogLevel, cfg.Advanced.LogPretty, cfg.Advanced.LogJson)
 
 	cfg.LogStartupValues()
 
@@ -57,31 +58,40 @@ func main() {
 	cfgFileSystem, err := adapters.NewFileSystemRepository(cfg.Advanced.ConfigStoragePath)
 	internal.AssertNoError(err)
 
-	shouldExit, err := app.HandleProgramArgs(cfg, rawDb)
+	shouldExit, err := app.HandleProgramArgs(rawDb)
 	switch {
 	case shouldExit && err == nil:
 		return
-	case shouldExit && err != nil:
-		logrus.Errorf("Failed to process program args: %v", err)
+	case shouldExit:
+		slog.Error("Failed to process program args", "error", err)
 		os.Exit(1)
-	case !shouldExit:
+	default:
 		internal.AssertNoError(err)
 	}
 
 	queueSize := 100
 	eventBus := evbus.New(queueSize)
 
+	auditManager := audit.NewManager(database)
+
+	auditRecorder, err := audit.NewAuditRecorder(cfg, eventBus, database)
+	internal.AssertNoError(err)
+	auditRecorder.StartBackgroundJobs(ctx)
+
 	userManager, err := users.NewUserManager(cfg, eventBus, database, database)
 	internal.AssertNoError(err)
+	userManager.StartBackgroundJobs(ctx)
 
 	authenticator, err := auth.NewAuthenticator(&cfg.Auth, cfg.Web.ExternalUrl, eventBus, userManager)
 	internal.AssertNoError(err)
 
 	wireGuardManager, err := wireguard.NewWireGuardManager(cfg, eventBus, wireGuard, wgQuick, database)
 	internal.AssertNoError(err)
+	wireGuardManager.StartBackgroundJobs(ctx)
 
 	statisticsCollector, err := wireguard.NewStatisticsCollector(cfg, eventBus, database, wireGuard, metricsServer)
 	internal.AssertNoError(err)
+	statisticsCollector.StartBackgroundJobs(ctx)
 
 	cfgFileManager, err := configfile.NewConfigFileManager(cfg, eventBus, database, database, cfgFileSystem)
 	internal.AssertNoError(err)
@@ -89,35 +99,65 @@ func main() {
 	mailManager, err := mail.NewMailManager(cfg, mailer, cfgFileManager, database, database)
 	internal.AssertNoError(err)
 
-	auditRecorder, err := audit.NewAuditRecorder(cfg, eventBus, database)
-	internal.AssertNoError(err)
-	auditRecorder.StartBackgroundJobs(ctx)
-
 	routeManager, err := route.NewRouteManager(cfg, eventBus, database)
 	internal.AssertNoError(err)
 	routeManager.StartBackgroundJobs(ctx)
 
-	backend, err := app.New(cfg, eventBus, authenticator, userManager, wireGuardManager,
-		statisticsCollector, cfgFileManager, mailManager)
+	webhookManager, err := webhooks.NewManager(cfg, eventBus)
 	internal.AssertNoError(err)
-	err = backend.Startup(ctx)
+	webhookManager.StartBackgroundJobs(ctx)
+
+	err = app.Initialize(cfg, wireGuardManager, userManager)
 	internal.AssertNoError(err)
 
-	apiFrontend := handlersV0.NewRestApi(cfg, backend)
+	validatorManager := validator.New()
 
+	// region API v0 (SPA frontend)
+
+	apiV0Session := handlersV0.NewSessionWrapper(cfg)
+	apiV0Auth := handlersV0.NewAuthenticationHandler(authenticator, apiV0Session)
+
+	apiV0BackendUsers := backendV0.NewUserService(cfg, userManager, wireGuardManager)
+	apiV0BackendInterfaces := backendV0.NewInterfaceService(cfg, wireGuardManager, cfgFileManager)
+	apiV0BackendPeers := backendV0.NewPeerService(cfg, wireGuardManager, cfgFileManager, mailManager)
+
+	apiV0EndpointAuth := handlersV0.NewAuthEndpoint(cfg, apiV0Auth, apiV0Session, validatorManager, authenticator)
+	apiV0EndpointAudit := handlersV0.NewAuditEndpoint(cfg, apiV0Auth, auditManager)
+	apiV0EndpointUsers := handlersV0.NewUserEndpoint(cfg, apiV0Auth, validatorManager, apiV0BackendUsers)
+	apiV0EndpointInterfaces := handlersV0.NewInterfaceEndpoint(cfg, apiV0Auth, validatorManager, apiV0BackendInterfaces)
+	apiV0EndpointPeers := handlersV0.NewPeerEndpoint(cfg, apiV0Auth, validatorManager, apiV0BackendPeers)
+	apiV0EndpointConfig := handlersV0.NewConfigEndpoint(cfg, apiV0Auth)
+	apiV0EndpointTest := handlersV0.NewTestEndpoint(apiV0Auth)
+
+	apiFrontend := handlersV0.NewRestApi(apiV0Session,
+		apiV0EndpointAuth,
+		apiV0EndpointAudit,
+		apiV0EndpointUsers,
+		apiV0EndpointInterfaces,
+		apiV0EndpointPeers,
+		apiV0EndpointConfig,
+		apiV0EndpointTest,
+	)
+
+	// endregion API v0 (SPA frontend)
+
+	// region API v1 (User REST API)
+
+	apiV1Auth := handlersV1.NewAuthenticationHandler(userManager)
 	apiV1BackendUsers := backendV1.NewUserService(cfg, userManager)
 	apiV1BackendPeers := backendV1.NewPeerService(cfg, wireGuardManager, userManager)
 	apiV1BackendInterfaces := backendV1.NewInterfaceService(cfg, wireGuardManager)
 	apiV1BackendProvisioning := backendV1.NewProvisioningService(cfg, userManager, wireGuardManager, cfgFileManager)
 	apiV1BackendMetrics := backendV1.NewMetricsService(cfg, database, userManager, wireGuardManager)
-	apiV1EndpointUsers := handlersV1.NewUserEndpoint(apiV1BackendUsers)
-	apiV1EndpointPeers := handlersV1.NewPeerEndpoint(apiV1BackendPeers)
-	apiV1EndpointInterfaces := handlersV1.NewInterfaceEndpoint(apiV1BackendInterfaces)
-	apiV1EndpointProvisioning := handlersV1.NewProvisioningEndpoint(apiV1BackendProvisioning)
-	apiV1EndpointMetrics := handlersV1.NewMetricsEndpoint(apiV1BackendMetrics)
+
+	apiV1EndpointUsers := handlersV1.NewUserEndpoint(apiV1Auth, validatorManager, apiV1BackendUsers)
+	apiV1EndpointPeers := handlersV1.NewPeerEndpoint(apiV1Auth, validatorManager, apiV1BackendPeers)
+	apiV1EndpointInterfaces := handlersV1.NewInterfaceEndpoint(apiV1Auth, validatorManager, apiV1BackendInterfaces)
+	apiV1EndpointProvisioning := handlersV1.NewProvisioningEndpoint(apiV1Auth, validatorManager,
+		apiV1BackendProvisioning)
+	apiV1EndpointMetrics := handlersV1.NewMetricsEndpoint(apiV1Auth, validatorManager, apiV1BackendMetrics)
 
 	apiV1 := handlersV1.NewRestApi(
-		userManager,
 		apiV1EndpointUsers,
 		apiV1EndpointPeers,
 		apiV1EndpointInterfaces,
@@ -125,47 +165,22 @@ func main() {
 		apiV1EndpointMetrics,
 	)
 
+	// endregion API v1 (User REST API)
+
 	webSrv, err := core.NewServer(cfg, apiFrontend, apiV1)
 	internal.AssertNoError(err)
 
 	go metricsServer.Run(ctx)
 	go webSrv.Run(ctx, cfg.Web.ListeningAddress)
 
+	slog.Info("Application startup complete")
+
 	// wait until context gets cancelled
 	<-ctx.Done()
 
-	logrus.Infof("Stopping WireGuard Portal")
+	slog.Info("Stopping WireGuard Portal")
 
 	time.Sleep(5 * time.Second) // wait for (most) goroutines to finish gracefully
 
-	logrus.Infof("Stopped WireGuard Portal")
-}
-
-func setupLogging(cfg *config.Config) {
-	switch strings.ToLower(cfg.Advanced.LogLevel) {
-	case "trace":
-		logrus.SetLevel(logrus.TraceLevel)
-	case "debug":
-		logrus.SetLevel(logrus.DebugLevel)
-	case "info", "information":
-		logrus.SetLevel(logrus.InfoLevel)
-	case "warn", "warning":
-		logrus.SetLevel(logrus.WarnLevel)
-	case "error":
-		logrus.SetLevel(logrus.ErrorLevel)
-	default:
-		logrus.SetLevel(logrus.InfoLevel)
-	}
-
-	switch {
-	case cfg.Advanced.LogJson:
-		logrus.SetFormatter(&logrus.JSONFormatter{
-			PrettyPrint: cfg.Advanced.LogPretty,
-		})
-	case cfg.Advanced.LogPretty:
-		logrus.SetFormatter(&logrus.TextFormatter{
-			ForceColors:   true,
-			DisableColors: false,
-		})
-	}
+	slog.Info("Stopped WireGuard Portal")
 }

config.yml.sample

@@ -13,11 +13,15 @@ web:
   external_url: http://localhost:8888
   request_logging: true
 
+webhook:
+  url: ""
+  authentication: ""
+  timeout: 10s
+
 auth:
   ldap:
     - id: ldap1
       provider_name: company ldap
-      display_name: Login with</br>LDAP
       url: ldap://ldap.yourcompany.local:389
       bind_user: ldap_wireguard@yourcompany.local
       bind_pass: super_Secret_PASSWORD

deploy/helm/Chart.yaml

@@ -16,7 +16,7 @@ annotations:
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.7.0
+version: 0.7.1
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to

deploy/helm/README.md

@@ -1,6 +1,6 @@
 # wg-portal
 
-![Version: 0.7.0](https://img.shields.io/badge/Version-0.7.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v2](https://img.shields.io/badge/AppVersion-v2-informational?style=flat-square)
+![Version: 0.7.1](https://img.shields.io/badge/Version-0.7.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v2](https://img.shields.io/badge/AppVersion-v2-informational?style=flat-square)
 
 WireGuard Configuration Portal with LDAP, OAuth, OIDC authentication
 
@@ -27,97 +27,98 @@ The [Values](#values) section lists the parameters that can be configured during
 
 ## Values
 
-| Key                              | Type       | Default                        | Description                                                                                                                                                                                                                                                     |
-|----------------------------------|------------|--------------------------------|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| nameOverride                     | string     | `""`                           | Partially override resource names (adds suffix)                                                                                                                                                                                                                 |
-| fullnameOverride                 | string     | `""`                           | Fully override resource names                                                                                                                                                                                                                                   |
-| extraDeploy                      | list       | `[]`                           | Array of extra objects to deploy with the release                                                                                                                                                                                                               |
-| config.advanced                  | tpl/object | `{}`                           | [Advanced configuration](https://wgportal.org/latest/documentation/configuration/overview/#advanced) options.                                                                                                                                                   |
-| config.auth                      | tpl/object | `{}`                           | [Auth configuration](https://wgportal.org/latest/documentation/configuration/overview/#auth) options.                                                                                                                                                           |
-| config.core                      | tpl/object | `{}`                           | [Core configuration](https://wgportal.org/latest/documentation/configuration/overview/#core) options.<br> If external admins in `auth` are defined and there are no `admin_user` and `admin_password` defined here, the default admin account will be disabled. |
-| config.database                  | tpl/object | `{}`                           | [Database configuration](https://wgportal.org/latest/documentation/configuration/overview/#database) options                                                                                                                                                    |
-| config.mail                      | tpl/object | `{}`                           | [Mail configuration](https://wgportal.org/latest/documentation/configuration/overview/#mail) options                                                                                                                                                            |
-| config.statistics                | tpl/object | `{}`                           | [Statistics configuration](https://wgportal.org/latest/documentation/configuration/overview/#statistics) options                                                                                                                                                |
-| config.web                       | tpl/object | `{}`                           | [Web configuration](https://wgportal.org/latest/documentation/configuration/overview/#web) options.<br> `listening_address` will be set automatically from `service.web.port`. `external_url` is required to enable ingress and certificate resources.          |
-| revisionHistoryLimit             | string     | `10`                           | The number of old ReplicaSets to retain to allow rollback.                                                                                                                                                                                                      |
-| workloadType                     | string     | `"Deployment"`                 | Workload type - `Deployment` or `StatefulSet`                                                                                                                                                                                                                   |
-| strategy                         | object     | `{"type":"RollingUpdate"}`     | Update strategy for the workload Valid values are:  `RollingUpdate` or `Recreate` for Deployment,  `RollingUpdate` or `OnDelete` for StatefulSet                                                                                                                |
-| image.repository                 | string     | `"ghcr.io/h44z/wg-portal"`     | Image repository                                                                                                                                                                                                                                                |
-| image.pullPolicy                 | string     | `"IfNotPresent"`               | Image pull policy                                                                                                                                                                                                                                               |
-| image.tag                        | string     | `""`                           | Overrides the image tag whose default is the chart appVersion                                                                                                                                                                                                   |
-| imagePullSecrets                 | list       | `[]`                           | Image pull secrets                                                                                                                                                                                                                                              |
-| podAnnotations                   | tpl/object | `{}`                           | Extra annotations to add to the pod                                                                                                                                                                                                                             |
-| podLabels                        | object     | `{}`                           | Extra labels to add to the pod                                                                                                                                                                                                                                  |
-| podSecurityContext               | object     | `{}`                           | Pod Security Context                                                                                                                                                                                                                                            |
-| securityContext.capabilities.add | list       | `["NET_ADMIN"]`                | Add capabilities to the container                                                                                                                                                                                                                               |
-| initContainers                   | tpl/list   | `[]`                           | Pod init containers                                                                                                                                                                                                                                             |
-| sidecarContainers                | tpl/list   | `[]`                           | Pod sidecar containers                                                                                                                                                                                                                                          |
-| dnsPolicy                        | string     | `"ClusterFirst"`               | Set DNS policy for the pod. Valid values are `ClusterFirstWithHostNet`, `ClusterFirst`, `Default` or `None`.                                                                                                                                                    |
-| restartPolicy                    | string     | `"Always"`                     | Restart policy for all containers within the pod. Valid values are `Always`, `OnFailure` or `Never`.                                                                                                                                                            |
-| hostNetwork                      | string     | `false`.                       | Use the host's network namespace.                                                                                                                                                                                                                               |
-| resources                        | object     | `{}`                           | Resources requests and limits                                                                                                                                                                                                                                   |
-| command                          | list       | `[]`                           | Overwrite pod command                                                                                                                                                                                                                                           |
-| args                             | list       | `[]`                           | Additional pod arguments                                                                                                                                                                                                                                        |
-| env                              | tpl/list   | `[]`                           | Additional environment variables                                                                                                                                                                                                                                |
-| envFrom                          | tpl/list   | `[]`                           | Additional environment variables from a secret or configMap                                                                                                                                                                                                     |
-| livenessProbe                    | object     | `{}`                           | Liveness probe configuration                                                                                                                                                                                                                                    |
-| readinessProbe                   | object     | `{}`                           | Readiness probe configuration                                                                                                                                                                                                                                   |
-| startupProbe                     | object     | `{}`                           | Startup probe configuration                                                                                                                                                                                                                                     |
-| volumes                          | tpl/list   | `[]`                           | Additional volumes                                                                                                                                                                                                                                              |
-| volumeMounts                     | tpl/list   | `[]`                           | Additional volumeMounts                                                                                                                                                                                                                                         |
-| nodeSelector                     | object     | `{"kubernetes.io/os":"linux"}` | Node Selector configuration                                                                                                                                                                                                                                     |
-| tolerations                      | list       | `[]`                           | Tolerations configuration                                                                                                                                                                                                                                       |
-| affinity                         | object     | `{}`                           | Affinity configuration                                                                                                                                                                                                                                          |
-| service.mixed.enabled            | bool       | `false`                        | Whether to create a single service for the web and wireguard interfaces                                                                                                                                                                                         |
-| service.mixed.type               | string     | `"LoadBalancer"`               | Service type                                                                                                                                                                                                                                                    |
-| service.web.annotations          | object     | `{}`                           | Annotations for the web service                                                                                                                                                                                                                                 |
-| service.web.type                 | string     | `"ClusterIP"`                  | Web service type                                                                                                                                                                                                                                                |
-| service.web.port                 | int        | `8888`                         | Web service port Used for the web interface listener                                                                                                                                                                                                            |
-| service.web.appProtocol          | string     | `"http"`                       | Web service appProtocol. Will be auto set to `https` if certificate is enabled.                                                                                                                                                                                 |
-| service.wireguard.annotations    | object     | `{}`                           | Annotations for the WireGuard service                                                                                                                                                                                                                           |
-| service.wireguard.type           | string     | `"LoadBalancer"`               | Wireguard service type                                                                                                                                                                                                                                          |
-| service.wireguard.ports          | list       | `[51820]`                      | Wireguard service ports. Exposes the WireGuard ports for created interfaces. Lowerest port is selected as start port for the first interface. Increment next port by 1 for each additional interface.                                                           |
-| service.metrics.port             | int        | `8787`                         |                                                                                                                                                                                                                                                                 |
-| ingress.enabled                  | bool       | `false`                        | Specifies whether an ingress resource should be created                                                                                                                                                                                                         |
-| ingress.className                | string     | `""`                           | Ingress class name                                                                                                                                                                                                                                              |
-| ingress.annotations              | object     | `{}`                           | Ingress annotations                                                                                                                                                                                                                                             |
-| ingress.tls                      | bool       | `false`                        | Ingress TLS configuration. Enable certificate resource or add ingress annotation to create required secret                                                                                                                                                      |
-| certificate.enabled              | bool       | `false`                        | Specifies whether a certificate resource should be created. If enabled, certificate will be used for the web.                                                                                                                                                   |
-| certificate.issuer.name          | string     | `""`                           | Certificate issuer name                                                                                                                                                                                                                                         |
-| certificate.issuer.kind          | string     | `""`                           | Certificate issuer kind (ClusterIssuer or Issuer)                                                                                                                                                                                                               |
-| certificate.issuer.group         | string     | `"cert-manager.io"`            | Certificate issuer group                                                                                                                                                                                                                                        |
-| certificate.duration             | string     | `""`                           | Optional. [Documentation](https://cert-manager.io/docs/usage/certificate/#creating-certificate-resources)                                                                                                                                                       |
-| certificate.renewBefore          | string     | `""`                           | Optional. [Documentation](https://cert-manager.io/docs/usage/certificate/#creating-certificate-resources)                                                                                                                                                       |
-| certificate.commonName           | string     | `""`                           | Optional. [Documentation](https://cert-manager.io/docs/usage/certificate/#creating-certificate-resources)                                                                                                                                                       |
-| certificate.emailAddresses       | list       | `[]`                           | Optional. [Documentation](https://cert-manager.io/docs/usage/certificate/#creating-certificate-resources)                                                                                                                                                       |
-| certificate.ipAddresses          | list       | `[]`                           | Optional. [Documentation](https://cert-manager.io/docs/usage/certificate/#creating-certificate-resources)                                                                                                                                                       |
-| certificate.keystores            | object     | `{}`                           | Optional. [Documentation](https://cert-manager.io/docs/usage/certificate/#creating-certificate-resources)                                                                                                                                                       |
-| certificate.privateKey           | object     | `{}`                           | Optional. [Documentation](https://cert-manager.io/docs/usage/certificate/#creating-certificate-resources)                                                                                                                                                       |
-| certificate.secretTemplate       | object     | `{}`                           | Optional. [Documentation](https://cert-manager.io/docs/usage/certificate/#creating-certificate-resources)                                                                                                                                                       |
-| certificate.subject              | object     | `{}`                           | Optional. [Documentation](https://cert-manager.io/docs/usage/certificate/#creating-certificate-resources)                                                                                                                                                       |
-| certificate.uris                 | list       | `[]`                           | Optional. [Documentation](https://cert-manager.io/docs/usage/certificate/#creating-certificate-resources)                                                                                                                                                       |
-| certificate.usages               | list       | `[]`                           | Optional. [Documentation](https://cert-manager.io/docs/usage/certificate/#creating-certificate-resources)                                                                                                                                                       |
-| persistence.enabled              | bool       | `false`                        | Specifies whether an persistent volume should be created                                                                                                                                                                                                        |
-| persistence.annotations          | object     | `{}`                           | Persistent Volume Claim annotations                                                                                                                                                                                                                             |
-| persistence.storageClass         | string     | `""`                           | Persistent Volume storage class. If undefined (the default) cluster's default provisioner will be used.                                                                                                                                                         |
-| persistence.accessMode           | string     | `"ReadWriteOnce"`              | Persistent Volume Access Mode                                                                                                                                                                                                                                   |
-| persistence.size                 | string     | `"1Gi"`                        | Persistent Volume size                                                                                                                                                                                                                                          |
-| serviceAccount.create            | bool       | `true`                         | Specifies whether a service account should be created                                                                                                                                                                                                           |
-| serviceAccount.annotations       | object     | `{}`                           | Service account annotations                                                                                                                                                                                                                                     |
-| serviceAccount.automount         | bool       | `false`                        | Automatically mount a ServiceAccount's API credentials                                                                                                                                                                                                          |
-| serviceAccount.name              | string     | `""`                           | The name of the service account to use. If not set and create is true, a name is generated using the fullname template                                                                                                                                          |
-| monitoring.enabled               | bool       | `false`                        | Enable Prometheus monitoring.                                                                                                                                                                                                                                   |
-| monitoring.apiVersion            | string     | `"monitoring.coreos.com/v1"`   | API version of the Prometheus resource. Use `azmonitoring.coreos.com/v1` for Azure Managed Prometheus.                                                                                                                                                          |
-| monitoring.kind                  | string     | `"PodMonitor"`                 | Kind of the Prometheus resource. Could be `PodMonitor` or `ServiceMonitor`.                                                                                                                                                                                     |
-| monitoring.labels                | object     | `{}`                           | Resource labels.                                                                                                                                                                                                                                                |
-| monitoring.annotations           | object     | `{}`                           | Resource annotations.                                                                                                                                                                                                                                           |
-| monitoring.interval              | string     | `1m`                           | Interval at which metrics should be scraped. If not specified `config.statistics.data_collection_interval` interval is used.                                                                                                                                    |
-| monitoring.metricRelabelings     | list       | `[]`                           | Relabelings to samples before ingestion.                                                                                                                                                                                                                        |
-| monitoring.relabelings           | list       | `[]`                           | Relabelings to samples before scraping.                                                                                                                                                                                                                         |
-| monitoring.scrapeTimeout         | string     | `""`                           | Timeout after which the scrape is ended If not specified, the Prometheus global scrape interval is used.                                                                                                                                                        |
-| monitoring.jobLabel              | string     | `""`                           | The label to use to retrieve the job name from.                                                                                                                                                                                                                 |
-| monitoring.podTargetLabels       | object     | `{}`                           | Transfers labels on the Kubernetes Pod onto the target.                                                                                                                                                                                                         |
-| monitoring.dashboard.enabled     | bool       | `false`                        | Enable Grafana dashboard.                                                                                                                                                                                                                                       |
-| monitoring.dashboard.annotations | object     | `{}`                           | Annotations for the dashboard ConfigMap.                                                                                                                                                                                                                        |
-| monitoring.dashboard.labels      | object     | `{}`                           | Additional labels for the dashboard ConfigMap.                                                                                                                                                                                                                  |
-| monitoring.dashboard.namespace   | string     | `""`                           | Dashboard ConfigMap namespace Overrides the namespace for the dashboard ConfigMap.                                                                                                                                                                              |
+| Key | Type | Default | Description |
+|-----|------|---------|-------------|
+| nameOverride | string | `""` | Partially override resource names (adds suffix) |
+| fullnameOverride | string | `""` | Fully override resource names |
+| extraDeploy | list | `[]` | Array of extra objects to deploy with the release |
+| config.advanced | tpl/object | `{}` | [Advanced configuration](https://wgportal.org/latest/documentation/configuration/overview/#advanced) options. |
+| config.auth | tpl/object | `{}` | [Auth configuration](https://wgportal.org/latest/documentation/configuration/overview/#auth) options. |
+| config.core | tpl/object | `{}` | [Core configuration](https://wgportal.org/latest/documentation/configuration/overview/#core) options.<br> If external admins in `auth` are defined and there are no `admin_user` and `admin_password` defined here, the default admin account will be disabled. |
+| config.database | tpl/object | `{}` | [Database configuration](https://wgportal.org/latest/documentation/configuration/overview/#database) options |
+| config.mail | tpl/object | `{}` | [Mail configuration](https://wgportal.org/latest/documentation/configuration/overview/#mail) options |
+| config.statistics | tpl/object | `{}` | [Statistics configuration](https://wgportal.org/latest/documentation/configuration/overview/#statistics) options |
+| config.web | tpl/object | `{}` | [Web configuration](https://wgportal.org/latest/documentation/configuration/overview/#web) options.<br> `listening_address` will be set automatically from `service.web.port`. `external_url` is required to enable ingress and certificate resources. |
+| revisionHistoryLimit | string | `10` | The number of old ReplicaSets to retain to allow rollback. |
+| workloadType | string | `"Deployment"` | Workload type - `Deployment` or `StatefulSet` |
+| strategy | object | `{"type":"RollingUpdate"}` | Update strategy for the workload Valid values are:  `RollingUpdate` or `Recreate` for Deployment,  `RollingUpdate` or `OnDelete` for StatefulSet |
+| image.repository | string | `"ghcr.io/h44z/wg-portal"` | Image repository |
+| image.pullPolicy | string | `"IfNotPresent"` | Image pull policy |
+| image.tag | string | `""` | Overrides the image tag whose default is the chart appVersion |
+| imagePullSecrets | list | `[]` | Image pull secrets |
+| podAnnotations | tpl/object | `{}` | Extra annotations to add to the pod |
+| podLabels | object | `{}` | Extra labels to add to the pod |
+| podSecurityContext | object | `{}` | Pod Security Context |
+| securityContext.capabilities.add | list | `["NET_ADMIN"]` | Add capabilities to the container |
+| initContainers | tpl/list | `[]` | Pod init containers |
+| sidecarContainers | tpl/list | `[]` | Pod sidecar containers |
+| dnsPolicy | string | `"ClusterFirst"` | Set DNS policy for the pod. Valid values are `ClusterFirstWithHostNet`, `ClusterFirst`, `Default` or `None`. |
+| restartPolicy | string | `"Always"` | Restart policy for all containers within the pod. Valid values are `Always`, `OnFailure` or `Never`. |
+| hostNetwork | string | `false`. | Use the host's network namespace. |
+| resources | object | `{}` | Resources requests and limits |
+| command | list | `[]` | Overwrite pod command |
+| args | list | `[]` | Additional pod arguments |
+| env | tpl/list | `[]` | Additional environment variables |
+| envFrom | tpl/list | `[]` | Additional environment variables from a secret or configMap |
+| livenessProbe | object | `{}` | Liveness probe configuration |
+| readinessProbe | object | `{}` | Readiness probe configuration |
+| startupProbe | object | `{}` | Startup probe configuration |
+| volumes | tpl/list | `[]` | Additional volumes |
+| volumeMounts | tpl/list | `[]` | Additional volumeMounts |
+| nodeSelector | object | `{"kubernetes.io/os":"linux"}` | Node Selector configuration |
+| tolerations | list | `[]` | Tolerations configuration |
+| affinity | object | `{}` | Affinity configuration |
+| service.mixed.enabled | bool | `false` | Whether to create a single service for the web and wireguard interfaces |
+| service.mixed.type | string | `"LoadBalancer"` | Service type |
+| service.web.annotations | object | `{}` | Annotations for the web service |
+| service.web.type | string | `"ClusterIP"` | Web service type |
+| service.web.port | int | `8888` | Web service port Used for the web interface listener |
+| service.web.appProtocol | string | `"http"` | Web service appProtocol. Will be auto set to `https` if certificate is enabled. |
+| service.wireguard.annotations | object | `{}` | Annotations for the WireGuard service |
+| service.wireguard.type | string | `"LoadBalancer"` | Wireguard service type |
+| service.wireguard.ports | list | `[51820]` | Wireguard service ports. Exposes the WireGuard ports for created interfaces. Lowerest port is selected as start port for the first interface. Increment next port by 1 for each additional interface. |
+| service.metrics.port | int | `8787` |  |
+| ingress.enabled | bool | `false` | Specifies whether an ingress resource should be created |
+| ingress.className | string | `""` | Ingress class name |
+| ingress.annotations | object | `{}` | Ingress annotations |
+| ingress.tls | bool | `false` | Ingress TLS configuration. Enable certificate resource or add ingress annotation to create required secret |
+| certificate.enabled | bool | `false` | Specifies whether a certificate resource should be created. If enabled, certificate will be used for the web. |
+| certificate.issuer.name | string | `""` | Certificate issuer name |
+| certificate.issuer.kind | string | `""` | Certificate issuer kind (ClusterIssuer or Issuer) |
+| certificate.issuer.group | string | `"cert-manager.io"` | Certificate issuer group |
+| certificate.duration | string | `""` | Optional. [Documentation](https://cert-manager.io/docs/usage/certificate/#creating-certificate-resources) |
+| certificate.renewBefore | string | `""` | Optional. [Documentation](https://cert-manager.io/docs/usage/certificate/#creating-certificate-resources) |
+| certificate.commonName | string | `""` | Optional. [Documentation](https://cert-manager.io/docs/usage/certificate/#creating-certificate-resources) |
+| certificate.emailAddresses | list | `[]` | Optional. [Documentation](https://cert-manager.io/docs/usage/certificate/#creating-certificate-resources) |
+| certificate.ipAddresses | list | `[]` | Optional. [Documentation](https://cert-manager.io/docs/usage/certificate/#creating-certificate-resources) |
+| certificate.keystores | object | `{}` | Optional. [Documentation](https://cert-manager.io/docs/usage/certificate/#creating-certificate-resources) |
+| certificate.privateKey | object | `{}` | Optional. [Documentation](https://cert-manager.io/docs/usage/certificate/#creating-certificate-resources) |
+| certificate.secretTemplate | object | `{}` | Optional. [Documentation](https://cert-manager.io/docs/usage/certificate/#creating-certificate-resources) |
+| certificate.subject | object | `{}` | Optional. [Documentation](https://cert-manager.io/docs/usage/certificate/#creating-certificate-resources) |
+| certificate.uris | list | `[]` | Optional. [Documentation](https://cert-manager.io/docs/usage/certificate/#creating-certificate-resources) |
+| certificate.usages | list | `[]` | Optional. [Documentation](https://cert-manager.io/docs/usage/certificate/#creating-certificate-resources) |
+| persistence.enabled | bool | `false` | Specifies whether an persistent volume should be created |
+| persistence.annotations | object | `{}` | Persistent Volume Claim annotations |
+| persistence.storageClass | string | `""` | Persistent Volume storage class. If undefined (the default) cluster's default provisioner will be used. |
+| persistence.accessMode | string | `"ReadWriteOnce"` | Persistent Volume Access Mode |
+| persistence.size | string | `"1Gi"` | Persistent Volume size |
+| persistence.volumeName | string | `""` | Persistent Volume Name (optional) |
+| serviceAccount.create | bool | `true` | Specifies whether a service account should be created |
+| serviceAccount.annotations | object | `{}` | Service account annotations |
+| serviceAccount.automount | bool | `false` | Automatically mount a ServiceAccount's API credentials |
+| serviceAccount.name | string | `""` | The name of the service account to use. If not set and create is true, a name is generated using the fullname template |
+| monitoring.enabled | bool | `false` | Enable Prometheus monitoring. |
+| monitoring.apiVersion | string | `"monitoring.coreos.com/v1"` | API version of the Prometheus resource. Use `azmonitoring.coreos.com/v1` for Azure Managed Prometheus. |
+| monitoring.kind | string | `"PodMonitor"` | Kind of the Prometheus resource. Could be `PodMonitor` or `ServiceMonitor`. |
+| monitoring.labels | object | `{}` | Resource labels. |
+| monitoring.annotations | object | `{}` | Resource annotations. |
+| monitoring.interval | string | `1m` | Interval at which metrics should be scraped. If not specified `config.statistics.data_collection_interval` interval is used. |
+| monitoring.metricRelabelings | list | `[]` | Relabelings to samples before ingestion. |
+| monitoring.relabelings | list | `[]` | Relabelings to samples before scraping. |
+| monitoring.scrapeTimeout | string | `""` | Timeout after which the scrape is ended If not specified, the Prometheus global scrape interval is used. |
+| monitoring.jobLabel | string | `""` | The label to use to retrieve the job name from. |
+| monitoring.podTargetLabels | object | `{}` | Transfers labels on the Kubernetes Pod onto the target. |
+| monitoring.dashboard.enabled | bool | `false` | Enable Grafana dashboard. |
+| monitoring.dashboard.annotations | object | `{}` | Annotations for the dashboard ConfigMap. |
+| monitoring.dashboard.labels | object | `{}` | Additional labels for the dashboard ConfigMap. |
+| monitoring.dashboard.namespace | string | `""` | Dashboard ConfigMap namespace Overrides the namespace for the dashboard ConfigMap. |

deploy/helm/templates/_helpers.tpl

@@ -89,13 +89,17 @@ admin_user: ""
 Define PersistentVolumeClaim spec
 */}}
 {{- define "wg-portal.pvc" -}}
-accessModes: [{{ .Values.persistence.accessMode }}]
-{{- with .Values.persistence.storageClass }}
-storageClassName: {{ . }}
-{{- end }}
+accessModes:
+  - {{ .Values.persistence.accessMode }}
 resources:
   requests:
     storage: {{ .Values.persistence.size | quote }}
+{{- with .Values.persistence.storageClass }}
+storageClassName: {{ . }}
+{{- end }}
+{{- with .Values.persistence.volumeName }}
+volumeName: {{ . }}
+{{- end }}
 {{- end -}}
 
 {{/*

deploy/helm/values.yaml

@@ -195,6 +195,8 @@ persistence:
   accessMode: ReadWriteOnce
   # -- Persistent Volume size
   size: 1Gi
+  # -- Persistent Volume Name (optional)
+  volumeName: ""
 
 serviceAccount:
   # -- Specifies whether a service account should be created

docs/documentation/configuration/examples.md

@@ -43,7 +43,6 @@ auth:
     # a sample LDAP provider with user sync enabled
     - id: ldap
       provider_name: Active Directory
-      display_name: Login with</br>AD
       url: ldap://srv-ad1.company.local:389
       bind_user: ldap_wireguard@company.local
       bind_pass: super-s3cr3t-ldap

docs/documentation/configuration/overview.md

@@ -58,7 +58,7 @@ mail:
   host: 127.0.0.1
   port: 25
   encryption: none
-  cert_validation: false
+  cert_validation: true
   username: ""
   password: ""
   auth_type: plain
@@ -81,6 +81,11 @@ web:
   request_logging: false
   cert_file: ""
   key_File: ""
+
+webhook:
+  url: ""
+  authentication: ""
+  timeout: 10s
 ```
 
 </details>
@@ -92,8 +97,9 @@ Below you will find sections like
 [`database`](#database),
 [`statistics`](#statistics),
 [`mail`](#mail),
-[`auth`](#auth) and
-[`web`](#web).  
+[`auth`](#auth),
+[`web`](#web) and
+[`webhook`](#webhook).  
 Each section describes the individual configuration keys, their default values, and a brief explanation of their purpose.
 
 ---
@@ -289,7 +295,7 @@ Options for configuring email notifications or sending peer configurations via e
 - **Description:** SMTP encryption type. Valid values: `none`, `tls`, `starttls`.
 
 ### `cert_validation`
-- **Default:** `false`
+- **Default:** `true`
 - **Description:** If `true`, validate the SMTP server certificate (relevant if `encryption` = `tls`).
 
 ### `username`
@@ -356,7 +362,7 @@ Below are the properties for each OIDC provider entry inside `auth.oidc`:
   - Available fields: `user_identifier`, `email`, `firstname`, `lastname`, `phone`, `department`, `is_admin`, `user_groups`.
 
     | **Field**         | **Typical OIDC Claim**            | **Explanation**                                                                                                                                                                                         |
-    | ----------------- | --------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+    |-------------------|-----------------------------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
     | `user_identifier` | `sub` or `preferred_username`     | A unique identifier for the user. Often the OIDC `sub` claim is used because it’s guaranteed to be unique for the user within the IdP. Some providers also support `preferred_username` if it’s unique. |
     | `email`           | `email`                           | The user’s email address as provided by the IdP. Not always verified, depending on IdP settings.                                                                                                        |
     | `firstname`       | `given_name`                      | The user’s first name, typically provided by the IdP in the `given_name` claim.                                                                                                                         |
@@ -425,7 +431,7 @@ Below are the properties for each OAuth provider entry inside `auth.oauth`:
   - Available fields: `user_identifier`, `email`, `firstname`, `lastname`, `phone`, `department`, `is_admin`, `user_groups`.
 
     | **Field**         | **Typical Claim**                 | **Explanation**                                                                                                                                                                                         |
-    | ----------------- | --------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+    |-------------------|-----------------------------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
     | `user_identifier` | `sub` or `preferred_username`     | A unique identifier for the user. Often the OIDC `sub` claim is used because it’s guaranteed to be unique for the user within the IdP. Some providers also support `preferred_username` if it’s unique. |
     | `email`           | `email`                           | The user’s email address as provided by the IdP. Not always verified, depending on IdP settings.                                                                                                        |
     | `firstname`       | `given_name`                      | The user’s first name, typically provided by the IdP in the `given_name` claim.                                                                                                                         |
@@ -456,6 +462,10 @@ Below are the properties for each OAuth provider entry inside `auth.oauth`:
 The `ldap` array contains a list of LDAP authentication providers.
 Below are the properties for each LDAP provider entry inside `auth.ldap`:
 
+#### `provider_name`
+- **Default:** *(empty)*
+- **Description:** A **unique** name for this provider. Must not conflict with other providers.
+
 #### `url`
 - **Default:** *(empty)*
 - **Description:** The LDAP server URL (e.g., `ldap://srv-ad01.company.local:389`).
@@ -494,7 +504,7 @@ Below are the properties for each LDAP provider entry inside `auth.ldap`:
     - Available fields: `user_identifier`, `email`, `firstname`, `lastname`, `phone`, `department`, `memberof`.
   
       | **WireGuard Portal Field** | **Typical LDAP Attribute** | **Short Description**                                        |
-      | -------------------------- | -------------------------- | ------------------------------------------------------------ |
+      |----------------------------|----------------------------|--------------------------------------------------------------|
       | user_identifier            | sAMAccountName / uid       | Uniquely identifies the user within the LDAP directory.      |
       | email                      | mail / userPrincipalName   | Stores the user's primary email address.                     |
       | firstname                  | givenName                  | Contains the user's first (given) name.                      |
@@ -552,13 +562,18 @@ Below are the properties for each LDAP provider entry inside `auth.ldap`:
 
 ## Web
 
+The web section contains configuration options for the web server, including the listening address, session management, and CSRF protection.
+It is important to specify a valid `external_url` for the web server, especially if you are using a reverse proxy. 
+Without a valid `external_url`, the login process may fail due to CSRF protection.
+
 ### `listening_address`
 - **Default:** `:8888`
 - **Description:** The listening port of the web server.
 
 ### `external_url`
 - **Default:** `http://localhost:8888`
-- **Description:** The URL where a client can access WireGuard Portal.
+- **Description:** The URL where a client can access WireGuard Portal. This URL is used for generating links in emails and for performing OAUTH redirects.  
+  **Important:** If you are using a reverse proxy, set this to the external URL of the reverse proxy, otherwise login will fail. If you access the portal via IP address, set this to the IP address of the server.
 
 ### `site_company_name`
 - **Default:** `WireGuard Portal`
@@ -591,3 +606,33 @@ Below are the properties for each LDAP provider entry inside `auth.ldap`:
 ### `key_file`
 - **Default:** *(empty)*
 - **Description:** (Optional) Path to the TLS certificate key file.
+
+---
+
+## Webhook
+
+The webhook section allows you to configure a webhook that is called on certain events in WireGuard Portal.
+A JSON object is sent in a POST request to the webhook URL with the following structure:
+```json
+{
+  "event": "peer_created",
+  "entity": "peer",
+  "identifier": "the-peer-identifier",
+  "payload": {
+    // The payload of the event, e.g. peer data.
+    // Check the API documentation for the exact structure.
+  }
+}
+```
+
+### `url`
+- **Default:** *(empty)*
+- **Description:** The POST endpoint to which the webhook is sent. The URL must be reachable from the WireGuard Portal server. If the URL is empty, the webhook is disabled.
+
+### `authentication`
+- **Default:** *(empty)*
+- **Description:** The Authorization header for the webhook endpoint. The value is send as-is in the header. For example: `Bearer <token>`.
+
+### `timeout`
+- **Default:** `10s`
+- **Description:** The timeout for the webhook request. If the request takes longer than this, it is aborted.

docs/documentation/getting-started/sources.md

@@ -4,8 +4,8 @@ To build the application from source files, use the Makefile provided in the rep
 
 - [Git](https://git-scm.com/downloads)
 - [Make](https://www.gnu.org/software/make/)
-- [Go](https://go.dev/dl/): `>=1.23.0`
-- [NodeJS with npm](https://nodejs.org/en/download): `node>=18, npm>=9`
+- [Go](https://go.dev/dl/): `>=1.24.0`
+- [Node.js with npm](https://nodejs.org/en/download): `node>=18, npm>=9`
 
 ## Build
 

docs/documentation/monitoring/prometheus.md

@@ -1,4 +1,4 @@
-By default WG-Portal exposes Prometheus metrics on port `8787` if interface/peer statistic data collection is enabled.
+By default, WG-Portal exposes Prometheus metrics on port `8787` if interface/peer statistic data collection is enabled.
 
 ## Exposed Metrics
 

frontend/package.json

@@ -8,27 +8,27 @@
     "preview": "vite preview --port 5050"
   },
   "dependencies": {
-    "@fontsource/nunito-sans": "^5.1.1",
+    "@fontsource/nunito-sans": "^5.2.5",
     "@fortawesome/fontawesome-free": "^6.7.2",
     "@kyvg/vue3-notification": "^3.4.1",
     "@popperjs/core": "^2.11.8",
-    "bootstrap": "^5.3.3",
-    "bootswatch": "^5.3.3",
+    "@vojtechlanka/vue-tags-input": "^3.1.1",
+    "bootstrap": "^5.3.5",
+    "bootswatch": "^5.3.5",
     "flag-icons": "^7.3.2",
     "ip-address": "^10.0.1",
-    "is-cidr": "^5.1.0",
+    "is-cidr": "^5.1.1",
     "is-ip": "^5.0.1",
-    "pinia": "^2.3.1",
-    "prismjs": "^1.29.0",
+    "pinia": "^3.0.2",
+    "prismjs": "^1.30.0",
     "vue": "^3.5.13",
-    "vue-i18n": "^11.0.1",
+    "vue-i18n": "^11.1.3",
     "vue-prism-component": "github:h44z/vue-prism-component",
-    "vue-router": "^4.5.0",
-    "vue3-tags-input": "^1.0.12"
+    "vue-router": "^4.5.0"
   },
   "devDependencies": {
-    "@vitejs/plugin-vue": "^5.2.1",
-    "sass-embedded": "^1.83.4",
-    "vite": "^5.4.12"
+    "@vitejs/plugin-vue": "^5.2.3",
+    "sass-embedded": "^1.86.3",
+    "vite": "6.3.2"
   }
 }

frontend/src/App.vue

@@ -4,6 +4,7 @@ import { computed, getCurrentInstance, onMounted, ref } from "vue";
 import { authStore } from "./stores/auth";
 import { securityStore } from "./stores/security";
 import { settingsStore } from "@/stores/settings";
+import { Notifications } from "@kyvg/vue3-notification";
 
 const appGlobal = getCurrentInstance().appContext.config.globalProperties
 const auth = authStore()
@@ -90,6 +91,7 @@ const currentYear = ref(new Date().getFullYear())
             <div class="dropdown-menu">
               <RouterLink :to="{ name: 'profile' }" class="dropdown-item"><i class="fas fa-user"></i> {{ $t('menu.profile') }}</RouterLink>
               <RouterLink :to="{ name: 'settings' }" class="dropdown-item" v-if="auth.IsAdmin || !settings.Setting('ApiAdminOnly')"><i class="fas fa-gears"></i> {{ $t('menu.settings') }}</RouterLink>
+              <RouterLink :to="{ name: 'audit' }" class="dropdown-item" v-if="auth.IsAdmin"><i class="fas fa-file-shield"></i> {{ $t('menu.audit') }}</RouterLink>
               <div class="dropdown-divider"></div>
               <a class="dropdown-item" href="#" @click.prevent="auth.Logout"><i class="fas fa-sign-out-alt"></i> {{ $t('menu.logout') }}</a>
             </div>

frontend/src/assets/base.css

@@ -15,3 +15,85 @@ a.disabled {
 .desc::after {
   content: " ↓";
 }
+
+/* style the background and the text color of the input ... */
+.vue-tags-input {
+  max-width: 100% !important;
+  background-color: #f7f7f9 !important;
+  padding: 0 0;
+}
+
+.vue-tags-input .ti-input {
+  padding: 0 0;
+  border: none !important;
+  transition: border-bottom 200ms ease;
+}
+
+.vue-tags-input .ti-new-tag-input {
+  background: transparent;
+  color: var(--bs-body-color);
+  padding: 0.75rem 1.5rem !important;
+}
+
+
+/* style the placeholders color across all browser */
+.vue-tags-input ::-webkit-input-placeholder {
+  color: var(--bs-secondary-color);
+}
+.vue-tags-input .ti-input::placeholder {
+  color: var(--bs-secondary-color);
+}
+
+.vue-tags-input ::-moz-placeholder {
+  color: var(--bs-secondary-color);
+}
+
+.vue-tags-input :-ms-input-placeholder {
+  color: var(--bs-secondary-color);
+}
+
+.vue-tags-input :-moz-placeholder {
+  color: var(--bs-secondary-color);
+}
+
+/* default styles for all the tags */
+.vue-tags-input .ti-tag {
+  position: relative;
+  background: #ffffff;
+  border: 2px solid var(--bs-body-color);
+  margin: 6px;
+  color: var(--bs-body-color);
+}
+
+/* the styles if a tag is invalid */
+.vue-tags-input .ti-tag.ti-invalid {
+  background-color: #e88a74;
+}
+
+/* if the user input is invalid, the input color should be red */
+.vue-tags-input .ti-new-tag-input.ti-invalid {
+  color: #e88a74;
+}
+
+/* if a tag or the user input is a duplicate, it should be crossed out */
+.vue-tags-input .ti-duplicate span,
+.vue-tags-input .ti-new-tag-input.ti-duplicate {
+  text-decoration: line-through;
+}
+
+/* if the user presses backspace, the complete tag should be crossed out, to mark it for deletion */
+.vue-tags-input .ti-tag:after {
+  transition: transform .2s;
+  position: absolute;
+  content: '';
+  height: 2px;
+  width: 108%;
+  left: -4%;
+  top: calc(50% - 1px);
+  background-color: #000;
+  transform: scaleX(0);
+}
+
+.vue-tags-input .ti-deletion-mark:after {
+  transform: scaleX(1);
+}

frontend/src/components/InterfaceEditModal.vue

@@ -4,7 +4,7 @@ import {interfaceStore} from "@/stores/interfaces";
 import {computed, ref, watch} from "vue";
 import { useI18n } from 'vue-i18n';
 import { notify } from "@kyvg/vue3-notification";
-import Vue3TagsInput from 'vue3-tags-input';
+import { VueTagsInput } from '@vojtechlanka/vue-tags-input';
 import { validateCIDR, validateIP, validateDomain } from '@/helpers/validators';
 import isCidr from "is-cidr";
 import {isIP} from 'is-ip';
@@ -38,6 +38,15 @@ const title = computed(() => {
   return t("modals.interface-edit.headline-new")
 })
 
+const currentTags = ref({
+  Addresses: "",
+  Dns: "",
+  DnsSearch: "",
+  PeerDefNetwork: "",
+  PeerDefAllowedIPs: "",
+  PeerDefDns: "",
+  PeerDefDnsSearch: ""
+})
 const formData = ref(freshInterface())
 
 // functions
@@ -137,94 +146,94 @@ function close() {
 function handleChangeAddresses(tags) {
   let validInput = true
   tags.forEach(tag => {
-    if(isCidr(tag) === 0) {
+    if(isCidr(tag.text) === 0) {
       validInput = false
       notify({
         title: "Invalid CIDR",
-        text: tag + " is not a valid IP address",
+        text: tag.text + " is not a valid IP address",
         type: 'error',
       })
     }
   })
   if(validInput) {
-    formData.value.Addresses = tags
+    formData.value.Addresses = tags.map(tag => tag.text)
   }
 }
 
 function handleChangeDns(tags) {
   let validInput = true
   tags.forEach(tag => {
-    if(!isIP(tag)) {
+    if(!isIP(tag.text)) {
       validInput = false
       notify({
         title: "Invalid IP",
-        text: tag + " is not a valid IP address",
+        text: tag.text + " is not a valid IP address",
         type: 'error',
       })
     }
   })
   if(validInput) {
-    formData.value.Dns = tags
+    formData.value.Dns = tags.map(tag => tag.text)
   }
 }
 
 function handleChangeDnsSearch(tags) {
-  formData.value.DnsSearch = tags
+  formData.value.DnsSearch = tags.map(tag => tag.text)
 }
 
 function handleChangePeerDefNetwork(tags) {
   let validInput = true
   tags.forEach(tag => {
-    if(isCidr(tag) === 0) {
+    if(isCidr(tag.text) === 0) {
       validInput = false
       notify({
         title: "Invalid CIDR",
-        text: tag + " is not a valid IP address",
+        text: tag.text + " is not a valid IP address",
         type: 'error',
       })
     }
   })
   if(validInput) {
-    formData.value.PeerDefNetwork = tags
+    formData.value.PeerDefNetwork = tags.map(tag => tag.text)
   }
 }
 
 function handleChangePeerDefAllowedIPs(tags) {
   let validInput = true
   tags.forEach(tag => {
-    if(isCidr(tag) === 0) {
+    if(isCidr(tag.text) === 0) {
       validInput = false
       notify({
         title: "Invalid CIDR",
-        text: tag + " is not a valid IP address",
+        text: tag.text + " is not a valid IP address",
         type: 'error',
       })
     }
   })
   if(validInput) {
-    formData.value.PeerDefAllowedIPs = tags
+    formData.value.PeerDefAllowedIPs = tags.map(tag => tag.text)
   }
 }
 
 function handleChangePeerDefDns(tags) {
   let validInput = true
   tags.forEach(tag => {
-    if(!isIP(tag)) {
+    if(!isIP(tag.text)) {
       validInput = false
       notify({
         title: "Invalid IP",
-        text: tag + " is not a valid IP address",
+        text: tag.text + " is not a valid IP address",
         type: 'error',
       })
     }
   })
   if(validInput) {
-    formData.value.PeerDefDns = tags
+    formData.value.PeerDefDns = tags.map(tag => tag.text)
   }
 }
 
 function handleChangePeerDefDnsSearch(tags) {
-  formData.value.PeerDefDnsSearch = tags
+  formData.value.PeerDefDnsSearch = tags.map(tag => tag.text)
 }
 
 async function save() {
@@ -333,11 +342,15 @@ async function del() {
             <legend class="mt-4">{{ $t('modals.interface-edit.header-network') }}</legend>
             <div class="form-group">
               <label class="form-label mt-4">{{ $t('modals.interface-edit.ip.label') }}</label>
-              <vue3-tags-input class="form-control" :tags="formData.Addresses"
-                               :placeholder="$t('modals.interface-edit.ip.placeholder')"
-                               :add-tag-on-keys="[13, 188, 32, 9]"
-                               :validate="validateCIDR"
-                               @on-tags-changed="handleChangeAddresses"/>
+              <vue-tags-input class="form-control" v-model="currentTags.Addresses"
+                              :tags="formData.Addresses.map(str => ({ text: str }))"
+                              :placeholder="$t('modals.interface-edit.ip.placeholder')"
+                              :validation="validateCIDR()"
+                              :add-on-key="[13, 188, 32, 9]"
+                              :save-on-key="[13, 188, 32, 9]"
+                              :allow-edit-tags="true"
+                              :separators="[',', ';', ' ']"
+                              @tags-changed="handleChangeAddresses"/>
             </div>
             <div v-if="formData.Mode==='server'" class="form-group">
               <label class="form-label mt-4">{{ $t('modals.interface-edit.listen-port.label') }}</label>
@@ -345,19 +358,27 @@ async function del() {
             </div>
             <div v-if="formData.Mode!=='server'" class="form-group">
               <label class="form-label mt-4">{{ $t('modals.interface-edit.dns.label') }}</label>
-              <vue3-tags-input class="form-control" :tags="formData.Dns"
-                               :placeholder="$t('modals.interface-edit.dns.placeholder')"
-                               :add-tag-on-keys="[13, 188, 32, 9]"
-                               :validate="validateIP"
-                               @on-tags-changed="handleChangeDns"/>
+              <vue-tags-input class="form-control" v-model="currentTags.Dns"
+                              :tags="formData.Dns.map(str => ({ text: str }))"
+                              :placeholder="$t('modals.interface-edit.dns.placeholder')"
+                              :validation="validateIP()"
+                              :add-on-key="[13, 188, 32, 9]"
+                              :save-on-key="[13, 188, 32, 9]"
+                              :allow-edit-tags="true"
+                              :separators="[',', ';', ' ']"
+                              @tags-changed="handleChangeDns"/>
             </div>
             <div v-if="formData.Mode!=='server'" class="form-group">
               <label class="form-label mt-4">{{ $t('modals.interface-edit.dns-search.label') }}</label>
-              <vue3-tags-input class="form-control" :tags="formData.DnsSearch"
-                               :placeholder="$t('modals.interface-edit.dns-search.placeholder')"
-                               :add-tag-on-keys="[13, 188, 32, 9]"
-                               :validate="validateDomain"
-                               @on-tags-changed="handleChangeDnsSearch"/>
+              <vue-tags-input class="form-control" v-model="currentTags.DnsSearch"
+                              :tags="formData.DnsSearch.map(str => ({ text: str }))"
+                              :placeholder="$t('modals.interface-edit.dns-search.placeholder')"
+                              :validation="validateDomain()"
+                              :add-on-key="[13, 188, 32, 9]"
+                              :save-on-key="[13, 188, 32, 9]"
+                              :allow-edit-tags="true"
+                              :separators="[',', ';', ' ']"
+                              @tags-changed="handleChangeDnsSearch"/>
             </div>
             <div class="row">
               <div class="form-group col-md-6">
@@ -420,36 +441,52 @@ async function del() {
             </div>
             <div class="form-group">
               <label class="form-label mt-4">{{ $t('modals.interface-edit.defaults.networks.label') }}</label>
-              <vue3-tags-input class="form-control" :tags="formData.PeerDefNetwork"
-                               :placeholder="$t('modals.interface-edit.defaults.networks.placeholder')"
-                               :add-tag-on-keys="[13, 188, 32, 9]"
-                               :validate="validateCIDR"
-                               @on-tags-changed="handleChangePeerDefNetwork"/>
+              <vue-tags-input class="form-control" v-model="currentTags.PeerDefNetwork"
+                              :tags="formData.PeerDefNetwork.map(str => ({ text: str }))"
+                              :placeholder="$t('modals.interface-edit.defaults.networks.placeholder')"
+                              :validation="validateCIDR()"
+                              :add-on-key="[13, 188, 32, 9]"
+                              :save-on-key="[13, 188, 32, 9]"
+                              :allow-edit-tags="true"
+                              :separators="[',', ';', ' ']"
+                              @tags-changed="handleChangePeerDefNetwork"/>
               <small class="form-text text-muted">{{ $t('modals.interface-edit.defaults.networks.description') }}</small>
             </div>
             <div class="form-group">
               <label class="form-label mt-4">{{ $t('modals.interface-edit.defaults.allowed-ip.label') }}</label>
-              <vue3-tags-input class="form-control" :tags="formData.PeerDefAllowedIPs"
-                               :placeholder="$t('modals.interface-edit.defaults.allowed-ip.placeholder')"
-                               :add-tag-on-keys="[13, 188, 32, 9]"
-                               :validate="validateCIDR"
-                               @on-tags-changed="handleChangePeerDefAllowedIPs"/>
+              <vue-tags-input class="form-control" v-model="currentTags.PeerDefAllowedIPs"
+                              :tags="formData.PeerDefAllowedIPs.map(str => ({ text: str }))"
+                              :placeholder="$t('modals.interface-edit.defaults.allowed-ip.placeholder')"
+                              :validation="validateCIDR()"
+                              :add-on-key="[13, 188, 32, 9]"
+                              :save-on-key="[13, 188, 32, 9]"
+                              :allow-edit-tags="true"
+                              :separators="[',', ';', ' ']"
+                              @tags-changed="handleChangePeerDefAllowedIPs"/>
             </div>
             <div class="form-group">
               <label class="form-label mt-4">{{ $t('modals.interface-edit.dns.label') }}</label>
-              <vue3-tags-input class="form-control" :tags="formData.PeerDefDns"
-                               :placeholder="$t('modals.interface-edit.dns.placeholder')"
-                               :add-tag-on-keys="[13, 188, 32, 9]"
-                               :validate="validateIP"
-                               @on-tags-changed="handleChangePeerDefDns"/>
+              <vue-tags-input class="form-control" v-model="currentTags.PeerDefDns"
+                              :tags="formData.PeerDefDns.map(str => ({ text: str }))"
+                              :placeholder="$t('modals.interface-edit.dns.placeholder')"
+                              :validation="validateIP()"
+                              :add-on-key="[13, 188, 32, 9]"
+                              :save-on-key="[13, 188, 32, 9]"
+                              :allow-edit-tags="true"
+                              :separators="[',', ';', ' ']"
+                              @tags-changed="handleChangePeerDefDns"/>
             </div>
             <div class="form-group">
               <label class="form-label mt-4">{{ $t('modals.interface-edit.dns-search.label') }}</label>
-              <vue3-tags-input class="form-control" :tags="formData.PeerDefDnsSearch"
-                               :placeholder="$t('modals.interface-edit.dns-search.placeholder')"
-                               :add-tag-on-keys="[13, 188, 32, 9]"
-                               :validate="validateDomain"
-                               @on-tags-changed="handleChangePeerDefDnsSearch"/>
+              <vue-tags-input class="form-control" v-model="currentTags.PeerDefDnsSearch"
+                              :tags="formData.PeerDefDnsSearch.map(str => ({ text: str }))"
+                              :placeholder="$t('modals.interface-edit.dns-search.placeholder')"
+                              :validation="validateDomain()"
+                              :add-on-key="[13, 188, 32, 9]"
+                              :save-on-key="[13, 188, 32, 9]"
+                              :allow-edit-tags="true"
+                              :separators="[',', ';', ' ']"
+                              @tags-changed="handleChangePeerDefDnsSearch"/>
             </div>
             <div class="row">
               <div class="form-group col-md-6">

frontend/src/components/PeerEditModal.vue

@@ -5,7 +5,7 @@ import { interfaceStore } from "@/stores/interfaces";
 import { computed, ref, watch } from "vue";
 import { useI18n } from 'vue-i18n';
 import { notify } from "@kyvg/vue3-notification";
-import Vue3TagsInput from "vue3-tags-input";
+import { VueTagsInput } from '@vojtechlanka/vue-tags-input';
 import { validateCIDR, validateIP, validateDomain } from '@/helpers/validators';
 import isCidr from "is-cidr";
 import { isIP } from 'is-ip';
@@ -65,6 +65,13 @@ const title = computed(() => {
   }
 })
 
+const currentTags = ref({
+  Addresses: "",
+  AllowedIPs: "",
+  ExtraAllowedIPs: "",
+  Dns: "",
+  DnsSearch: ""
+})
 const formData = ref(freshPeer())
 
 // functions
@@ -193,73 +200,73 @@ function close() {
 function handleChangeAddresses(tags) {
   let validInput = true
   tags.forEach(tag => {
-    if (isCidr(tag) === 0) {
+    if (isCidr(tag.text) === 0) {
       validInput = false
       notify({
         title: "Invalid CIDR",
-        text: tag + " is not a valid IP address",
+        text: tag.text + " is not a valid IP address",
         type: 'error',
       })
     }
   })
   if (validInput) {
-    formData.value.Addresses = tags
+    formData.value.Addresses = tags.map(tag => tag.text)
   }
 }
 
 function handleChangeAllowedIPs(tags) {
   let validInput = true
   tags.forEach(tag => {
-    if (isCidr(tag) === 0) {
+    if (isCidr(tag.text) === 0) {
       validInput = false
       notify({
         title: "Invalid CIDR",
-        text: tag + " is not a valid IP address",
+        text: tag.text + " is not a valid IP address",
         type: 'error',
       })
     }
   })
   if (validInput) {
-    formData.value.AllowedIPs.Value = tags
+    formData.value.AllowedIPs.Value = tags.map(tag => tag.text)
   }
 }
 
 function handleChangeExtraAllowedIPs(tags) {
   let validInput = true
   tags.forEach(tag => {
-    if (isCidr(tag) === 0) {
+    if (isCidr(tag.text) === 0) {
       validInput = false
       notify({
         title: "Invalid CIDR",
-        text: tag + " is not a valid IP address",
+        text: tag.text + " is not a valid IP address",
         type: 'error',
       })
     }
   })
   if (validInput) {
-    formData.value.ExtraAllowedIPs = tags
+    formData.value.ExtraAllowedIPs = tags.map(tag => tag.text)
   }
 }
 
 function handleChangeDns(tags) {
   let validInput = true
   tags.forEach(tag => {
-    if (!isIP(tag)) {
+    if (!isIP(tag.text)) {
       validInput = false
       notify({
         title: "Invalid IP",
-        text: tag + " is not a valid IP address",
+        text: tag.text + " is not a valid IP address",
         type: 'error',
       })
     }
   })
   if (validInput) {
-    formData.value.Dns.Value = tags
+    formData.value.Dns.Value = tags.map(tag => tag.text)
   }
 }
 
 function handleChangeDnsSearch(tags) {
-  formData.value.DnsSearch.Value = tags
+  formData.value.DnsSearch.Value = tags.map(tag => tag.text)
 }
 
 async function save() {
@@ -344,34 +351,64 @@ async function del() {
         </div>
         <div class="form-group">
           <label class="form-label mt-4">{{ $t('modals.peer-edit.ip.label') }}</label>
-          <vue3-tags-input class="form-control" :tags="formData.Addresses"
-            :placeholder="$t('modals.peer-edit.ip.placeholder')" :add-tag-on-keys="[13, 188, 32, 9]"
-            :validate="validateCIDR" @on-tags-changed="handleChangeAddresses" />
+          <vue-tags-input class="form-control" v-model="currentTags.Addresses"
+                           :tags="formData.Addresses.map(str => ({ text: str }))"
+                           :placeholder="$t('modals.peer-edit.ip.placeholder')"
+                           :validation="validateCIDR()"
+                           :add-on-key="[13, 188, 32, 9]"
+                           :save-on-key="[13, 188, 32, 9]"
+                           :allow-edit-tags="true"
+                           :separators="[',', ';', ' ']"
+                           @tags-changed="handleChangeAddresses" />
         </div>
         <div class="form-group">
           <label class="form-label mt-4">{{ $t('modals.peer-edit.allowed-ip.label') }}</label>
-          <vue3-tags-input class="form-control" :tags="formData.AllowedIPs.Value"
-            :placeholder="$t('modals.peer-edit.allowed-ip.placeholder')" :add-tag-on-keys="[13, 188, 32, 9]"
-            :validate="validateCIDR" @on-tags-changed="handleChangeAllowedIPs" />
+          <vue-tags-input class="form-control" v-model="currentTags.AllowedIPs"
+                           :tags="formData.AllowedIPs.Value.map(str => ({ text: str }))"
+                           :placeholder="$t('modals.peer-edit.allowed-ip.placeholder')"
+                           :validation="validateCIDR()"
+                           :add-on-key="[13, 188, 32, 9]"
+                           :save-on-key="[13, 188, 32, 9]"
+                           :allow-edit-tags="true"
+                           :separators="[',', ';', ' ']"
+                           @tags-changed="handleChangeAllowedIPs" />
         </div>
         <div class="form-group">
           <label class="form-label mt-4">{{ $t('modals.peer-edit.extra-allowed-ip.label') }}</label>
-          <vue3-tags-input class="form-control" :tags="formData.ExtraAllowedIPs"
-            :placeholder="$t('modals.peer-edit.extra-allowed-ip.placeholder')" :add-tag-on-keys="[13, 188, 32, 9]"
-            :validate="validateCIDR" @on-tags-changed="handleChangeExtraAllowedIPs" />
+          <vue-tags-input class="form-control" v-model="currentTags.ExtraAllowedIPs"
+                          :tags="formData.ExtraAllowedIPs.map(str => ({ text: str }))"
+                          :placeholder="$t('modals.peer-edit.extra-allowed-ip.placeholder')"
+                          :validation="validateCIDR()"
+                          :add-on-key="[13, 188, 32, 9]"
+                          :save-on-key="[13, 188, 32, 9]"
+                          :allow-edit-tags="true"
+                          :separators="[',', ';', ' ']"
+                          @tags-changed="handleChangeExtraAllowedIPs" />
           <small class="form-text text-muted">{{ $t('modals.peer-edit.extra-allowed-ip.description') }}</small>
         </div>
         <div class="form-group">
           <label class="form-label mt-4">{{ $t('modals.peer-edit.dns.label') }}</label>
-          <vue3-tags-input class="form-control" :tags="formData.Dns.Value"
-            :placeholder="$t('modals.peer-edit.dns.placeholder')" :add-tag-on-keys="[13, 188, 32, 9]"
-            :validate="validateIP" @on-tags-changed="handleChangeDns" />
+          <vue-tags-input class="form-control" v-model="currentTags.Dns"
+                          :tags="formData.Dns.Value.map(str => ({ text: str }))"
+                          :placeholder="$t('modals.peer-edit.dns.placeholder')"
+                          :validation="validateIP()"
+                          :add-on-key="[13, 188, 32, 9]"
+                          :save-on-key="[13, 188, 32, 9]"
+                          :allow-edit-tags="true"
+                          :separators="[',', ';', ' ']"
+                          @tags-changed="handleChangeDns" />
         </div>
-        <div hidden class="form-group">
+        <div class="form-group">
           <label class="form-label mt-4">{{ $t('modals.peer-edit.dns-search.label') }}</label>
-          <vue3-tags-input class="form-control" :tags="formData.DnsSearch.Value"
-            :placeholder="$t('modals.peer-edit.dns-search.label')" :add-tag-on-keys="[13, 188, 32, 9]"
-            :validate="validateDomain" @on-tags-changed="handleChangeDnsSearch" />
+          <vue-tags-input class="form-control" v-model="currentTags.DnsSearch"
+                          :tags="formData.DnsSearch.Value.map(str => ({ text: str }))"
+                          :placeholder="$t('modals.peer-edit.dns-search.label')"
+                          :validation="validateDomain()"
+                          :add-on-key="[13, 188, 32, 9]"
+                          :save-on-key="[13, 188, 32, 9]"
+                          :allow-edit-tags="true"
+                          :separators="[',', ';', ' ']"
+                          @tags-changed="handleChangeDnsSearch" />
         </div>
         <div class="row">
           <div class="form-group col-md-6">

frontend/src/components/PeerMultiCreateModal.vue

@@ -5,7 +5,7 @@ import {interfaceStore} from "@/stores/interfaces";
 import {computed, ref} from "vue";
 import { useI18n } from 'vue-i18n';
 import { notify } from "@kyvg/vue3-notification";
-import Vue3TagsInput from "vue3-tags-input";
+import { VueTagsInput } from '@vojtechlanka/vue-tags-input';
 import { freshInterface } from '@/helpers/models';
 
 const { t } = useI18n()
@@ -36,6 +36,7 @@ function freshForm() {
   }
 }
 
+const currentTag = ref("")
 const formData = ref(freshForm())
 
 const title = computed(() => {
@@ -55,7 +56,7 @@ function close() {
 }
 
 function handleChangeUserIdentifiers(tags) {
-  formData.value.Identifiers = tags
+  formData.value.Identifiers = tags.map(tag => tag.text)
 }
 
 async function save() {
@@ -89,10 +90,14 @@ async function save() {
       <fieldset>
         <div class="form-group">
           <label class="form-label mt-4">{{ $t('modals.peer-multi-create.identifiers.label') }}</label>
-          <vue3-tags-input class="form-control" :tags="formData.Identifiers"
-                           :placeholder="$t('modals.peer-multi-create.identifiers.placeholder')"
-                           :add-tag-on-keys="[13, 188, 32, 9]"
-                           @on-tags-changed="handleChangeUserIdentifiers"/>
+          <vue-tags-input class="form-control" v-model="currentTag"
+                          :tags="formData.Identifiers.map(str => ({ text: str }))"
+                          :placeholder="$t('modals.peer-multi-create.identifiers.placeholder')"
+                          :add-on-key="[13, 188, 32, 9]"
+                          :save-on-key="[13, 188, 32, 9]"
+                          :allow-edit-tags="true"
+                          :separators="[',', ';', ' ']"
+                          @tags-changed="handleChangeUserIdentifiers"/>
           <small class="form-text text-muted">{{ $t('modals.peer-multi-create.identifiers.description') }}</small>
         </div>
         <div class="form-group">

frontend/src/components/PeerViewModal.vue

@@ -89,19 +89,11 @@ watch(() => props.visible, async (newValue, oldValue) => {
 
 function download() {
   // credit: https://www.bitdegree.org/learn/javascript-download
-  let filename = 'WireGuard-Tunnel.conf'
-  if (selectedPeer.value.DisplayName) {
-    filename = selectedPeer.value.DisplayName
-      .replace(/ /g, "_")
-      .replace(/[^a-zA-Z0-9-_]/g, "")
-      .substring(0, 16)
-      + ".conf"
-  }
   let text = configString.value
 
   let element = document.createElement('a')
   element.setAttribute('href', 'data:application/octet-stream;charset=utf-8,' + encodeURIComponent(text))
-  element.setAttribute('download', filename)
+  element.setAttribute('download', selectedPeer.value.Filename)
 
   element.style.display = 'none'
   document.body.appendChild(element)

frontend/src/components/UserEditModal.vue

@@ -51,6 +51,7 @@ watch(() => props.visible, async (newValue, oldValue) => {
           formData.value.Notes = selectedUser.value.Notes
           formData.value.Password = ""
           formData.value.Disabled = selectedUser.value.Disabled
+          formData.value.Locked = selectedUser.value.Locked
         }
       }
     }

frontend/src/helpers/models.js

@@ -42,7 +42,8 @@ export function freshInterface() {
     PeerDefPostDown: "",
 
     TotalPeers: 0,
-    EnabledPeers: 0
+    EnabledPeers: 0,
+    Filename: ""
   }
 }
 
@@ -120,8 +121,11 @@ export function freshPeer() {
       Overridable: true,
     },
 
-    // Internal value
-    IgnoreGlobalSettings: false
+    Filename: "",
+
+    // Internal values
+    IgnoreGlobalSettings: false,
+    IsSelected: false
   }
 }
 
@@ -148,7 +152,10 @@ export function freshUser() {
 
     ApiEnabled: false,
 
-    PeerCount: 0
+    PeerCount: 0,
+
+    // Internal values
+    IsSelected: false
   }
 }
 

frontend/src/helpers/validators.js

@@ -1,14 +1,26 @@
 import isCidr from "is-cidr";
 import {isIP} from 'is-ip';
 
-export function validateCIDR(value) {
-  return isCidr(value) !== 0
+export function validateCIDR() {
+  return [{
+    classes: 'invalid-cidr',
+    rule: ({ text }) => isCidr(text) === 0,
+    disableAdd: true,
+  }]
 }
 
-export function validateIP(value) {
-  return isIP(value)
+export function validateIP() {
+  return [{
+    classes: 'invalid-ip',
+    rule: ({ text }) => !isIP(text),
+    disableAdd: true,
+  }]
 }
 
-export function validateDomain(value) {
-  return true
+export function validateDomain() {
+  return [{
+    classes: 'invalid-domain',
+    rule: tag => tag.text.length < 3,
+    disableAdd: true,
+  }]
 }

frontend/src/lang/translations/en.json

@@ -38,6 +38,7 @@
     "lang": "Toggle Language",
     "profile": "My Profile",
     "settings": "Settings",
+    "audit": "Audit Log",
     "login": "Login",
     "logout": "Logout"
   },
@@ -188,6 +189,23 @@
       "api-link": "API Documentation"
     }
   },
+  "audit": {
+    "headline": "Audit Log",
+    "abstract": "Here you can find the audit log of all actions performed in the WireGuard Portal.",
+    "no-entries": {
+      "headline": "No log entries available",
+      "abstract": "Currently, there are no audit logs recorded."
+    },
+    "entries-headline": "Log Entries",
+    "table-heading": {
+      "id": "#",
+      "time": "Time",
+      "user": "User",
+      "severity": "Severity",
+      "origin": "Origin",
+      "message": "Message"
+    }
+  },
   "modals": {
     "user-view": {
       "headline": "User Account:",

frontend/src/router/index.js

@@ -4,6 +4,7 @@ import LoginView from '../views/LoginView.vue'
 import InterfaceView from '../views/InterfaceView.vue'
 
 import {authStore} from '@/stores/auth'
+import {securityStore} from '@/stores/security'
 import {notify} from "@kyvg/vue3-notification";
 
 const router = createRouter({
@@ -55,6 +56,14 @@ const router = createRouter({
       // this generates a separate chunk (About.[hash].js) for this route
       // which is lazy-loaded when the route is visited.
       component: () => import('../views/SettingsView.vue')
+    },
+    {
+      path: '/audit',
+      name: 'audit',
+      // route level code-splitting
+      // this generates a separate chunk (About.[hash].js) for this route
+      // which is lazy-loaded when the route is visited.
+      component: () => import('../views/AuditView.vue')
     }
   ],
   linkActiveClass: "active",
@@ -114,4 +123,13 @@ router.beforeEach(async (to) => {
   }
 })
 
+router.afterEach(async (to, from) => {
+  const sec = securityStore()
+  const csrfPages = ['/', '/login']
+
+  if (csrfPages.includes(to.path)) {
+    await sec.LoadSecurityProperties() // make sure we have a valid csrf token
+  }
+})
+
 export default router

frontend/src/stores/audit.js

@@ -0,0 +1,87 @@
+import { defineStore } from 'pinia'
+import {apiWrapper} from "@/helpers/fetch-wrapper";
+import {notify} from "@kyvg/vue3-notification";
+import { base64_url_encode } from '@/helpers/encoding';
+
+const baseUrl = `/audit`
+
+export const auditStore = defineStore('audit', {
+  state: () => ({
+    entries: [],
+    filter: "",
+    pageSize: 10,
+    pageOffset: 0,
+    pages: [],
+    fetching: false,
+  }),
+  getters: {
+    Count: (state) => state.entries.length,
+    FilteredCount: (state) => state.Filtered.length,
+    All: (state) => state.entries,
+    Filtered: (state) => {
+      if (!state.filter) {
+        return state.entries
+      }
+      return state.entries.filter((e) => {
+        return e.Timestamp.includes(state.filter) ||
+            e.Message.includes(state.filter) ||
+            e.Severity.includes(state.filter) ||
+            e.Origin.includes(state.filter)
+      })
+    },
+    FilteredAndPaged: (state) => {
+      return state.Filtered.slice(state.pageOffset, state.pageOffset + state.pageSize)
+    },
+    isFetching: (state) => state.fetching,
+    hasNextPage: (state) => state.pageOffset < (state.FilteredCount - state.pageSize),
+    hasPrevPage: (state) => state.pageOffset > 0,
+    currentPage: (state) => (state.pageOffset / state.pageSize)+1,
+  },
+  actions: {
+    afterPageSizeChange() {
+      // reset pageOffset to avoid problems with new page sizes
+      this.pageOffset = 0
+      this.calculatePages()
+    },
+    calculatePages() {
+      let pageCounter = 1;
+      this.pages = []
+      for (let i = 0; i < this.FilteredCount; i+=this.pageSize) {
+        this.pages.push(pageCounter++)
+      }
+    },
+    gotoPage(page) {
+      this.pageOffset = (page-1) * this.pageSize
+
+      this.calculatePages()
+    },
+    nextPage() {
+      this.pageOffset += this.pageSize
+
+      this.calculatePages()
+    },
+    previousPage() {
+      this.pageOffset -= this.pageSize
+
+      this.calculatePages()
+    },
+    setEntries(entries) {
+      this.entries = entries
+      this.calculatePages()
+      this.fetching = false
+    },
+    async LoadEntries() {
+      this.fetching = true
+      return apiWrapper.get(`${baseUrl}/entries`)
+        .then(this.setEntries)
+        .catch(error => {
+          this.setEntries([])
+          console.log("Failed to load audit entries: ", error)
+          notify({
+            title: "Backend Connection Failure",
+            text: "Failed to load audit entries!",
+          })
+        })
+    },
+  }
+})

frontend/src/stores/auth.js

@@ -4,8 +4,7 @@ import { notify } from "@kyvg/vue3-notification";
 import { apiWrapper } from '@/helpers/fetch-wrapper'
 import router from '../router'
 
-export const authStore = defineStore({
-    id: 'auth',
+export const authStore = defineStore('auth',{
     state: () => ({
         // initialize state from local storage to enable user to stay logged in
         user: JSON.parse(localStorage.getItem('user')),
@@ -122,4 +121,4 @@ export const authStore = defineStore({
             }
         },
     }
-});
+});

frontend/src/stores/interfaces.js

@@ -7,8 +7,7 @@ import { base64_url_encode } from '@/helpers/encoding';
 
 const baseUrl = `/interface`
 
-export const interfaceStore = defineStore({
-  id: 'interfaces',
+export const interfaceStore = defineStore('interfaces', {
   state: () => ({
     interfaces: [],
     prepared: freshInterface(),

frontend/src/stores/peers.js

@@ -8,8 +8,7 @@ import { ipToBigInt } from '@/helpers/utils';
 
 const baseUrl = `/peer`
 
-export const peerStore = defineStore({
-  id: 'peers',
+export const peerStore = defineStore('peers', {
   state: () => ({
     peers: [],
     stats: {},

frontend/src/stores/profile.js

@@ -8,8 +8,7 @@ import { ipToBigInt } from '@/helpers/utils';
 
 const baseUrl = `/user`
 
-export const profileStore = defineStore({
-  id: 'profile',
+export const profileStore = defineStore('profile', {
   state: () => ({
     peers: [],
     interfaces: [],

frontend/src/stores/security.js

@@ -3,8 +3,7 @@ import { defineStore } from 'pinia'
 import { notify } from "@kyvg/vue3-notification";
 import { apiWrapper } from '@/helpers/fetch-wrapper'
 
-export const securityStore = defineStore({
-    id: 'security',
+export const securityStore = defineStore('security',{
     state: () => ({
         csrfToken: "",
     }),
@@ -29,4 +28,4 @@ export const securityStore = defineStore({
                 })
         }
     }
-});
+});

frontend/src/stores/settings.js

@@ -5,8 +5,7 @@ import { apiWrapper } from '@/helpers/fetch-wrapper'
 
 const baseUrl = `/config`
 
-export const settingsStore = defineStore({
-    id: 'settings',
+export const settingsStore = defineStore('settings', {
     state: () => ({
         settings: {},
     }),
@@ -33,4 +32,4 @@ export const settingsStore = defineStore({
                 })
         }
     }
-});
+});

frontend/src/stores/users.js

@@ -5,8 +5,7 @@ import { base64_url_encode } from '@/helpers/encoding';
 
 const baseUrl = `/user`
 
-export const userStore = defineStore({
-  id: 'users',
+export const userStore = defineStore('users', {
   state: () => ({
     userPeers: [],
     users: [],

frontend/src/views/AuditView.vue

@@ -0,0 +1,96 @@
+<script setup>
+import { onMounted } from "vue";
+import {auditStore} from "@/stores/audit";
+
+const audit = auditStore()
+
+onMounted(async () => {
+  await audit.LoadEntries()
+})
+
+</script>
+
+<template>
+  <div class="page-header">
+    <h1>{{ $t('audit.headline') }}</h1>
+  </div>
+
+  <p class="lead">{{ $t('audit.abstract') }}</p>
+
+  <!-- Entry list -->
+  <div class="mt-4 row">
+    <div class="col-12 col-lg-6">
+      <h3>{{ $t('audit.entries-headline') }}</h3>
+    </div>
+    <div class="col-12 col-lg-6 text-lg-end">
+      <div class="form-group d-inline">
+        <div class="input-group mb-3">
+          <input v-model="audit.filter" class="form-control" :placeholder="$t('general.search.placeholder')" type="text" @keyup="audit.afterPageSizeChange">
+          <button class="input-group-text btn btn-primary" :title="$t('general.search.button')"><i class="fa-solid fa-search"></i></button>
+        </div>
+      </div>
+    </div>
+  </div>
+  <div class="mt-2 table-responsive">
+    <div v-if="audit.Count===0">
+      <h4>{{ $t('audit.no-entries.headline') }}</h4>
+      <p>{{ $t('audit.no-entries.abstract') }}</p>
+    </div>
+    <table v-if="audit.Count!==0" id="auditTable" class="table table-sm">
+      <thead>
+      <tr>
+        <th scope="col">{{ $t('audit.table-heading.id') }}</th>
+        <th class="text-center" scope="col">{{ $t('audit.table-heading.time') }}</th>
+        <th class="text-center" scope="col">{{ $t('audit.table-heading.severity') }}</th>
+        <th scope="col">{{ $t('audit.table-heading.user') }}</th>
+        <th scope="col">{{ $t('audit.table-heading.origin') }}</th>
+        <th scope="col">{{ $t('audit.table-heading.message') }}</th>
+      </tr>
+      </thead>
+      <tbody>
+      <tr v-for="entry in audit.FilteredAndPaged" :key="entry.Id">
+        <td>{{entry.Id}}</td>
+        <td>{{entry.Timestamp}}</td>
+        <td class="text-center"><span class="badge rounded-pill" :class="[ entry.Severity === 'low' ? 'bg-light' : entry.Severity === 'medium' ? 'bg-warning' : 'bg-danger']">{{entry.Severity}}</span></td>
+        <td>{{entry.ContextUser}}</td>
+        <td>{{entry.Origin}}</td>
+        <td>{{entry.Message}}</td>
+      </tr>
+      </tbody>
+    </table>
+  </div>
+  <hr>
+  <div class="mt-3">
+    <div class="row">
+      <div class="col-6">
+        <ul class="pagination pagination-sm">
+          <li :class="{disabled:audit.pageOffset===0}" class="page-item">
+            <a class="page-link" @click="audit.previousPage">&laquo;</a>
+          </li>
+
+          <li v-for="page in audit.pages" :key="page" :class="{active:audit.currentPage===page}" class="page-item">
+            <a class="page-link" @click="audit.gotoPage(page)">{{page}}</a>
+          </li>
+
+          <li :class="{disabled:!audit.hasNextPage}" class="page-item">
+            <a class="page-link" @click="audit.nextPage">&raquo;</a>
+          </li>
+        </ul>
+      </div>
+      <div class="col-6">
+        <div class="form-group row">
+          <label class="col-sm-6 col-form-label text-end" for="paginationSelector">{{ $t('general.pagination.size') }}:</label>
+          <div class="col-sm-6">
+            <select v-model.number="audit.pageSize" class="form-select" @click="audit.afterPageSizeChange()">
+              <option value="10">10</option>
+              <option value="25">25</option>
+              <option value="50">50</option>
+              <option value="100">100</option>
+              <option value="999999999">{{ $t('general.pagination.all') }}</option>
+            </select>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>

frontend/src/views/InterfaceView.vue

@@ -22,8 +22,9 @@ const multiCreatePeerId = ref("")
 const editInterfaceId = ref("")
 const viewedInterfaceId = ref("")
 
-const sortKey = ref("");
-const sortOrder = ref(1);
+const sortKey = ref("")
+const sortOrder = ref(1)
+const selectAll = ref(false)
 
 function sortBy(key) {
   if (sortKey.value === key) {
@@ -48,12 +49,11 @@ async function download() {
   await interfaces.LoadInterfaceConfig(interfaces.GetSelected.Identifier)
 
   // credit: https://www.bitdegree.org/learn/javascript-download
-  let filename = interfaces.GetSelected.Identifier + ".conf"
   let text = interfaces.configuration
 
   let element = document.createElement('a')
   element.setAttribute('href', 'data:application/octet-stream;charset=utf-8,' + encodeURIComponent(text))
-  element.setAttribute('download', filename)
+  element.setAttribute('download', interfaces.GetSelected.Filename)
 
   element.style.display = 'none'
   document.body.appendChild(element)
@@ -81,6 +81,12 @@ async function saveConfig() {
   }
 }
 
+function toggleSelectAll() {
+  peers.FilteredAndPaged.forEach(peer => {
+    peer.IsSelected = selectAll.value;
+  });
+}
+
 onMounted(async () => {
   await interfaces.LoadInterfaces()
   await peers.LoadPeers(undefined) // use default interface
@@ -326,7 +332,7 @@ onMounted(async () => {
       <thead>
       <tr>
         <th scope="col">
-          <input id="flexCheckDefault" class="form-check-input" :title="$t('general.select-all')" type="checkbox" value="">
+          <input class="form-check-input" :title="$t('general.select-all')" type="checkbox" v-model="selectAll" @change="toggleSelectAll">
         </th><!-- select -->
         <th scope="col"></th><!-- status -->
         <th scope="col" @click="sortBy('DisplayName')">
@@ -357,7 +363,7 @@ onMounted(async () => {
       <tbody>
         <tr v-for="peer in peers.FilteredAndPaged" :key="peer.Identifier">
           <th scope="row">
-            <input id="flexCheckDefault" class="form-check-input" type="checkbox" value="">
+            <input class="form-check-input" type="checkbox" v-model="peer.IsSelected">
           </th>
           <td class="text-center">
             <span v-if="peer.Disabled" class="text-danger" :title="$t('interfaces.peer-disabled') + ' ' + peer.DisabledReason"><i class="fa fa-circle-xmark"></i></span>

frontend/src/views/ProfileView.vue

@@ -13,8 +13,9 @@ const profile = profileStore()
 const viewedPeerId = ref("")
 const editPeerId = ref("")
 
-const sortKey = ref("");
-const sortOrder = ref(1);
+const sortKey = ref("")
+const sortOrder = ref(1)
+const selectAll = ref(false)
 
 function sortBy(key) {
   if (sortKey.value === key) {
@@ -34,6 +35,12 @@ function friendlyInterfaceName(id, name) {
   return id
 }
 
+function toggleSelectAll() {
+  profile.FilteredAndPagedPeers.forEach(peer => {
+    peer.IsSelected = selectAll.value;
+  });
+}
+
 onMounted(async () => {
   await profile.LoadUser()
   await profile.LoadPeers()
@@ -86,8 +93,7 @@ onMounted(async () => {
       <thead>
         <tr>
           <th scope="col">
-            <input id="flexCheckDefault" class="form-check-input" :title="$t('general.select-all')" type="checkbox"
-              value="">
+            <input class="form-check-input" :title="$t('general.select-all')" type="checkbox" v-model="selectAll" @change="toggleSelectAll">
           </th><!-- select -->
           <th scope="col"></th><!-- status -->
           <th scope="col" @click="sortBy('DisplayName')">
@@ -112,7 +118,7 @@ onMounted(async () => {
       <tbody>
         <tr v-for="peer in profile.FilteredAndPagedPeers" :key="peer.Identifier">
           <th scope="row">
-            <input id="flexCheckDefault" class="form-check-input" type="checkbox" value="">
+            <input class="form-check-input" type="checkbox" v-model="peer.IsSelected">
           </th>
           <td class="text-center">
             <span v-if="peer.Disabled" class="text-danger"><i class="fa fa-circle-xmark"

frontend/src/views/SettingsView.vue

@@ -1,13 +1,8 @@
 <script setup>
-import PeerViewModal from "../components/PeerViewModal.vue";
-
-import { onMounted, ref } from "vue";
+import { onMounted } from "vue";
 import { profileStore } from "@/stores/profile";
-import PeerEditModal from "@/components/PeerEditModal.vue";
 import { settingsStore } from "@/stores/settings";
-import { humanFileSize } from "@/helpers/utils";
-import {RouterLink} from "vue-router";
-import {authStore} from "../stores/auth";
+import { authStore } from "../stores/auth";
 
 const profile = profileStore()
 const settings = settingsStore()

frontend/src/views/UserView.vue

@@ -3,15 +3,20 @@ import {userStore} from "@/stores/users";
 import {ref,onMounted} from "vue";
 import UserEditModal from "../components/UserEditModal.vue";
 import UserViewModal from "../components/UserViewModal.vue";
-import {notify} from "@kyvg/vue3-notification";
-import {settingsStore} from "@/stores/settings";
 
-const settings = settingsStore()
 const users = userStore()
 
 const editUserId = ref("")
 const viewedUserId = ref("")
 
+const selectAll = ref(false)
+
+function toggleSelectAll() {
+  users.FilteredAndPaged.forEach(user => {
+    user.IsSelected = selectAll.value;
+  });
+}
+
 onMounted(() => {
   users.LoadUsers()
 })
@@ -49,7 +54,7 @@ onMounted(() => {
       <thead>
         <tr>
           <th scope="col">
-            <input id="flexCheckDefault" class="form-check-input" :title="$t('general.select-all')" type="checkbox" value="">
+            <input class="form-check-input" :title="$t('general.select-all')" type="checkbox" v-model="selectAll" @change="toggleSelectAll">
           </th><!-- select -->
           <th scope="col"></th><!-- status -->
           <th scope="col">{{ $t('users.table-heading.id') }}</th>
@@ -65,7 +70,7 @@ onMounted(() => {
       <tbody>
         <tr v-for="user in users.FilteredAndPaged" :key="user.Identifier">
           <th scope="row">
-            <input id="flexCheckDefault" class="form-check-input" type="checkbox" value="">
+            <input class="form-check-input" type="checkbox" v-model="user.IsSelected">
           </th>
           <td class="text-center">
             <span v-if="user.Disabled" class="text-danger" :title="$t('users.user-disabled') + ' ' + user.DisabledReason"><i class="fa fa-circle-xmark"></i></span>

go.mod

@@ -1,32 +1,30 @@
 module github.com/h44z/wg-portal
 
-go 1.23
+go 1.24.0
 
 require (
-	github.com/a8m/envsubst v1.4.2
-	github.com/coreos/go-oidc/v3 v3.12.0
-	github.com/gin-contrib/cors v1.7.3
-	github.com/gin-contrib/sessions v1.0.2
-	github.com/gin-gonic/gin v1.10.0
+	github.com/a8m/envsubst v1.4.3
+	github.com/alexedwards/scs/v2 v2.8.0
+	github.com/coreos/go-oidc/v3 v3.14.1
 	github.com/glebarez/sqlite v1.11.0
-	github.com/go-ldap/ldap/v3 v3.4.10
+	github.com/go-ldap/ldap/v3 v3.4.11
+	github.com/go-pkgz/routegroup v1.4.1
+	github.com/go-playground/validator/v10 v10.26.0
 	github.com/google/uuid v1.6.0
-	github.com/prometheus-community/pro-bing v0.6.1
-	github.com/prometheus/client_golang v1.20.5
-	github.com/sirupsen/logrus v1.9.3
+	github.com/prometheus-community/pro-bing v0.7.0
+	github.com/prometheus/client_golang v1.22.0
 	github.com/stretchr/testify v1.10.0
 	github.com/swaggo/swag v1.16.4
-	github.com/toorop/gin-logrus v0.0.0-20210225092905-2c785434f26f
-	github.com/utrack/gin-csrf v0.0.0-20190424104817-40fb8d2c8fca
 	github.com/vardius/message-bus v1.1.5
 	github.com/vishvananda/netlink v1.3.0
 	github.com/xhit/go-simple-mail/v2 v2.16.0
-	github.com/yeqown/go-qrcode/v2 v2.2.4
-	golang.org/x/crypto v0.32.0
-	golang.org/x/oauth2 v0.25.0
-	golang.org/x/sys v0.29.0
+	github.com/yeqown/go-qrcode/v2 v2.2.5
+	github.com/yeqown/go-qrcode/writer/compressed v1.0.1
+	golang.org/x/crypto v0.37.0
+	golang.org/x/oauth2 v0.29.0
+	golang.org/x/sys v0.32.0
 	golang.zx2c4.com/wireguard/wgctrl v0.0.0-20241231184526-a9ab2273dd10
-	gopkg.in/yaml.v2 v2.4.0
+	gopkg.in/yaml.v3 v3.0.1
 	gorm.io/driver/mysql v1.5.7
 	gorm.io/driver/postgres v1.5.11
 	gorm.io/driver/sqlserver v1.5.4
@@ -38,45 +36,33 @@ require (
 	github.com/Azure/go-ntlmssp v0.0.0-20221128193559-754e69321358 // indirect
 	github.com/KyleBanks/depth v1.2.1 // indirect
 	github.com/beorn7/perks v1.0.1 // indirect
-	github.com/bytedance/sonic v1.12.7 // indirect
-	github.com/bytedance/sonic/loader v0.2.2 // indirect
 	github.com/cespare/xxhash/v2 v2.3.0 // indirect
-	github.com/cloudwego/base64x v0.1.4 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
-	github.com/dchest/uniuri v1.2.0 // indirect
 	github.com/dustin/go-humanize v1.0.1 // indirect
-	github.com/gabriel-vasile/mimetype v1.4.8 // indirect
-	github.com/gin-contrib/sse v1.0.0 // indirect
+	github.com/gabriel-vasile/mimetype v1.4.9 // indirect
 	github.com/glebarez/go-sqlite v1.22.0 // indirect
-	github.com/go-asn1-ber/asn1-ber v1.5.7 // indirect
-	github.com/go-jose/go-jose/v4 v4.0.4 // indirect
-	github.com/go-openapi/jsonpointer v0.21.0 // indirect
+	github.com/go-asn1-ber/asn1-ber v1.5.8-0.20250403174932-29230038a667 // indirect
+	github.com/go-jose/go-jose/v4 v4.1.0 // indirect
+	github.com/go-openapi/jsonpointer v0.21.1 // indirect
 	github.com/go-openapi/jsonreference v0.21.0 // indirect
 	github.com/go-openapi/spec v0.21.0 // indirect
-	github.com/go-openapi/swag v0.23.0 // indirect
+	github.com/go-openapi/swag v0.23.1 // indirect
 	github.com/go-playground/locales v0.14.1 // indirect
 	github.com/go-playground/universal-translator v0.18.1 // indirect
-	github.com/go-playground/validator/v10 v10.24.0 // indirect
-	github.com/go-sql-driver/mysql v1.8.1 // indirect
+	github.com/go-sql-driver/mysql v1.9.2 // indirect
 	github.com/go-test/deep v1.1.1 // indirect
-	github.com/goccy/go-json v0.10.4 // indirect
 	github.com/golang-sql/civil v0.0.0-20220223132316-b832511892a9 // indirect
 	github.com/golang-sql/sqlexp v0.1.0 // indirect
-	github.com/google/go-cmp v0.6.0 // indirect
-	github.com/gorilla/context v1.1.2 // indirect
-	github.com/gorilla/securecookie v1.1.2 // indirect
-	github.com/gorilla/sessions v1.4.0 // indirect
+	github.com/google/go-cmp v0.7.0 // indirect
 	github.com/jackc/pgpassfile v1.0.0 // indirect
 	github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761 // indirect
-	github.com/jackc/pgx/v5 v5.7.2 // indirect
+	github.com/jackc/pgx/v5 v5.7.4 // indirect
 	github.com/jackc/puddle/v2 v2.2.2 // indirect
 	github.com/jinzhu/inflection v1.0.0 // indirect
 	github.com/jinzhu/now v1.1.5 // indirect
 	github.com/josharian/intern v1.0.0 // indirect
 	github.com/josharian/native v1.1.0 // indirect
-	github.com/json-iterator/go v1.1.12 // indirect
-	github.com/klauspost/compress v1.17.11 // indirect
-	github.com/klauspost/cpuid/v2 v2.2.9 // indirect
+	github.com/klauspost/compress v1.18.0 // indirect
 	github.com/leodido/go-urn v1.4.0 // indirect
 	github.com/mailru/easyjson v0.9.0 // indirect
 	github.com/mattn/go-isatty v0.0.20 // indirect
@@ -84,35 +70,26 @@ require (
 	github.com/mdlayher/netlink v1.7.2 // indirect
 	github.com/mdlayher/socket v0.5.1 // indirect
 	github.com/microsoft/go-mssqldb v1.8.0 // indirect
-	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
-	github.com/modern-go/reflect2 v1.0.2 // indirect
 	github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
 	github.com/ncruces/go-strftime v0.1.9 // indirect
-	github.com/pelletier/go-toml/v2 v2.2.3 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
-	github.com/prometheus/client_model v0.6.1 // indirect
-	github.com/prometheus/common v0.61.0 // indirect
-	github.com/prometheus/procfs v0.15.1 // indirect
-	github.com/quasoft/memstore v0.0.0-20191010062613-2bce066d2b0b // indirect
+	github.com/prometheus/client_model v0.6.2 // indirect
+	github.com/prometheus/common v0.63.0 // indirect
+	github.com/prometheus/procfs v0.16.0 // indirect
 	github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec // indirect
-	github.com/stretchr/objx v0.5.2 // indirect
-	github.com/toorop/go-dkim v0.0.0-20240103092955-90b7d1423f92 // indirect
-	github.com/twitchyliquid64/golang-asm v0.15.1 // indirect
-	github.com/ugorji/go/codec v1.2.12 // indirect
+	github.com/toorop/go-dkim v0.0.0-20250226130143-9025cce95817 // indirect
 	github.com/vishvananda/netns v0.0.5 // indirect
 	github.com/yeqown/reedsolomon v1.0.0 // indirect
-	golang.org/x/arch v0.13.0 // indirect
-	golang.org/x/exp v0.0.0-20250106191152-7588d65b2ba8 // indirect
-	golang.org/x/net v0.34.0 // indirect
-	golang.org/x/sync v0.10.0 // indirect
-	golang.org/x/text v0.21.0 // indirect
-	golang.org/x/tools v0.29.0 // indirect
+	golang.org/x/exp v0.0.0-20250408133849-7e4ce0ab07d0 // indirect
+	golang.org/x/net v0.39.0 // indirect
+	golang.org/x/sync v0.13.0 // indirect
+	golang.org/x/text v0.24.0 // indirect
+	golang.org/x/tools v0.32.0 // indirect
 	golang.zx2c4.com/wireguard v0.0.0-20231211153847-12269c276173 // indirect
-	google.golang.org/protobuf v1.36.2 // indirect
-	gopkg.in/yaml.v3 v3.0.1 // indirect
-	modernc.org/libc v1.61.7 // indirect
+	google.golang.org/protobuf v1.36.6 // indirect
+	modernc.org/libc v1.63.0 // indirect
 	modernc.org/mathutil v1.7.1 // indirect
-	modernc.org/memory v1.8.1 // indirect
-	modernc.org/sqlite v1.34.4 // indirect
+	modernc.org/memory v1.10.0 // indirect
+	modernc.org/sqlite v1.37.0 // indirect
 	sigs.k8s.io/yaml v1.4.0 // indirect
 )

go.sum

@@ -25,85 +25,70 @@ github.com/AzureAD/microsoft-authentication-library-for-go v1.2.2 h1:XHOnouVk1mx
 github.com/AzureAD/microsoft-authentication-library-for-go v1.2.2/go.mod h1:wP83P5OoQ5p6ip3ScPr0BAq0BvuPAvacpEuSzyouqAI=
 github.com/KyleBanks/depth v1.2.1 h1:5h8fQADFrWtarTdtDudMmGsC7GPbOAu6RVB3ffsVFHc=
 github.com/KyleBanks/depth v1.2.1/go.mod h1:jzSb9d0L43HxTQfT+oSA1EEp2q+ne2uh6XgeJcm8brE=
-github.com/a8m/envsubst v1.4.2 h1:4yWIHXOLEJHQEFd4UjrWDrYeYlV7ncFWJOCBRLOZHQg=
-github.com/a8m/envsubst v1.4.2/go.mod h1:MVUTQNGQ3tsjOOtKCNd+fl8RzhsXcDvvAEzkhGtlsbY=
+github.com/a8m/envsubst v1.4.3 h1:kDF7paGK8QACWYaQo6KtyYBozY2jhQrTuNNuUxQkhJY=
+github.com/a8m/envsubst v1.4.3/go.mod h1:4jjHWQlZoaXPoLQUb7H2qT4iLkZDdmEQiOUogdUmqVU=
 github.com/alexbrainman/sspi v0.0.0-20231016080023-1a75b4708caa h1:LHTHcTQiSGT7VVbI0o4wBRNQIgn917usHWOd6VAffYI=
 github.com/alexbrainman/sspi v0.0.0-20231016080023-1a75b4708caa/go.mod h1:cEWa1LVoE5KvSD9ONXsZrj0z6KqySlCCNKHlLzbqAt4=
+github.com/alexedwards/scs/v2 v2.8.0 h1:h31yUYoycPuL0zt14c0gd+oqxfRwIj6SOjHdKRZxhEw=
+github.com/alexedwards/scs/v2 v2.8.0/go.mod h1:ToaROZxyKukJKT/xLcVQAChi5k6+Pn1Gvmdl7h3RRj8=
 github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=
 github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=
-github.com/boj/redistore v0.0.0-20180917114910-cd5dcc76aeff/go.mod h1:+RTT1BOk5P97fT2CiHkbFQwkK3mjsFAP6zCYV2aXtjw=
-github.com/bradfitz/gomemcache v0.0.0-20180710155616-bc664df96737/go.mod h1:PmM6Mmwb0LSuEubjR8N7PtNe1KxZLtOUHtbeikc5h60=
-github.com/bradleypeabody/gorilla-sessions-memcache v0.0.0-20181103040241-659414f458e1/go.mod h1:dkChI7Tbtx7H1Tj7TqGSZMOeGpMP5gLHtjroHd4agiI=
-github.com/bytedance/sonic v1.12.7 h1:CQU8pxOy9HToxhndH0Kx/S1qU/CuS9GnKYrGioDcU1Q=
-github.com/bytedance/sonic v1.12.7/go.mod h1:tnbal4mxOMju17EGfknm2XyYcpyCnIROYOEYuemj13I=
-github.com/bytedance/sonic/loader v0.1.1/go.mod h1:ncP89zfokxS5LZrJxl5z0UJcsk4M4yY2JpfqGeCtNLU=
-github.com/bytedance/sonic/loader v0.2.2 h1:jxAJuN9fOot/cyz5Q6dUuMJF5OqQ6+5GfA8FjjQ0R4o=
-github.com/bytedance/sonic/loader v0.2.2/go.mod h1:N8A3vUdtUebEY2/VQC0MyhYeKUFosQU6FxH2JmUe6VI=
 github.com/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UFvs=
 github.com/cespare/xxhash/v2 v2.3.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
-github.com/cloudwego/base64x v0.1.4 h1:jwCgWpFanWmN8xoIUHa2rtzmkd5J2plF/dnLS6Xd/0Y=
-github.com/cloudwego/base64x v0.1.4/go.mod h1:0zlkT4Wn5C6NdauXdJRhSKRlJvmclQ1hhJgA0rcu/8w=
-github.com/cloudwego/iasm v0.2.0/go.mod h1:8rXZaNYT2n95jn+zTI1sDr+IgcD2GVs0nlbbQPiEFhY=
-github.com/coreos/go-oidc/v3 v3.12.0 h1:sJk+8G2qq94rDI6ehZ71Bol3oUHy63qNYmkiSjrc/Jo=
-github.com/coreos/go-oidc/v3 v3.12.0/go.mod h1:gE3LgjOgFoHi9a4ce4/tJczr0Ai2/BoDhf0r5lltWI0=
+github.com/coreos/go-oidc/v3 v3.14.1 h1:9ePWwfdwC4QKRlCXsJGou56adA/owXczOzwKdOumLqk=
+github.com/coreos/go-oidc/v3 v3.14.1/go.mod h1:HaZ3szPaZ0e4r6ebqvsLWlk2Tn+aejfmrfah6hnSYEU=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/dchest/uniuri v0.0.0-20160212164326-8902c56451e9/go.mod h1:GgB8SF9nRG+GqaDtLcwJZsQFhcogVCJ79j4EdT0c2V4=
-github.com/dchest/uniuri v1.2.0 h1:koIcOUdrTIivZgSLhHQvKgqdWZq5d7KdMEWF1Ud6+5g=
-github.com/dchest/uniuri v1.2.0/go.mod h1:fSzm4SLHzNZvWLvWJew423PhAzkpNQYq+uNLq4kxhkY=
 github.com/dnaeon/go-vcr v1.1.0/go.mod h1:M7tiix8f0r6mKKJ3Yq/kqU1OYf3MnfmBWVbPx/yU9ko=
 github.com/dnaeon/go-vcr v1.2.0/go.mod h1:R4UdLID7HZT3taECzJs4YgbbH6PIGXB6W/sc5OLb6RQ=
 github.com/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkpeCY=
 github.com/dustin/go-humanize v1.0.1/go.mod h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+mFykh5fBlto=
 github.com/gabriel-vasile/mimetype v1.4.8 h1:FfZ3gj38NjllZIeJAmMhr+qKL8Wu+nOoI3GqacKw1NM=
 github.com/gabriel-vasile/mimetype v1.4.8/go.mod h1:ByKUIKGjh1ODkGM1asKUbQZOLGrPjydw3hYPU2YU9t8=
-github.com/garyburd/redigo v1.6.0/go.mod h1:NR3MbYisc3/PwhQ00EMzDiPmrwpPxAn5GI05/YaO1SY=
-github.com/gin-contrib/cors v1.7.3 h1:hV+a5xp8hwJoTw7OY+a70FsL8JkVVFTXw9EcfrYUdns=
-github.com/gin-contrib/cors v1.7.3/go.mod h1:M3bcKZhxzsvI+rlRSkkxHyljJt1ESd93COUvemZ79j4=
-github.com/gin-contrib/sessions v0.0.0-20190101140330-dc5246754963/go.mod h1:4lkInX8nHSR62NSmhXM3xtPeMSyfiR58NaEz+om1lHM=
-github.com/gin-contrib/sessions v1.0.2 h1:UaIjUvTH1cMeOdj3in6dl+Xb6It8RiKRF9Z1anbUyCA=
-github.com/gin-contrib/sessions v1.0.2/go.mod h1:KxKxWqWP5LJVDCInulOl4WbLzK2KSPlLesfZ66wRvMs=
-github.com/gin-contrib/sse v0.0.0-20170109093832-22d885f9ecc7/go.mod h1:VJ0WA2NBN22VlZ2dKZQPAPnyWw5XTlK1KymzLKsr59s=
-github.com/gin-contrib/sse v1.0.0 h1:y3bT1mUWUxDpW4JLQg/HnTqV4rozuW4tC9eFKTxYI9E=
-github.com/gin-contrib/sse v1.0.0/go.mod h1:zNuFdwarAygJBht0NTKiSi3jRf6RbqeILZ9Sp6Slhe0=
-github.com/gin-gonic/gin v1.3.0/go.mod h1:7cKuhb5qV2ggCFctp2fJQ+ErvciLZrIeoOSOm6mUr7Y=
-github.com/gin-gonic/gin v1.10.0 h1:nTuyha1TYqgedzytsKYqna+DfLos46nTv2ygFy86HFU=
-github.com/gin-gonic/gin v1.10.0/go.mod h1:4PMNQiOhvDRa013RKVbsiNwoyezlm2rm0uX/T7kzp5Y=
+github.com/gabriel-vasile/mimetype v1.4.9 h1:5k+WDwEsD9eTLL8Tz3L0VnmVh9QxGjRmjBvAG7U/oYY=
+github.com/gabriel-vasile/mimetype v1.4.9/go.mod h1:WnSQhFKJuBlRyLiKohA/2DtIlPFAbguNaG7QCHcyGok=
 github.com/glebarez/go-sqlite v1.22.0 h1:uAcMJhaA6r3LHMTFgP0SifzgXg46yJkgxqyuyec+ruQ=
 github.com/glebarez/go-sqlite v1.22.0/go.mod h1:PlBIdHe0+aUEFn+r2/uthrWq4FxbzugL0L8Li6yQJbc=
 github.com/glebarez/sqlite v1.11.0 h1:wSG0irqzP6VurnMEpFGer5Li19RpIRi2qvQz++w0GMw=
 github.com/glebarez/sqlite v1.11.0/go.mod h1:h8/o8j5wiAsqSPoWELDUdJXhjAhsVliSn7bWZjOhrgQ=
-github.com/globalsign/mgo v0.0.0-20181015135952-eeefdecb41b8/go.mod h1:xkRDCp4j0OGD1HRkm4kmhM+pmpv3AKq5SU7GMg4oO/Q=
 github.com/go-asn1-ber/asn1-ber v1.5.7 h1:DTX+lbVTWaTw1hQ+PbZPlnDZPEIs0SS/GCZAl535dDk=
 github.com/go-asn1-ber/asn1-ber v1.5.7/go.mod h1:hEBeB/ic+5LoWskz+yKT7vGhhPYkProFKoKdwZRWMe0=
-github.com/go-jose/go-jose/v4 v4.0.4 h1:VsjPI33J0SB9vQM6PLmNjoHqMQNGPiZ0rHL7Ni7Q6/E=
-github.com/go-jose/go-jose/v4 v4.0.4/go.mod h1:NKb5HO1EZccyMpiZNbdUw/14tiXNyUJh188dfnMCAfc=
+github.com/go-asn1-ber/asn1-ber v1.5.8-0.20250403174932-29230038a667 h1:BP4M0CvQ4S3TGls2FvczZtj5Re/2ZzkV9VwqPHH/3Bo=
+github.com/go-asn1-ber/asn1-ber v1.5.8-0.20250403174932-29230038a667/go.mod h1:hEBeB/ic+5LoWskz+yKT7vGhhPYkProFKoKdwZRWMe0=
+github.com/go-jose/go-jose/v4 v4.0.5 h1:M6T8+mKZl/+fNNuFHvGIzDz7BTLQPIounk/b9dw3AaE=
+github.com/go-jose/go-jose/v4 v4.0.5/go.mod h1:s3P1lRrkT8igV8D9OjyL4WRyHvjB6a4JSllnOrmmBOA=
+github.com/go-jose/go-jose/v4 v4.1.0 h1:cYSYxd3pw5zd2FSXk2vGdn9igQU2PS8MuxrCOCl0FdY=
+github.com/go-jose/go-jose/v4 v4.1.0/go.mod h1:GG/vqmYm3Von2nYiB2vGTXzdoNKE5tix5tuc6iAd+sw=
 github.com/go-ldap/ldap/v3 v3.4.10 h1:ot/iwPOhfpNVgB1o+AVXljizWZ9JTp7YF5oeyONmcJU=
 github.com/go-ldap/ldap/v3 v3.4.10/go.mod h1:JXh4Uxgi40P6E9rdsYqpUtbW46D9UTjJ9QSwGRznplY=
-github.com/go-openapi/jsonpointer v0.21.0 h1:YgdVicSA9vH5RiHs9TZW5oyafXZFc6+2Vc1rr/O9oNQ=
-github.com/go-openapi/jsonpointer v0.21.0/go.mod h1:IUyH9l/+uyhIYQ/PXVA41Rexl+kOkAPDdXEYns6fzUY=
+github.com/go-ldap/ldap/v3 v3.4.11 h1:4k0Yxweg+a3OyBLjdYn5OKglv18JNvfDykSoI8bW0gU=
+github.com/go-ldap/ldap/v3 v3.4.11/go.mod h1:bY7t0FLK8OAVpp/vV6sSlpz3EQDGcQwc8pF0ujLgKvM=
+github.com/go-openapi/jsonpointer v0.21.1 h1:whnzv/pNXtK2FbX/W9yJfRmE2gsmkfahjMKB0fZvcic=
+github.com/go-openapi/jsonpointer v0.21.1/go.mod h1:50I1STOfbY1ycR8jGz8DaMeLCdXiI6aDteEdRNNzpdk=
 github.com/go-openapi/jsonreference v0.21.0 h1:Rs+Y7hSXT83Jacb7kFyjn4ijOuVGSvOdF2+tg1TRrwQ=
 github.com/go-openapi/jsonreference v0.21.0/go.mod h1:LmZmgsrTkVg9LG4EaHeY8cBDslNPMo06cago5JNLkm4=
 github.com/go-openapi/spec v0.21.0 h1:LTVzPc3p/RzRnkQqLRndbAzjY0d0BCL72A6j3CdL9ZY=
 github.com/go-openapi/spec v0.21.0/go.mod h1:78u6VdPw81XU44qEWGhtr982gJ5BWg2c0I5XwVMotYk=
-github.com/go-openapi/swag v0.23.0 h1:vsEVJDUo2hPJ2tu0/Xc+4noaxyEffXNIs3cOULZ+GrE=
-github.com/go-openapi/swag v0.23.0/go.mod h1:esZ8ITTYEsH1V2trKHjAN8Ai7xHb8RV+YSZ577vPjgQ=
+github.com/go-openapi/swag v0.23.1 h1:lpsStH0n2ittzTnbaSloVZLuB5+fvSY/+hnagBjSNZU=
+github.com/go-openapi/swag v0.23.1/go.mod h1:STZs8TbRvEQQKUA+JZNAm3EWlgaOBGpyFDqQnDHMef0=
+github.com/go-pkgz/routegroup v1.4.1 h1:iw1yW3lXuurZZOv/DF9fY8Mkpvy6J9UjBiP1oDIQE/s=
+github.com/go-pkgz/routegroup v1.4.1/go.mod h1:kDDPDRLRiRY1vnENrZJw1jQAzQX7fvsbsHGRQFNQfKc=
 github.com/go-playground/assert/v2 v2.2.0 h1:JvknZsQTYeFEAhQwI4qEt9cyV5ONwRHC+lYKSsYSR8s=
 github.com/go-playground/assert/v2 v2.2.0/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4=
 github.com/go-playground/locales v0.14.1 h1:EWaQ/wswjilfKLTECiXz7Rh+3BjFhfDFKv/oXslEjJA=
 github.com/go-playground/locales v0.14.1/go.mod h1:hxrqLVvrK65+Rwrd5Fc6F2O76J/NuW9t0sjnWqG1slY=
 github.com/go-playground/universal-translator v0.18.1 h1:Bcnm0ZwsGyWbCzImXv+pAJnYK9S473LQFuzCbDbfSFY=
 github.com/go-playground/universal-translator v0.18.1/go.mod h1:xekY+UJKNuX9WP91TpwSH2VMlDf28Uj24BCp08ZFTUY=
-github.com/go-playground/validator/v10 v10.24.0 h1:KHQckvo8G6hlWnrPX4NJJ+aBfWNAE/HH+qdL2cBpCmg=
-github.com/go-playground/validator/v10 v10.24.0/go.mod h1:GGzBIJMuE98Ic/kJsBXbz1x/7cByt++cQ+YOuDM5wus=
+github.com/go-playground/validator/v10 v10.26.0 h1:SP05Nqhjcvz81uJaRfEV0YBSSSGMc/iMaVtFbr3Sw2k=
+github.com/go-playground/validator/v10 v10.26.0/go.mod h1:I5QpIEbmr8On7W0TktmJAumgzX4CA1XNl4ZmDuVHKKo=
 github.com/go-sql-driver/mysql v1.7.0/go.mod h1:OXbVy3sEdcQ2Doequ6Z5BW6fXNQTmx+9S1MCJN5yJMI=
-github.com/go-sql-driver/mysql v1.8.1 h1:LedoTUt/eveggdHS9qUFC1EFSa8bU2+1pZjSRpvNJ1Y=
-github.com/go-sql-driver/mysql v1.8.1/go.mod h1:wEBSXgmK//2ZFJyE+qWnIsVGmvmEKlqwuVSjsCm7DZg=
+github.com/go-sql-driver/mysql v1.9.1 h1:FrjNGn/BsJQjVRuSa8CBrM5BWA9BWoXXat3KrtSb/iI=
+github.com/go-sql-driver/mysql v1.9.1/go.mod h1:qn46aNg1333BRMNU69Lq93t8du/dwxI64Gl8i5p1WMU=
+github.com/go-sql-driver/mysql v1.9.2 h1:4cNKDYQ1I84SXslGddlsrMhc8k4LeDVj6Ad6WRjiHuU=
+github.com/go-sql-driver/mysql v1.9.2/go.mod h1:qn46aNg1333BRMNU69Lq93t8du/dwxI64Gl8i5p1WMU=
 github.com/go-test/deep v1.1.1 h1:0r/53hagsehfO4bzD2Pgr/+RgHqhmf+k1Bpse2cTu1U=
 github.com/go-test/deep v1.1.1/go.mod h1:5C2ZWiW0ErCdrYzpqxLbTX7MG14M9iiw8DgHncVwcsE=
-github.com/goccy/go-json v0.10.4 h1:JSwxQzIqKfmFX1swYPpUThQZp/Ka4wzJdK0LWVytLPM=
-github.com/goccy/go-json v0.10.4/go.mod h1:oq7eo15ShAhp70Anwd5lgX2pLfOS3QCiwU/PULtXL6M=
 github.com/golang-jwt/jwt/v5 v5.0.0/go.mod h1:pqrtFR0X4osieyHYxtmOUWsAWrfe1Q5UVIyoH402zdk=
 github.com/golang-jwt/jwt/v5 v5.2.0/go.mod h1:pqrtFR0X4osieyHYxtmOUWsAWrfe1Q5UVIyoH402zdk=
 github.com/golang-jwt/jwt/v5 v5.2.1 h1:OuVbFODueb089Lh128TAcimifWaLhJwVflnrgM17wHk=
@@ -112,31 +97,19 @@ github.com/golang-sql/civil v0.0.0-20220223132316-b832511892a9 h1:au07oEsX2xN0kt
 github.com/golang-sql/civil v0.0.0-20220223132316-b832511892a9/go.mod h1:8vg3r2VgvsThLBIFL93Qb5yWzgyZWhEmBwUJWevAkK0=
 github.com/golang-sql/sqlexp v0.1.0 h1:ZCD6MBpcuOVfGVqsEmY5/4FtYiKz6tSyUv9LPEDei6A=
 github.com/golang-sql/sqlexp v0.1.0/go.mod h1:J4ad9Vo8ZCWQ2GMrC4UCQy1JpCbwU9m3EOqtpKwwwHI=
-github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
-github.com/gomodule/redigo v2.0.0+incompatible/go.mod h1:B4C85qUVwatsJoIUNIfCRsp7qO0iAmpGFZ4EELWSbC4=
 github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
-github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
 github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
-github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
-github.com/google/gofuzz v1.2.0 h1:xRy4A+RhZaiKjJ1bPfwQ8sedCA+YS2YcCHW6ec7JMi0=
-github.com/google/gofuzz v1.2.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
+github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8=
+github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU=
 github.com/google/pprof v0.0.0-20240409012703-83162a5b38cd h1:gbpYu9NMq8jhDVbvlGkMFWCjLFlqqEZjEmObmhUy6Vo=
 github.com/google/pprof v0.0.0-20240409012703-83162a5b38cd/go.mod h1:kf6iHlnVGwgKolg33glAes7Yg/8iWP8ukqeldJSO7jw=
+github.com/google/pprof v0.0.0-20250317173921-a4b03ec1a45e h1:ijClszYn+mADRFY17kjQEVQ1XRhq2/JR1M3sGqeJoxs=
 github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/google/uuid v1.5.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
 github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
-github.com/gorilla/context v1.1.1/go.mod h1:kBGZzfjB9CEq2AlWe17Uuf7NDRt0dE0s8S51q0aT7Yg=
-github.com/gorilla/context v1.1.2 h1:WRkNAv2uoa03QNIc1A6u4O7DAGMUVoopZhkiXWA2V1o=
-github.com/gorilla/context v1.1.2/go.mod h1:KDPwT9i/MeWHiLl90fuTgrt4/wPcv75vFAZLaOOcbxM=
 github.com/gorilla/securecookie v1.1.1/go.mod h1:ra0sb63/xPlUeL+yeDciTfxMRAA+MP+HVt/4epWDjd4=
-github.com/gorilla/securecookie v1.1.2 h1:YCIWL56dvtr73r6715mJs5ZvhtnY73hBvEF8kXD8ePA=
-github.com/gorilla/securecookie v1.1.2/go.mod h1:NfCASbcHqRSY+3a8tlWJwsQap2VX5pwzwo4h3eOamfo=
-github.com/gorilla/sessions v1.1.1/go.mod h1:8KCfur6+4Mqcc6S0FEfKuN15Vl5MgXW92AE8ovaJD0w=
-github.com/gorilla/sessions v1.1.3/go.mod h1:8KCfur6+4Mqcc6S0FEfKuN15Vl5MgXW92AE8ovaJD0w=
 github.com/gorilla/sessions v1.2.1/go.mod h1:dk2InVEVJ0sfLlnXv9EAgkf6ecYs/i80K/zI+bUmuGM=
-github.com/gorilla/sessions v1.4.0 h1:kpIYOp/oi6MG/p5PgxApU8srsSw9tuFbt46Lt7auzqQ=
-github.com/gorilla/sessions v1.4.0/go.mod h1:FLWm50oby91+hl7p/wRxDth9bWSuk0qVL2emc7lT5ik=
 github.com/hashicorp/go-uuid v1.0.2/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro=
 github.com/hashicorp/go-uuid v1.0.3 h1:2gKiV6YVmrJ1i2CKKa9obLvRieoRGviZFL26PcT/Co8=
 github.com/hashicorp/go-uuid v1.0.3/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro=
@@ -144,8 +117,10 @@ github.com/jackc/pgpassfile v1.0.0 h1:/6Hmqy13Ss2zCq62VdNG8tM1wchn8zjSGOBJ6icpsI
 github.com/jackc/pgpassfile v1.0.0/go.mod h1:CEx0iS5ambNFdcRtxPj5JhEz+xB6uRky5eyVu/W2HEg=
 github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761 h1:iCEnooe7UlwOQYpKFhBabPMi4aNAfoODPEFNiAnClxo=
 github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761/go.mod h1:5TJZWKEWniPve33vlWYSoGYefn3gLQRzjfDlhSJ9ZKM=
-github.com/jackc/pgx/v5 v5.7.2 h1:mLoDLV6sonKlvjIEsV56SkWNCnuNv531l94GaIzO+XI=
-github.com/jackc/pgx/v5 v5.7.2/go.mod h1:ncY89UGWxg82EykZUwSpUKEfccBGGYq1xjrOpsbsfGQ=
+github.com/jackc/pgx/v5 v5.7.3 h1:PO1wNKj/bTAwxSJnO1Z4Ai8j4magtqg2SLNjEDzcXQo=
+github.com/jackc/pgx/v5 v5.7.3/go.mod h1:ncY89UGWxg82EykZUwSpUKEfccBGGYq1xjrOpsbsfGQ=
+github.com/jackc/pgx/v5 v5.7.4 h1:9wKznZrhWa2QiHL+NjTSPP6yjl3451BX3imWDnokYlg=
+github.com/jackc/pgx/v5 v5.7.4/go.mod h1:ncY89UGWxg82EykZUwSpUKEfccBGGYq1xjrOpsbsfGQ=
 github.com/jackc/puddle/v2 v2.2.2 h1:PR8nw+E/1w0GLuRFSmiioY6UooMp6KJv0/61nB7icHo=
 github.com/jackc/puddle/v2 v2.2.2/go.mod h1:vriiEXHvEE654aYKXXjOvZM39qJ0q+azkZFrfEOc3H4=
 github.com/jcmturner/aescts/v2 v2.0.0 h1:9YKLH6ey7H4eDBXW8khjYslgyqG2xZikXP0EQFKrle8=
@@ -168,21 +143,10 @@ github.com/josharian/intern v1.0.0 h1:vlS4z54oSdjm0bgjRigI+G1HpF+tI+9rE5LLzOg8Hm
 github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y=
 github.com/josharian/native v1.1.0 h1:uuaP0hAbW7Y4l0ZRQ6C9zfb7Mg1mbFKry/xzDAfmtLA=
 github.com/josharian/native v1.1.0/go.mod h1:7X/raswPFr05uY3HiLlYeyQntB6OO7E/d2Cu7qoaN2w=
-github.com/json-iterator/go v1.1.5/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=
-github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM=
-github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo=
-github.com/kidstuff/mongostore v0.0.0-20181113001930-e650cd85ee4b/go.mod h1:g2nVr8KZVXJSS97Jo8pJ0jgq29P6H7dG0oplUA86MQw=
-github.com/klauspost/compress v1.17.11 h1:In6xLpyWOi1+C7tXUUWv2ot1QvBjxevKAaI6IXrJmUc=
-github.com/klauspost/compress v1.17.11/go.mod h1:pMDklpSncoRMuLFrf1W9Ss9KT+0rH90U12bZKk7uwG0=
-github.com/klauspost/cpuid/v2 v2.0.9/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg=
-github.com/klauspost/cpuid/v2 v2.2.9 h1:66ze0taIn2H33fBvCkXuv9BmCwDfafmiIVpKV9kKGuY=
-github.com/klauspost/cpuid/v2 v2.2.9/go.mod h1:rqkxqrZ1EhYM9G+hXH7YdowN5R5RGN6NK4QwQ3WMXF8=
-github.com/knz/go-libedit v1.10.1/go.mod h1:MZTVkCWyz0oBc7JOWP3wNAzd002ZbM/5hgShxwh4x8M=
-github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
+github.com/klauspost/compress v1.18.0 h1:c/Cqfb0r+Yi+JtIEq73FWXVkRonBlf0CRNYc8Zttxdo=
+github.com/klauspost/compress v1.18.0/go.mod h1:2Pp+KzxcywXVXMr50+X0Q/Lsb43OQHYWRCY2AiWywWQ=
 github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
 github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk=
-github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
-github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
 github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
 github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
 github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0SNc=
@@ -191,7 +155,6 @@ github.com/leodido/go-urn v1.4.0 h1:WT9HwE9SGECu3lg4d/dIA+jxlljEa1/ffXKmRjqdmIQ=
 github.com/leodido/go-urn v1.4.0/go.mod h1:bvxc+MVxLKB4z00jd1z+Dvzr47oO32F/QSNjSBOlFxI=
 github.com/mailru/easyjson v0.9.0 h1:PrnmzHw7262yW8sTBwxi1PdJA3Iw/EKBa8psRf7d9a4=
 github.com/mailru/easyjson v0.9.0/go.mod h1:1+xMtQp2MRNVL/V1bOzuP3aP8VNwRW55fQUto+XFtTU=
-github.com/mattn/go-isatty v0.0.4/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4=
 github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY=
 github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
 github.com/mdlayher/genetlink v1.3.2 h1:KdrNKe+CTu+IbZnm/GVUMXSqBBLqcGpRDa0xkQy56gw=
@@ -200,26 +163,17 @@ github.com/mdlayher/netlink v1.7.2 h1:/UtM3ofJap7Vl4QWCPDGXY8d3GIY2UGSDbK+QWmY8/
 github.com/mdlayher/netlink v1.7.2/go.mod h1:xraEF7uJbxLhc5fpHL4cPe221LI2bdttWlU+ZGLfQSw=
 github.com/mdlayher/socket v0.5.1 h1:VZaqt6RkGkt2OE9l3GcC6nZkqD3xKeQLyfleW/uBcos=
 github.com/mdlayher/socket v0.5.1/go.mod h1:TjPLHI1UgwEv5J1B5q0zTZq12A/6H7nKmtTanQE37IQ=
-github.com/memcachier/mc v2.0.1+incompatible/go.mod h1:7bkvFE61leUBvXz+yxsOnGBQSZpBSPIMUQSmmSHvuXc=
 github.com/microsoft/go-mssqldb v1.7.2/go.mod h1:kOvZKUdrhhFQmxLZqbwUV0rHkNkZpthMITIb2Ko1IoA=
 github.com/microsoft/go-mssqldb v1.8.0 h1:7cyZ/AT7ycDsEoWPIXibd+aVKFtteUNhDGf3aobP+tw=
 github.com/microsoft/go-mssqldb v1.8.0/go.mod h1:6znkekS3T2vp0waiMhen4GPU1BiAsrP+iXHcE7a7rFo=
 github.com/mikioh/ipaddr v0.0.0-20190404000644-d465c8ab6721 h1:RlZweED6sbSArvlE924+mUcZuXKLBHA35U7LN621Bws=
 github.com/mikioh/ipaddr v0.0.0-20190404000644-d465c8ab6721/go.mod h1:Ickgr2WtCLZ2MDGd4Gr0geeCH5HybhRJbonOgQpvSxc=
-github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
-github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg=
-github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
-github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
-github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M=
-github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk=
 github.com/modocache/gover v0.0.0-20171022184752-b58185e213c5/go.mod h1:caMODM3PzxT8aQXRPkAt8xlV/e7d7w8GM5g0fa5F0D8=
 github.com/montanaflynn/stats v0.7.0/go.mod h1:etXPPgVO6n31NxCd9KQUMvCM+ve0ruNzt6R8Bnaayow=
 github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA=
 github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ=
 github.com/ncruces/go-strftime v0.1.9 h1:bY0MQC28UADQmHmaF5dgpLmImcShSi2kHU9XLdhx/f4=
 github.com/ncruces/go-strftime v0.1.9/go.mod h1:Fwc5htZGVVkseilnfgOVb9mKy6w1naJmn9CehxcKcls=
-github.com/pelletier/go-toml/v2 v2.2.3 h1:YmeHyLY8mFWbdkNWwpr+qIL2bEqT0o95WSdkNHvL12M=
-github.com/pelletier/go-toml/v2 v2.2.3/go.mod h1:MfCQTFTvCcUyyvvwm1+G6H/jORL20Xlb6rzQu9GuUkc=
 github.com/pkg/browser v0.0.0-20210911075715-681adbf594b8/go.mod h1:HKlIX3XHQyzLZPlr7++PzdhaXEj94dEiJgZDTsxEqUI=
 github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c h1:+mdjkGKdHQG3305AYmdv1U2eRNDiU2ErMBj1gwrq8eQ=
 github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c/go.mod h1:7rwL4CYBLnjLxUqIJNnCWiEdr3bn6IUYi15bNlnbCCU=
@@ -227,29 +181,27 @@ github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZb
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/prometheus-community/pro-bing v0.6.1 h1:EQukUOma9YFZRPe4DGSscxUf9LH07rpqwisNWjSZrgU=
 github.com/prometheus-community/pro-bing v0.6.1/go.mod h1:jNCOI3D7pmTCeaoF41cNS6uaxeFY/Gmc3ffwbuJVzAQ=
-github.com/prometheus/client_golang v1.20.5 h1:cxppBPuYhUnsO6yo/aoRol4L7q7UFfdm+bR9r+8l63Y=
-github.com/prometheus/client_golang v1.20.5/go.mod h1:PIEt8X02hGcP8JWbeHyeZ53Y/jReSnHgO035n//V5WE=
+github.com/prometheus-community/pro-bing v0.7.0 h1:KFYFbxC2f2Fp6c+TyxbCOEarf7rbnzr9Gw8eIb0RfZA=
+github.com/prometheus-community/pro-bing v0.7.0/go.mod h1:Moob9dvlY50Bfq6i88xIwfyw7xLFHH69LUgx9n5zqCE=
+github.com/prometheus/client_golang v1.21.1 h1:DOvXXTqVzvkIewV/CDPFdejpMCGeMcbGCQ8YOmu+Ibk=
+github.com/prometheus/client_golang v1.21.1/go.mod h1:U9NM32ykUErtVBxdvD3zfi+EuFkkaBvMb09mIfe0Zgg=
+github.com/prometheus/client_golang v1.22.0 h1:rb93p9lokFEsctTys46VnV1kLCDpVZ0a/Y92Vm0Zc6Q=
+github.com/prometheus/client_golang v1.22.0/go.mod h1:R7ljNsLXhuQXYZYtw6GAE9AZg8Y7vEW5scdCXrWRXC0=
 github.com/prometheus/client_model v0.6.1 h1:ZKSh/rekM+n3CeS952MLRAdFwIKqeY8b62p8ais2e9E=
 github.com/prometheus/client_model v0.6.1/go.mod h1:OrxVMOVHjw3lKMa8+x6HeMGkHMQyHDk9E3jmP2AmGiY=
-github.com/prometheus/common v0.61.0 h1:3gv/GThfX0cV2lpO7gkTUwZru38mxevy90Bj8YFSRQQ=
-github.com/prometheus/common v0.61.0/go.mod h1:zr29OCN/2BsJRaFwG8QOBr41D6kkchKbpeNH7pAjb/s=
-github.com/prometheus/procfs v0.15.1 h1:YagwOFzUgYfKKHX6Dr+sHT7km/hxC76UB0learggepc=
-github.com/prometheus/procfs v0.15.1/go.mod h1:fB45yRUv8NstnjriLhBQLuOUt+WW4BsoGhij/e3PBqk=
-github.com/quasoft/memstore v0.0.0-20180925164028-84a050167438/go.mod h1:wTPjTepVu7uJBYgZ0SdWHQlIas582j6cn2jgk4DDdlg=
-github.com/quasoft/memstore v0.0.0-20191010062613-2bce066d2b0b h1:aUNXCGgukb4gtY99imuIeoh8Vr0GSwAlYxPAhqZrpFc=
-github.com/quasoft/memstore v0.0.0-20191010062613-2bce066d2b0b/go.mod h1:wTPjTepVu7uJBYgZ0SdWHQlIas582j6cn2jgk4DDdlg=
+github.com/prometheus/client_model v0.6.2 h1:oBsgwpGs7iVziMvrGhE53c/GrLUsZdHnqNwqPLxwZyk=
+github.com/prometheus/client_model v0.6.2/go.mod h1:y3m2F6Gdpfy6Ut/GBsUqTWZqCUvMVzSfMLjcu6wAwpE=
+github.com/prometheus/common v0.63.0 h1:YR/EIY1o3mEFP/kZCD7iDMnLPlGyuU2Gb3HIcXnA98k=
+github.com/prometheus/common v0.63.0/go.mod h1:VVFF/fBIoToEnWRVkYoXEkq3R3paCoxG9PXP74SnV18=
+github.com/prometheus/procfs v0.16.0 h1:xh6oHhKwnOJKMYiYBDWmkHqQPyiY40sny36Cmx2bbsM=
+github.com/prometheus/procfs v0.16.0/go.mod h1:8veyXUu3nGP7oaCxhX6yeaM5u4stL2FeMXnCqhDthZg=
 github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec h1:W09IVJc94icq4NjY3clb7Lk8O1qJ8BdBEF8z0ibU0rE=
 github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo=
 github.com/rogpeppe/go-internal v1.11.0 h1:cWPaGQEPrBb5/AsnsZesgZZ9yb1OQ+GOISoDNXVBh4M=
 github.com/rogpeppe/go-internal v1.11.0/go.mod h1:ddIwULY96R17DhadqLgMfk9H9tvdUzkipdSkR5nkCZA=
-github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ=
-github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
 github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
-github.com/stretchr/objx v0.5.2 h1:xuMeJ0Sdp5ZMRXx/aWO6RZxdr3beISkG5/G/aIRr3pY=
-github.com/stretchr/objx v0.5.2/go.mod h1:FRsXN1f5AsAjCGJKqEizvkpNtU+EGNCLh3NxZ/8L+MA=
-github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
 github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
 github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
@@ -261,18 +213,9 @@ github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOf
 github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
 github.com/swaggo/swag v1.16.4 h1:clWJtd9LStiG3VeijiCfOVODP6VpHtKdQy9ELFG3s1A=
 github.com/swaggo/swag v1.16.4/go.mod h1:VBsHJRsDvfYvqoiMKnsdwhNV9LEMHgEDZcyVYX0sxPg=
-github.com/toorop/gin-logrus v0.0.0-20210225092905-2c785434f26f h1:oqdnd6OGlOUu1InG37hWcCB3a+Jy3fwjylyVboaNMwY=
-github.com/toorop/gin-logrus v0.0.0-20210225092905-2c785434f26f/go.mod h1:X3Dd1SB8Gt1V968NTzpKFjMM6O8ccta2NPC6MprOxZQ=
 github.com/toorop/go-dkim v0.0.0-20201103131630-e1cd1a0a5208/go.mod h1:BzWtXXrXzZUvMacR0oF/fbDDgUPO8L36tDMmRAf14ns=
-github.com/toorop/go-dkim v0.0.0-20240103092955-90b7d1423f92 h1:flbMkdl6HxQkLs6DDhH1UkcnFpNBOu70391STjMS0O4=
-github.com/toorop/go-dkim v0.0.0-20240103092955-90b7d1423f92/go.mod h1:BzWtXXrXzZUvMacR0oF/fbDDgUPO8L36tDMmRAf14ns=
-github.com/twitchyliquid64/golang-asm v0.15.1 h1:SU5vSMR7hnwNxj24w34ZyCi/FmDZTkS4MhqMhdFk5YI=
-github.com/twitchyliquid64/golang-asm v0.15.1/go.mod h1:a1lVb/DtPvCB8fslRZhAngC2+aY1QWCk3Cedj/Gdt08=
-github.com/ugorji/go/codec v0.0.0-20181209151446-772ced7fd4c2/go.mod h1:VFNgLljTbGfSG7qAOspJ7OScBnGdDN/yBr0sguwnwf0=
-github.com/ugorji/go/codec v1.2.12 h1:9LC83zGrHhuUA9l16C9AHXAqEV/2wBQ4nkvumAE65EE=
-github.com/ugorji/go/codec v1.2.12/go.mod h1:UNopzCgEMSXjBc6AOMqYvWC1ktqTAfzJZUZgYf6w6lg=
-github.com/utrack/gin-csrf v0.0.0-20190424104817-40fb8d2c8fca h1:lpvAjPK+PcxnbcB8H7axIb4fMNwjX9bE4DzwPjGg8aE=
-github.com/utrack/gin-csrf v0.0.0-20190424104817-40fb8d2c8fca/go.mod h1:XXKxNbpoLihvvT7orUZbs/iZayg1n4ip7iJakJPAwA8=
+github.com/toorop/go-dkim v0.0.0-20250226130143-9025cce95817 h1:q0hKh5a5FRkhuTb5JNfgjzpzvYLHjH0QOgPZPYnRWGA=
+github.com/toorop/go-dkim v0.0.0-20250226130143-9025cce95817/go.mod h1:BzWtXXrXzZUvMacR0oF/fbDDgUPO8L36tDMmRAf14ns=
 github.com/vardius/message-bus v1.1.5 h1:YSAC2WB4HRlwc4neFPTmT88kzzoiQ+9WRRbej/E/LZc=
 github.com/vardius/message-bus v1.1.5/go.mod h1:6xladCV2lMkUAE4bzzS85qKOiB5miV7aBVRafiTJGqw=
 github.com/vishvananda/netlink v1.3.0 h1:X7l42GfcV4S6E4vHTsw48qbrV+9PVojNfIhZcwQdrZk=
@@ -282,13 +225,13 @@ github.com/vishvananda/netns v0.0.5 h1:DfiHV+j8bA32MFM7bfEunvT8IAqQ/NzSJHtcmW5zd
 github.com/vishvananda/netns v0.0.5/go.mod h1:SpkAiCQRtJ6TvvxPnOSyH3BMl6unz3xZlaprSwhNNJM=
 github.com/xhit/go-simple-mail/v2 v2.16.0 h1:ouGy/Ww4kuaqu2E2UrDw7SvLaziWTB60ICLkIkNVccA=
 github.com/xhit/go-simple-mail/v2 v2.16.0/go.mod h1:b7P5ygho6SYE+VIqpxA6QkYfv4teeyG4MKqB3utRu98=
-github.com/yeqown/go-qrcode/v2 v2.2.4 h1:cXdYlrhzHzVAnJHiwr/T6lAUmS9MtEStjEZBjArrvnc=
-github.com/yeqown/go-qrcode/v2 v2.2.4/go.mod h1:uHpt9CM0V1HeXLz+Wg5MN50/sI/fQhfkZlOM+cOTHxw=
+github.com/yeqown/go-qrcode/v2 v2.2.5 h1:HCOe2bSjkhZyYoyyNaXNzh4DJZll6inVJQQw+8228Zk=
+github.com/yeqown/go-qrcode/v2 v2.2.5/go.mod h1:uHpt9CM0V1HeXLz+Wg5MN50/sI/fQhfkZlOM+cOTHxw=
+github.com/yeqown/go-qrcode/writer/compressed v1.0.1 h1:0el6zOppx3oPiYWMUJWRYGvxWYh8MDmUU0j3rSWGWlI=
+github.com/yeqown/go-qrcode/writer/compressed v1.0.1/go.mod h1:BJScsGUIKM+eg0CCLCcVaDTaclDM1IEXtq2r8qQnDKk=
 github.com/yeqown/reedsolomon v1.0.0 h1:x1h/Ej/uJnNu8jaX7GLHBWmZKCAWjEJTetkqaabr4B0=
 github.com/yeqown/reedsolomon v1.0.0/go.mod h1:P76zpcn2TCuL0ul1Fso373qHRc69LKwAw/Iy6g1WiiM=
 github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
-golang.org/x/arch v0.13.0 h1:KCkqVVV1kGg0X87TFysjCJ8MxtZEIU4Ja/yXGeoECdA=
-golang.org/x/arch v0.13.0/go.mod h1:FEVrYAQjsQXMVJ1nsMoVVXPZg6p2JE2mx8psSWTDQys=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
 golang.org/x/crypto v0.6.0/go.mod h1:OFC/31mSvZgRz0V1QTNCzfAI1aIRzbiufJtkMIlEp58=
@@ -302,18 +245,19 @@ golang.org/x/crypto v0.18.0/go.mod h1:R0j02AL6hcrfOiy9T4ZYp/rcWeMxM3L6QYxlOuEG1m
 golang.org/x/crypto v0.19.0/go.mod h1:Iy9bg/ha4yyC70EfRS8jz+B6ybOBKMaSxLj6P6oBDfU=
 golang.org/x/crypto v0.23.0/go.mod h1:CKFgDieR+mRhux2Lsu27y0fO304Db0wZe70UKqHu0v8=
 golang.org/x/crypto v0.31.0/go.mod h1:kDsLvtWBEx7MV9tJOj9bnXsPbxwJQ6csT/x4KIN4Ssk=
-golang.org/x/crypto v0.32.0 h1:euUpcYgM8WcP71gNpTqQCn6rC2t6ULUPiOzfWaXVVfc=
-golang.org/x/crypto v0.32.0/go.mod h1:ZnnJkOaASj8g0AjIduWNlq2NRxL0PlBrbKVyZ6V/Ugc=
-golang.org/x/exp v0.0.0-20250106191152-7588d65b2ba8 h1:yqrTHse8TCMW1M1ZCP+VAR/l0kKxwaAIqN/il7x4voA=
-golang.org/x/exp v0.0.0-20250106191152-7588d65b2ba8/go.mod h1:tujkw807nyEEAamNbDrEGzRav+ilXA7PCRAd6xsmwiU=
+golang.org/x/crypto v0.37.0 h1:kJNSjF/Xp7kU0iB2Z+9viTPMW4EqqsrywMXLJOOsXSE=
+golang.org/x/crypto v0.37.0/go.mod h1:vg+k43peMZ0pUMhYmVAWysMK35e6ioLh3wB8ZCAfbVc=
+golang.org/x/exp v0.0.0-20250305212735-054e65f0b394 h1:nDVHiLt8aIbd/VzvPWN6kSOPE7+F/fNFDSXLVYkE/Iw=
+golang.org/x/exp v0.0.0-20250305212735-054e65f0b394/go.mod h1:sIifuuw/Yco/y6yb6+bDNfyeQ/MdPUy/hKEMYQV17cM=
+golang.org/x/exp v0.0.0-20250408133849-7e4ce0ab07d0 h1:R84qjqJb5nVJMxqWYb3np9L5ZsaDtB+a39EqjV0JSUM=
+golang.org/x/exp v0.0.0-20250408133849-7e4ce0ab07d0/go.mod h1:S9Xr4PYopiDyqSyp5NjCrhFrqg6A5zA2E/iPHPhqnS8=
 golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
 golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
 golang.org/x/mod v0.12.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
 golang.org/x/mod v0.15.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
 golang.org/x/mod v0.17.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
-golang.org/x/mod v0.22.0 h1:D4nJWe9zXqHOmWqj4VMOJhvzj7bEZg4wEYa759z1pH4=
-golang.org/x/mod v0.22.0/go.mod h1:6SkKJ3Xj0I0BrPOZoBy3bdMptDDU9oJrpohJ3eWZ1fY=
-golang.org/x/net v0.0.0-20181220203305-927f97764cc3/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/mod v0.24.0 h1:ZfthKaKaT4NrhGVZHO1/WDTwGES4De8KtWO0SIbNJMU=
+golang.org/x/mod v0.24.0/go.mod h1:IXM97Txy2VM4PJ3gI61r1YEk/gAj6zAHN3AdZt6S9Ww=
 golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
@@ -331,26 +275,26 @@ golang.org/x/net v0.20.0/go.mod h1:z8BVo6PvndSri0LbOE3hAn0apkU+1YvI6E70E9jsnvY=
 golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44=
 golang.org/x/net v0.25.0/go.mod h1:JkAGAh7GEvH74S6FOH42FLoXpXbE/aqXSrIQjXgsiwM=
 golang.org/x/net v0.33.0/go.mod h1:HXLR5J+9DxmrqMwG9qjGCxZ+zKXxBru04zlTvWlWuN4=
-golang.org/x/net v0.34.0 h1:Mb7Mrk043xzHgnRM88suvJFwzVrRfHEHJEl5/71CKw0=
-golang.org/x/net v0.34.0/go.mod h1:di0qlW3YNM5oh6GqDGQr92MyTozJPmybPK4Ev/Gm31k=
-golang.org/x/oauth2 v0.25.0 h1:CY4y7XT9v0cRI9oupztF8AgiIu99L/ksR/Xp/6jrZ70=
-golang.org/x/oauth2 v0.25.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI=
-golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/net v0.37.0 h1:1zLorHbz+LYj7MQlSf1+2tPIIgibq2eL5xkrGk6f+2c=
+golang.org/x/net v0.37.0/go.mod h1:ivrbrMbzFq5J41QOQh0siUuly180yBYtLp+CKbEaFx8=
+golang.org/x/net v0.39.0 h1:ZCu7HMWDxpXpaiKdhzIfaltL9Lp31x/3fCP11bc6/fY=
+golang.org/x/net v0.39.0/go.mod h1:X7NRbYVEA+ewNkCNyJ513WmMdQ3BineSwVtN2zD/d+E=
+golang.org/x/oauth2 v0.29.0 h1:WdYw2tdTK1S8olAzWHdgeqfy+Mtm9XNhv/xJsY65d98=
+golang.org/x/oauth2 v0.29.0/go.mod h1:onh5ek6nERTohokkhCD/y2cV4Do3fxFHFuAejCkRWT8=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.3.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y=
 golang.org/x/sync v0.6.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
 golang.org/x/sync v0.7.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
-golang.org/x/sync v0.10.0 h1:3NQrjDixjgGwUOCaF8w2+VYHv0Ve/vGYSbdkTa98gmQ=
 golang.org/x/sync v0.10.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
-golang.org/x/sys v0.0.0-20181228144115-9a3f9b0469bb/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sync v0.13.0 h1:AauUjRAJ9OSnvULf/ARrrVywoJDy0YS2AwQ98I37610=
+golang.org/x/sync v0.13.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20210616045830-e2b7044e8c71/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
@@ -366,8 +310,8 @@ golang.org/x/sys v0.16.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/sys v0.28.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
-golang.org/x/sys v0.29.0 h1:TPYlXGxvx1MGTn2GiZDhnjPA9wZzZeGKHHmKhHYvgaU=
-golang.org/x/sys v0.29.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/sys v0.32.0 h1:s77OFDvIQeibCmezSnk/q6iAfkdiQaJi4VzroCFrN20=
+golang.org/x/sys v0.32.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
 golang.org/x/telemetry v0.0.0-20240228155512-f48c80bd79b2/go.mod h1:TeRTkGYfJXctD9OcfyVLyj2J3IxLnKwHJR8f4D8a3YE=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
@@ -394,34 +338,34 @@ golang.org/x/text v0.12.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
 golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
 golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
 golang.org/x/text v0.15.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
-golang.org/x/text v0.21.0 h1:zyQAAkrwaneQ066sspRyJaG9VNi/YJ1NfzcGB3hZ/qo=
 golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ=
+golang.org/x/text v0.24.0 h1:dd5Bzh4yt5KYA8f9CJHCP4FB4D51c2c6JvN37xJJkJ0=
+golang.org/x/text v0.24.0/go.mod h1:L8rBsPeo2pSS+xqN0d5u2ikmjtmoJbDBT1b7nHvFCdU=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
 golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU=
 golang.org/x/tools v0.13.0/go.mod h1:HvlwmtVNQAhOuCjW7xxvovg8wbNq7LwfXh/k7wXUl58=
 golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d/go.mod h1:aiJjzUbINMkxbQROHiO6hDPo2LHcIPhhQsa9DLh0yGk=
-golang.org/x/tools v0.29.0 h1:Xx0h3TtM9rzQpQuR4dKLrdglAmCEN5Oi+P74JdhdzXE=
-golang.org/x/tools v0.29.0/go.mod h1:KMQVMRsVxU6nHCFXrBPhDB8XncLNLM0lIy/F14RP588=
+golang.org/x/tools v0.31.0 h1:0EedkvKDbh+qistFTd0Bcwe/YLh4vHwWEkiI0toFIBU=
+golang.org/x/tools v0.31.0/go.mod h1:naFTU+Cev749tSJRXJlna0T3WxKvb1kWEx15xA4SdmQ=
+golang.org/x/tools v0.32.0 h1:Q7N1vhpkQv7ybVzLFtTjvQya2ewbwNDZzUgfXGqtMWU=
+golang.org/x/tools v0.32.0/go.mod h1:ZxrU41P/wAbZD8EDa6dDCa6XfpkhJ7HFMjHJXfBDu8s=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.zx2c4.com/wireguard v0.0.0-20231211153847-12269c276173 h1:/jFs0duh4rdb8uIfPMv78iAJGcPKDeqAFnaLBropIC4=
 golang.zx2c4.com/wireguard v0.0.0-20231211153847-12269c276173/go.mod h1:tkCQ4FQXmpAgYVh++1cq16/dH4QJtmvpRv19DWGAHSA=
 golang.zx2c4.com/wireguard/wgctrl v0.0.0-20241231184526-a9ab2273dd10 h1:3GDAcqdIg1ozBNLgPy4SLT84nfcBjr6rhGtXYtrkWLU=
 golang.zx2c4.com/wireguard/wgctrl v0.0.0-20241231184526-a9ab2273dd10/go.mod h1:T97yPqesLiNrOYxkwmhMI0ZIlJDm+p0PMR8eRVeR5tQ=
-google.golang.org/protobuf v1.36.2 h1:R8FeyR1/eLmkutZOM5CWghmo5itiG9z0ktFlTVLuTmU=
-google.golang.org/protobuf v1.36.2/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE=
+google.golang.org/protobuf v1.36.5 h1:tPhr+woSbjfYvY6/GPufUoYizxw1cF/yFoxJ2fmpwlM=
+google.golang.org/protobuf v1.36.5/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE=
+google.golang.org/protobuf v1.36.6 h1:z1NpPI8ku2WgiWnf+t9wTPsn6eP1L7ksHUlkfLvd9xY=
+google.golang.org/protobuf v1.36.6/go.mod h1:jduwjTPXsFjZGTmRluh+L6NjiWu7pchiJ2/5YcXBHnY=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
-gopkg.in/go-playground/assert.v1 v1.2.1/go.mod h1:9RXL0bg/zibRAgZUYszZSwO/z8Y/a8bDuhia5mkpMnE=
-gopkg.in/go-playground/validator.v8 v8.18.2/go.mod h1:RX2a/7Ha8BgOhfk7j780h4/u/RRjR0eouCJSH80/M2Y=
-gopkg.in/mgo.v2 v2.0.0-20180705113604-9856a29383ce/go.mod h1:yeKp02qBN3iKW1OzL3MGk2IdtZzaj7SFntXj72NppTA=
 gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
 gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
@@ -438,28 +382,36 @@ gorm.io/gorm v1.25.12 h1:I0u8i2hWQItBq1WfE0o2+WuL9+8L21K9e2HHSTE/0f8=
 gorm.io/gorm v1.25.12/go.mod h1:xh7N7RHfYlNc5EmcI/El95gXusucDrQnHXe0+CgWcLQ=
 modernc.org/cc/v4 v4.24.4 h1:TFkx1s6dCkQpd6dKurBNmpo+G8Zl4Sq/ztJ+2+DEsh0=
 modernc.org/cc/v4 v4.24.4/go.mod h1:uVtb5OGqUKpoLWhqwNQo/8LwvoiEBLvZXIQ/SmO6mL0=
-modernc.org/ccgo/v4 v4.23.10 h1:DnDZT/H6TtoJvQmVf7d8W+lVqEZpIJY/+0ENFh1LIHE=
-modernc.org/ccgo/v4 v4.23.10/go.mod h1:vdN4h2WR5aEoNondUx26K7G8X+nuBscYnAEWSRmN2/0=
+modernc.org/cc/v4 v4.26.0 h1:QMYvbVduUGH0rrO+5mqF/PSPPRZNpRtg2CLELy7vUpA=
+modernc.org/ccgo/v4 v4.23.16 h1:Z2N+kk38b7SfySC1ZkpGLN2vthNJP1+ZzGZIlH7uBxo=
+modernc.org/ccgo/v4 v4.23.16/go.mod h1:nNma8goMTY7aQZQNTyN9AIoJfxav4nvTnvKThAeMDdo=
+modernc.org/ccgo/v4 v4.26.0 h1:gVzXaDzGeBYJ2uXTOpR8FR7OlksDOe9jxnjhIKCsiTc=
 modernc.org/fileutil v1.3.0 h1:gQ5SIzK3H9kdfai/5x41oQiKValumqNTDXMvKo62HvE=
 modernc.org/fileutil v1.3.0/go.mod h1:XatxS8fZi3pS8/hKG2GH/ArUogfxjpEKs3Ku3aK4JyQ=
-modernc.org/gc/v2 v2.6.1 h1:+Qf6xdG8l7B27TQ8D8lw/iFMUj1RXRBOuMUWziJOsk8=
-modernc.org/gc/v2 v2.6.1/go.mod h1:YgIahr1ypgfe7chRuJi2gD7DBQiKSLMPgBQe9oIiito=
-modernc.org/libc v1.61.7 h1:exz8rasFniviSgh3dH7QBnQHqYh9lolA5hVYfsiwkfo=
-modernc.org/libc v1.61.7/go.mod h1:xspSrXRNVSfWfcfqgvZDVe/Hw5kv4FVC6IRfoms5v/0=
+modernc.org/gc/v2 v2.6.3 h1:aJVhcqAte49LF+mGveZ5KPlsp4tdGdAOT4sipJXADjw=
+modernc.org/gc/v2 v2.6.3/go.mod h1:YgIahr1ypgfe7chRuJi2gD7DBQiKSLMPgBQe9oIiito=
+modernc.org/gc/v2 v2.6.5 h1:nyqdV8q46KvTpZlsw66kWqwXRHdjIlJOhG6kxiV/9xI=
+modernc.org/libc v1.61.13 h1:3LRd6ZO1ezsFiX1y+bHd1ipyEHIJKvuprv0sLTBwLW8=
+modernc.org/libc v1.61.13/go.mod h1:8F/uJWL/3nNil0Lgt1Dpz+GgkApWh04N3el3hxJcA6E=
+modernc.org/libc v1.63.0 h1:wKzb61wOGCzgahQBORb1b0dZonh8Ufzl/7r4Yf1D5YA=
+modernc.org/libc v1.63.0/go.mod h1:wDzH1mgz1wUIEwottFt++POjGRO9sgyQKrpXaz3x89E=
 modernc.org/mathutil v1.7.1 h1:GCZVGXdaN8gTqB1Mf/usp1Y/hSqgI2vAGGP4jZMCxOU=
 modernc.org/mathutil v1.7.1/go.mod h1:4p5IwJITfppl0G4sUEDtCr4DthTaT47/N3aT6MhfgJg=
-modernc.org/memory v1.8.1 h1:HS1HRg1jEohnuONobEq2WrLEhLyw8+J42yLFTnllm2A=
-modernc.org/memory v1.8.1/go.mod h1:ZbjSvMO5NQ1A2i3bWeDiVMxIorXwdClKE/0SZ+BMotU=
+modernc.org/memory v1.9.1 h1:V/Z1solwAVmMW1yttq3nDdZPJqV1rM05Ccq6KMSZ34g=
+modernc.org/memory v1.9.1/go.mod h1:/JP4VbVC+K5sU2wZi9bHoq2MAkCnrt2r98UGeSK7Mjw=
+modernc.org/memory v1.10.0 h1:fzumd51yQ1DxcOxSO+S6X7+QTuVU+n8/Aj7swYjFfC4=
+modernc.org/memory v1.10.0/go.mod h1:/JP4VbVC+K5sU2wZi9bHoq2MAkCnrt2r98UGeSK7Mjw=
 modernc.org/opt v0.1.4 h1:2kNGMRiUjrp4LcaPuLY2PzUfqM/w9N23quVwhKt5Qm8=
 modernc.org/opt v0.1.4/go.mod h1:03fq9lsNfvkYSfxrfUhZCWPk1lm4cq4N+Bh//bEtgns=
 modernc.org/sortutil v1.2.1 h1:+xyoGf15mM3NMlPDnFqrteY07klSFxLElE2PVuWIJ7w=
 modernc.org/sortutil v1.2.1/go.mod h1:7ZI3a3REbai7gzCLcotuw9AC4VZVpYMjDzETGsSMqJE=
-modernc.org/sqlite v1.34.4 h1:sjdARozcL5KJBvYQvLlZEmctRgW9xqIZc2ncN7PU0P8=
-modernc.org/sqlite v1.34.4/go.mod h1:3QQFCG2SEMtc2nv+Wq4cQCH7Hjcg+p/RMlS1XK+zwbk=
+modernc.org/sqlite v1.36.1 h1:bDa8BJUH4lg6EGkLbahKe/8QqoF8p9gArSc6fTqYhyQ=
+modernc.org/sqlite v1.36.1/go.mod h1:7MPwH7Z6bREicF9ZVUR78P1IKuxfZ8mRIDHD0iD+8TU=
+modernc.org/sqlite v1.37.0 h1:s1TMe7T3Q3ovQiK2Ouz4Jwh7dw4ZDqbebSDTlSJdfjI=
+modernc.org/sqlite v1.37.0/go.mod h1:5YiWv+YviqGMuGw4V+PNplcyaJ5v+vQd7TQOgkACoJM=
 modernc.org/strutil v1.2.1 h1:UneZBkQA+DX2Rp35KcM69cSsNES9ly8mQWD71HKlOA0=
 modernc.org/strutil v1.2.1/go.mod h1:EHkiggD70koQxjVdSBM3JKM7k6L0FbGE5eymy9i3B9A=
 modernc.org/token v1.1.0 h1:Xl7Ap9dKaEs5kLoOQeQmPWevfnk/DM5qcLcYlA8ys6Y=
 modernc.org/token v1.1.0/go.mod h1:UGzOrNV1mAFSEB63lOFHIpNRUVMvYTc6yu1SMY/XTDM=
-nullprogram.com/x/optparse v1.0.0/go.mod h1:KdyPE+Igbe0jQUrVfMqDMeJQIJZEuyV7pjYmp6pbG50=
 sigs.k8s.io/yaml v1.4.0 h1:Mk1wCc2gy/F0THH0TAp1QYyJNzRm2KCLy3o5ASXVI5E=
 sigs.k8s.io/yaml v1.4.0/go.mod h1:Ejl7/uTz7PSA4eKMyQCUTnhZYNmLIl+5c2lQPGR2BPY=

internal/adapters/database.go

@@ -4,23 +4,23 @@ import (
 	"context"
 	"errors"
 	"fmt"
+	"log/slog"
 	"os"
 	"path/filepath"
 	"strings"
 	"time"
 
-	"github.com/sirupsen/logrus"
+	"github.com/glebarez/sqlite"
+	"gorm.io/driver/mysql"
+	"gorm.io/driver/postgres"
+	"gorm.io/driver/sqlserver"
+	"gorm.io/gorm"
 	"gorm.io/gorm/clause"
 	"gorm.io/gorm/logger"
 	"gorm.io/gorm/utils"
 
-	"github.com/glebarez/sqlite"
 	"github.com/h44z/wg-portal/internal/config"
 	"github.com/h44z/wg-portal/internal/domain"
-	gormMySQL "gorm.io/driver/mysql"
-	"gorm.io/driver/postgres"
-	"gorm.io/driver/sqlserver"
-	"gorm.io/gorm"
 )
 
 // SchemaVersion describes the current database schema version. It must be incremented if a manual migration is needed.
@@ -32,13 +32,15 @@ type SysStat struct {
 	SchemaVersion uint64    `gorm:"primaryKey,column:schema_version"`
 }
 
-// GormLogger is a custom logger for Gorm, making it use logrus.
+// GormLogger is a custom logger for Gorm, making it use slog
 type GormLogger struct {
 	SlowThreshold           time.Duration
 	SourceField             string
 	IgnoreErrRecordNotFound bool
 	Debug                   bool
 	Silent                  bool
+
+	prefix string
 }
 
 func NewLogger(slowThreshold time.Duration, debug bool) *GormLogger {
@@ -48,6 +50,7 @@ func NewLogger(slowThreshold time.Duration, debug bool) *GormLogger {
 		IgnoreErrRecordNotFound: true,
 		Silent:                  false,
 		SourceField:             "src",
+		prefix:                  "GORM-SQL: ",
 	}
 }
 
@@ -60,25 +63,25 @@ func (l *GormLogger) LogMode(level logger.LogLevel) logger.Interface {
 	return l
 }
 
-func (l *GormLogger) Info(ctx context.Context, s string, args ...interface{}) {
+func (l *GormLogger) Info(ctx context.Context, s string, args ...any) {
 	if l.Silent {
 		return
 	}
-	logrus.WithContext(ctx).Infof(s, args...)
+	slog.InfoContext(ctx, l.prefix+s, args...)
 }
 
-func (l *GormLogger) Warn(ctx context.Context, s string, args ...interface{}) {
+func (l *GormLogger) Warn(ctx context.Context, s string, args ...any) {
 	if l.Silent {
 		return
 	}
-	logrus.WithContext(ctx).Warnf(s, args...)
+	slog.WarnContext(ctx, l.prefix+s, args...)
 }
 
-func (l *GormLogger) Error(ctx context.Context, s string, args ...interface{}) {
+func (l *GormLogger) Error(ctx context.Context, s string, args ...any) {
 	if l.Silent {
 		return
 	}
-	logrus.WithContext(ctx).Errorf(s, args...)
+	slog.ErrorContext(ctx, l.prefix+s, args...)
 }
 
 func (l *GormLogger) Trace(ctx context.Context, begin time.Time, fc func() (string, int64), err error) {
@@ -88,36 +91,40 @@ func (l *GormLogger) Trace(ctx context.Context, begin time.Time, fc func() (stri
 
 	elapsed := time.Since(begin)
 	sql, rows := fc()
-	fields := logrus.Fields{
-		"rows":     rows,
-		"duration": elapsed,
+
+	attrs := []any{
+		"rows", rows,
+		"duration", elapsed,
 	}
+
 	if l.SourceField != "" {
-		fields[l.SourceField] = utils.FileWithLineNum()
+		attrs = append(attrs, l.SourceField, utils.FileWithLineNum())
 	}
+
 	if err != nil && !(errors.Is(err, gorm.ErrRecordNotFound) && l.IgnoreErrRecordNotFound) {
-		fields[logrus.ErrorKey] = err
-		logrus.WithContext(ctx).WithFields(fields).Errorf("%s", sql)
+		attrs = append(attrs, "error", err)
+		slog.ErrorContext(ctx, l.prefix+sql, attrs...)
 		return
 	}
 
 	if l.SlowThreshold != 0 && elapsed > l.SlowThreshold {
-		logrus.WithContext(ctx).WithFields(fields).Warnf("%s", sql)
+		slog.WarnContext(ctx, l.prefix+sql, attrs...)
 		return
 	}
 
 	if l.Debug {
-		logrus.WithContext(ctx).WithFields(fields).Tracef("%s", sql)
+		slog.DebugContext(ctx, l.prefix+sql, attrs...)
 	}
 }
 
+// NewDatabase creates a new database connection and returns a Gorm database instance.
 func NewDatabase(cfg config.DatabaseConfig) (*gorm.DB, error) {
 	var gormDb *gorm.DB
 	var err error
 
 	switch cfg.Type {
 	case config.DatabaseMySQL:
-		gormDb, err = gorm.Open(gormMySQL.Open(cfg.DSN), &gorm.Config{
+		gormDb, err = gorm.Open(mysql.Open(cfg.DSN), &gorm.Config{
 			Logger: NewLogger(cfg.SlowQueryThreshold, cfg.Debug),
 		})
 		if err != nil {
@@ -172,6 +179,7 @@ type SqlRepo struct {
 	db *gorm.DB
 }
 
+// NewSqlRepository creates a new SqlRepo instance.
 func NewSqlRepository(db *gorm.DB) (*SqlRepo, error) {
 	repo := &SqlRepo{
 		db: db,
@@ -210,13 +218,13 @@ func (r *SqlRepo) preCheck() error {
 }
 
 func (r *SqlRepo) migrate() error {
-	logrus.Tracef("sysstat migration: %v", r.db.AutoMigrate(&SysStat{}))
-	logrus.Tracef("user migration: %v", r.db.AutoMigrate(&domain.User{}))
-	logrus.Tracef("interface migration: %v", r.db.AutoMigrate(&domain.Interface{}))
-	logrus.Tracef("peer migration: %v", r.db.AutoMigrate(&domain.Peer{}))
-	logrus.Tracef("peer status migration: %v", r.db.AutoMigrate(&domain.PeerStatus{}))
-	logrus.Tracef("interface status migration: %v", r.db.AutoMigrate(&domain.InterfaceStatus{}))
-	logrus.Tracef("audit data migration: %v", r.db.AutoMigrate(&domain.AuditEntry{}))
+	slog.Debug("running migration: sys-stat", "result", r.db.AutoMigrate(&SysStat{}))
+	slog.Debug("running migration: user", "result", r.db.AutoMigrate(&domain.User{}))
+	slog.Debug("running migration: interface", "result", r.db.AutoMigrate(&domain.Interface{}))
+	slog.Debug("running migration: peer", "result", r.db.AutoMigrate(&domain.Peer{}))
+	slog.Debug("running migration: peer status", "result", r.db.AutoMigrate(&domain.PeerStatus{}))
+	slog.Debug("running migration: interface status", "result", r.db.AutoMigrate(&domain.InterfaceStatus{}))
+	slog.Debug("running migration: audit data", "result", r.db.AutoMigrate(&domain.AuditEntry{}))
 
 	existingSysStat := SysStat{}
 	r.db.Where("schema_version = ?", SchemaVersion).First(&existingSysStat)
@@ -228,7 +236,7 @@ func (r *SqlRepo) migrate() error {
 		if err := r.db.Create(&sysStat).Error; err != nil {
 			return fmt.Errorf("failed to write sysstat entry for schema version %d: %w", SchemaVersion, err)
 		}
-		logrus.Debugf("sysstat entry for schema version %d written", SchemaVersion)
+		slog.Debug("sys-stat entry written", "schema_version", SchemaVersion)
 	}
 
 	return nil
@@ -236,6 +244,8 @@ func (r *SqlRepo) migrate() error {
 
 // region interfaces
 
+// GetInterface returns the interface with the given id.
+// If no interface is found, an error domain.ErrNotFound is returned.
 func (r *SqlRepo) GetInterface(ctx context.Context, id domain.InterfaceIdentifier) (*domain.Interface, error) {
 	var in domain.Interface
 
@@ -251,6 +261,8 @@ func (r *SqlRepo) GetInterface(ctx context.Context, id domain.InterfaceIdentifie
 	return &in, nil
 }
 
+// GetInterfaceAndPeers returns the interface with the given id and all peers associated with it.
+// If no interface is found, an error domain.ErrNotFound is returned.
 func (r *SqlRepo) GetInterfaceAndPeers(ctx context.Context, id domain.InterfaceIdentifier) (
 	*domain.Interface,
 	[]domain.Peer,
@@ -269,6 +281,7 @@ func (r *SqlRepo) GetInterfaceAndPeers(ctx context.Context, id domain.InterfaceI
 	return in, peers, nil
 }
 
+// GetPeersStats returns the stats for the given peer ids. The order of the returned stats is not guaranteed.
 func (r *SqlRepo) GetPeersStats(ctx context.Context, ids ...domain.PeerIdentifier) ([]domain.PeerStatus, error) {
 	if len(ids) == 0 {
 		return nil, nil
@@ -284,6 +297,7 @@ func (r *SqlRepo) GetPeersStats(ctx context.Context, ids ...domain.PeerIdentifie
 	return stats, nil
 }
 
+// GetAllInterfaces returns all interfaces.
 func (r *SqlRepo) GetAllInterfaces(ctx context.Context) ([]domain.Interface, error) {
 	var interfaces []domain.Interface
 
@@ -295,6 +309,8 @@ func (r *SqlRepo) GetAllInterfaces(ctx context.Context) ([]domain.Interface, err
 	return interfaces, nil
 }
 
+// GetInterfaceStats returns the stats for the given interface id.
+// If no stats are found, an error domain.ErrNotFound is returned.
 func (r *SqlRepo) GetInterfaceStats(ctx context.Context, id domain.InterfaceIdentifier) (
 	*domain.InterfaceStatus,
 	error,
@@ -319,6 +335,8 @@ func (r *SqlRepo) GetInterfaceStats(ctx context.Context, id domain.InterfaceIden
 	return &stat, nil
 }
 
+// FindInterfaces returns all interfaces that match the given search string.
+// The search string is matched against the interface identifier and display name.
 func (r *SqlRepo) FindInterfaces(ctx context.Context, search string) ([]domain.Interface, error) {
 	var users []domain.Interface
 
@@ -335,6 +353,7 @@ func (r *SqlRepo) FindInterfaces(ctx context.Context, search string) ([]domain.I
 	return users, nil
 }
 
+// SaveInterface updates the interface with the given id.
 func (r *SqlRepo) SaveInterface(
 	ctx context.Context,
 	id domain.InterfaceIdentifier,
@@ -410,6 +429,7 @@ func (r *SqlRepo) upsertInterface(ui *domain.ContextUserInfo, tx *gorm.DB, in *d
 	return nil
 }
 
+// DeleteInterface deletes the interface with the given id.
 func (r *SqlRepo) DeleteInterface(ctx context.Context, id domain.InterfaceIdentifier) error {
 	err := r.db.WithContext(ctx).Transaction(func(tx *gorm.DB) error {
 		err := tx.Where("interface_identifier = ?", id).Delete(&domain.Peer{}).Error
@@ -436,6 +456,7 @@ func (r *SqlRepo) DeleteInterface(ctx context.Context, id domain.InterfaceIdenti
 	return nil
 }
 
+// GetInterfaceIps returns a map of interface identifiers to their respective IP addresses.
 func (r *SqlRepo) GetInterfaceIps(ctx context.Context) (map[domain.InterfaceIdentifier][]domain.Cidr, error) {
 	var ips []struct {
 		domain.Cidr
@@ -461,6 +482,8 @@ func (r *SqlRepo) GetInterfaceIps(ctx context.Context) (map[domain.InterfaceIden
 
 // region peers
 
+// GetPeer returns the peer with the given id.
+// If no peer is found, an error domain.ErrNotFound is returned.
 func (r *SqlRepo) GetPeer(ctx context.Context, id domain.PeerIdentifier) (*domain.Peer, error) {
 	var peer domain.Peer
 
@@ -476,6 +499,7 @@ func (r *SqlRepo) GetPeer(ctx context.Context, id domain.PeerIdentifier) (*domai
 	return &peer, nil
 }
 
+// GetInterfacePeers returns all peers associated with the given interface id.
 func (r *SqlRepo) GetInterfacePeers(ctx context.Context, id domain.InterfaceIdentifier) ([]domain.Peer, error) {
 	var peers []domain.Peer
 
@@ -487,6 +511,8 @@ func (r *SqlRepo) GetInterfacePeers(ctx context.Context, id domain.InterfaceIden
 	return peers, nil
 }
 
+// FindInterfacePeers returns all peers associated with the given interface id that match the given search string.
+// The search string is matched against the peer identifier, display name and IP address.
 func (r *SqlRepo) FindInterfacePeers(ctx context.Context, id domain.InterfaceIdentifier, search string) (
 	[]domain.Peer,
 	error,
@@ -506,6 +532,7 @@ func (r *SqlRepo) FindInterfacePeers(ctx context.Context, id domain.InterfaceIde
 	return peers, nil
 }
 
+// GetUserPeers returns all peers associated with the given user id.
 func (r *SqlRepo) GetUserPeers(ctx context.Context, id domain.UserIdentifier) ([]domain.Peer, error) {
 	var peers []domain.Peer
 
@@ -517,6 +544,8 @@ func (r *SqlRepo) GetUserPeers(ctx context.Context, id domain.UserIdentifier) ([
 	return peers, nil
 }
 
+// FindUserPeers returns all peers associated with the given user id that match the given search string.
+// The search string is matched against the peer identifier, display name and IP address.
 func (r *SqlRepo) FindUserPeers(ctx context.Context, id domain.UserIdentifier, search string) ([]domain.Peer, error) {
 	var peers []domain.Peer
 
@@ -533,6 +562,8 @@ func (r *SqlRepo) FindUserPeers(ctx context.Context, id domain.UserIdentifier, s
 	return peers, nil
 }
 
+// SavePeer updates the peer with the given id.
+// If no existing peer is found, a new peer is created.
 func (r *SqlRepo) SavePeer(
 	ctx context.Context,
 	id domain.PeerIdentifier,
@@ -607,6 +638,7 @@ func (r *SqlRepo) upsertPeer(ui *domain.ContextUserInfo, tx *gorm.DB, peer *doma
 	return nil
 }
 
+// DeletePeer deletes the peer with the given id.
 func (r *SqlRepo) DeletePeer(ctx context.Context, id domain.PeerIdentifier) error {
 	err := r.db.WithContext(ctx).Transaction(func(tx *gorm.DB) error {
 		err := tx.Delete(&domain.PeerStatus{PeerId: id}).Error
@@ -628,6 +660,7 @@ func (r *SqlRepo) DeletePeer(ctx context.Context, id domain.PeerIdentifier) erro
 	return nil
 }
 
+// GetPeerIps returns a map of peer identifiers to their respective IP addresses.
 func (r *SqlRepo) GetPeerIps(ctx context.Context) (map[domain.PeerIdentifier][]domain.Cidr, error) {
 	var ips []struct {
 		domain.Cidr
@@ -649,6 +682,7 @@ func (r *SqlRepo) GetPeerIps(ctx context.Context) (map[domain.PeerIdentifier][]d
 	return result, nil
 }
 
+// GetUsedIpsPerSubnet returns a map of subnets to their respective used IP addresses.
 func (r *SqlRepo) GetUsedIpsPerSubnet(ctx context.Context, subnets []domain.Cidr) (
 	map[domain.Cidr][]domain.Cidr,
 	error,
@@ -707,6 +741,8 @@ func (r *SqlRepo) GetUsedIpsPerSubnet(ctx context.Context, subnets []domain.Cidr
 
 // region users
 
+// GetUser returns the user with the given id.
+// If no user is found, an error domain.ErrNotFound is returned.
 func (r *SqlRepo) GetUser(ctx context.Context, id domain.UserIdentifier) (*domain.User, error) {
 	var user domain.User
 
@@ -722,6 +758,9 @@ func (r *SqlRepo) GetUser(ctx context.Context, id domain.UserIdentifier) (*domai
 	return &user, nil
 }
 
+// GetUserByEmail returns the user with the given email.
+// If no user is found, an error domain.ErrNotFound is returned.
+// If multiple users are found, an error domain.ErrNotUnique is returned.
 func (r *SqlRepo) GetUserByEmail(ctx context.Context, email string) (*domain.User, error) {
 	var users []domain.User
 
@@ -746,6 +785,7 @@ func (r *SqlRepo) GetUserByEmail(ctx context.Context, email string) (*domain.Use
 	return &user, nil
 }
 
+// GetAllUsers returns all users.
 func (r *SqlRepo) GetAllUsers(ctx context.Context) ([]domain.User, error) {
 	var users []domain.User
 
@@ -757,6 +797,8 @@ func (r *SqlRepo) GetAllUsers(ctx context.Context) ([]domain.User, error) {
 	return users, nil
 }
 
+// FindUsers returns all users that match the given search string.
+// The search string is matched against the user identifier, firstname, lastname and email.
 func (r *SqlRepo) FindUsers(ctx context.Context, search string) ([]domain.User, error) {
 	var users []domain.User
 
@@ -774,6 +816,8 @@ func (r *SqlRepo) FindUsers(ctx context.Context, search string) ([]domain.User,
 	return users, nil
 }
 
+// SaveUser updates the user with the given id.
+// If no user is found, a new user is created.
 func (r *SqlRepo) SaveUser(
 	ctx context.Context,
 	id domain.UserIdentifier,
@@ -807,6 +851,7 @@ func (r *SqlRepo) SaveUser(
 	return nil
 }
 
+// DeleteUser deletes the user with the given id.
 func (r *SqlRepo) DeleteUser(ctx context.Context, id domain.UserIdentifier) error {
 	err := r.db.WithContext(ctx).Delete(&domain.User{}, id).Error
 	if err != nil {
@@ -859,6 +904,8 @@ func (r *SqlRepo) upsertUser(ui *domain.ContextUserInfo, tx *gorm.DB, user *doma
 
 // region statistics
 
+// UpdateInterfaceStatus updates the interface status with the given id.
+// If no interface status is found, a new one is created.
 func (r *SqlRepo) UpdateInterfaceStatus(
 	ctx context.Context,
 	id domain.InterfaceIdentifier,
@@ -919,6 +966,8 @@ func (r *SqlRepo) upsertInterfaceStatus(tx *gorm.DB, in *domain.InterfaceStatus)
 	return nil
 }
 
+// UpdatePeerStatus updates the peer status with the given id.
+// If no peer status is found, a new one is created.
 func (r *SqlRepo) UpdatePeerStatus(
 	ctx context.Context,
 	id domain.PeerIdentifier,
@@ -976,6 +1025,7 @@ func (r *SqlRepo) upsertPeerStatus(tx *gorm.DB, in *domain.PeerStatus) error {
 	return nil
 }
 
+// DeletePeerStatus deletes the peer status with the given id.
 func (r *SqlRepo) DeletePeerStatus(ctx context.Context, id domain.PeerIdentifier) error {
 	err := r.db.WithContext(ctx).Delete(&domain.PeerStatus{}, id).Error
 	if err != nil {
@@ -989,6 +1039,7 @@ func (r *SqlRepo) DeletePeerStatus(ctx context.Context, id domain.PeerIdentifier
 
 // region audit
 
+// SaveAuditEntry saves the given audit entry.
 func (r *SqlRepo) SaveAuditEntry(ctx context.Context, entry *domain.AuditEntry) error {
 	err := r.db.WithContext(ctx).Save(entry).Error
 	if err != nil {
@@ -998,4 +1049,16 @@ func (r *SqlRepo) SaveAuditEntry(ctx context.Context, entry *domain.AuditEntry)
 	return nil
 }
 
+// GetAllAuditEntries retrieves all audit entries from the database.
+// The entries are ordered by timestamp, with the newest entries first.
+func (r *SqlRepo) GetAllAuditEntries(ctx context.Context) ([]domain.AuditEntry, error) {
+	var entries []domain.AuditEntry
+	err := r.db.WithContext(ctx).Order("created_at desc").Find(&entries).Error
+	if err != nil {
+		return nil, err
+	}
+
+	return entries, nil
+}
+
 // endregion audit

internal/adapters/database_integration_test.go

@@ -5,17 +5,14 @@ package adapters
 import (
 	"database/sql"
 	"fmt"
+	"testing"
 
 	"github.com/glebarez/sqlite"
 	"github.com/stretchr/testify/assert"
 	"gorm.io/gorm"
-
-	"testing"
 )
 
 func tempSqliteDb(t *testing.T) *gorm.DB {
-
-	// github.com/mattn/go-sqlite3
 	db, err := gorm.Open(sqlite.Open("file::memory:?cache=shared"), &gorm.Config{})
 	if err != nil {
 		t.Fatal(err)

internal/adapters/filesystem.go

@@ -2,8 +2,8 @@ package adapters
 
 import (
 	"fmt"
-	"github.com/sirupsen/logrus"
 	"io"
+	"log/slog"
 	"os"
 	"path/filepath"
 )
@@ -12,6 +12,7 @@ type FilesystemRepo struct {
 	basePath string
 }
 
+// NewFileSystemRepository creates a new FilesystemRepo instance.
 func NewFileSystemRepository(basePath string) (*FilesystemRepo, error) {
 	if basePath == "" {
 		return nil, nil // no path, return empty repository
@@ -26,6 +27,10 @@ func NewFileSystemRepository(basePath string) (*FilesystemRepo, error) {
 	return r, nil
 }
 
+// WriteFile writes the given contents to the given path.
+// The path is relative to the base path of the repository.
+// If the parent directory does not exist, it is created.
+// If the file already exists, it is overwritten.
 func (r *FilesystemRepo) WriteFile(path string, contents io.Reader) error {
 	filePath := filepath.Join(r.basePath, path)
 	parentDirectory := filepath.Dir(filePath)
@@ -36,11 +41,11 @@ func (r *FilesystemRepo) WriteFile(path string, contents io.Reader) error {
 
 	file, err := os.OpenFile(filePath, os.O_RDWR|os.O_CREATE|os.O_TRUNC, os.ModePerm)
 	if err != nil {
-		return fmt.Errorf("failed to open file %s: %w", file.Name(), err)
+		return fmt.Errorf("failed to open file %s: %w", filePath, err)
 	}
 	defer func(file *os.File) {
 		if err := file.Close(); err != nil {
-			logrus.Errorf("failed to close file %s: %v", file.Name(), err)
+			slog.Error("failed to close file", "file", file.Name(), "error", err)
 		}
 	}(file)
 
@@ -50,5 +55,17 @@ func (r *FilesystemRepo) WriteFile(path string, contents io.Reader) error {
 	}
 
 	return nil
-
+}
+
+// DeleteFile deletes the file at the given path.
+// The path is relative to the base path of the repository.
+// If the file does not exist, it is ignored.
+func (r *FilesystemRepo) DeleteFile(path string) error {
+	filePath := filepath.Join(r.basePath, path)
+
+	if err := os.Remove(filePath); err != nil && !os.IsNotExist(err) {
+		return fmt.Errorf("failed to delete file %s: %w", filePath, err)
+	}
+
+	return nil
 }

internal/adapters/mailer.go

@@ -5,23 +5,26 @@ import (
 	"crypto/tls"
 	"errors"
 	"fmt"
+	"io"
+	"time"
+
+	mail "github.com/xhit/go-simple-mail/v2"
+
 	"github.com/h44z/wg-portal/internal"
 	"github.com/h44z/wg-portal/internal/config"
 	"github.com/h44z/wg-portal/internal/domain"
-	mail "github.com/xhit/go-simple-mail/v2"
-	"io"
-	"time"
 )
 
 type MailRepo struct {
 	cfg *config.MailConfig
 }
 
+// NewSmtpMailRepo creates a new MailRepo instance.
 func NewSmtpMailRepo(cfg config.MailConfig) MailRepo {
 	return MailRepo{cfg: &cfg}
 }
 
-// Send sends a mail.
+// Send sends a mail using SMTP.
 func (r MailRepo) Send(_ context.Context, subject, body string, to []string, options *domain.MailOptions) error {
 	if options == nil {
 		options = &domain.MailOptions{}

internal/adapters/metrics.go

@@ -2,16 +2,18 @@ package adapters
 
 import (
 	"context"
+	"errors"
+	"log/slog"
 	"net/http"
 	"time"
 
+	"github.com/prometheus/client_golang/prometheus"
+	"github.com/prometheus/client_golang/prometheus/promauto"
+	"github.com/prometheus/client_golang/prometheus/promhttp"
+
 	"github.com/h44z/wg-portal/internal"
 	"github.com/h44z/wg-portal/internal/config"
 	"github.com/h44z/wg-portal/internal/domain"
-	"github.com/prometheus/client_golang/prometheus"
-	"github.com/prometheus/client_golang/prometheus/promauto"
-	"github.com/prometheus/client_golang/prometheus/promhttp"
-	"github.com/sirupsen/logrus"
 )
 
 type MetricsServer struct {
@@ -84,16 +86,16 @@ func NewMetricsServer(cfg *config.Config) *MetricsServer {
 	}
 }
 
-// Run starts the metrics server
+// Run starts the metrics server. The function blocks until the context is cancelled.
 func (m *MetricsServer) Run(ctx context.Context) {
 	// Run the metrics server in a goroutine
 	go func() {
-		if err := m.ListenAndServe(); err != nil && err != http.ErrServerClosed {
-			logrus.Errorf("metrics service on %s exited: %v", m.Addr, err)
+		if err := m.ListenAndServe(); err != nil && !errors.Is(err, http.ErrServerClosed) {
+			slog.Error("metrics service exited", "address", m.Addr, "error", err)
 		}
 	}()
 
-	logrus.Infof("started metrics service on %s", m.Addr)
+	slog.Info("started metrics service", "address", m.Addr)
 
 	// Wait for the context to be done
 	<-ctx.Done()
@@ -102,11 +104,11 @@ func (m *MetricsServer) Run(ctx context.Context) {
 	shutdownCtx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
 	defer cancel()
 
-	// Attempt to gracefully shutdown the metrics server
+	// Attempt to gracefully shut down the metrics server
 	if err := m.Shutdown(shutdownCtx); err != nil {
-		logrus.Errorf("metrics service on %s shutdown failed: %v", m.Addr, err)
+		slog.Error("metrics service shutdown failed", "address", m.Addr, "error", err)
 	} else {
-		logrus.Infof("metrics service on %s shutdown gracefully", m.Addr)
+		slog.Info("metrics service shutdown gracefully", "address", m.Addr)
 	}
 }
 
@@ -121,9 +123,9 @@ func (m *MetricsServer) UpdateInterfaceMetrics(status domain.InterfaceStatus) {
 func (m *MetricsServer) UpdatePeerMetrics(peer *domain.Peer, status domain.PeerStatus) {
 	labels := []string{
 		string(peer.InterfaceIdentifier),
-		string(peer.Interface.AddressStr()),
+		peer.Interface.AddressStr(),
 		string(status.PeerId),
-		string(peer.DisplayName),
+		peer.DisplayName,
 	}
 
 	if status.LastHandshake != nil {

internal/adapters/wgquick.go

@@ -3,12 +3,12 @@ package adapters
 import (
 	"bytes"
 	"fmt"
+	"log/slog"
 	"os/exec"
 	"strings"
 
 	"github.com/h44z/wg-portal/internal"
 	"github.com/h44z/wg-portal/internal/domain"
-	"github.com/sirupsen/logrus"
 )
 
 // WgQuickRepo implements higher level wg-quick like interactions like setting DNS, routing tables or interface hooks.
@@ -17,6 +17,7 @@ type WgQuickRepo struct {
 	resolvConfIfacePrefix string
 }
 
+// NewWgQuickRepo creates a new WgQuickRepo instance.
 func NewWgQuickRepo() *WgQuickRepo {
 	return &WgQuickRepo{
 		shellCmd:              "bash",
@@ -24,12 +25,16 @@ func NewWgQuickRepo() *WgQuickRepo {
 	}
 }
 
+// ExecuteInterfaceHook executes the given hook command.
+// The hook command can contain the following placeholders:
+//
+//	%i: the interface identifier.
 func (r *WgQuickRepo) ExecuteInterfaceHook(id domain.InterfaceIdentifier, hookCmd string) error {
 	if hookCmd == "" {
 		return nil
 	}
 
-	logrus.Tracef("interface %s: executing hook %s", id, hookCmd)
+	slog.Debug("executing interface hook", "interface", id, "hook", hookCmd)
 	err := r.exec(hookCmd, id)
 	if err != nil {
 		return fmt.Errorf("failed to exec hook: %w", err)
@@ -38,6 +43,7 @@ func (r *WgQuickRepo) ExecuteInterfaceHook(id domain.InterfaceIdentifier, hookCm
 	return nil
 }
 
+// SetDNS sets the DNS settings for the given interface. It uses resolvconf to set the DNS settings.
 func (r *WgQuickRepo) SetDNS(id domain.InterfaceIdentifier, dnsStr, dnsSearchStr string) error {
 	if dnsStr == "" && dnsSearchStr == "" {
 		return nil
@@ -67,6 +73,7 @@ func (r *WgQuickRepo) SetDNS(id domain.InterfaceIdentifier, dnsStr, dnsSearchStr
 	return nil
 }
 
+// UnsetDNS unsets the DNS settings for the given interface. It uses resolvconf to unset the DNS settings.
 func (r *WgQuickRepo) UnsetDNS(id domain.InterfaceIdentifier) error {
 	dnsCommand := "resolvconf -d %resPref%i -f"
 
@@ -99,6 +106,8 @@ func (r *WgQuickRepo) exec(command string, interfaceId domain.InterfaceIdentifie
 	if err != nil {
 		return fmt.Errorf("failed to exexute shell command %s: %w", commandWithInterfaceName, err)
 	}
-	logrus.Tracef("executed shell command %s, with output: %s", commandWithInterfaceName, string(out))
+	slog.Debug("executed shell command",
+		"command", commandWithInterfaceName,
+		"output", string(out))
 	return nil
 }

internal/adapters/wireguard.go

@@ -6,11 +6,12 @@ import (
 	"fmt"
 	"os"
 
-	"github.com/h44z/wg-portal/internal/domain"
-	"github.com/h44z/wg-portal/internal/lowlevel"
 	"github.com/vishvananda/netlink"
 	"golang.zx2c4.com/wireguard/wgctrl"
 	"golang.zx2c4.com/wireguard/wgctrl/wgtypes"
+
+	"github.com/h44z/wg-portal/internal/domain"
+	"github.com/h44z/wg-portal/internal/lowlevel"
 )
 
 // WgRepo implements all low-level WireGuard interactions.
@@ -19,6 +20,8 @@ type WgRepo struct {
 	nl lowlevel.NetlinkClient
 }
 
+// NewWireGuardRepository creates a new WgRepo instance.
+// This repository is used to interact with the WireGuard kernel or userspace module.
 func NewWireGuardRepository() *WgRepo {
 	wg, err := wgctrl.New()
 	if err != nil {
@@ -35,6 +38,7 @@ func NewWireGuardRepository() *WgRepo {
 	return repo
 }
 
+// GetInterfaces returns all existing WireGuard interfaces.
 func (r *WgRepo) GetInterfaces(_ context.Context) ([]domain.PhysicalInterface, error) {
 	devices, err := r.wg.Devices()
 	if err != nil {
@@ -53,10 +57,14 @@ func (r *WgRepo) GetInterfaces(_ context.Context) ([]domain.PhysicalInterface, e
 	return interfaces, nil
 }
 
+// GetInterface returns the interface with the given id.
+// If no interface is found, an error os.ErrNotExist is returned.
 func (r *WgRepo) GetInterface(_ context.Context, id domain.InterfaceIdentifier) (*domain.PhysicalInterface, error) {
 	return r.getInterface(id)
 }
 
+// GetPeers returns all peers associated with the given interface id.
+// If the requested interface is found, an error os.ErrNotExist is returned.
 func (r *WgRepo) GetPeers(_ context.Context, deviceId domain.InterfaceIdentifier) ([]domain.PhysicalPeer, error) {
 	device, err := r.wg.Device(string(deviceId))
 	if err != nil {
@@ -75,6 +83,8 @@ func (r *WgRepo) GetPeers(_ context.Context, deviceId domain.InterfaceIdentifier
 	return peers, nil
 }
 
+// GetPeer returns the peer with the given id.
+// If the requested interface or peer is found, an error os.ErrNotExist is returned.
 func (r *WgRepo) GetPeer(
 	_ context.Context,
 	deviceId domain.InterfaceIdentifier,
@@ -156,6 +166,9 @@ func (r *WgRepo) convertWireGuardPeer(peer *wgtypes.Peer) (domain.PhysicalPeer,
 	return peerModel, nil
 }
 
+// SaveInterface updates the interface with the given id.
+// If no existing interface is found, a new interface is created.
+// Updating the interface does not interrupt any existing connections.
 func (r *WgRepo) SaveInterface(
 	_ context.Context,
 	id domain.InterfaceIdentifier,
@@ -186,10 +199,10 @@ func (r *WgRepo) SaveInterface(
 func (r *WgRepo) getOrCreateInterface(id domain.InterfaceIdentifier) (*domain.PhysicalInterface, error) {
 	device, err := r.getInterface(id)
 	if err == nil {
-		return device, nil
+		return device, nil // interface exists
 	}
-	if err != nil && !errors.Is(err, os.ErrNotExist) {
-		return nil, fmt.Errorf("device error: %w", err)
+	if !errors.Is(err, os.ErrNotExist) {
+		return nil, fmt.Errorf("device error: %w", err) // unknown error
 	}
 
 	// create new device
@@ -307,6 +320,8 @@ func (r *WgRepo) updateWireGuardInterface(pi *domain.PhysicalInterface) error {
 	return nil
 }
 
+// DeleteInterface deletes the interface with the given id.
+// If the requested interface is found, no error is returned.
 func (r *WgRepo) DeleteInterface(_ context.Context, id domain.InterfaceIdentifier) error {
 	if err := r.deleteLowLevelInterface(id); err != nil {
 		return err
@@ -333,6 +348,8 @@ func (r *WgRepo) deleteLowLevelInterface(id domain.InterfaceIdentifier) error {
 	return nil
 }
 
+// SavePeer updates the peer with the given id.
+// If no existing peer is found, a new peer is created.
 func (r *WgRepo) SavePeer(
 	_ context.Context,
 	deviceId domain.InterfaceIdentifier,
@@ -362,10 +379,10 @@ func (r *WgRepo) getOrCreatePeer(deviceId domain.InterfaceIdentifier, id domain.
 ) {
 	peer, err := r.getPeer(deviceId, id)
 	if err == nil {
-		return peer, nil
+		return peer, nil // peer exists
 	}
-	if err != nil && !errors.Is(err, os.ErrNotExist) {
-		return nil, fmt.Errorf("peer error: %w", err)
+	if !errors.Is(err, os.ErrNotExist) {
+		return nil, fmt.Errorf("peer error: %w", err) // unknown error
 	}
 
 	// create new peer
@@ -424,6 +441,8 @@ func (r *WgRepo) updatePeer(deviceId domain.InterfaceIdentifier, pp *domain.Phys
 	return nil
 }
 
+// DeletePeer deletes the peer with the given id.
+// If the requested interface or peer is found, no error is returned.
 func (r *WgRepo) DeletePeer(_ context.Context, deviceId domain.InterfaceIdentifier, id domain.PeerIdentifier) error {
 	if !id.IsPublicKey() {
 		return errors.New("invalid public key")

internal/adapters/wireguard_integration_test.go

@@ -12,11 +12,11 @@ import (
 	"strings"
 	"testing"
 
+	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
+	"github.com/h44z/wg-portal/internal"
 	"github.com/h44z/wg-portal/internal/domain"
-
-	"github.com/stretchr/testify/assert"
 )
 
 // setup WireGuard manager with no linked store
@@ -43,12 +43,12 @@ func Test_wgRepository_GetInterfaces(t *testing.T) {
 	mgr := setup(t)
 
 	interfaceName := domain.InterfaceIdentifier("wg_test_001")
-	defer mgr.DeleteInterface(context.Background(), interfaceName)
+	defer internal.LogError(mgr.DeleteInterface(context.Background(), interfaceName))
 	err := mgr.SaveInterface(context.Background(), interfaceName, nil)
 	require.NoError(t, err)
 
 	interfaceName2 := domain.InterfaceIdentifier("wg_test_002")
-	defer mgr.DeleteInterface(context.Background(), interfaceName2)
+	defer internal.LogError(mgr.DeleteInterface(context.Background(), interfaceName2))
 	err = mgr.SaveInterface(context.Background(), interfaceName2, nil)
 	require.NoError(t, err)
 
@@ -66,15 +66,16 @@ func TestWireGuardCreateInterface(t *testing.T) {
 	interfaceName := domain.InterfaceIdentifier("wg_test_001")
 	ipAddress := "10.11.12.13"
 	ipV6Address := "1337:d34d:b33f::2"
-	defer mgr.DeleteInterface(context.Background(), interfaceName)
+	defer internal.LogError(mgr.DeleteInterface(context.Background(), interfaceName))
 
-	err := mgr.SaveInterface(context.Background(), interfaceName, func(pi *domain.PhysicalInterface) (*domain.PhysicalInterface, error) {
-		pi.Addresses = []domain.Cidr{
-			domain.CidrFromIpNet(net.IPNet{IP: net.ParseIP(ipAddress), Mask: net.CIDRMask(24, 32)}),
-			domain.CidrFromIpNet(net.IPNet{IP: net.ParseIP(ipV6Address), Mask: net.CIDRMask(64, 128)}),
-		}
-		return pi, nil
-	})
+	err := mgr.SaveInterface(context.Background(), interfaceName,
+		func(pi *domain.PhysicalInterface) (*domain.PhysicalInterface, error) {
+			pi.Addresses = []domain.Cidr{
+				domain.CidrFromIpNet(net.IPNet{IP: net.ParseIP(ipAddress), Mask: net.CIDRMask(24, 32)}),
+				domain.CidrFromIpNet(net.IPNet{IP: net.ParseIP(ipV6Address), Mask: net.CIDRMask(64, 128)}),
+			}
+			return pi, nil
+		})
 	assert.NoError(t, err)
 
 	// Validate that the interface has been created
@@ -90,7 +91,7 @@ func TestWireGuardUpdateInterface(t *testing.T) {
 	mgr := setup(t)
 
 	interfaceName := domain.InterfaceIdentifier("wg_test_001")
-	defer mgr.DeleteInterface(context.Background(), interfaceName)
+	defer internal.LogError(mgr.DeleteInterface(context.Background(), interfaceName))
 
 	err := mgr.SaveInterface(context.Background(), interfaceName, nil)
 	require.NoError(t, err)
@@ -102,13 +103,14 @@ func TestWireGuardUpdateInterface(t *testing.T) {
 
 	ipAddress := "10.11.12.13"
 	ipV6Address := "1337:d34d:b33f::2"
-	err = mgr.SaveInterface(context.Background(), interfaceName, func(pi *domain.PhysicalInterface) (*domain.PhysicalInterface, error) {
-		pi.Addresses = []domain.Cidr{
-			domain.CidrFromIpNet(net.IPNet{IP: net.ParseIP(ipAddress), Mask: net.CIDRMask(24, 32)}),
-			domain.CidrFromIpNet(net.IPNet{IP: net.ParseIP(ipV6Address), Mask: net.CIDRMask(64, 128)}),
-		}
-		return pi, nil
-	})
+	err = mgr.SaveInterface(context.Background(), interfaceName,
+		func(pi *domain.PhysicalInterface) (*domain.PhysicalInterface, error) {
+			pi.Addresses = []domain.Cidr{
+				domain.CidrFromIpNet(net.IPNet{IP: net.ParseIP(ipAddress), Mask: net.CIDRMask(24, 32)}),
+				domain.CidrFromIpNet(net.IPNet{IP: net.ParseIP(ipV6Address), Mask: net.CIDRMask(64, 128)}),
+			}
+			return pi, nil
+		})
 	assert.NoError(t, err)
 
 	// Validate that the interface has been updated

internal/app/api/core/assets/doc/v0_swagger.json

@@ -11,6 +11,29 @@
     },
     "basePath": "/api/v0",
     "paths": {
+        "/audit/entries": {
+            "get": {
+                "produces": [
+                    "application/json"
+                ],
+                "tags": [
+                    "Audit"
+                ],
+                "summary": "Get all available audit entries. Ordered by timestamp.",
+                "operationId": "audit_handleEntriesGet",
+                "responses": {
+                    "200": {
+                        "description": "OK",
+                        "schema": {
+                            "type": "array",
+                            "items": {
+                                "$ref": "#/definitions/model.AuditEntry"
+                            }
+                        }
+                    }
+                }
+            }
+        },
         "/auth/login": {
             "post": {
                 "produces": [
@@ -35,7 +58,7 @@
             }
         },
         "/auth/logout": {
-            "get": {
+            "post": {
                 "produces": [
                     "application/json"
                 ],
@@ -43,15 +66,12 @@
                     "Authentication"
                 ],
                 "summary": "Get all available external login providers.",
-                "operationId": "auth_handleLogoutGet",
+                "operationId": "auth_handleLogoutPost",
                 "responses": {
                     "200": {
                         "description": "OK",
                         "schema": {
-                            "type": "array",
-                            "items": {
-                                "$ref": "#/definitions/model.LoginProviderInfo"
-                            }
+                            "$ref": "#/definitions/model.Error"
                         }
                     }
                 }
@@ -171,6 +191,9 @@
                         "schema": {
                             "type": "string"
                         }
+                    },
+                    "500": {
+                        "description": "Internal Server Error"
                     }
                 }
             }
@@ -1363,6 +1386,50 @@
                 }
             }
         },
+        "/user/{id}/interfaces": {
+            "get": {
+                "produces": [
+                    "application/json"
+                ],
+                "tags": [
+                    "Users"
+                ],
+                "summary": "Get interfaces for the given user. Returns an empty list if self provisioning is disabled.",
+                "operationId": "users_handleInterfacesGet",
+                "parameters": [
+                    {
+                        "type": "string",
+                        "description": "The user identifier",
+                        "name": "id",
+                        "in": "path",
+                        "required": true
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "OK",
+                        "schema": {
+                            "type": "array",
+                            "items": {
+                                "$ref": "#/definitions/model.Interface"
+                            }
+                        }
+                    },
+                    "400": {
+                        "description": "Bad Request",
+                        "schema": {
+                            "$ref": "#/definitions/model.Error"
+                        }
+                    },
+                    "500": {
+                        "description": "Internal Server Error",
+                        "schema": {
+                            "$ref": "#/definitions/model.Error"
+                        }
+                    }
+                }
+            }
+        },
         "/user/{id}/peers": {
             "get": {
                 "produces": [
@@ -1373,6 +1440,15 @@
                 ],
                 "summary": "Get peers for the given user.",
                 "operationId": "users_handlePeersGet",
+                "parameters": [
+                    {
+                        "type": "string",
+                        "description": "The user identifier",
+                        "name": "id",
+                        "in": "path",
+                        "required": true
+                    }
+                ],
                 "responses": {
                     "200": {
                         "description": "OK",
@@ -1408,6 +1484,15 @@
                 ],
                 "summary": "Get peer stats for the given user.",
                 "operationId": "users_handleStatsGet",
+                "parameters": [
+                    {
+                        "type": "string",
+                        "description": "The user identifier",
+                        "name": "id",
+                        "in": "path",
+                        "required": true
+                    }
+                ],
                 "responses": {
                     "200": {
                         "description": "OK",
@@ -1432,6 +1517,30 @@
         }
     },
     "definitions": {
+        "model.AuditEntry": {
+            "type": "object",
+            "properties": {
+                "ContextUser": {
+                    "type": "string"
+                },
+                "Id": {
+                    "type": "integer"
+                },
+                "Message": {
+                    "type": "string"
+                },
+                "Origin": {
+                    "description": "origin: for example user auth, stats, ...",
+                    "type": "string"
+                },
+                "Severity": {
+                    "type": "string"
+                },
+                "Timestamp": {
+                    "type": "string"
+                }
+            }
+        },
         "model.ConfigOption-array_string": {
             "type": "object",
             "properties": {
@@ -1537,6 +1646,10 @@
                 "EnabledPeers": {
                     "type": "integer"
                 },
+                "Filename": {
+                    "description": "the filename of the config file, for example: wg0.conf",
+                    "type": "string"
+                },
                 "FirewallMark": {
                     "description": "a firewall mark",
                     "type": "integer"
@@ -1778,6 +1891,10 @@
                         "type": "string"
                     }
                 },
+                "Filename": {
+                    "description": "the filename of the config file, for example: wg_peer_x.conf",
+                    "type": "string"
+                },
                 "FirewallMark": {
                     "description": "a firewall mark",
                     "allOf": [

internal/app/api/core/assets/doc/v0_swagger.yaml

@@ -1,5 +1,21 @@
 basePath: /api/v0
 definitions:
+  model.AuditEntry:
+    properties:
+      ContextUser:
+        type: string
+      Id:
+        type: integer
+      Message:
+        type: string
+      Origin:
+        description: 'origin: for example user auth, stats, ...'
+        type: string
+      Severity:
+        type: string
+      Timestamp:
+        type: string
+    type: object
   model.ConfigOption-array_string:
     properties:
       Overridable:
@@ -72,6 +88,9 @@ definitions:
         type: array
       EnabledPeers:
         type: integer
+      Filename:
+        description: 'the filename of the config file, for example: wg0.conf'
+        type: string
       FirewallMark:
         description: a firewall mark
         type: integer
@@ -240,6 +259,9 @@ definitions:
         items:
           type: string
         type: array
+      Filename:
+        description: 'the filename of the config file, for example: wg_peer_x.conf'
+        type: string
       FirewallMark:
         allOf:
         - $ref: '#/definitions/model.ConfigOption-uint32'
@@ -419,6 +441,21 @@ info:
   title: WireGuard Portal SPA-UI API
   version: "0.0"
 paths:
+  /audit/entries:
+    get:
+      operationId: audit_handleEntriesGet
+      produces:
+      - application/json
+      responses:
+        "200":
+          description: OK
+          schema:
+            items:
+              $ref: '#/definitions/model.AuditEntry'
+            type: array
+      summary: Get all available audit entries. Ordered by timestamp.
+      tags:
+      - Audit
   /auth/{provider}/callback:
     get:
       operationId: auth_handleOauthCallbackGet
@@ -465,17 +502,15 @@ paths:
       tags:
       - Authentication
   /auth/logout:
-    get:
-      operationId: auth_handleLogoutGet
+    post:
+      operationId: auth_handleLogoutPost
       produces:
       - application/json
       responses:
         "200":
           description: OK
           schema:
-            items:
-              $ref: '#/definitions/model.LoginProviderInfo'
-            type: array
+            $ref: '#/definitions/model.Error'
       summary: Get all available external login providers.
       tags:
       - Authentication
@@ -523,6 +558,8 @@ paths:
           description: The JavaScript contents
           schema:
             type: string
+        "500":
+          description: Internal Server Error
       summary: Get the dynamic frontend configuration javascript.
       tags:
       - Configuration
@@ -1262,9 +1299,45 @@ paths:
       summary: Enable the REST API for the given user.
       tags:
       - Users
+  /user/{id}/interfaces:
+    get:
+      operationId: users_handleInterfacesGet
+      parameters:
+      - description: The user identifier
+        in: path
+        name: id
+        required: true
+        type: string
+      produces:
+      - application/json
+      responses:
+        "200":
+          description: OK
+          schema:
+            items:
+              $ref: '#/definitions/model.Interface'
+            type: array
+        "400":
+          description: Bad Request
+          schema:
+            $ref: '#/definitions/model.Error'
+        "500":
+          description: Internal Server Error
+          schema:
+            $ref: '#/definitions/model.Error'
+      summary: Get interfaces for the given user. Returns an empty list if self provisioning
+        is disabled.
+      tags:
+      - Users
   /user/{id}/peers:
     get:
       operationId: users_handlePeersGet
+      parameters:
+      - description: The user identifier
+        in: path
+        name: id
+        required: true
+        type: string
       produces:
       - application/json
       responses:
@@ -1288,6 +1361,12 @@ paths:
   /user/{id}/stats:
     get:
       operationId: users_handleStatsGet
+      parameters:
+      - description: The user identifier
+        in: path
+        name: id
+        required: true
+        type: string
       produces:
       - application/json
       responses:

internal/app/api/core/assets/doc/v1_swagger.json

@@ -1471,14 +1471,6 @@
                 }
             }
         },
-        "models.ExpiryDate": {
-            "type": "object",
-            "properties": {
-                "time.Time": {
-                    "type": "string"
-                }
-            }
-        },
         "models.Interface": {
             "type": "object",
             "required": [
@@ -1539,6 +1531,13 @@
                     "type": "integer",
                     "readOnly": true
                 },
+                "Filename": {
+                    "description": "Filename is the name of the config file for this interface.\nThis value is read only and is not settable by the user.",
+                    "type": "string",
+                    "maxLength": 21,
+                    "readOnly": true,
+                    "example": "wg0.conf"
+                },
                 "FirewallMark": {
                     "description": "FirewallMark is an optional firewall mark which is used to handle interface traffic.",
                     "type": "integer"
@@ -1798,11 +1797,7 @@
                 },
                 "ExpiresAt": {
                     "description": "ExpiresAt is the expiry date of the peer  in YYYY-MM-DD format. An expired peer is not able to connect.",
-                    "allOf": [
-                        {
-                            "$ref": "#/definitions/models.ExpiryDate"
-                        }
-                    ]
+                    "type": "string"
                 },
                 "ExtraAllowedIPs": {
                     "description": "ExtraAllowedIPs is a list of additional allowed IP subnets for the peer. These allowed IP subnets are added on the server side.",
@@ -1811,6 +1806,13 @@
                         "type": "string"
                     }
                 },
+                "Filename": {
+                    "description": "Filename is the name of the config file for this peer.\nThis value is read only and is not settable by the user.",
+                    "type": "string",
+                    "maxLength": 21,
+                    "readOnly": true,
+                    "example": "wg_peer_x.conf"
+                },
                 "FirewallMark": {
                     "description": "FirewallMark is an optional firewall mark which is used to handle peer traffic.",
                     "allOf": [
@@ -1998,8 +2000,7 @@
         "models.User": {
             "type": "object",
             "required": [
-                "Identifier",
-                "IsAdmin"
+                "Identifier"
             ],
             "properties": {
                 "ApiEnabled": {

internal/app/api/core/assets/doc/v1_swagger.yaml

@@ -42,11 +42,6 @@ definitions:
         description: Error message.
         type: string
     type: object
-  models.ExpiryDate:
-    properties:
-      time.Time:
-        type: string
-    type: object
   models.Interface:
     properties:
       Addresses:
@@ -92,6 +87,14 @@ definitions:
           Only enabled peers are able to connect.
         readOnly: true
         type: integer
+      Filename:
+        description: |-
+          Filename is the name of the config file for this interface.
+          This value is read only and is not settable by the user.
+        example: wg0.conf
+        maxLength: 21
+        readOnly: true
+        type: string
       FirewallMark:
         description: FirewallMark is an optional firewall mark which is used to handle
           interface traffic.
@@ -306,16 +309,23 @@ definitions:
         - $ref: '#/definitions/models.ConfigOption-string'
         description: EndpointPublicKey is the endpoint public key.
       ExpiresAt:
-        allOf:
-        - $ref: '#/definitions/models.ExpiryDate'
         description: ExpiresAt is the expiry date of the peer  in YYYY-MM-DD format.
           An expired peer is not able to connect.
+        type: string
       ExtraAllowedIPs:
         description: ExtraAllowedIPs is a list of additional allowed IP subnets for
           the peer. These allowed IP subnets are added on the server side.
         items:
           type: string
         type: array
+      Filename:
+        description: |-
+          Filename is the name of the config file for this peer.
+          This value is read only and is not settable by the user.
+        example: wg_peer_x.conf
+        maxLength: 21
+        readOnly: true
+        type: string
       FirewallMark:
         allOf:
         - $ref: '#/definitions/models.ConfigOption-uint32'
@@ -549,7 +559,6 @@ definitions:
         type: string
     required:
     - Identifier
-    - IsAdmin
     type: object
   models.UserInformation:
     properties:

internal/app/api/core/middleware/cors/middleware.go

@@ -0,0 +1,214 @@
+package cors
+
+import (
+	"net/http"
+	"slices"
+	"strconv"
+	"strings"
+)
+
+// Middleware is a type that creates a new CORS middleware. The CORS middleware
+// adds Cross-Origin Resource Sharing headers to the response. This middleware should
+// be used to allow cross-origin requests to your server.
+type Middleware struct {
+	o options
+
+	varyHeaders string // precomputed Vary header
+	allOrigins  bool   // all origins are allowed
+}
+
+// New returns a new CORS middleware with the provided options.
+func New(opts ...Option) *Middleware {
+	o := newOptions(opts...)
+
+	m := &Middleware{
+		o: o,
+	}
+
+	// set vary headers
+	if m.o.allowPrivateNetworks {
+		m.varyHeaders = "Origin, Access-Control-Request-Method, Access-Control-Request-Headers, Access-Control-Request-Private-Network"
+	} else {
+		m.varyHeaders = "Origin, Access-Control-Request-Method, Access-Control-Request-Headers"
+	}
+
+	if len(m.o.allowedOrigins) == 1 && m.o.allowedOrigins[0] == "*" {
+		m.allOrigins = true
+	}
+
+	return m
+}
+
+// Handler returns the CORS middleware handler.
+func (m *Middleware) Handler(next http.Handler) http.Handler {
+	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		// Handle preflight requests and stop the chain as some other
+		// middleware may not handle OPTIONS requests correctly.
+		// https://developer.mozilla.org/en-US/docs/Web/HTTP/CORS#preflighted_requests
+		if r.Method == http.MethodOptions && r.Header.Get("Access-Control-Request-Method") != "" {
+			m.handlePreflight(w, r)
+			w.WriteHeader(http.StatusNoContent) // always return 204 No Content
+			return
+		}
+
+		// handle normal CORS requests
+		m.handleNormal(w, r)
+		next.ServeHTTP(w, r) // execute the next handler
+	})
+}
+
+// region internal-helpers
+
+// handlePreflight handles preflight requests. If the request was successful, this function will
+// write the CORS headers and return. If the request was not successful, this function will
+// not add any CORS headers and return - thus the CORS request is considered invalid.
+func (m *Middleware) handlePreflight(w http.ResponseWriter, r *http.Request) {
+	// Always set Vary headers
+	// see https://github.com/rs/cors/issues/10,
+	// https://github.com/rs/cors/commit/dbdca4d95feaa7511a46e6f1efb3b3aa505bc43f#commitcomment-12352001
+	w.Header().Add("Vary", m.varyHeaders)
+
+	// check origin
+	origin := r.Header.Get("Origin")
+	if origin == "" {
+		return // not a valid CORS request
+	}
+
+	if !m.originAllowed(origin) {
+		return
+	}
+
+	// check method
+	reqMethod := r.Header.Get("Access-Control-Request-Method")
+	if !m.methodAllowed(reqMethod) {
+		return
+	}
+
+	// check headers
+	reqHeaders := r.Header.Get("Access-Control-Request-Headers")
+	if !m.headersAllowed(reqHeaders) {
+		return
+	}
+
+	// set CORS headers for the successful preflight request
+	if m.allOrigins {
+		w.Header().Set("Access-Control-Allow-Origin", "*")
+	} else {
+		w.Header().Set("Access-Control-Allow-Origin", origin) // return original origin
+	}
+	w.Header().Set("Access-Control-Allow-Methods", reqMethod)
+	if reqHeaders != "" {
+		// Spec says: Since the list of headers can be unbounded, simply returning supported headers
+		// from Access-Control-Request-Headers can be enough
+		w.Header().Set("Access-Control-Allow-Headers", reqHeaders)
+	}
+	if m.o.allowCredentials {
+		w.Header().Set("Access-Control-Allow-Credentials", "true")
+	}
+	if m.o.allowPrivateNetworks && r.Header.Get("Access-Control-Request-Private-Network") == "true" {
+		w.Header().Set("Access-Control-Allow-Private-Network", "true")
+	}
+	if m.o.maxAge > 0 {
+		w.Header().Set("Access-Control-Max-Age", strconv.Itoa(m.o.maxAge))
+	}
+}
+
+// handleNormal handles normal CORS requests. If the request was successful, this function will
+// write the CORS headers to the response. If the request was not successful, this function will
+// not add any CORS headers to the response. In this case, the CORS request is considered invalid.
+func (m *Middleware) handleNormal(w http.ResponseWriter, r *http.Request) {
+	// Always set Vary headers
+	// see https://github.com/rs/cors/issues/10,
+	// https://github.com/rs/cors/commit/dbdca4d95feaa7511a46e6f1efb3b3aa505bc43f#commitcomment-12352001
+	w.Header().Add("Vary", "Origin")
+
+	// check origin
+	origin := r.Header.Get("Origin")
+	if origin == "" {
+		return // not a valid CORS request
+	}
+
+	if !m.originAllowed(origin) {
+		return
+	}
+
+	// check method
+	if !m.methodAllowed(r.Method) {
+		return
+	}
+
+	// set CORS headers for the successful CORS request
+	if m.allOrigins {
+		w.Header().Set("Access-Control-Allow-Origin", "*")
+	} else {
+		w.Header().Set("Access-Control-Allow-Origin", origin) // return original origin
+	}
+	if len(m.o.exposedHeaders) > 0 {
+		w.Header().Set("Access-Control-Expose-Headers", strings.Join(m.o.exposedHeaders, ", "))
+	}
+	if m.o.allowCredentials {
+		w.Header().Set("Access-Control-Allow-Credentials", "true")
+	}
+}
+
+func (m *Middleware) originAllowed(origin string) bool {
+	if len(m.o.allowedOrigins) == 1 && m.o.allowedOrigins[0] == "*" {
+		return true // everything is allowed
+	}
+
+	// check simple origins
+	if slices.Contains(m.o.allowedOrigins, origin) {
+		return true
+	}
+
+	// check wildcard origins
+	for _, allowedOrigin := range m.o.allowedOriginPatterns {
+		if allowedOrigin.match(origin) {
+			return true
+		}
+	}
+
+	return false
+}
+
+func (m *Middleware) methodAllowed(method string) bool {
+	if method == http.MethodOptions {
+		return true // preflight request is always allowed
+	}
+
+	if len(m.o.allowedMethods) == 1 && m.o.allowedMethods[0] == "*" {
+		return true // everything is allowed
+	}
+
+	if slices.Contains(m.o.allowedMethods, method) {
+		return true
+	}
+
+	return false
+}
+
+func (m *Middleware) headersAllowed(headers string) bool {
+	if headers == "" {
+		return true // no headers are requested
+	}
+
+	if len(m.o.allowedHeaders) == 0 {
+		return false // no headers are allowed
+	}
+
+	if _, ok := m.o.allowedHeaders["*"]; ok {
+		return true // everything is allowed
+	}
+
+	// split headers by comma (according to definition, the headers are sorted and in lowercase)
+	// https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Access-Control-Request-Headers
+	for header := range strings.SplitSeq(headers, ",") {
+		if _, ok := m.o.allowedHeaders[strings.TrimSpace(header)]; !ok {
+			return false
+		}
+	}
+
+	return true
+}
+
+// endregion internal-helpers

internal/app/api/core/middleware/cors/middleware_test.go

@@ -0,0 +1,101 @@
+package cors
+
+import (
+	"net/http"
+	"net/http/httptest"
+	"testing"
+)
+
+func TestMiddleware_New(t *testing.T) {
+	m := New(WithAllowedOrigins("*"))
+
+	if len(m.varyHeaders) == 0 {
+		t.Errorf("expected vary headers to be populated, got %v", m.varyHeaders)
+	}
+	if !m.allOrigins {
+		t.Errorf("expected allOrigins to be true, got %v", m.allOrigins)
+	}
+}
+
+func TestMiddleware_Handler_normal(t *testing.T) {
+	m := New(WithAllowedOrigins("http://example.com"))
+
+	handler := m.Handler(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		w.WriteHeader(http.StatusOK)
+	}))
+
+	req := httptest.NewRequest(http.MethodGet, "http://example.com", nil)
+	req.Header.Set("Origin", "http://example.com")
+	w := httptest.NewRecorder()
+
+	handler.ServeHTTP(w, req)
+
+	if w.Result().StatusCode != http.StatusOK {
+		t.Errorf("expected status code 200, got %d", w.Result().StatusCode)
+	}
+
+	if w.Header().Get("Access-Control-Allow-Origin") != "http://example.com" {
+		t.Errorf("expected Access-Control-Allow-Origin to be 'http://example.com', got %s",
+			w.Header().Get("Access-Control-Allow-Origin"))
+	}
+}
+
+func TestMiddleware_Handler_preflight(t *testing.T) {
+	m := New(WithAllowedOrigins("http://example.com"))
+
+	handler := m.Handler(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		w.WriteHeader(http.StatusOK)
+	}))
+
+	req := httptest.NewRequest(http.MethodOptions, "http://example.com", nil)
+	req.Header.Set("Origin", "http://example.com")
+	req.Header.Set("Access-Control-Request-Method", http.MethodGet)
+	w := httptest.NewRecorder()
+
+	handler.ServeHTTP(w, req)
+
+	if w.Result().StatusCode != http.StatusNoContent {
+		t.Errorf("expected status code 204, got %d", w.Result().StatusCode)
+	}
+
+	if w.Header().Get("Access-Control-Allow-Origin") != "http://example.com" {
+		t.Errorf("expected Access-Control-Allow-Origin to be 'http://example.com', got %s",
+			w.Header().Get("Access-Control-Allow-Origin"))
+	}
+}
+
+func TestMiddleware_originAllowed(t *testing.T) {
+	m := New(WithAllowedOrigins("http://example.com"))
+
+	if !m.originAllowed("http://example.com") {
+		t.Errorf("expected origin 'http://example.com' to be allowed")
+	}
+
+	if m.originAllowed("http://notallowed.com") {
+		t.Errorf("expected origin 'http://notallowed.com' to be not allowed")
+	}
+}
+
+func TestMiddleware_methodAllowed(t *testing.T) {
+	m := New(WithAllowedMethods(http.MethodGet, http.MethodPost))
+
+	if !m.methodAllowed(http.MethodGet) {
+		t.Errorf("expected method 'GET' to be allowed")
+	}
+
+	if m.methodAllowed(http.MethodDelete) {
+		t.Errorf("expected method 'DELETE' to be not allowed")
+	}
+}
+
+func TestMiddleware_headersAllowed(t *testing.T) {
+	m := New(WithAllowedHeaders("Content-Type", "Authorization"))
+
+	if !m.headersAllowed("content-type, authorization") {
+		t.Errorf("expected headers 'Content-Type, Authorization' to be allowed")
+	}
+
+	if m.headersAllowed("x-custom-header") {
+		t.Errorf("expected header 'X-Custom-Header' to be not allowed")
+	}
+}

internal/app/api/core/middleware/cors/options.go

@@ -0,0 +1,133 @@
+package cors
+
+import (
+	"net/http"
+	"strings"
+)
+
+type void struct{}
+
+// options is a struct that contains options for the CORS middleware.
+// It uses the functional options pattern for flexible configuration.
+type options struct {
+	allowedOrigins        []string   // origins without wildcards
+	allowedOriginPatterns []wildcard // origins with wildcards
+	allowedMethods        []string
+	allowedHeaders        map[string]void
+	exposedHeaders        []string // these are in addition to the CORS-safelisted response headers
+	allowCredentials      bool
+	allowPrivateNetworks  bool
+	maxAge                int
+}
+
+// Option is a type that is used to set options for the CORS middleware.
+// It implements the functional options pattern.
+type Option func(*options)
+
+// WithAllowedOrigins sets the allowed origins for the CORS middleware.
+// If the special "*" value is present in the list, all origins will be allowed.
+// An origin may contain a wildcard (*) to replace 0 or more characters
+// (i.e.: http://*.domain.com). Usage of wildcards implies a small performance penalty.
+// Only one wildcard can be used per origin.
+// By default, all origins are allowed (*).
+func WithAllowedOrigins(origins ...string) Option {
+	return func(o *options) {
+		o.allowedOrigins = nil
+		o.allowedOriginPatterns = nil
+
+		for _, origin := range origins {
+			if len(origin) > 1 && strings.Contains(origin, "*") {
+				o.allowedOriginPatterns = append(
+					o.allowedOriginPatterns,
+					newWildcard(origin),
+				)
+			} else {
+				o.allowedOrigins = append(o.allowedOrigins, origin)
+			}
+		}
+	}
+}
+
+// WithAllowedMethods sets the allowed methods for the CORS middleware.
+// By default, all methods are allowed (*).
+func WithAllowedMethods(methods ...string) Option {
+	return func(o *options) {
+		o.allowedMethods = methods
+	}
+}
+
+// WithAllowedHeaders sets the allowed headers for the CORS middleware.
+// By default, all headers are allowed (*).
+func WithAllowedHeaders(headers ...string) Option {
+	return func(o *options) {
+		o.allowedHeaders = make(map[string]void)
+
+		for _, header := range headers {
+			// allowed headers are always checked in lowercase
+			o.allowedHeaders[strings.ToLower(header)] = void{}
+		}
+	}
+}
+
+// WithExposedHeaders sets the exposed headers for the CORS middleware.
+// By default, no headers are exposed.
+func WithExposedHeaders(headers ...string) Option {
+	return func(o *options) {
+		o.exposedHeaders = nil
+
+		for _, header := range headers {
+			o.exposedHeaders = append(o.exposedHeaders, http.CanonicalHeaderKey(header))
+		}
+	}
+}
+
+// WithAllowCredentials sets the allow credentials option for the CORS middleware.
+// This setting indicates whether the request can include user credentials like
+// cookies, HTTP authentication or client side SSL certificates.
+// By default, credentials are not allowed.
+func WithAllowCredentials(allow bool) Option {
+	return func(o *options) {
+		o.allowCredentials = allow
+	}
+}
+
+// WithAllowPrivateNetworks sets the allow private networks option for the CORS middleware.
+// This setting indicates whether to accept cross-origin requests over a private network.
+func WithAllowPrivateNetworks(allow bool) Option {
+	return func(o *options) {
+		o.allowPrivateNetworks = allow
+	}
+}
+
+// WithMaxAge sets the max age (in seconds) for the CORS middleware.
+// The maximum age indicates how long (in seconds) the results of a preflight request
+// can be cached. A value of 0 means that no Access-Control-Max-Age header is sent back,
+// resulting in browsers using their default value (5s by spec).
+// If you need to force a 0 max-age, set it to a negative value (ie: -1).
+// By default, the max age is 7200 seconds.
+func WithMaxAge(age int) Option {
+	return func(o *options) {
+		o.maxAge = age
+	}
+}
+
+// newOptions is a function that returns a new options struct with sane default values.
+func newOptions(opts ...Option) options {
+	o := options{
+		allowedOrigins: []string{"*"},
+		allowedMethods: []string{
+			http.MethodHead, http.MethodGet, http.MethodPost, http.MethodPut, http.MethodPatch, http.MethodDelete,
+		},
+		allowedHeaders:       map[string]void{"*": {}},
+		exposedHeaders:       nil,
+		allowCredentials:     false,
+		allowPrivateNetworks: false,
+		maxAge:               0,
+	}
+
+	for _, opt := range opts {
+		opt(&o)
+	}
+
+	return o
+}

internal/app/api/core/middleware/cors/options_test.go

@@ -0,0 +1,96 @@
+package cors
+
+import (
+	"maps"
+	"net/http"
+	"slices"
+	"testing"
+)
+
+func TestWithAllowedOrigins(t *testing.T) {
+	tests := []struct {
+		name         string
+		origins      []string
+		wantNormal   []string
+		wantWildcard []wildcard
+	}{
+		{
+			name:         "No origins",
+			origins:      []string{},
+			wantNormal:   nil,
+			wantWildcard: nil,
+		},
+		{
+			name:         "Single origin",
+			origins:      []string{"http://example.com"},
+			wantNormal:   []string{"http://example.com"},
+			wantWildcard: nil,
+		},
+		{
+			name:         "Wildcard origin",
+			origins:      []string{"http://*.example.com"},
+			wantNormal:   nil,
+			wantWildcard: []wildcard{newWildcard("http://*.example.com")},
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			o := newOptions(WithAllowedOrigins(tt.origins...))
+			if !slices.Equal(o.allowedOrigins, tt.wantNormal) {
+				t.Errorf("got %v, want %v", o, tt.wantNormal)
+			}
+			if !slices.Equal(o.allowedOriginPatterns, tt.wantWildcard) {
+				t.Errorf("got %v, want %v", o, tt.wantWildcard)
+			}
+		})
+	}
+}
+
+func TestWithAllowedMethods(t *testing.T) {
+	methods := []string{http.MethodGet, http.MethodPost}
+	o := newOptions(WithAllowedMethods(methods...))
+	if !slices.Equal(o.allowedMethods, methods) {
+		t.Errorf("got %v, want %v", o.allowedMethods, methods)
+	}
+}
+
+func TestWithAllowedHeaders(t *testing.T) {
+	headers := []string{"Content-Type", "Authorization"}
+	o := newOptions(WithAllowedHeaders(headers...))
+	expectedHeaders := map[string]void{"content-type": {}, "authorization": {}}
+	if !maps.Equal(o.allowedHeaders, expectedHeaders) {
+		t.Errorf("got %v, want %v", o.allowedHeaders, expectedHeaders)
+	}
+}
+
+func TestWithExposedHeaders(t *testing.T) {
+	headers := []string{"X-Custom-Header"}
+	o := newOptions(WithExposedHeaders(headers...))
+	expectedHeaders := []string{http.CanonicalHeaderKey("X-Custom-Header")}
+	if !slices.Equal(o.exposedHeaders, expectedHeaders) {
+		t.Errorf("got %v, want %v", o.exposedHeaders, expectedHeaders)
+	}
+}
+
+func TestWithAllowCredentials(t *testing.T) {
+	o := newOptions(WithAllowCredentials(true))
+	if !o.allowCredentials {
+		t.Errorf("got %v, want %v", o.allowCredentials, true)
+	}
+}
+
+func TestWithAllowPrivateNetworks(t *testing.T) {
+	o := newOptions(WithAllowPrivateNetworks(true))
+	if !o.allowPrivateNetworks {
+		t.Errorf("got %v, want %v", o.allowPrivateNetworks, true)
+	}
+}
+
+func TestWithMaxAge(t *testing.T) {
+	maxAge := 3600
+	o := newOptions(WithMaxAge(maxAge))
+	if o.maxAge != maxAge {
+		t.Errorf("got %v, want %v", o.maxAge, maxAge)
+	}
+}

internal/app/api/core/middleware/cors/wildcard.go

@@ -0,0 +1,33 @@
+package cors
+
+import "strings"
+
+// wildcard is a type that represents a wildcard string.
+// This type allows faster matching of strings with a wildcard
+// in comparison to using regex.
+type wildcard struct {
+	prefix string
+	suffix string
+}
+
+// match returns true if the string s has the prefix and suffix of the wildcard.
+func (w wildcard) match(s string) bool {
+	return len(s) >= len(w.prefix)+len(w.suffix) &&
+		strings.HasPrefix(s, w.prefix) &&
+		strings.HasSuffix(s, w.suffix)
+}
+
+func newWildcard(s string) wildcard {
+	if i := strings.IndexByte(s, '*'); i >= 0 {
+		return wildcard{
+			prefix: s[:i],
+			suffix: s[i+1:],
+		}
+	}
+
+	// fallback, usually this case should not happen
+	return wildcard{
+		prefix: s,
+		suffix: "",
+	}
+}

internal/app/api/core/middleware/cors/wildcard_test.go

@@ -0,0 +1,94 @@
+package cors
+
+import "testing"
+
+func TestWildcardMatch(t *testing.T) {
+	tests := []struct {
+		name     string
+		wildcard wildcard
+		input    string
+		expected bool
+	}{
+		{
+			name:     "Match with prefix and suffix",
+			wildcard: newWildcard("http://*.example.com"),
+			input:    "http://sub.example.com",
+			expected: true,
+		},
+		{
+			name:     "No match with different prefix",
+			wildcard: newWildcard("http://*.example.com"),
+			input:    "https://sub.example.com",
+			expected: false,
+		},
+		{
+			name:     "No match with different suffix",
+			wildcard: newWildcard("http://*.example.com"),
+			input:    "http://sub.example.org",
+			expected: false,
+		},
+		{
+			name:     "Match with empty suffix",
+			wildcard: newWildcard("http://*"),
+			input:    "http://example.com",
+			expected: true,
+		},
+		{
+			name:     "Match with empty prefix",
+			wildcard: newWildcard("*.example.com"),
+			input:    "sub.example.com",
+			expected: true,
+		},
+		{
+			name:     "No match with empty prefix and different suffix",
+			wildcard: newWildcard("*.example.com"),
+			input:    "sub.example.org",
+			expected: false,
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			if got := tt.wildcard.match(tt.input); got != tt.expected {
+				t.Errorf("wildcard.match(%s) = %v, want %v", tt.input, got, tt.expected)
+			}
+		})
+	}
+}
+
+func TestNewWildcard(t *testing.T) {
+	tests := []struct {
+		name     string
+		input    string
+		expected wildcard
+	}{
+		{
+			name:     "Wildcard with prefix and suffix",
+			input:    "http://*.example.com",
+			expected: wildcard{prefix: "http://", suffix: ".example.com"},
+		},
+		{
+			name:     "Wildcard with empty suffix",
+			input:    "http://*",
+			expected: wildcard{prefix: "http://", suffix: ""},
+		},
+		{
+			name:     "Wildcard with empty prefix",
+			input:    "*.example.com",
+			expected: wildcard{prefix: "", suffix: ".example.com"},
+		},
+		{
+			name:     "No wildcard character",
+			input:    "http://example.com",
+			expected: wildcard{prefix: "http://example.com", suffix: ""},
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			if got := newWildcard(tt.input); got != tt.expected {
+				t.Errorf("newWildcard(%s) = %v, want %v", tt.input, got, tt.expected)
+			}
+		})
+	}
+}

internal/app/api/core/middleware/csrf/middleware.go

@@ -0,0 +1,137 @@
+package csrf
+
+import (
+	"context"
+	"net/http"
+	"slices"
+)
+
+// ContextValueIdentifier is the context value identifier for the CSRF token.
+// The token is only stored in the context if the RefreshToken function was called before.
+const ContextValueIdentifier = "_csrf_token"
+
+// Middleware is a type that creates a new CSRF middleware. The CSRF middleware
+// can be used to mitigate Cross-Site Request Forgery attacks.
+type Middleware struct {
+	o options
+}
+
+// New returns a new CSRF middleware with the provided options.
+func New(sessionReader SessionReader, sessionWriter SessionWriter, opts ...Option) *Middleware {
+	opts = append(opts, withSessionReader(sessionReader), withSessionWriter(sessionWriter))
+	o := newOptions(opts...)
+
+	m := &Middleware{
+		o: o,
+	}
+
+	checkForPRNG()
+
+	return m
+}
+
+// Handler returns the CSRF middleware handler. This middleware validates the CSRF token and calls the specified
+// error handler if an invalid CSRF token was found.
+func (m *Middleware) Handler(next http.Handler) http.Handler {
+	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		if slices.Contains(m.o.ignoreMethods, r.Method) {
+			next.ServeHTTP(w, r) // skip CSRF check for ignored methods
+			return
+		}
+
+		// get the token from the request
+		token := m.o.tokenGetter(r)
+		storedToken := m.o.sessionGetter(r)
+
+		if !tokenEqual(token, storedToken) {
+			m.o.errCallback(w, r)
+			return
+		}
+
+		next.ServeHTTP(w, r) // execute the next handler
+	})
+}
+
+// RefreshToken generates a new CSRF Token and stores it in the session. The token is also passed to subsequent handlers
+// via the context value ContextValueIdentifier.
+func (m *Middleware) RefreshToken(next http.Handler) http.Handler {
+	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		if GetToken(r.Context()) != "" {
+			// token already generated higher up in the chain
+			next.ServeHTTP(w, r)
+			return
+		}
+
+		// generate a new token
+		token := generateToken(m.o.tokenLength)
+		key := generateToken(m.o.tokenLength)
+
+		// mask the token
+		maskedToken := maskToken(token, key)
+		encodedToken := encodeToken(maskedToken)
+
+		// pass the token down the chain via the context
+		r = r.WithContext(setToken(r.Context(), encodedToken))
+
+		// store the token in the session
+		m.o.sessionWriter(r, encodedToken)
+
+		next.ServeHTTP(w, r)
+	})
+}
+
+// region token-access
+
+// GetToken retrieves the CSRF token from the given context. Ensure that the RefreshToken function was called before,
+// otherwise, no token is populated in the context.
+func GetToken(ctx context.Context) string {
+	token, ok := ctx.Value(ContextValueIdentifier).(string)
+	if !ok {
+		return ""
+	}
+
+	return token
+}
+
+// endregion token-access
+
+// region internal-helpers
+
+func setToken(ctx context.Context, token string) context.Context {
+	return context.WithValue(ctx, ContextValueIdentifier, token)
+}
+
+// defaultTokenGetter is the default token getter function for the CSRF middleware.
+// It checks the request form values, URL query parameters, and headers for the CSRF token.
+// The order of precedence is:
+//  1. Header "X-CSRF-TOKEN"
+//  2. Header "X-XSRF-TOKEN"
+//  3. URL query parameter "_csrf"
+//  4. Form value "_csrf"
+func defaultTokenGetter(r *http.Request) string {
+	if t := r.Header.Get("X-CSRF-TOKEN"); len(t) > 0 {
+		return t
+	}
+
+	if t := r.Header.Get("X-XSRF-TOKEN"); len(t) > 0 {
+		return t
+	}
+
+	if t := r.URL.Query().Get("_csrf"); len(t) > 0 {
+		return t
+	}
+
+	if t := r.FormValue("_csrf"); len(t) > 0 {
+		return t
+	}
+
+	return ""
+}
+
+// defaultErrorHandler is the default error handler function for the CSRF middleware.
+// It writes a 403 Forbidden response.
+func defaultErrorHandler(w http.ResponseWriter, _ *http.Request) {
+	http.Error(w, "CSRF token mismatch", http.StatusForbidden)
+}
+
+// endregion internal-helpers

internal/app/api/core/middleware/csrf/middleware_test.go

@@ -0,0 +1,251 @@
+package csrf
+
+import (
+	"io"
+	"net/http"
+	"net/http/httptest"
+	"strings"
+	"testing"
+
+	"github.com/h44z/wg-portal/internal/app/api/core/request"
+)
+
+func TestMiddleware_Handler(t *testing.T) {
+	sessionToken := "stored-token"
+	sessionReader := func(r *http.Request) string {
+		return sessionToken
+	}
+	sessionWriter := func(r *http.Request, token string) {
+		sessionToken = token
+	}
+	m := New(sessionReader, sessionWriter)
+
+	handler := m.Handler(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		w.WriteHeader(http.StatusOK)
+	}))
+
+	tests := []struct {
+		name       string
+		method     string
+		token      string
+		wantStatus int
+	}{
+		{"ValidToken", "POST", "stored-token", http.StatusOK},
+		{"ValidToken2", "PUT", "stored-token", http.StatusOK},
+		{"ValidToken3", "GET", "stored-token", http.StatusOK},
+		{"InvalidToken", "POST", "invalid-token", http.StatusForbidden},
+		{"IgnoredMethod", "GET", "", http.StatusOK},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			req := httptest.NewRequest(tt.method, "/", nil)
+			req.Header.Set("X-CSRF-TOKEN", tt.token)
+			rr := httptest.NewRecorder()
+
+			handler.ServeHTTP(rr, req)
+
+			if status := rr.Code; status != tt.wantStatus {
+				t.Errorf("Handler() status = %d, want %d", status, tt.wantStatus)
+			}
+		})
+	}
+}
+
+func TestMiddleware_RefreshToken(t *testing.T) {
+	sessionToken := ""
+	sessionReader := func(r *http.Request) string {
+		return sessionToken
+	}
+	sessionWriter := func(r *http.Request, token string) {
+		sessionToken = token
+	}
+	m := New(sessionReader, sessionWriter)
+
+	handler := m.RefreshToken(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		token := GetToken(r.Context())
+		if token == "" {
+			t.Errorf("RefreshToken() did not set token in context")
+		}
+		w.WriteHeader(http.StatusOK)
+	}))
+
+	req := httptest.NewRequest("POST", "/", nil)
+	rr := httptest.NewRecorder()
+
+	handler.ServeHTTP(rr, req)
+
+	if status := rr.Code; status != http.StatusOK {
+		t.Errorf("RefreshToken() status = %d, want %d", status, http.StatusOK)
+	}
+
+	if sessionToken == "" {
+		t.Errorf("RefreshToken() did not set token in session")
+	}
+}
+
+func TestMiddleware_RefreshToken_chained(t *testing.T) {
+	sessionToken := ""
+	tokenWrites := 0
+	sessionReader := func(r *http.Request) string {
+		return sessionToken
+	}
+	sessionWriter := func(r *http.Request, token string) {
+		sessionToken = token
+		tokenWrites++
+	}
+	m := New(sessionReader, sessionWriter)
+
+	handler := m.RefreshToken(m.RefreshToken(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		token := GetToken(r.Context())
+		if token == "" {
+			t.Errorf("RefreshToken() did not set token in context")
+		}
+		w.WriteHeader(http.StatusOK)
+	})))
+
+	req := httptest.NewRequest("POST", "/", nil)
+	rr := httptest.NewRecorder()
+
+	handler.ServeHTTP(rr, req)
+
+	if status := rr.Code; status != http.StatusOK {
+		t.Errorf("RefreshToken() status = %d, want %d", status, http.StatusOK)
+	}
+
+	if sessionToken == "" {
+		t.Errorf("RefreshToken() did not set token in session")
+	}
+
+	if tokenWrites != 1 {
+		t.Errorf("RefreshToken() wrote token to session more than once: %d", tokenWrites)
+	}
+}
+
+func TestMiddleware_RefreshToken_Handler(t *testing.T) {
+	sessionToken := ""
+	sessionReader := func(r *http.Request) string {
+		return sessionToken
+	}
+	sessionWriter := func(r *http.Request, token string) {
+		sessionToken = token
+	}
+	m := New(sessionReader, sessionWriter)
+
+	// simulate two requests: first one GET request with the RefreshToken handler, the next one is a PUT request with
+	// the token from the first request added as X-CSRF-TOKEN header
+
+	// first request
+	retrievedToken := ""
+	req := httptest.NewRequest("GET", "/", nil)
+	rr := httptest.NewRecorder()
+	handler := m.RefreshToken(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		retrievedToken = GetToken(r.Context())
+		if retrievedToken == "" {
+			t.Errorf("RefreshToken() did not set token in context")
+		}
+		w.WriteHeader(http.StatusAccepted)
+	}))
+	handler.ServeHTTP(rr, req)
+	if status := rr.Code; status != http.StatusAccepted {
+		t.Errorf("Handler() status = %d, want %d", status, http.StatusAccepted)
+	}
+	if retrievedToken == "" {
+		t.Errorf("no token retrieved")
+	}
+	if retrievedToken != sessionToken {
+		t.Errorf("token in context does not match token in session")
+	}
+
+	// second request
+	req = httptest.NewRequest("PUT", "/", nil)
+	req.Header.Set("X-CSRF-TOKEN", retrievedToken)
+	rr = httptest.NewRecorder()
+	handler = m.Handler(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		w.WriteHeader(http.StatusOK)
+	}))
+	handler.ServeHTTP(rr, req)
+	if status := rr.Code; status != http.StatusOK {
+		t.Errorf("Handler() status = %d, want %d", status, http.StatusOK)
+	}
+}
+
+func TestMiddleware_Handler_FormBody(t *testing.T) {
+	sessionToken := "stored-token"
+	sessionReader := func(r *http.Request) string {
+		return sessionToken
+	}
+	sessionWriter := func(r *http.Request, token string) {
+		sessionToken = token
+	}
+	m := New(sessionReader, sessionWriter)
+
+	handler := m.Handler(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		bodyData, err := request.BodyString(r)
+		if err != nil {
+			t.Errorf("Handler() error = %v, want nil", err)
+		}
+		// ensure that the body is empty - ParseForm() should have been called before by the CSRF middleware
+		if bodyData != "" {
+			t.Errorf("Handler() bodyData = %s, want empty", bodyData)
+		}
+
+		if r.FormValue("_csrf") != "stored-token" {
+			t.Errorf("Handler() _csrf = %s, want %s", r.FormValue("_csrf"), "stored-token")
+		}
+
+		w.WriteHeader(http.StatusOK)
+	}))
+
+	req := httptest.NewRequest("POST", "/", nil)
+	req.Header.Set("Content-Type", "application/x-www-form-urlencoded")
+	req.Form = make(map[string][]string)
+	req.Form.Add("_csrf", "stored-token")
+	rr := httptest.NewRecorder()
+
+	handler.ServeHTTP(rr, req)
+
+	if status := rr.Code; status != http.StatusOK {
+		t.Errorf("Handler() status = %d, want %d", status, http.StatusOK)
+	}
+}
+
+func TestMiddleware_Handler_FormBodyAvailable(t *testing.T) {
+	sessionToken := "stored-token"
+	sessionReader := func(r *http.Request) string {
+		return sessionToken
+	}
+	sessionWriter := func(r *http.Request, token string) {
+		sessionToken = token
+	}
+	m := New(sessionReader, sessionWriter)
+
+	handler := m.Handler(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		bodyData, err := request.BodyString(r)
+		if err != nil {
+			t.Errorf("Handler() error = %v, want nil", err)
+		}
+		// ensure that the body is not empty, as the CSRF middleware should not have read the body
+		if bodyData != "the original body" {
+			t.Errorf("Handler() bodyData = %s, want %s", bodyData, "the original body")
+		}
+
+		// check if the token is available in the form values (from query parameters)
+		if r.FormValue("_csrf") != "stored-token" {
+			t.Errorf("Handler() _csrf = %s, want %s", r.FormValue("_csrf"), "stored-token")
+		}
+
+		w.WriteHeader(http.StatusOK)
+	}))
+
+	req := httptest.NewRequest("POST", "/?_csrf=stored-token", nil)
+	req.Header.Set("Content-Type", "text/plain")
+	req.Body = io.NopCloser(strings.NewReader("the original body"))
+	rr := httptest.NewRecorder()
+
+	handler.ServeHTTP(rr, req)
+
+	if status := rr.Code; status != http.StatusOK {
+		t.Errorf("Handler() status = %d, want %d", status, http.StatusOK)
+	}
+}

internal/app/api/core/middleware/csrf/options.go

@@ -0,0 +1,88 @@
+package csrf
+
+import "net/http"
+
+type SessionReader func(r *http.Request) string
+type SessionWriter func(r *http.Request, token string)
+
+// options is a struct that contains options for the CSRF middleware.
+// It uses the functional options pattern for flexible configuration.
+type options struct {
+	tokenLength   int
+	ignoreMethods []string
+
+	errCallbackOverride bool
+	errCallback         func(w http.ResponseWriter, r *http.Request)
+
+	tokenGetterOverride bool
+	tokenGetter         func(r *http.Request) string
+
+	sessionGetter SessionReader
+	sessionWriter SessionWriter
+}
+
+// Option is a type that is used to set options for the CSRF middleware.
+// It implements the functional options pattern.
+type Option func(*options)
+
+// WithTokenLength is a method that sets the token length for the CSRF middleware.
+// The default value is 32.
+func WithTokenLength(length int) Option {
+	return func(o *options) {
+		o.tokenLength = length
+	}
+}
+
+// WithErrorCallback is a method that sets the error callback function for the CSRF middleware.
+// The error callback function is called when the CSRF token is invalid.
+// The default behavior is to write a 403 Forbidden response.
+func WithErrorCallback(fn func(w http.ResponseWriter, r *http.Request)) Option {
+	return func(o *options) {
+		o.errCallback = fn
+		o.errCallbackOverride = true
+	}
+}
+
+// WithTokenGetter is a method that sets the token getter function for the CSRF middleware.
+// The token getter function is called to get the CSRF token from the request.
+// The default behavior is to get the token from the "X-CSRF-Token" header.
+func WithTokenGetter(fn func(r *http.Request) string) Option {
+	return func(o *options) {
+		o.tokenGetter = fn
+		o.tokenGetterOverride = true
+	}
+}
+
+// withSessionReader is a method that sets the session reader function for the CSRF middleware.
+// The session reader function is called to get the CSRF token from the session.
+func withSessionReader(fn SessionReader) Option {
+	return func(o *options) {
+		o.sessionGetter = fn
+	}
+}
+
+// withSessionWriter is a method that sets the session writer function for the CSRF middleware.
+// The session writer function is called to write the CSRF token to the session.
+func withSessionWriter(fn SessionWriter) Option {
+	return func(o *options) {
+		o.sessionWriter = fn
+	}
+}
+
+// newOptions is a function that returns a new options struct with sane default values.
+func newOptions(opts ...Option) options {
+	o := options{
+		tokenLength:         32,
+		ignoreMethods:       []string{"GET", "HEAD", "OPTIONS"},
+		errCallbackOverride: false,
+		errCallback:         defaultErrorHandler,
+		tokenGetterOverride: false,
+		tokenGetter:         defaultTokenGetter,
+	}
+
+	for _, opt := range opts {
+		opt(&o)
+	}
+
+	return o
+}

internal/app/api/core/middleware/csrf/options_test.go

@@ -0,0 +1,75 @@
+package csrf
+
+import (
+	"net/http"
+	"testing"
+)
+
+func TestWithTokenLength(t *testing.T) {
+	o := newOptions(WithTokenLength(64))
+	if o.tokenLength != 64 {
+		t.Errorf("WithTokenLength() = %d, want %d", o.tokenLength, 64)
+	}
+}
+
+func TestWithErrorCallback(t *testing.T) {
+	callback := func(w http.ResponseWriter, r *http.Request) {
+		w.WriteHeader(http.StatusTeapot)
+	}
+	o := newOptions(WithErrorCallback(callback))
+	if !o.errCallbackOverride {
+		t.Errorf("WithErrorCallback() did not set errCallbackOverride to true")
+	}
+	if o.errCallback == nil {
+		t.Errorf("WithErrorCallback() did not set errCallback")
+	}
+}
+
+func TestWithTokenGetter(t *testing.T) {
+	getter := func(r *http.Request) string {
+		return "test-token"
+	}
+	o := newOptions(WithTokenGetter(getter))
+	if !o.tokenGetterOverride {
+		t.Errorf("WithTokenGetter() did not set tokenGetterOverride to true")
+	}
+	if o.tokenGetter == nil {
+		t.Errorf("WithTokenGetter() did not set tokenGetter")
+	}
+}
+
+func TestWithSessionReader(t *testing.T) {
+	reader := func(r *http.Request) string {
+		return "session-token"
+	}
+	o := newOptions(withSessionReader(reader))
+	if o.sessionGetter == nil {
+		t.Errorf("withSessionReader() did not set sessionGetter")
+	}
+}
+
+func TestWithSessionWriter(t *testing.T) {
+	writer := func(r *http.Request, token string) {
+		// do nothing
+	}
+	o := newOptions(withSessionWriter(writer))
+	if o.sessionWriter == nil {
+		t.Errorf("withSessionWriter() did not set sessionWriter")
+	}
+}
+
+func TestNewOptionsDefaults(t *testing.T) {
+	o := newOptions()
+	if o.tokenLength != 32 {
+		t.Errorf("newOptions() default tokenLength = %d, want %d", o.tokenLength, 32)
+	}
+	if len(o.ignoreMethods) != 3 {
+		t.Errorf("newOptions() default ignoreMethods length = %d, want %d", len(o.ignoreMethods), 3)
+	}
+	if o.errCallback == nil {
+		t.Errorf("newOptions() default errCallback is nil")
+	}
+	if o.tokenGetter == nil {
+		t.Errorf("newOptions() default tokenGetter is nil")
+	}
+}

internal/app/api/core/middleware/csrf/token.go

@@ -0,0 +1,90 @@
+package csrf
+
+import (
+	"crypto/rand"
+	"encoding/base64"
+	"fmt"
+	"io"
+	"slices"
+)
+
+// checkForPRNG is a function that checks if a cryptographically secure PRNG is available.
+// If it is not available, the function panics.
+func checkForPRNG() {
+	buf := make([]byte, 1)
+	_, err := io.ReadFull(rand.Reader, buf)
+
+	if err != nil {
+		panic(fmt.Sprintf("crypto/rand is unavailable: Read() failed with %#v", err))
+	}
+}
+
+// generateToken is a function that generates a secure random CSRF token.
+func generateToken(length int) []byte {
+	bytes := make([]byte, length)
+
+	if _, err := io.ReadFull(rand.Reader, bytes); err != nil {
+		panic(err)
+	}
+
+	return bytes
+}
+
+// encodeToken is a function that encodes a token to a base64 string.
+func encodeToken(token []byte) string {
+	return base64.URLEncoding.EncodeToString(token)
+}
+
+// decodeToken is a function that decodes a base64 string to a token.
+func decodeToken(token string) ([]byte, error) {
+	return base64.URLEncoding.DecodeString(token)
+}
+
+// maskToken is a function that masks a token with a given key.
+// The returned byte slice contains the key + the masked token.
+// The key needs to have the same length as the token, otherwise the function panics.
+// So the resulting slice has a length of len(token) * 2.
+func maskToken(token, key []byte) []byte {
+	if len(token) != len(key) {
+		panic("token and key must have the same length")
+	}
+
+	// masked contains the key in the first half and the XOR masked token in the second half
+	tokenLength := len(token)
+	masked := make([]byte, tokenLength*2)
+	for i := 0; i < len(token); i++ {
+		masked[i] = key[i]
+		masked[i+tokenLength] = token[i] ^ key[i] // XOR mask
+	}
+
+	return masked
+}
+
+// unmaskToken is a function that unmask a token which contains the key in the first half.
+// The returned byte slice contains the unmasked token, it has exactly half the length of the input slice.
+func unmaskToken(masked []byte) []byte {
+	tokenLength := len(masked) / 2
+	token := make([]byte, tokenLength)
+	for i := 0; i < tokenLength; i++ {
+		token[i] = masked[i] ^ masked[i+tokenLength] // XOR unmask
+	}
+
+	return token
+}
+
+// tokenEqual is a function that compares two tokens for equality.
+func tokenEqual(a, b string) bool {
+	decodedA, err := decodeToken(a)
+	if err != nil {
+		return false
+	}
+	decodedB, err := decodeToken(b)
+	if err != nil {
+		return false
+	}
+
+	unmaskedA := unmaskToken(decodedA)
+	unmaskedB := unmaskToken(decodedB)
+
+	return slices.Equal(unmaskedA, unmaskedB)
+}

internal/app/api/core/middleware/csrf/token_test.go

@@ -0,0 +1,81 @@
+package csrf
+
+import (
+	"encoding/base64"
+	"testing"
+)
+
+func TestCheckForPRNG(t *testing.T) {
+	defer func() {
+		if r := recover(); r != nil {
+			t.Errorf("checkForPRNG() panicked: %v", r)
+		}
+	}()
+	checkForPRNG()
+}
+
+func TestGenerateToken(t *testing.T) {
+	length := 32
+	token := generateToken(length)
+	if len(token) != length {
+		t.Errorf("generateToken() returned token of length %d, expected %d", len(token), length)
+	}
+}
+
+func TestEncodeToken(t *testing.T) {
+	token := []byte("testtoken")
+	encoded := encodeToken(token)
+	expected := base64.URLEncoding.EncodeToString(token)
+	if encoded != expected {
+		t.Errorf("encodeToken() = %v, want %v", encoded, expected)
+	}
+}
+
+func TestDecodeToken(t *testing.T) {
+	token := "dGVzdHRva2Vu"
+	expected := []byte("testtoken")
+	decoded, err := decodeToken(token)
+	if err != nil {
+		t.Errorf("decodeToken() error = %v", err)
+	}
+	if string(decoded) != string(expected) {
+		t.Errorf("decodeToken() = %v, want %v", decoded, expected)
+	}
+}
+
+func TestMaskToken(t *testing.T) {
+	token := []byte("testtoken")
+	key := []byte("keykeykey")
+	masked := maskToken(token, key)
+	if len(masked) != len(token)*2 {
+		t.Errorf("maskToken() returned masked token of length %d, expected %d", len(masked), len(token)*2)
+	}
+}
+
+func TestUnmaskToken(t *testing.T) {
+	token := []byte("testtoken")
+	key := []byte("keykeykey")
+	masked := maskToken(token, key)
+	unmasked := unmaskToken(masked)
+	if string(unmasked) != string(token) {
+		t.Errorf("unmaskToken() = %v, want %v", unmasked, token)
+	}
+}
+
+func TestTokenEqual(t *testing.T) {
+	tokenA := encodeToken(maskToken([]byte{0x01, 0x02, 0x03}, []byte{0x01, 0x02, 0x03}))
+	tokenB := encodeToken(maskToken([]byte{0x01, 0x02, 0x03}, []byte{0x04, 0x05, 0x06}))
+	if !tokenEqual(tokenA, tokenB) {
+		t.Errorf("tokenEqual() = false, want true")
+	}
+
+	tokenC := encodeToken(maskToken([]byte{0x01, 0x02, 0x03}, []byte{0x07, 0x08, 0x09}))
+	if !tokenEqual(tokenA, tokenC) {
+		t.Errorf("tokenEqual() = false, want true")
+	}
+
+	tokenD := encodeToken(maskToken([]byte{0x09, 0x02, 0x03}, []byte{0x04, 0x05, 0x06}))
+	if tokenEqual(tokenA, tokenD) {
+		t.Errorf("tokenEqual() = true, want false")
+	}
+}

internal/app/api/core/middleware/logging/middleware.go

@@ -0,0 +1,199 @@
+package logging
+
+import (
+	"fmt"
+	"log/slog"
+	"net/http"
+	"strings"
+	"time"
+)
+
+// LogLevel is an enumeration of the different log levels.
+type LogLevel int
+
+const (
+	LogLevelDebug LogLevel = iota
+	LogLevelInfo
+	LogLevelWarn
+	LogLevelError
+)
+
+// Logger is an interface that defines the methods that a logger must implement.
+// This allows the logging middleware to be used with different logging libraries.
+type Logger interface {
+	// Debugf logs a message at debug level.
+	Debugf(format string, args ...any)
+	// Infof logs a message at info level.
+	Infof(format string, args ...any)
+	// Warnf logs a message at warn level.
+	Warnf(format string, args ...any)
+	// Errorf logs a message at error level.
+	Errorf(format string, args ...any)
+}
+
+// Middleware is a type that creates a new logging middleware. The logging middleware
+// logs information about each request.
+type Middleware struct {
+	o options
+}
+
+// New returns a new logging middleware with the provided options.
+func New(opts ...Option) *Middleware {
+	o := newOptions(opts...)
+
+	m := &Middleware{
+		o: o,
+	}
+
+	return m
+}
+
+// Handler returns the logging middleware handler.
+func (m *Middleware) Handler(next http.Handler) http.Handler {
+	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		ww := newWriterWrapper(w)
+		start := time.Now()
+		defer func() {
+			info := m.extractInfoMap(r, start, ww)
+
+			if m.o.logger == nil {
+				msg, args := m.buildSlogMessageAndArguments(info)
+				m.logMsg(msg, args...)
+			} else {
+				msg := m.buildNormalLogMessage(info)
+				m.logMsg(msg)
+			}
+		}()
+
+		next.ServeHTTP(ww, r)
+	})
+}
+
+func (m *Middleware) extractInfoMap(r *http.Request, start time.Time, ww *writerWrapper) map[string]any {
+	info := make(map[string]any)
+
+	info["method"] = r.Method
+	info["path"] = r.URL.Path
+	info["protocol"] = r.Proto
+	info["clientIP"] = r.Header.Get("X-Forwarded-For")
+	if info["clientIP"] == "" {
+		// If the X-Forwarded-For header is not set, use the remote address without the port number.
+		lastColonIndex := strings.LastIndex(r.RemoteAddr, ":")
+		switch lastColonIndex {
+		case -1:
+			info["clientIP"] = r.RemoteAddr
+		default:
+			info["clientIP"] = r.RemoteAddr[:lastColonIndex]
+		}
+	}
+	info["userAgent"] = r.UserAgent()
+	info["referer"] = r.Header.Get("Referer")
+	info["duration"] = time.Since(start).String()
+	info["status"] = ww.StatusCode
+	info["dataLength"] = ww.WrittenBytes
+
+	if m.o.headerRequestIdKey != "" {
+		info["headerRequestId"] = r.Header.Get(m.o.headerRequestIdKey)
+	}
+	if m.o.contextRequestIdKey != "" {
+		info["contextRequestId"], _ = r.Context().Value(m.o.contextRequestIdKey).(string)
+	}
+
+	return info
+}
+
+func (m *Middleware) buildNormalLogMessage(info map[string]any) string {
+	switch {
+	case info["headerRequestId"] != nil && info["contextRequestId"] != nil:
+		return fmt.Sprintf("%s %s %s - %d %d - %s - %s %s %s - rid=%s ctx=%s",
+			info["method"], info["path"], info["protocol"],
+			info["status"], info["dataLength"],
+			info["duration"],
+			info["clientIP"], info["userAgent"], info["referer"],
+			info["headerRequestId"], info["contextRequestId"])
+	case info["headerRequestId"] != nil:
+		return fmt.Sprintf("%s %s %s - %d %d - %s - %s %s %s - rid=%s",
+			info["method"], info["path"], info["protocol"],
+			info["status"], info["dataLength"],
+			info["duration"],
+			info["clientIP"], info["userAgent"], info["referer"],
+			info["headerRequestId"])
+	case info["contextRequestId"] != nil:
+		return fmt.Sprintf("%s %s %s - %d %d - %s - %s %s %s - ctx=%s",
+			info["method"], info["path"], info["protocol"],
+			info["status"], info["dataLength"],
+			info["duration"],
+			info["clientIP"], info["userAgent"], info["referer"],
+			info["contextRequestId"])
+	default:
+		return fmt.Sprintf("%s %s %s - %d %d - %s - %s %s %s",
+			info["method"], info["path"], info["protocol"],
+			info["status"], info["dataLength"],
+			info["duration"],
+			info["clientIP"], info["userAgent"], info["referer"])
+	}
+}
+
+func (m *Middleware) buildSlogMessageAndArguments(info map[string]any) (message string, args []any) {
+	message = fmt.Sprintf("%s %s", info["method"], info["path"])
+
+	// Use a fixed order for the keys, so that the message is always the same.
+	// Skip method and path as they are already in the message.
+	keys := []string{
+		"protocol",
+		"status",
+		"dataLength",
+		"duration",
+		"clientIP",
+		"userAgent",
+		"referer",
+		"headerRequestId",
+		"contextRequestId",
+	}
+	for _, k := range keys {
+		if v, ok := info[k]; ok {
+			args = append(args, k, v) // only add key, value if it exists
+		}
+	}
+
+	return
+}
+
+func (m *Middleware) addPrefix(message string) string {
+	if m.o.prefix != "" {
+		return m.o.prefix + " " + message
+	}
+	return message
+}
+
+func (m *Middleware) logMsg(message string, args ...any) {
+	message = m.addPrefix(message)
+
+	if m.o.logger != nil {
+		switch m.o.logLevel {
+		case LogLevelDebug:
+			m.o.logger.Debugf(message, args...)
+		case LogLevelInfo:
+			m.o.logger.Infof(message, args...)
+		case LogLevelWarn:
+			m.o.logger.Warnf(message, args...)
+		case LogLevelError:
+			m.o.logger.Errorf(message, args...)
+		default:
+			m.o.logger.Infof(message, args...)
+		}
+	} else {
+		switch m.o.logLevel {
+		case LogLevelDebug:
+			slog.Debug(message, args...)
+		case LogLevelInfo:
+			slog.Info(message, args...)
+		case LogLevelWarn:
+			slog.Warn(message, args...)
+		case LogLevelError:
+			slog.Error(message, args...)
+		default:
+			slog.Info(message, args...)
+		}
+	}
+}

internal/app/api/core/middleware/logging/middleware_test.go

@@ -0,0 +1,148 @@
+package logging
+
+import (
+	"net/http"
+	"net/http/httptest"
+	"strings"
+	"testing"
+)
+
+type mockLogger struct {
+	messages []string
+}
+
+func (m *mockLogger) Debugf(format string, _ ...any) {
+	m.messages = append(m.messages, "DEBUG: "+format)
+}
+func (m *mockLogger) Infof(format string, _ ...any) {
+	m.messages = append(m.messages, "INFO: "+format)
+}
+func (m *mockLogger) Warnf(format string, _ ...any) {
+	m.messages = append(m.messages, "WARN: "+format)
+}
+func (m *mockLogger) Errorf(format string, _ ...any) {
+	m.messages = append(m.messages, "ERROR: "+format)
+}
+
+func TestMiddleware_Normal(t *testing.T) {
+	logger := &mockLogger{}
+
+	handler := http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		w.WriteHeader(http.StatusTeapot)
+		_, _ = w.Write([]byte("Hello, World!"))
+	})
+
+	middleware := New(WithLogger(logger), WithLevel(LogLevelError)).Handler(handler)
+	req := httptest.NewRequest("GET", "http://example.com/foo", nil)
+	rr := httptest.NewRecorder()
+
+	middleware.ServeHTTP(rr, req)
+
+	if status := rr.Code; status != http.StatusTeapot {
+		t.Errorf("expected status code to be %v, got %v", http.StatusTeapot, status)
+	}
+
+	expected := "Hello, World!"
+	if rr.Body.String() != expected {
+		t.Errorf("expected response body to be %v, got %v", expected, rr.Body.String())
+	}
+
+	if len(logger.messages) == 0 {
+		t.Errorf("expected log messages, got none")
+	}
+
+	if len(logger.messages) != 0 && !strings.Contains(logger.messages[0], "ERROR: GET /foo") {
+		t.Errorf("expected log message to contain request info, got %v", logger.messages[0])
+	}
+}
+
+func TestMiddleware_Extended(t *testing.T) {
+	handler := http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		w.WriteHeader(http.StatusTeapot)
+		_, _ = w.Write([]byte("Hello, World!"))
+	})
+
+	middleware := New(WithContextRequestIdKey("requestId"), WithHeaderRequestIdKey("X-Request-Id")).
+		Handler(handler)
+	req := httptest.NewRequest("GET", "http://example.com/foo", nil)
+	rr := httptest.NewRecorder()
+
+	middleware.ServeHTTP(rr, req)
+
+	if status := rr.Code; status != http.StatusTeapot {
+		t.Errorf("expected status code to be %v, got %v", http.StatusTeapot, status)
+	}
+
+	expected := "Hello, World!"
+	if rr.Body.String() != expected {
+		t.Errorf("expected response body to be %v, got %v", expected, rr.Body.String())
+	}
+}
+
+func TestMiddleware_Logger_remoteAddr(t *testing.T) {
+	logger := &mockLogger{}
+
+	handler := http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		w.WriteHeader(http.StatusTeapot)
+		_, _ = w.Write([]byte("Hello, World!"))
+	})
+
+	middleware := New(WithLogger(logger), WithLevel(LogLevelError)).Handler(handler)
+	req := httptest.NewRequest("GET", "http://example.com/foo", nil)
+	req.RemoteAddr = "xhamster.com:1234"
+	rr := httptest.NewRecorder()
+
+	middleware.ServeHTTP(rr, req)
+
+}
+
+func TestMiddleware_Logger_remoteAddrNoPort(t *testing.T) {
+	logger := &mockLogger{}
+
+	handler := http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		w.WriteHeader(http.StatusTeapot)
+		_, _ = w.Write([]byte("Hello, World!"))
+	})
+
+	middleware := New(WithLogger(logger), WithLevel(LogLevelError)).Handler(handler)
+	req := httptest.NewRequest("GET", "http://example.com/foo", nil)
+	req.RemoteAddr = "xhamster.com"
+	rr := httptest.NewRecorder()
+
+	middleware.ServeHTTP(rr, req)
+
+}
+
+func TestMiddleware_Logger_remoteAddrV6(t *testing.T) {
+	logger := &mockLogger{}
+
+	handler := http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		w.WriteHeader(http.StatusTeapot)
+		_, _ = w.Write([]byte("Hello, World!"))
+	})
+
+	middleware := New(WithLogger(logger), WithLevel(LogLevelError)).Handler(handler)
+	req := httptest.NewRequest("GET", "http://example.com/foo", nil)
+	req.RemoteAddr = "[::1]:4711"
+	rr := httptest.NewRecorder()
+
+	middleware.ServeHTTP(rr, req)
+
+}
+
+func TestMiddleware_Logger_remoteAddrV6NoPort(t *testing.T) {
+	logger := &mockLogger{}
+
+	handler := http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		w.WriteHeader(http.StatusTeapot)
+		_, _ = w.Write([]byte("Hello, World!"))
+	})
+
+	middleware := New(WithLogger(logger), WithLevel(LogLevelError)).Handler(handler)
+	req := httptest.NewRequest("GET", "http://example.com/foo", nil)
+	req.RemoteAddr = "[::1]"
+	rr := httptest.NewRecorder()
+
+	middleware.ServeHTTP(rr, req)
+
+}

internal/app/api/core/middleware/logging/options.go

@@ -0,0 +1,80 @@
+package logging
+
+// options is a struct that contains options for the logging middleware.
+// It uses the functional options pattern for flexible configuration.
+type options struct {
+	logLevel LogLevel
+	logger   Logger
+	prefix   string
+
+	contextRequestIdKey string
+	headerRequestIdKey  string
+}
+
+// Option is a type that is used to set options for the logging middleware.
+// It implements the functional options pattern.
+type Option func(*options)
+
+// WithLevel is a method that sets the log level for the logging middleware.
+// Possible values are LogLevelDebug, LogLevelInfo, LogLevelWarn, and LogLevelError.
+// The default value is LogLevelInfo.
+func WithLevel(level LogLevel) Option {
+	return func(o *options) {
+		o.logLevel = level
+	}
+}
+
+// WithPrefix is a method that sets the prefix for the logging middleware.
+// If a prefix is set, it will be prepended to each log message. A space will
+// be added between the prefix and the log message.
+// The default value is an empty string.
+func WithPrefix(prefix string) Option {
+	return func(o *options) {
+		o.prefix = prefix
+	}
+}
+
+// WithContextRequestIdKey is a method that sets the key for the request ID in the
+// request context. If a key is set, the logging middleware will use this key to
+// retrieve the request ID from the request context.
+// The default value is an empty string, meaning the request ID will not be logged.
+func WithContextRequestIdKey(key string) Option {
+	return func(o *options) {
+		o.contextRequestIdKey = key
+	}
+}
+
+// WithHeaderRequestIdKey is a method that sets the key for the request ID in the
+// request headers. If a key is set, the logging middleware will use this key to
+// retrieve the request ID from the request headers.
+// The default value is an empty string, meaning the request ID will not be logged.
+func WithHeaderRequestIdKey(key string) Option {
+	return func(o *options) {
+		o.headerRequestIdKey = key
+	}
+}
+
+// WithLogger is a method that sets the logger for the logging middleware.
+// If a logger is set, the logging middleware will use this logger to log messages.
+// The default logger is the structured slog logger.
+func WithLogger(logger Logger) Option {
+	return func(o *options) {
+		o.logger = logger
+	}
+}
+
+// newOptions is a function that returns a new options struct with sane default values.
+func newOptions(opts ...Option) options {
+	o := options{
+		logLevel:            LogLevelInfo,
+		logger:              nil,
+		prefix:              "",
+		contextRequestIdKey: "",
+	}
+
+	for _, opt := range opts {
+		opt(&o)
+	}
+
+	return o
+}

internal/app/api/core/middleware/logging/options_test.go

@@ -0,0 +1,88 @@
+package logging
+
+import (
+	"testing"
+)
+
+func TestWithLevel(t *testing.T) {
+	// table test to check all possible log levels
+	levels := []LogLevel{
+		LogLevelDebug,
+		LogLevelInfo,
+		LogLevelWarn,
+		LogLevelError,
+	}
+
+	for _, level := range levels {
+		opt := WithLevel(level)
+		o := newOptions(opt)
+
+		if o.logLevel != level {
+			t.Errorf("expected log level to be %v, got %v", level, o.logLevel)
+		}
+	}
+}
+
+func TestWithPrefix(t *testing.T) {
+	prefix := "TEST"
+	opt := WithPrefix(prefix)
+	o := newOptions(opt)
+
+	if o.prefix != prefix {
+		t.Errorf("expected prefix to be %v, got %v", prefix, o.prefix)
+	}
+}
+
+func TestWithContextRequestIdKey(t *testing.T) {
+	key := "contextKey"
+	opt := WithContextRequestIdKey(key)
+	o := newOptions(opt)
+
+	if o.contextRequestIdKey != key {
+		t.Errorf("expected contextRequestIdKey to be %v, got %v", key, o.contextRequestIdKey)
+	}
+}
+
+func TestWithHeaderRequestIdKey(t *testing.T) {
+	key := "headerKey"
+	opt := WithHeaderRequestIdKey(key)
+	o := newOptions(opt)
+
+	if o.headerRequestIdKey != key {
+		t.Errorf("expected headerRequestIdKey to be %v, got %v", key, o.headerRequestIdKey)
+	}
+}
+
+func TestWithLogger(t *testing.T) {
+	logger := &mockLogger{}
+	opt := WithLogger(logger)
+	o := newOptions(opt)
+
+	if o.logger != logger {
+		t.Errorf("expected logger to be %v, got %v", logger, o.logger)
+	}
+}
+
+func TestDefaults(t *testing.T) {
+	o := newOptions()
+
+	if o.logLevel != LogLevelInfo {
+		t.Errorf("expected log level to be %v, got %v", LogLevelInfo, o.logLevel)
+	}
+
+	if o.logger != nil {
+		t.Errorf("expected logger to be nil, got %v", o.logger)
+	}
+
+	if o.prefix != "" {
+		t.Errorf("expected prefix to be empty, got %v", o.prefix)
+	}
+
+	if o.contextRequestIdKey != "" {
+		t.Errorf("expected contextRequestIdKey to be empty, got %v", o.contextRequestIdKey)
+	}
+
+	if o.headerRequestIdKey != "" {
+		t.Errorf("expected headerRequestIdKey to be empty, got %v", o.headerRequestIdKey)
+	}
+}

internal/app/api/core/middleware/logging/writer.go

@@ -0,0 +1,45 @@
+package logging
+
+import (
+	"net/http"
+)
+
+// writerWrapper wraps a http.ResponseWriter and tracks the number of bytes written to it.
+// It also tracks the http response code passed to the WriteHeader func of
+// the ResponseWriter.
+type writerWrapper struct {
+	http.ResponseWriter
+
+	// StatusCode is the last http response code passed to the WriteHeader func of
+	// the ResponseWriter. If no such call is made, a default code of http.StatusOK
+	// is assumed instead.
+	StatusCode int
+
+	// WrittenBytes is the number of bytes successfully written by the Write or
+	// ReadFrom function of the ResponseWriter. ResponseWriters may also write
+	// data to their underlaying connection directly (e.g. headers), but those
+	// are not tracked. Therefor the number of Written bytes will usually match
+	// the size of the response body.
+	WrittenBytes int64
+}
+
+// WriteHeader wraps the WriteHeader method of the ResponseWriter and tracks the
+// http response code passed to it.
+func (w *writerWrapper) WriteHeader(code int) {
+	w.StatusCode = code
+	w.ResponseWriter.WriteHeader(code)
+}
+
+// Write wraps the Write method of the ResponseWriter and tracks the number of bytes
+// written to it.
+func (w *writerWrapper) Write(data []byte) (int, error) {
+	n, err := w.ResponseWriter.Write(data)
+	w.WrittenBytes += int64(n)
+	return n, err
+}
+
+// newWriterWrapper returns a new writerWrapper that wraps the given http.ResponseWriter.
+// It initializes the StatusCode to http.StatusOK.
+func newWriterWrapper(w http.ResponseWriter) *writerWrapper {
+	return &writerWrapper{ResponseWriter: w, StatusCode: http.StatusOK}
+}

internal/app/api/core/middleware/logging/writer_test.go

@@ -0,0 +1,85 @@
+package logging
+
+import (
+	"net/http"
+	"net/http/httptest"
+	"testing"
+)
+
+func TestWriterWrapper_WriteHeader(t *testing.T) {
+	rr := httptest.NewRecorder()
+	ww := newWriterWrapper(rr)
+
+	ww.WriteHeader(http.StatusNotFound)
+
+	if ww.StatusCode != http.StatusNotFound {
+		t.Errorf("expected status code to be %v, got %v", http.StatusNotFound, ww.StatusCode)
+	}
+	if rr.Code != http.StatusNotFound {
+		t.Errorf("expected recorder status code to be %v, got %v", http.StatusNotFound, rr.Code)
+	}
+}
+
+func TestWriterWrapper_Write(t *testing.T) {
+	rr := httptest.NewRecorder()
+	ww := newWriterWrapper(rr)
+
+	data := []byte("Hello, World!")
+	n, err := ww.Write(data)
+
+	if err != nil {
+		t.Errorf("unexpected error: %v", err)
+	}
+	if n != len(data) {
+		t.Errorf("expected written bytes to be %v, got %v", len(data), n)
+	}
+	if ww.WrittenBytes != int64(len(data)) {
+		t.Errorf("expected WrittenBytes to be %v, got %v", len(data), ww.WrittenBytes)
+	}
+	if rr.Body.String() != string(data) {
+		t.Errorf("expected response body to be %v, got %v", string(data), rr.Body.String())
+	}
+}
+
+func TestWriterWrapper_WriteWithHeaders(t *testing.T) {
+	rr := httptest.NewRecorder()
+	ww := newWriterWrapper(rr)
+
+	data := []byte("Hello, World!")
+	n, err := ww.Write(data)
+
+	ww.Header().Set("Content-Type", "text/plain")
+	ww.Header().Set("X-Some-Header", "some-value")
+	ww.WriteHeader(http.StatusTeapot)
+
+	if err != nil {
+		t.Errorf("unexpected error: %v", err)
+	}
+	if n != len(data) {
+		t.Errorf("expected written bytes to be %v, got %v", len(data), n)
+	}
+	if ww.WrittenBytes != int64(len(data)) {
+		t.Errorf("expected WrittenBytes to be %v, got %v", len(data), ww.WrittenBytes)
+	}
+	if rr.Body.String() != string(data) {
+		t.Errorf("expected response body to be %v, got %v", string(data), rr.Body.String())
+	}
+	if ww.StatusCode != http.StatusTeapot {
+		t.Errorf("expected status code to be %v, got %v", http.StatusTeapot, ww.StatusCode)
+	}
+}
+
+func TestNewWriterWrapper(t *testing.T) {
+	rr := httptest.NewRecorder()
+	ww := newWriterWrapper(rr)
+
+	if ww.StatusCode != http.StatusOK {
+		t.Errorf("expected initial status code to be %v, got %v", http.StatusOK, ww.StatusCode)
+	}
+	if ww.WrittenBytes != 0 {
+		t.Errorf("expected initial WrittenBytes to be %v, got %v", 0, ww.WrittenBytes)
+	}
+	if ww.ResponseWriter != rr {
+		t.Errorf("expected ResponseWriter to be %v, got %v", rr, ww.ResponseWriter)
+	}
+}

internal/app/api/core/middleware/recovery/middleware.go

@@ -0,0 +1,133 @@
+package recovery
+
+import (
+	"encoding/json"
+	"errors"
+	"fmt"
+	"log/slog"
+	"net/http"
+	"os"
+	"runtime/debug"
+	"strings"
+)
+
+// Logger is an interface that defines the methods that a logger must implement.
+// This allows the logging middleware to be used with different logging libraries.
+type Logger interface {
+	// Errorf logs a message at error level.
+	Errorf(format string, args ...any)
+}
+
+// Middleware is a type that creates a new recovery middleware. The recovery middleware
+// recovers from panics and returns an Internal Server Error response. This middleware should
+// be the first middleware in the middleware chain, so that it can recover from panics in other
+// middlewares.
+type Middleware struct {
+	o options
+}
+
+// New returns a new recovery middleware with the provided options.
+func New(opts ...Option) *Middleware {
+	o := newOptions(opts...)
+
+	m := &Middleware{
+		o: o,
+	}
+
+	return m
+}
+
+// Handler returns the recovery middleware handler.
+func (m *Middleware) Handler(next http.Handler) http.Handler {
+	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		defer func() {
+			if err := recover(); err != nil {
+				stack := debug.Stack()
+
+				realErr, ok := err.(error)
+				if !ok {
+					realErr = fmt.Errorf("%v", err)
+				}
+
+				// Check for a broken connection, as it is not really a
+				// condition that warrants a panic stack trace.
+				brokenPipe := isBrokenPipeError(realErr)
+
+				// Log the error and stack trace
+				if m.o.logCallback != nil {
+					m.o.logCallback(realErr, stack, brokenPipe)
+				}
+
+				switch {
+				case brokenPipe && m.o.brokenPipeCallback != nil:
+					m.o.brokenPipeCallback(realErr, stack, w, r)
+				case !brokenPipe && m.o.errCallback != nil:
+					m.o.errCallback(realErr, stack, w, r)
+				default:
+					// no callback set, simply recover and do nothing...
+				}
+			}
+		}()
+
+		next.ServeHTTP(w, r)
+	})
+}
+
+func addPrefix(o options, message string) string {
+	if o.defaultLogPrefix != "" {
+		return o.defaultLogPrefix + " " + message
+	}
+	return message
+}
+
+// defaultErrCallback is the default error callback function for the recovery middleware.
+// It writes a JSON response with an Internal Server Error status code. If the exposeStackTrace option is
+// enabled, the stack trace is included in the response.
+func getDefaultErrCallback(o options) func(err error, stack []byte, w http.ResponseWriter, r *http.Request) {
+	return func(err error, stack []byte, w http.ResponseWriter, r *http.Request) {
+		responseBody := map[string]interface{}{
+			"error": "Internal Server Error",
+		}
+		if o.exposeStackTrace && len(stack) > 0 {
+			responseBody["stack"] = string(stack)
+		}
+
+		jsonBody, _ := json.Marshal(responseBody)
+
+		w.Header().Set("Content-Type", "application/json")
+		w.WriteHeader(http.StatusInternalServerError)
+		_, _ = w.Write(jsonBody)
+	}
+}
+
+// getDefaultLogCallback is the default log callback function for the recovery middleware.
+// It logs the error and stack trace using the structured slog logger or the provided logger in Error level.
+func getDefaultLogCallback(o options) func(error, []byte, bool) {
+	return func(err error, stack []byte, brokenPipe bool) {
+		if brokenPipe {
+			return // by default, ignore broken pipe errors
+		}
+
+		switch {
+		case o.useSlog:
+			slog.Error(addPrefix(o, err.Error()), "stack", string(stack))
+		case o.logger != nil:
+			o.logger.Errorf(fmt.Sprintf("%s; stacktrace=%s", addPrefix(o, err.Error()), string(stack)))
+		default:
+			// no logger set, do nothing...
+		}
+	}
+}
+
+func isBrokenPipeError(err error) bool {
+	var syscallErr *os.SyscallError
+	if errors.As(err, &syscallErr) {
+		errMsg := strings.ToLower(syscallErr.Err.Error())
+		if strings.Contains(errMsg, "broken pipe") ||
+			strings.Contains(errMsg, "connection reset by peer") {
+			return true
+		}
+	}
+
+	return false
+}

internal/app/api/core/middleware/recovery/middleware_test.go

@@ -0,0 +1,149 @@
+package recovery
+
+import (
+	"errors"
+	"net/http"
+	"net/http/httptest"
+	"os"
+	"strings"
+	"testing"
+)
+
+type mockLogger struct{}
+
+func (m *mockLogger) Errorf(_ string, _ ...any) {}
+
+func TestMiddleware(t *testing.T) {
+	tests := []struct {
+		name           string
+		options        []Option
+		panicSimulator func()
+		expectedStatus int
+		expectedBody   string
+		expectStack    bool
+	}{
+		{
+			name:    "default behavior",
+			options: []Option{},
+			panicSimulator: func() {
+				panic(errors.New("test panic"))
+			},
+			expectedStatus: http.StatusInternalServerError,
+			expectedBody:   `{"error":"Internal Server Error"}`,
+		},
+		{
+			name: "custom error callback",
+			options: []Option{
+				WithErrCallback(func(err error, stack []byte, w http.ResponseWriter, r *http.Request) {
+					w.WriteHeader(http.StatusTeapot)
+					w.Write([]byte("custom error"))
+				}),
+			},
+			panicSimulator: func() {
+				panic(errors.New("test panic"))
+			},
+			expectedStatus: http.StatusTeapot,
+			expectedBody:   "custom error",
+		},
+		{
+			name: "broken pipe error",
+			options: []Option{
+				WithBrokenPipeCallback(func(err error, stack []byte, w http.ResponseWriter, r *http.Request) {
+					w.WriteHeader(http.StatusServiceUnavailable)
+					w.Write([]byte("broken pipe"))
+				}),
+			},
+			panicSimulator: func() {
+				panic(&os.SyscallError{Err: errors.New("broken pipe")})
+			},
+			expectedStatus: http.StatusServiceUnavailable,
+			expectedBody:   "broken pipe",
+		},
+		{
+			name:    "default callback broken pipe error",
+			options: nil,
+			panicSimulator: func() {
+				panic(&os.SyscallError{Err: errors.New("broken pipe")})
+			},
+			expectedStatus: http.StatusOK,
+			expectedBody:   "",
+		},
+		{
+			name:    "default callback normal error",
+			options: nil,
+			panicSimulator: func() {
+				panic("something went wrong")
+			},
+			expectedStatus: http.StatusInternalServerError,
+			expectedBody:   "{\"error\":\"Internal Server Error\"}",
+		},
+		{
+			name: "default callback with stack trace",
+			options: []Option{
+				WithExposeStackTrace(true),
+			},
+			panicSimulator: func() {
+				panic("something went wrong")
+			},
+			expectedStatus: http.StatusInternalServerError,
+			expectedBody:   "\"stack\":",
+			expectStack:    true,
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			handler := New(tt.options...).Handler(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+				tt.panicSimulator()
+			}))
+
+			req := httptest.NewRequest(http.MethodGet, "/", nil)
+			rr := httptest.NewRecorder()
+
+			handler.ServeHTTP(rr, req)
+
+			if rr.Code != tt.expectedStatus {
+				t.Errorf("expected status %v, got %v", tt.expectedStatus, rr.Code)
+			}
+			if !tt.expectStack && rr.Body.String() != tt.expectedBody {
+				t.Errorf("expected body %v, got %v", tt.expectedBody, rr.Body.String())
+			}
+			if tt.expectStack && !strings.Contains(rr.Body.String(), tt.expectedBody) {
+				t.Errorf("expected body to contain %v, got %v", tt.expectedBody, rr.Body.String())
+			}
+		})
+	}
+}
+
+func TestIsBrokenPipeError(t *testing.T) {
+	tests := []struct {
+		name     string
+		err      error
+		expected bool
+	}{
+		{
+			name:     "broken pipe error",
+			err:      &os.SyscallError{Err: errors.New("broken pipe")},
+			expected: true,
+		},
+		{
+			name:     "connection reset by peer error",
+			err:      &os.SyscallError{Err: errors.New("connection reset by peer")},
+			expected: true,
+		},
+		{
+			name:     "other error",
+			err:      errors.New("other error"),
+			expected: false,
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			result := isBrokenPipeError(tt.err)
+			if result != tt.expected {
+				t.Errorf("expected %v, got %v", tt.expected, result)
+			}
+		})
+	}
+}

internal/app/api/core/middleware/recovery/options.go

@@ -0,0 +1,129 @@
+package recovery
+
+import "net/http"
+
+// options is a struct that contains options for the recovery middleware.
+// It uses the functional options pattern for flexible configuration.
+type options struct {
+	logger  Logger
+	useSlog bool
+
+	errCallbackOverride        bool
+	errCallback                func(err error, stack []byte, w http.ResponseWriter, r *http.Request)
+	brokenPipeCallbackOverride bool
+	brokenPipeCallback         func(err error, stack []byte, w http.ResponseWriter, r *http.Request)
+
+	exposeStackTrace    bool
+	defaultLogPrefix    string
+	logCallbackOverride bool
+	logCallback         func(err error, stack []byte, brokenPipe bool)
+}
+
+// Option is a type that is used to set options for the recovery middleware.
+// It implements the functional options pattern.
+type Option func(*options)
+
+// WithErrCallback sets the error callback function for the recovery middleware.
+// The error callback function is called when a panic is recovered by the middleware.
+// This function completely overrides the default behavior of the middleware. It is the
+// responsibility of the user to handle the error and write a response to the client.
+//
+// Ensure that this function does not panic, as it will be called in a deferred function!
+func WithErrCallback(fn func(err error, stack []byte, w http.ResponseWriter, r *http.Request)) Option {
+	return func(o *options) {
+		o.errCallback = fn
+		o.errCallbackOverride = true
+	}
+}
+
+// WithBrokenPipeCallback sets the broken pipe callback function for the recovery middleware.
+// The broken pipe callback function is called when a broken pipe error is recovered by the middleware.
+// This function completely overrides the default behavior of the middleware. It is the responsibility
+// of the user to handle the error and write a response to the client.
+//
+// Ensure that this function does not panic, as it will be called in a deferred function!
+func WithBrokenPipeCallback(fn func(err error, stack []byte, w http.ResponseWriter, r *http.Request)) Option {
+	return func(o *options) {
+		o.brokenPipeCallback = fn
+		o.brokenPipeCallbackOverride = true
+	}
+}
+
+// WithLogCallback sets the log callback function for the recovery middleware.
+// The log callback function is called when a panic is recovered by the middleware.
+// This function allows the user to log the error and stack trace. The default behavior is to log
+// the error and stack trace in Error level.
+// This function completely overrides the default behavior of the middleware.
+//
+// Ensure that this function does not panic, as it will be called in a deferred function!
+func WithLogCallback(fn func(err error, stack []byte, brokenPipe bool)) Option {
+	return func(o *options) {
+		o.logCallback = fn
+		o.logCallbackOverride = true
+	}
+}
+
+// WithLogger is a method that sets the logger for the logging middleware.
+// If a logger is set, the logging middleware will use this logger to log messages.
+// The default logger is the structured slog logger, see WithSlog.
+func WithLogger(logger Logger) Option {
+	return func(o *options) {
+		o.logger = logger
+	}
+}
+
+// WithSlog is a method that sets whether the recovery middleware should use the structured slog logger.
+// If set to true, the middleware will use the structured slog logger. If set to false, the middleware
+// will not use any logger unless one is explicitly set with the WithLogger option.
+// The default value is true.
+func WithSlog(useSlog bool) Option {
+	return func(o *options) {
+		o.useSlog = useSlog
+	}
+}
+
+// WithDefaultLogPrefix is a method that sets the default log prefix for the recovery middleware.
+// If a default log prefix is set and the default log callback is used, the prefix will be prepended
+// to each log message. A space will be added between the prefix and the log message.
+// The default value is an empty string.
+func WithDefaultLogPrefix(defaultLogPrefix string) Option {
+	return func(o *options) {
+		o.defaultLogPrefix = defaultLogPrefix
+	}
+}
+
+// WithExposeStackTrace is a method that sets whether the stack trace should be exposed in the response.
+// If set to true, the stack trace will be included in the response body. If set to false, the stack trace
+// will not be included in the response body. This only applies to the default error callback.
+// The default value is false.
+func WithExposeStackTrace(exposeStackTrace bool) Option {
+	return func(o *options) {
+		o.exposeStackTrace = exposeStackTrace
+	}
+}
+
+// newOptions is a function that returns a new options struct with sane default values.
+func newOptions(opts ...Option) options {
+	o := options{
+		logger:             nil,
+		useSlog:            true,
+		errCallback:        nil,
+		brokenPipeCallback: nil, // by default, ignore broken pipe errors
+		exposeStackTrace:   false,
+		defaultLogPrefix:   "",
+		logCallback:        nil,
+	}
+
+	for _, opt := range opts {
+		opt(&o)
+	}
+
+	if o.errCallback == nil && !o.errCallbackOverride {
+		o.errCallback = getDefaultErrCallback(o)
+	}
+	if o.logCallback == nil && !o.logCallbackOverride {
+		o.logCallback = getDefaultLogCallback(o)
+	}
+
+	return o
+}

internal/app/api/core/middleware/recovery/options_test.go

@@ -0,0 +1,100 @@
+package recovery
+
+import (
+	"net/http"
+	"testing"
+)
+
+func TestWithErrCallback(t *testing.T) {
+	callback := func(err error, stack []byte, w http.ResponseWriter, r *http.Request) {}
+	opt := WithErrCallback(callback)
+	o := newOptions(opt)
+
+	if o.errCallback == nil {
+		t.Errorf("expected errCallback to be set, got nil")
+	}
+}
+
+func TestWithBrokenPipeCallback(t *testing.T) {
+	callback := func(err error, stack []byte, w http.ResponseWriter, r *http.Request) {}
+	opt := WithBrokenPipeCallback(callback)
+	o := newOptions(opt)
+
+	if o.brokenPipeCallback == nil {
+		t.Errorf("expected brokenPipeCallback to be set, got nil")
+	}
+}
+
+func TestWithLogCallback(t *testing.T) {
+	callback := func(err error, stack []byte, brokenPipe bool) {}
+	opt := WithLogCallback(callback)
+	o := newOptions(opt)
+
+	if o.logCallback == nil {
+		t.Errorf("expected logCallback to be set, got nil")
+	}
+}
+
+func TestWithLogger(t *testing.T) {
+	logger := &mockLogger{}
+	opt := WithLogger(logger)
+	o := newOptions(opt)
+
+	if o.logger != logger {
+		t.Errorf("expected logger to be %v, got %v", logger, o.logger)
+	}
+}
+
+func TestWithSlog(t *testing.T) {
+	opt := WithSlog(false)
+	o := newOptions(opt)
+
+	if o.useSlog != false {
+		t.Errorf("expected useSlog to be false, got %v", o.useSlog)
+	}
+}
+
+func TestWithDefaultLogPrefix(t *testing.T) {
+	prefix := "PREFIX"
+	opt := WithDefaultLogPrefix(prefix)
+	o := newOptions(opt)
+
+	if o.defaultLogPrefix != prefix {
+		t.Errorf("expected defaultLogPrefix to be %v, got %v", prefix, o.defaultLogPrefix)
+	}
+}
+
+func TestWithExposeStackTrace(t *testing.T) {
+	opt := WithExposeStackTrace(true)
+	o := newOptions(opt)
+
+	if o.exposeStackTrace != true {
+		t.Errorf("expected exposeStackTrace to be true, got %v", o.exposeStackTrace)
+	}
+}
+
+func TestNewOptionsDefaults(t *testing.T) {
+	o := newOptions()
+
+	if o.logger != nil {
+		t.Errorf("expected logger to be nil, got %v", o.logger)
+	}
+	if o.useSlog != true {
+		t.Errorf("expected useSlog to be true, got %v", o.useSlog)
+	}
+	if o.errCallback == nil {
+		t.Errorf("expected errCallback to be set, got nil")
+	}
+	if o.brokenPipeCallback != nil {
+		t.Errorf("expected brokenPipeCallback to be nil, got %T", o.brokenPipeCallback)
+	}
+	if o.exposeStackTrace != false {
+		t.Errorf("expected exposeStackTrace to be false, got %T", o.exposeStackTrace)
+	}
+	if o.defaultLogPrefix != "" {
+		t.Errorf("expected defaultLogPrefix to be empty, got %T", o.defaultLogPrefix)
+	}
+	if o.logCallback == nil {
+		t.Errorf("expected logCallback to be set, got nil")
+	}
+}

internal/app/api/core/middleware/tracing/middleware.go

@@ -0,0 +1,69 @@
+package tracing
+
+import (
+	"context"
+	"math/rand"
+	"net/http"
+)
+
+// Middleware is a type that creates a new tracing middleware. The tracing middleware
+// can be used to trace requests based on a request ID header or parameter.
+type Middleware struct {
+	o options
+
+	seededRand *rand.Rand
+}
+
+// New returns a new CORS middleware with the provided options.
+func New(opts ...Option) *Middleware {
+	o := newOptions(opts...)
+
+	m := &Middleware{
+		o:          o,
+		seededRand: rand.New(rand.NewSource(o.generateSeed)),
+	}
+
+	return m
+}
+
+// Handler returns the tracing middleware handler.
+func (m *Middleware) Handler(next http.Handler) http.Handler {
+	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		var reqId string
+
+		// read upstream header und re-use it
+		if m.o.upstreamReqIdHeader != "" {
+			reqId = r.Header.Get(m.o.upstreamReqIdHeader)
+		}
+
+		// generate new id
+		if reqId == "" && m.o.generateLength > 0 {
+			reqId = m.generateRandomId()
+		}
+
+		// set response header
+		if m.o.headerIdentifier != "" {
+			w.Header().Set(m.o.headerIdentifier, reqId)
+		}
+
+		// set context value
+		if m.o.contextIdentifier != "" {
+			ctx := context.WithValue(r.Context(), m.o.contextIdentifier, reqId)
+			r = r.WithContext(ctx)
+		}
+
+		next.ServeHTTP(w, r) // execute the next handler
+	})
+}
+
+// region internal-helpers
+
+func (m *Middleware) generateRandomId() string {
+	b := make([]byte, m.o.generateLength)
+	for i := range b {
+		b[i] = m.o.generateCharset[m.seededRand.Intn(len(m.o.generateCharset))]
+	}
+	return string(b)
+}
+
+// endregion internal-helpers

internal/app/api/core/middleware/tracing/middleware_test.go

@@ -0,0 +1,118 @@
+package tracing
+
+import (
+	"net/http"
+	"net/http/httptest"
+	"testing"
+)
+
+const defaultLength = 8
+const upstreamHeaderValue = "upstream-id"
+
+func TestMiddleware_Handler_WithUpstreamHeader(t *testing.T) {
+	m := New(WithUpstreamHeader("X-Upstream-Id"))
+	handler := m.Handler(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		reqId := r.Header.Get("X-Upstream-Id")
+		if reqId != upstreamHeaderValue {
+			t.Errorf("expected upstream request id to be 'upstream-id', got %s", reqId)
+		}
+	}))
+
+	req := httptest.NewRequest(http.MethodGet, "/", nil)
+	req.Header.Set("X-Upstream-Id", upstreamHeaderValue)
+	rr := httptest.NewRecorder()
+	handler.ServeHTTP(rr, req)
+
+	if rr.Header().Get("X-Request-Id") != upstreamHeaderValue {
+		t.Errorf("expected X-Request-Id header to be set in the response")
+	}
+}
+
+func TestMiddleware_Handler_GenerateNewId(t *testing.T) {
+	idLen := 18
+	m := New(WithIdLength(idLen))
+	handler := m.Handler(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		reqId := w.Header().Get("X-Request-Id")
+		if len(reqId) != 18 {
+			t.Errorf("expected generated request id length to be %d, got %d", idLen, len(reqId))
+		}
+	}))
+
+	req := httptest.NewRequest(http.MethodGet, "/", nil)
+	rr := httptest.NewRecorder()
+	handler.ServeHTTP(rr, req)
+
+	if rr.Header().Get("X-Request-Id") == "" || len(rr.Header().Get("X-Request-Id")) != idLen {
+		t.Errorf("expected X-Request-Id header to be set in the response")
+	}
+}
+
+func TestMiddleware_Handler_SetContextValue(t *testing.T) {
+	m := New()
+	handler := m.Handler(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		reqId := r.Context().Value("RequestId").(string)
+		if reqId == "" || len(reqId) != defaultLength {
+			t.Errorf("expected context request id to be set, got empty string")
+		}
+	}))
+
+	req := httptest.NewRequest(http.MethodGet, "/", nil)
+	rr := httptest.NewRecorder()
+	handler.ServeHTTP(rr, req)
+}
+
+func TestMiddleware_Handler_SetCustomContextValue(t *testing.T) {
+	m := New(WithContextIdentifier("Custom-Id"))
+	handler := m.Handler(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		reqId := r.Context().Value("Custom-Id").(string)
+		if reqId == "" || len(reqId) != defaultLength {
+			t.Errorf("expected context request id to be set, got empty string")
+		}
+	}))
+
+	req := httptest.NewRequest(http.MethodGet, "/", nil)
+	rr := httptest.NewRecorder()
+	handler.ServeHTTP(rr, req)
+}
+
+func TestMiddleware_Handler_NoIdGenerated(t *testing.T) {
+	m := New(WithIdLength(0))
+	handler := m.Handler(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		reqId := w.Header().Get("X-Request-Id")
+		if reqId != "" {
+			t.Errorf("expected no request id to be generated, got %s", reqId)
+		}
+	}))
+
+	req := httptest.NewRequest(http.MethodGet, "/", nil)
+	rr := httptest.NewRecorder()
+	handler.ServeHTTP(rr, req)
+}
+
+func TestMiddleware_Handler_NoIdHeaderSet(t *testing.T) {
+	m := New(WithHeaderIdentifier(""))
+	handler := m.Handler(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		reqId := w.Header().Get("X-Request-Id")
+		if reqId != "" {
+			t.Errorf("expected no request id to be generated, got %s", reqId)
+		}
+	}))
+
+	req := httptest.NewRequest(http.MethodGet, "/", nil)
+	rr := httptest.NewRecorder()
+	handler.ServeHTTP(rr, req)
+}
+
+func TestMiddleware_Handler_NoIdContextSet(t *testing.T) {
+	m := New(WithHeaderIdentifier(""))
+	handler := m.Handler(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		reqId := r.Context().Value("Request-Id")
+		if reqId != nil {
+			t.Errorf("expected no context request id to be set, got %v", reqId)
+		}
+	}))
+
+	req := httptest.NewRequest(http.MethodGet, "/", nil)
+	rr := httptest.NewRecorder()
+	handler.ServeHTTP(rr, req)
+}

internal/app/api/core/middleware/tracing/options.go

@@ -0,0 +1,85 @@
+package tracing
+
+import "time"
+
+// options is a struct that contains options for the tracing middleware.
+// It uses the functional options pattern for flexible configuration.
+type options struct {
+	upstreamReqIdHeader string
+	headerIdentifier    string
+	contextIdentifier   string
+	generateLength      int
+	generateCharset     string
+	generateSeed        int64
+}
+
+// Option is a type that is used to set options for the tracing middleware.
+// It implements the functional options pattern.
+type Option func(*options)
+
+// WithIdSeed sets the seed for the random request id.
+// If no seed is provided, the current timestamp is used.
+func WithIdSeed(seed int64) Option {
+	return func(o *options) {
+		o.generateSeed = seed
+	}
+}
+
+// WithIdCharset sets the charset that is used to generate a random request id.
+// By default, upper-case letters and numbers are used.
+func WithIdCharset(charset string) Option {
+	return func(o *options) {
+		o.generateCharset = charset
+	}
+}
+
+// WithIdLength specifies the length of generated random ids.
+// By default, a length of 8 is used. If the length is 0, no request id will be generated.
+func WithIdLength(len int) Option {
+	return func(o *options) {
+		o.generateLength = len
+	}
+}
+
+// WithHeaderIdentifier specifies the header name for the request id that is added to the response headers.
+// If the identifier is empty, the request id will not be added to the response headers.
+func WithHeaderIdentifier(identifier string) Option {
+	return func(o *options) {
+		o.headerIdentifier = identifier
+	}
+}
+
+// WithUpstreamHeader sets the upstream header name, that should be used to fetch the request id.
+// If no upstream header is found, a random id will be generated if the id-length parameter is set to a value > 0.
+func WithUpstreamHeader(header string) Option {
+	return func(o *options) {
+		o.upstreamReqIdHeader = header
+	}
+}
+
+// WithContextIdentifier specifies the value-key for the request id that is added to the request context.
+// If the identifier is empty, the request id will not be added to the context.
+// If the request id is added to the context, it can be retrieved with:
+// `id := r.Context().Value(THE-IDENTIFIER).(string)`
+func WithContextIdentifier(identifier string) Option {
+	return func(o *options) {
+		o.contextIdentifier = identifier
+	}
+}
+
+// newOptions is a function that returns a new options struct with sane default values.
+func newOptions(opts ...Option) options {
+	o := options{
+		headerIdentifier:  "X-Request-Id",
+		contextIdentifier: "RequestId",
+		generateSeed:      time.Now().UnixNano(),
+		generateCharset:   "ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789",
+		generateLength:    8,
+	}
+
+	for _, opt := range opts {
+		opt(&o)
+	}
+
+	return o
+}

internal/app/api/core/middleware/tracing/options_test.go

@@ -0,0 +1,75 @@
+package tracing
+
+import (
+	"testing"
+)
+
+func TestWithIdSeed(t *testing.T) {
+	o := newOptions(WithIdSeed(12345))
+	if o.generateSeed != 12345 {
+		t.Errorf("expected generateSeed to be 12345, got %d", o.generateSeed)
+	}
+}
+
+func TestWithIdCharset(t *testing.T) {
+	o := newOptions(WithIdCharset("abc123"))
+	if o.generateCharset != "abc123" {
+		t.Errorf("expected generateCharset to be 'abc123', got %s", o.generateCharset)
+	}
+}
+
+func TestWithIdLength(t *testing.T) {
+	o := newOptions(WithIdLength(16))
+	if o.generateLength != 16 {
+		t.Errorf("expected generateLength to be 16, got %d", o.generateLength)
+	}
+}
+
+func TestWithHeaderIdentifier(t *testing.T) {
+	o := newOptions(WithHeaderIdentifier("X-Custom-Id"))
+	if o.headerIdentifier != "X-Custom-Id" {
+		t.Errorf("expected headerIdentifier to be 'X-Custom-Id', got %s", o.headerIdentifier)
+	}
+}
+
+func TestWithUpstreamHeader(t *testing.T) {
+	o := newOptions(WithUpstreamHeader("X-Upstream-Id"))
+	if o.upstreamReqIdHeader != "X-Upstream-Id" {
+		t.Errorf("expected upstreamReqIdHeader to be 'X-Upstream-Id', got %s", o.upstreamReqIdHeader)
+	}
+}
+
+func TestWithContextIdentifier(t *testing.T) {
+	o := newOptions(WithContextIdentifier("Request-Id"))
+	if o.contextIdentifier != "Request-Id" {
+		t.Errorf("expected contextIdentifier to be 'Request-Id', got %s", o.contextIdentifier)
+	}
+}
+
+func TestDefaults(t *testing.T) {
+	o := newOptions()
+
+	if o.generateLength != 8 {
+		t.Errorf("expected generateLength to be 8, got %d", o.generateLength)
+	}
+
+	if o.generateCharset != "ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789" {
+		t.Errorf("expected generateCharset to be 'ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789', got %s", o.generateCharset)
+	}
+
+	if o.generateSeed == 0 {
+		t.Errorf("expected generateSeed to be non-zero")
+	}
+
+	if o.headerIdentifier != "X-Request-Id" {
+		t.Errorf("expected headerIdentifier to be 'X-Request-Id', got %s", o.headerIdentifier)
+	}
+
+	if o.upstreamReqIdHeader != "" {
+		t.Errorf("expected upstreamReqIdHeader to be empty, got %s", o.upstreamReqIdHeader)
+	}
+
+	if o.contextIdentifier != "RequestId" {
+		t.Errorf("expected contextIdentifier to be 'RequestId', got %s", o.contextIdentifier)
+	}
+}

internal/app/api/core/request/basic.go

@@ -0,0 +1,259 @@
+// Package request provides functions to extract parameters from the request.
+package request
+
+import (
+	"encoding/json"
+	"io"
+	"net"
+	"net/http"
+	"net/textproto"
+	"slices"
+	"strings"
+)
+
+const CheckPrivateProxy = "PRIVATE"
+
+// PathRaw returns the value of the named path parameter.
+func PathRaw(r *http.Request, name string) string {
+	return r.PathValue(name)
+}
+
+// Path returns the value of the named path parameter.
+// The return value is trimmed of leading and trailing whitespace.
+func Path(r *http.Request, name string) string {
+	return strings.TrimSpace(PathRaw(r, name))
+}
+
+// PathDefault returns the value of the named path parameter.
+// If the parameter is empty, it returns the default value.
+// The return value is trimmed of leading and trailing whitespace.
+func PathDefault(r *http.Request, name string, defaultValue string) string {
+	value := r.PathValue(name)
+	if value == "" {
+		return defaultValue
+	}
+
+	return Path(r, name)
+}
+
+// QueryRaw returns the value of the named query parameter.
+func QueryRaw(r *http.Request, name string) string {
+	return r.URL.Query().Get(name)
+}
+
+// Query returns the value of the named query parameter.
+// The return value is trimmed of leading and trailing whitespace.
+func Query(r *http.Request, name string) string {
+	return strings.TrimSpace(QueryRaw(r, name))
+}
+
+// QueryDefault returns the value of the named query parameter.
+// If the parameter is empty, it returns the default value.
+// The return value is trimmed of leading and trailing whitespace.
+func QueryDefault(r *http.Request, name string, defaultValue string) string {
+	if !r.URL.Query().Has(name) {
+		return defaultValue
+	}
+
+	return Query(r, name)
+}
+
+// QuerySlice returns the value of the named query parameter.
+// All slice values are trimmed of leading and trailing whitespace.
+func QuerySlice(r *http.Request, name string) []string {
+	values, ok := r.URL.Query()[name]
+	if !ok {
+		return nil
+	}
+
+	result := make([]string, len(values))
+	for i, value := range values {
+		result[i] = strings.TrimSpace(value)
+	}
+	return result
+}
+
+// QuerySliceDefault returns the value of the named query parameter.
+// If the parameter is empty, it returns the default value.
+// All slice values are trimmed of leading and trailing whitespace.
+func QuerySliceDefault(r *http.Request, name string, defaultValue []string) []string {
+	if !r.URL.Query().Has(name) {
+		return defaultValue
+	}
+
+	return QuerySlice(r, name)
+}
+
+// FragmentRaw returns the value of the named fragment parameter.
+func FragmentRaw(r *http.Request) string {
+	return r.URL.Fragment
+}
+
+// Fragment returns the value of the named fragment parameter.
+// The return value is trimmed of leading and trailing whitespace.
+func Fragment(r *http.Request) string {
+	return strings.TrimSpace(FragmentRaw(r))
+}
+
+// FragmentDefault returns the value of the named fragment parameter.
+// If the parameter is empty, it returns the default value.
+// The return value is trimmed of leading and trailing whitespace.
+func FragmentDefault(r *http.Request, defaultValue string) string {
+	if r.URL.Fragment == "" {
+		return defaultValue
+	}
+
+	return Fragment(r)
+}
+
+// FormRaw returns the value of the named form parameter.
+func FormRaw(r *http.Request, name string) string {
+	return r.FormValue(name)
+}
+
+// Form returns the value of the named form parameter.
+// The return value is trimmed of leading and trailing whitespace.
+func Form(r *http.Request, name string) string {
+	return strings.TrimSpace(FormRaw(r, name))
+}
+
+// DefaultForm returns the value of the named form parameter.
+// If the parameter is not set, it returns the default value.
+// The return value is trimmed of leading and trailing whitespace.
+func DefaultForm(r *http.Request, name, defaultValue string) string {
+	err := r.ParseForm()
+	if err != nil {
+		return defaultValue
+	}
+
+	if !r.Form.Has(name) {
+		return defaultValue
+	}
+
+	return Form(r, name)
+}
+
+// HeaderRaw returns the value of the named header.
+func HeaderRaw(r *http.Request, name string) string {
+	return r.Header.Get(name)
+}
+
+// Header returns the value of the named header.
+// The return value is trimmed of leading and trailing whitespace.
+func Header(r *http.Request, name string) string {
+	return strings.TrimSpace(HeaderRaw(r, name))
+}
+
+// HeaderDefault returns the value of the named header.
+// If the header is not set, it returns the default value.
+// The return value is trimmed of leading and trailing whitespace.
+func HeaderDefault(r *http.Request, name, defaultValue string) string {
+	if _, ok := textproto.MIMEHeader(r.Header)[name]; !ok {
+		return defaultValue
+	}
+
+	return Header(r, name)
+}
+
+// Cookie returns the value of the named cookie.
+// The return value is trimmed of leading and trailing whitespace.
+func Cookie(r *http.Request, name string) string {
+	cookie, err := r.Cookie(name)
+	if err != nil {
+		return ""
+	}
+
+	return strings.TrimSpace(cookie.Value)
+}
+
+// CookieDefault returns the value of the named cookie.
+// If the cookie is not set, it returns the default value.
+// The return value is trimmed of leading and trailing whitespace.
+func CookieDefault(r *http.Request, name, defaultValue string) string {
+	cookie, err := r.Cookie(name)
+	if err != nil {
+		return defaultValue
+	}
+
+	return strings.TrimSpace(cookie.Value)
+}
+
+// ClientIp returns the client IP address.
+//
+// As the request may come from a proxy, the function checks the
+// X-Real-Ip and X-Forwarded-For headers to get the real client IP
+// if the request IP matches one of the allowed proxy IPs.
+// If the special proxy value CheckPrivateProxy ("PRIVATE") is passed, the function will
+// also check the header if the request IP is a private IP address.
+func ClientIp(r *http.Request, allowedProxyIp ...string) string {
+	ipStr, _, err := net.SplitHostPort(strings.TrimSpace(r.RemoteAddr))
+	switch {
+	case err != nil && strings.Contains(err.Error(), "missing port in address"):
+		ipStr = strings.TrimSpace(r.RemoteAddr)
+	case err != nil:
+		ipStr = ""
+	}
+	IP := net.ParseIP(ipStr)
+	if IP == nil {
+		return ""
+	}
+
+	isProxiedRequest := false
+	if len(allowedProxyIp) > 0 {
+		if slices.Contains(allowedProxyIp, IP.String()) {
+			isProxiedRequest = true
+		}
+		if IP.IsPrivate() && slices.Contains(allowedProxyIp, CheckPrivateProxy) {
+			isProxiedRequest = true
+		}
+	}
+
+	if isProxiedRequest {
+		realClientIP := r.Header.Get("X-Real-Ip")
+		if realClientIP == "" {
+			realClientIP = r.Header.Get("X-Forwarded-For")
+		}
+		if realClientIP != "" {
+			realIpStr, _, err := net.SplitHostPort(strings.TrimSpace(realClientIP))
+			switch {
+			case err != nil && strings.Contains(err.Error(), "missing port in address"):
+				realIpStr = realClientIP
+			case err != nil:
+				realIpStr = ipStr
+			}
+			realIP := net.ParseIP(realIpStr)
+			if realIP == nil {
+				return IP.String()
+			}
+			return realIP.String()
+		}
+	}
+
+	return IP.String()
+}
+
+// BodyJson decodes the JSON value from the request body into the target.
+// The target must be a pointer to a struct or slice.
+// The function returns an error if the JSON value could not be decoded.
+// The body reader is closed after reading.
+func BodyJson(r *http.Request, target any) error {
+	defer func() {
+		_ = r.Body.Close()
+	}()
+	return json.NewDecoder(r.Body).Decode(target)
+}
+
+// BodyString returns the request body as a string.
+// The content is read and returned as is, without any processing.
+// The body is assumed to be UTF-8 encoded.
+func BodyString(r *http.Request) (string, error) {
+	defer func() {
+		_ = r.Body.Close()
+	}()
+
+	bodyBytes, err := io.ReadAll(r.Body)
+	if err != nil {
+		return "", err
+	}
+	return string(bodyBytes), nil
+}

internal/app/api/core/request/basic_test.go

@@ -0,0 +1,221 @@
+package request
+
+import (
+	"io"
+	"net/http"
+	"net/url"
+	"slices"
+	"strings"
+	"testing"
+)
+
+func TestPath(t *testing.T) {
+	r := &http.Request{URL: &url.URL{Path: "/test/sample"}}
+	r.SetPathValue("first", "test")
+	if got := Path(r, "first"); got != "test" {
+		t.Errorf("Path() = %v, want %v", got, "test")
+	}
+}
+
+func TestDefaultPath(t *testing.T) {
+	r := &http.Request{URL: &url.URL{Path: "/"}}
+	if got := PathDefault(r, "test", "default"); got != "default" {
+		t.Errorf("PathDefault() = %v, want %v", got, "default")
+	}
+}
+
+func TestDefaultPath_noDefault(t *testing.T) {
+	r := &http.Request{URL: &url.URL{Path: "/"}}
+	r.SetPathValue("first", "test")
+	if got := PathDefault(r, "first", "test"); got != "test" {
+		t.Errorf("PathDefault() = %v, want %v", got, "test")
+	}
+}
+
+func TestQuery(t *testing.T) {
+	r := &http.Request{URL: &url.URL{RawQuery: "name=value"}}
+	if got := Query(r, "name"); got != "value" {
+		t.Errorf("Query() = %v, want %v", got, "value")
+	}
+}
+
+func TestDefaultQuery(t *testing.T) {
+	r := &http.Request{URL: &url.URL{RawQuery: ""}}
+	if got := QueryDefault(r, "name", "default"); got != "default" {
+		t.Errorf("QueryDefault() = %v, want %v", got, "default")
+	}
+}
+
+func TestQuerySlice(t *testing.T) {
+	r := &http.Request{URL: &url.URL{RawQuery: "name=value1  &name=value2"}}
+	expected := []string{"value1", "value2"}
+	if got := QuerySlice(r, "name"); !slices.Equal(got, expected) {
+		t.Errorf("QuerySlice() = %v, want %v", got, expected)
+	}
+}
+
+func TestQuerySlice_empty(t *testing.T) {
+	r := &http.Request{URL: &url.URL{RawQuery: "name=value1&name=value2"}}
+	if got := QuerySlice(r, "nix"); !slices.Equal(got, nil) {
+		t.Errorf("QuerySlice() = %v, want %v", got, nil)
+	}
+}
+
+func TestDefaultQuerySlice(t *testing.T) {
+	r := &http.Request{URL: &url.URL{RawQuery: ""}}
+	defaultValue := []string{"default1", "default2"}
+	if got := QuerySliceDefault(r, "name", defaultValue); !slices.Equal(got, defaultValue) {
+		t.Errorf("QuerySliceDefault() = %v, want %v", got, defaultValue)
+	}
+}
+
+func TestFragment(t *testing.T) {
+	r := &http.Request{URL: &url.URL{Fragment: "section"}}
+	if got := Fragment(r); got != "section" {
+		t.Errorf("Fragment() = %v, want %v", got, "section")
+	}
+}
+
+func TestDefaultFragment(t *testing.T) {
+	r := &http.Request{URL: &url.URL{Fragment: ""}}
+	if got := FragmentDefault(r, "default"); got != "default" {
+		t.Errorf("FragmentDefault() = %v, want %v", got, "default")
+	}
+}
+
+func TestForm(t *testing.T) {
+	r := &http.Request{Form: url.Values{"name": {"value"}}}
+	if got := Form(r, "name"); got != "value" {
+		t.Errorf("Form() = %v, want %v", got, "value")
+	}
+}
+
+func TestDefaultForm(t *testing.T) {
+	r := &http.Request{Form: url.Values{}}
+	if got := DefaultForm(r, "name", "default"); got != "default" {
+		t.Errorf("DefaultForm() = %v, want %v", got, "default")
+	}
+}
+
+func TestHeader(t *testing.T) {
+	r := &http.Request{Header: http.Header{"X-Test-Header": {"value"}}}
+	if got := Header(r, "X-Test-Header"); got != "value" {
+		t.Errorf("Header() = %v, want %v", got, "value")
+	}
+}
+
+func TestDefaultHeader(t *testing.T) {
+	r := &http.Request{Header: http.Header{}}
+	if got := HeaderDefault(r, "X-Test-Header", "default"); got != "default" {
+		t.Errorf("HeaderDefault() = %v, want %v", got, "default")
+	}
+}
+
+func TestCookie(t *testing.T) {
+	r := &http.Request{Header: http.Header{"Cookie": {"name=value"}}}
+	if got := Cookie(r, "name"); got != "value" {
+		t.Errorf("Cookie() = %v, want %v", got, "value")
+	}
+}
+
+func TestDefaultCookie(t *testing.T) {
+	r := &http.Request{Header: http.Header{}}
+	if got := CookieDefault(r, "name", "default"); got != "default" {
+		t.Errorf("CookieDefault() = %v, want %v", got, "default")
+	}
+}
+
+func TestClientIp(t *testing.T) {
+	r := &http.Request{RemoteAddr: "192.168.1.1:12345"}
+	if got := ClientIp(r); got != "192.168.1.1" {
+		t.Errorf("ClientIp() = %v, want %v", got, "192.168.1.1")
+	}
+}
+
+func TestClientIp_invalid(t *testing.T) {
+	r := &http.Request{RemoteAddr: "was_isn_des"}
+	if got := ClientIp(r); got != "" {
+		t.Errorf("ClientIp() = %v, want %v", got, "")
+	}
+}
+
+func TestClientIp_ignore_header(t *testing.T) {
+	r := &http.Request{RemoteAddr: "192.168.1.1:12345", Header: http.Header{"X-Forwarded-For": {"123.45.67.1"}}}
+	if got := ClientIp(r); got != "192.168.1.1" {
+		t.Errorf("ClientIp() = %v, want %v", got, "192.168.1.1")
+	}
+}
+
+func TestClientIp_header1(t *testing.T) {
+	r := &http.Request{RemoteAddr: "192.168.1.1:12345", Header: http.Header{"X-Forwarded-For": {"123.45.67.1"}}}
+	if got := ClientIp(r, CheckPrivateProxy); got != "123.45.67.1" {
+		t.Errorf("ClientIp() = %v, want %v", got, "123.45.67.1")
+	}
+}
+
+func TestClientIp_header2(t *testing.T) {
+	r := &http.Request{RemoteAddr: "192.168.1.1:12345", Header: http.Header{"X-Real-Ip": {"123.45.67.1"}}}
+	if got := ClientIp(r, CheckPrivateProxy); got != "123.45.67.1" {
+		t.Errorf("ClientIp() = %v, want %v", got, "123.45.67.1")
+	}
+}
+
+func TestClientIp_header3(t *testing.T) {
+	r := &http.Request{RemoteAddr: "1.1.1.1:12345", Header: http.Header{"X-Real-Ip": {"123.45.67.1"}}}
+	if got := ClientIp(r, "1.1.1.1"); got != "123.45.67.1" {
+		t.Errorf("ClientIp() = %v, want %v", got, "123.45.67.1")
+	}
+}
+
+func TestClientIp_header4(t *testing.T) {
+	r := &http.Request{RemoteAddr: "8.8.8.8:12345", Header: http.Header{"X-Real-Ip": {"123.45.67.1"}}}
+	if got := ClientIp(r, "1.1.1.1"); got != "8.8.8.8" {
+		t.Errorf("ClientIp() = %v, want %v", got, "8.8.8.8")
+	}
+}
+
+func TestClientIp_header_invalid(t *testing.T) {
+	r := &http.Request{RemoteAddr: "1.1.1.1:12345", Header: http.Header{"X-Real-Ip": {"so-sicher-nit"}}}
+	if got := ClientIp(r, "1.1.1.1"); got != "1.1.1.1" {
+		t.Errorf("ClientIp() = %v, want %v", got, "1.1.1.1")
+	}
+}
+
+func TestBodyJson(t *testing.T) {
+	type TestStruct struct {
+		Name  string `json:"name"`
+		Value int    `json:"value"`
+	}
+
+	jsonStr := `{"name": "test", "value": 123}`
+	r := &http.Request{
+		Body: io.NopCloser(strings.NewReader(jsonStr)),
+	}
+
+	var result TestStruct
+	err := BodyJson(r, &result)
+	if err != nil {
+		t.Fatalf("BodyJson() error = %v", err)
+	}
+
+	expected := TestStruct{Name: "test", Value: 123}
+	if result != expected {
+		t.Errorf("BodyJson() = %v, want %v", result, expected)
+	}
+}
+
+func TestBodyString(t *testing.T) {
+	bodyStr := "test body content"
+	r := &http.Request{
+		Body: io.NopCloser(strings.NewReader(bodyStr)),
+	}
+
+	result, err := BodyString(r)
+	if err != nil {
+		t.Fatalf("BodyString() error = %v", err)
+	}
+
+	if result != bodyStr {
+		t.Errorf("BodyString() = %v, want %v", result, bodyStr)
+	}
+}

internal/app/api/core/respond/basic.go

@@ -0,0 +1,100 @@
+// Package respond provides a set of utility functions to help with the HTTP response handling.
+package respond
+
+import (
+	"encoding/json"
+	"io"
+	"net/http"
+	"strconv"
+)
+
+// Status writes a response with the given status code.
+// The response will not contain any data.
+func Status(w http.ResponseWriter, code int) {
+	w.WriteHeader(code)
+}
+
+// String writes a plain text response with the given status code and data.
+// The Content-Type header is set to text/plain with a charset of utf-8.
+func String(w http.ResponseWriter, code int, data string) {
+	w.Header().Set("Content-Type", "text/plain;charset=utf-8")
+	w.WriteHeader(code)
+
+	_, _ = w.Write([]byte(data))
+}
+
+// JSON writes a JSON response with the given status code and data.
+// If data is nil, the response will null. The status code is set to the given code.
+// The Content-Type header is set to application/json.
+// If the given data is not JSON serializable, the response will not contain any data.
+// All encoding errors are silently ignored.
+func JSON(w http.ResponseWriter, code int, data any) {
+	w.Header().Set("Content-Type", "application/json")
+
+	// if no data was given, simply return null
+	if data == nil {
+		w.WriteHeader(code)
+		_, _ = w.Write([]byte("null"))
+		return
+	}
+
+	w.Header().Set("Content-Type", "application/json")
+	w.WriteHeader(code)
+
+	_ = json.NewEncoder(w).Encode(data)
+}
+
+// Data writes a response with the given status code, content type, and data.
+// If no content type is provided, it is detected from the data.
+func Data(w http.ResponseWriter, code int, contentType string, data []byte) {
+	if contentType == "" {
+		contentType = http.DetectContentType(data) // ensure content type is set
+	}
+
+	w.Header().Set("Content-Type", contentType)
+	w.Header().Set("Content-Length", strconv.Itoa(len(data)))
+	w.WriteHeader(code)
+
+	_, _ = w.Write(data)
+}
+
+// Reader writes a response with the given status code, content type, and data.
+// The content length is optional, it is only set if the given length is greater than 0.
+func Reader(w http.ResponseWriter, code int, contentType string, contentLength int, data io.Reader) {
+	w.Header().Set("Content-Type", contentType)
+	if contentLength > 0 {
+		w.Header().Set("Content-Length", strconv.Itoa(contentLength))
+	}
+	w.WriteHeader(code)
+
+	_, _ = io.Copy(w, data)
+}
+
+// Attachment writes a response with the given status code, content type, filename, and data.
+// If no content type is provided, it is detected from the data.
+func Attachment(w http.ResponseWriter, code int, filename, contentType string, data []byte) {
+	w.Header().Set("Content-Disposition", "attachment; filename="+filename)
+
+	Data(w, code, contentType, data)
+}
+
+// AttachmentReader writes a response with the given status code, content type, filename, content length, and data.
+// The content length is optional, it is only set if the given length is greater than 0.
+func AttachmentReader(
+	w http.ResponseWriter,
+	code int,
+	filename, contentType string,
+	contentLength int,
+	data io.Reader,
+) {
+	w.Header().Set("Content-Disposition", "attachment; filename="+filename)
+
+	Reader(w, code, contentType, contentLength, data)
+}
+
+// Redirect writes a response with the given status code and redirects to the given URL.
+// The redirect url will always be an absolute URL. If the given URL is relative,
+// the original request URL is used as the base.
+func Redirect(w http.ResponseWriter, r *http.Request, code int, url string) {
+	http.Redirect(w, r, url, code)
+}

internal/app/api/core/respond/basic_test.go

@@ -0,0 +1,273 @@
+package respond
+
+import (
+	"bytes"
+	"encoding/json"
+	"io"
+	"net/http"
+	"net/http/httptest"
+	"strconv"
+	"testing"
+)
+
+func TestStatus(t *testing.T) {
+	rec := httptest.NewRecorder()
+	Status(rec, http.StatusNoContent)
+
+	res := rec.Result()
+	defer res.Body.Close()
+
+	if res.StatusCode != http.StatusNoContent {
+		t.Errorf("expected status %d, got %d", http.StatusNoContent, res.StatusCode)
+	}
+
+	body, _ := io.ReadAll(res.Body)
+	if len(body) != 0 {
+		t.Errorf("expected no body, got %s", body)
+	}
+}
+
+func TestString(t *testing.T) {
+	rec := httptest.NewRecorder()
+	String(rec, http.StatusOK, "Hello, World!")
+
+	res := rec.Result()
+	defer res.Body.Close()
+
+	if res.StatusCode != http.StatusOK {
+		t.Errorf("expected status %d, got %d", http.StatusOK, res.StatusCode)
+	}
+
+	if contentType := res.Header.Get("Content-Type"); contentType != "text/plain;charset=utf-8" {
+		t.Errorf("expected content type %s, got %s", "text/plain;charset=utf-8", contentType)
+	}
+
+	body, _ := io.ReadAll(res.Body)
+	if string(body) != "Hello, World!" {
+		t.Errorf("expected body %s, got %s", "Hello, World!", string(body))
+	}
+}
+
+func TestJSON(t *testing.T) {
+	rec := httptest.NewRecorder()
+	data := map[string]string{"hello": "world"}
+	JSON(rec, http.StatusOK, data)
+
+	res := rec.Result()
+	defer res.Body.Close()
+
+	if res.StatusCode != http.StatusOK {
+		t.Errorf("expected status %d, got %d", http.StatusOK, res.StatusCode)
+	}
+
+	if contentType := res.Header.Get("Content-Type"); contentType != "application/json" {
+		t.Errorf("expected content type %s, got %s", "application/json", contentType)
+	}
+
+	var body map[string]string
+	_ = json.NewDecoder(res.Body).Decode(&body)
+	if body["hello"] != "world" {
+		t.Errorf("expected body %v, got %v", data, body)
+	}
+}
+
+func TestJSON_empty(t *testing.T) {
+	rec := httptest.NewRecorder()
+	JSON(rec, http.StatusOK, nil)
+
+	res := rec.Result()
+	defer res.Body.Close()
+
+	if res.StatusCode != http.StatusOK {
+		t.Errorf("expected status %d, got %d", http.StatusOK, res.StatusCode)
+	}
+
+	if contentType := res.Header.Get("Content-Type"); contentType != "application/json" {
+		t.Errorf("expected content type %s, got %s", "application/json", contentType)
+	}
+
+	body, _ := io.ReadAll(res.Body)
+	if string(body) != "null" {
+		t.Errorf("expected body %s, got %s", "null", body)
+	}
+}
+
+func TestData(t *testing.T) {
+	rec := httptest.NewRecorder()
+	data := []byte("Hello, World!")
+	Data(rec, http.StatusOK, "text/plain", data)
+
+	res := rec.Result()
+	defer res.Body.Close()
+
+	if res.StatusCode != http.StatusOK {
+		t.Errorf("expected status %d, got %d", http.StatusOK, res.StatusCode)
+	}
+
+	if contentType := res.Header.Get("Content-Type"); contentType != "text/plain" {
+		t.Errorf("expected content type %s, got %s", "text/plain", contentType)
+	}
+
+	body, _ := io.ReadAll(res.Body)
+	if !bytes.Equal(body, data) {
+		t.Errorf("expected body %s, got %s", data, body)
+	}
+}
+
+func TestData_noContentType(t *testing.T) {
+	rec := httptest.NewRecorder()
+	data := []byte{0x1, 0x2, 0x3, 0x4, 0x5}
+	Data(rec, http.StatusOK, "", data)
+
+	res := rec.Result()
+	defer res.Body.Close()
+
+	if res.StatusCode != http.StatusOK {
+		t.Errorf("expected status %d, got %d", http.StatusOK, res.StatusCode)
+	}
+
+	if contentType := res.Header.Get("Content-Type"); contentType != "application/octet-stream" {
+		t.Errorf("expected content type %s, got %s", "application/octet-stream", contentType)
+	}
+
+	body, _ := io.ReadAll(res.Body)
+	if !bytes.Equal(body, data) {
+		t.Errorf("expected body %s, got %s", data, body)
+	}
+}
+
+func TestReader(t *testing.T) {
+	rec := httptest.NewRecorder()
+	data := []byte("Hello, World!")
+	reader := bytes.NewBufferString(string(data))
+	Reader(rec, http.StatusOK, "text/plain", len(data), reader)
+
+	res := rec.Result()
+	defer res.Body.Close()
+
+	if res.StatusCode != http.StatusOK {
+		t.Errorf("expected status %d, got %d", http.StatusOK, res.StatusCode)
+	}
+
+	if contentType := res.Header.Get("Content-Type"); contentType != "text/plain" {
+		t.Errorf("expected content type %s, got %s", "text/plain", contentType)
+	}
+
+	if contentLength := res.Header.Get("Content-Length"); contentLength != strconv.Itoa(len(data)) {
+		t.Errorf("expected content length %d, got %s", len(data), contentLength)
+	}
+
+	body, _ := io.ReadAll(res.Body)
+	if string(body) != "Hello, World!" {
+		t.Errorf("expected body %s, got %s", "Hello, World!", string(body))
+	}
+}
+
+func TestReader_unknownLength(t *testing.T) {
+	rec := httptest.NewRecorder()
+	data := bytes.NewBufferString("Hello, World!")
+	Reader(rec, http.StatusOK, "text/plain", 0, data)
+
+	res := rec.Result()
+	defer res.Body.Close()
+
+	if res.StatusCode != http.StatusOK {
+		t.Errorf("expected status %d, got %d", http.StatusOK, res.StatusCode)
+	}
+
+	if contentType := res.Header.Get("Content-Type"); contentType != "text/plain" {
+		t.Errorf("expected content type %s, got %s", "text/plain", contentType)
+	}
+
+	if contentLength := res.Header.Get("Content-Length"); contentLength != "" {
+		t.Errorf("expected no content length, got %s", contentLength)
+	}
+
+	body, _ := io.ReadAll(res.Body)
+	if string(body) != "Hello, World!" {
+		t.Errorf("expected body %s, got %s", "Hello, World!", string(body))
+	}
+}
+
+func TestAttachment(t *testing.T) {
+	rec := httptest.NewRecorder()
+	data := []byte("Hello, World!")
+	Attachment(rec, http.StatusOK, "example.txt", "text/plain", data)
+
+	res := rec.Result()
+	defer res.Body.Close()
+
+	if res.StatusCode != http.StatusOK {
+		t.Errorf("expected status %d, got %d", http.StatusOK, res.StatusCode)
+	}
+
+	if contentDisposition := res.Header.Get("Content-Disposition"); contentDisposition != "attachment; filename=example.txt" {
+		t.Errorf("expected content disposition %s, got %s", "attachment; filename=example.txt", contentDisposition)
+	}
+
+	body, _ := io.ReadAll(res.Body)
+	if !bytes.Equal(body, data) {
+		t.Errorf("expected body %s, got %s", data, body)
+	}
+}
+
+func TestAttachmentReader(t *testing.T) {
+	rec := httptest.NewRecorder()
+	data := bytes.NewBufferString("Hello, World!")
+	AttachmentReader(rec, http.StatusOK, "example.txt", "text/plain", data.Len(), data)
+
+	res := rec.Result()
+	defer res.Body.Close()
+
+	if res.StatusCode != http.StatusOK {
+		t.Errorf("expected status %d, got %d", http.StatusOK, res.StatusCode)
+	}
+
+	if contentDisposition := res.Header.Get("Content-Disposition"); contentDisposition != "attachment; filename=example.txt" {
+		t.Errorf("expected content disposition %s, got %s", "attachment; filename=example.txt", contentDisposition)
+	}
+
+	body, _ := io.ReadAll(res.Body)
+	if string(body) != "Hello, World!" {
+		t.Errorf("expected body %s, got %s", "Hello, World!", string(body))
+	}
+}
+
+func TestRedirect(t *testing.T) {
+	rec := httptest.NewRecorder()
+	req := httptest.NewRequest(http.MethodGet, "/old", nil)
+	url := "http://example.com/new"
+
+	Redirect(rec, req, http.StatusMovedPermanently, url)
+
+	res := rec.Result()
+	defer res.Body.Close()
+
+	if res.StatusCode != http.StatusMovedPermanently {
+		t.Errorf("expected status %d, got %d", http.StatusMovedPermanently, res.StatusCode)
+	}
+
+	if location := res.Header.Get("Location"); location != url {
+		t.Errorf("expected location %s, got %s", url, location)
+	}
+}
+
+func TestRedirect_relative(t *testing.T) {
+	rec := httptest.NewRecorder()
+	req := httptest.NewRequest(http.MethodGet, "/old/dir", nil)
+	url := "newlocation/sub"
+	want := "/old/newlocation/sub"
+
+	Redirect(rec, req, http.StatusMovedPermanently, url)
+
+	res := rec.Result()
+	defer res.Body.Close()
+
+	if res.StatusCode != http.StatusMovedPermanently {
+		t.Errorf("expected status %d, got %d", http.StatusMovedPermanently, res.StatusCode)
+	}
+
+	if location := res.Header.Get("Location"); location != want {
+		t.Errorf("expected location %s, got %s", want, location)
+	}
+}

internal/app/api/core/respond/template.go

@@ -0,0 +1,46 @@
+package respond
+
+import (
+	"fmt"
+	"io"
+	"net/http"
+)
+
+// TplData is a map of template data. This is a convenience type for passing data to templates.
+type TplData map[string]any
+
+// TemplateInstance is an interface that wraps the ExecuteTemplate method.
+// It is implemented by the html/template and text/template packages.
+type TemplateInstance interface {
+	// ExecuteTemplate executes a template with the given name and data.
+	ExecuteTemplate(wr io.Writer, name string, data any) error
+}
+
+// TemplateRenderer is a renderer that uses a template instance to render HTML or Text templates.
+type TemplateRenderer struct {
+	t TemplateInstance
+}
+
+// NewTemplateRenderer creates a new HTML or Text template renderer with the given template instance.
+func NewTemplateRenderer(t TemplateInstance) *TemplateRenderer {
+	return &TemplateRenderer{t: t}
+}
+
+// Render renders a template with the given name and data.
+// If rendering fails, it will panic with an error.
+func (r *TemplateRenderer) Render(w http.ResponseWriter, code int, name, contentType string, data any) {
+	w.Header().Set("Content-Type", contentType)
+	w.WriteHeader(code)
+
+	err := r.t.ExecuteTemplate(w, name, data)
+	if err != nil {
+		panic(fmt.Errorf("error rendering template %s: %v", name, err))
+	}
+}
+
+// HTML renders a template with the given name and data. It is a convenience method for Render.
+// The content type is set to "text/html" and the encoding to "utf-8".
+// If rendering fails, it will panic with an error.
+func (r *TemplateRenderer) HTML(w http.ResponseWriter, code int, name string, data any) {
+	r.Render(w, code, name, "text/html;charset=utf-8", data)
+}

internal/app/api/core/respond/template_test.go

@@ -0,0 +1,67 @@
+package respond
+
+import (
+	"html/template"
+	"io"
+	"net/http"
+	"net/http/httptest"
+	"testing"
+)
+
+type mockTemplate struct {
+	tmpl *template.Template
+}
+
+func (m *mockTemplate) ExecuteTemplate(wr io.Writer, name string, data any) error {
+	return m.tmpl.ExecuteTemplate(wr, name, data)
+}
+
+func TestTemplateRenderer_Render(t *testing.T) {
+	tmpl := template.Must(template.New("test").Parse(`{{define "test"}}Hello, {{.}}!{{end}}`))
+	renderer := NewTemplateRenderer(&mockTemplate{tmpl: tmpl})
+
+	rec := httptest.NewRecorder()
+	renderer.Render(rec, http.StatusOK, "test", "text/plain", "World")
+
+	res := rec.Result()
+	defer res.Body.Close()
+
+	if res.StatusCode != http.StatusOK {
+		t.Errorf("expected status %d, got %d", http.StatusOK, res.StatusCode)
+	}
+
+	if contentType := res.Header.Get("Content-Type"); contentType != "text/plain" {
+		t.Errorf("expected content type %s, got %s", "text/plain", contentType)
+	}
+
+	body, _ := io.ReadAll(res.Body)
+	expectedBody := "Hello, World!"
+	if string(body) != expectedBody {
+		t.Errorf("expected body %s, got %s", expectedBody, string(body))
+	}
+}
+
+func TestTemplateRenderer_HTML(t *testing.T) {
+	tmpl := template.Must(template.New("test").Parse(`{{define "test"}}<p>Hello, {{.}}!</p>{{end}}`))
+	renderer := NewTemplateRenderer(&mockTemplate{tmpl: tmpl})
+
+	rec := httptest.NewRecorder()
+	renderer.HTML(rec, http.StatusOK, "test", "World")
+
+	res := rec.Result()
+	defer res.Body.Close()
+
+	if res.StatusCode != http.StatusOK {
+		t.Errorf("expected status %d, got %d", http.StatusOK, res.StatusCode)
+	}
+
+	if contentType := res.Header.Get("Content-Type"); contentType != "text/html;charset=utf-8" {
+		t.Errorf("expected content type %s, got %s", "text/html;charset=utf-8", contentType)
+	}
+
+	body, _ := io.ReadAll(res.Body)
+	expectedBody := "<p>Hello, World!</p>"
+	if string(body) != expectedBody {
+		t.Errorf("expected body %s, got %s", expectedBody, string(body))
+	}
+}

internal/app/api/core/server.go

@@ -2,26 +2,23 @@ package core
 
 import (
 	"context"
-	"encoding/base64"
 	"fmt"
 	"html/template"
-	"io"
 	"io/fs"
-	"math/rand"
+	"log/slog"
 	"net/http"
 	"os"
 	"time"
 
+	"github.com/go-pkgz/routegroup"
+
 	"github.com/h44z/wg-portal/internal"
+	"github.com/h44z/wg-portal/internal/app/api/core/middleware/cors"
+	"github.com/h44z/wg-portal/internal/app/api/core/middleware/logging"
+	"github.com/h44z/wg-portal/internal/app/api/core/middleware/recovery"
+	"github.com/h44z/wg-portal/internal/app/api/core/middleware/tracing"
+	"github.com/h44z/wg-portal/internal/app/api/core/respond"
 	"github.com/h44z/wg-portal/internal/config"
-
-	"github.com/gin-gonic/gin"
-	"github.com/sirupsen/logrus"
-	ginlogrus "github.com/toorop/gin-logrus"
-)
-
-var (
-	random = rand.New(rand.NewSource(time.Now().UTC().UnixNano()))
 )
 
 const (
@@ -31,19 +28,21 @@ const (
 type ApiVersion string
 type HandlerName string
 
-type GroupSetupFn func(group *gin.RouterGroup)
+type GroupSetupFn func(group *routegroup.Bundle)
 
 type ApiEndpointSetupFunc func() (ApiVersion, GroupSetupFn)
 
 type Server struct {
 	cfg      *config.Config
-	server   *gin.Engine
-	versions map[ApiVersion]*gin.RouterGroup
+	server   *routegroup.Bundle
+	tpl      *respond.TemplateRenderer
+	versions map[ApiVersion]*routegroup.Bundle
 }
 
 func NewServer(cfg *config.Config, endpoints ...ApiEndpointSetupFunc) (*Server, error) {
 	s := &Server{
-		cfg: cfg,
+		cfg:    cfg,
+		server: routegroup.New(http.NewServeMux()),
 	}
 
 	hostname, err := os.Hostname()
@@ -52,44 +51,39 @@ func NewServer(cfg *config.Config, endpoints ...ApiEndpointSetupFunc) (*Server,
 	}
 	hostname += ", version " + internal.Version
 
-	// Setup http server
-	gin.SetMode(gin.ReleaseMode)
-	gin.DefaultWriter = io.Discard
-	s.server = gin.New()
+	s.server.Use(recovery.New().Handler)
 	if cfg.Web.RequestLogging {
-		if logrus.GetLevel() == logrus.TraceLevel {
-			gin.SetMode(gin.DebugMode)
-			s.server.Use(ginlogrus.Logger(logrus.StandardLogger()))
-		} else {
-			s.server.Use(ginlogrus.Logger(logrus.StandardLogger()))
-		}
-	}
-	s.server.Use(gin.Recovery()).Use(func(c *gin.Context) {
-		c.Writer.Header().Set("X-Served-By", hostname)
-		c.Next()
-	}).Use(func(c *gin.Context) {
-		xRequestID := uuid(16)
+		s.server.Use(logging.New(logging.WithLevel(logging.LogLevelDebug)).Handler)
 
-		c.Request.Header.Set(RequestIDKey, xRequestID)
-		c.Set(RequestIDKey, xRequestID)
-		c.Next()
-	})
+	}
+	s.server.Use(cors.New().Handler)
+	s.server.Use(tracing.New(
+		tracing.WithContextIdentifier(RequestIDKey),
+		tracing.WithHeaderIdentifier(RequestIDKey),
+	).Handler)
+	if cfg.Web.ExposeHostInfo {
+		s.server.Use(func(handler http.Handler) http.Handler {
+			return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+				w.Header().Set("X-Served-By", hostname)
+				handler.ServeHTTP(w, r)
+			})
+		})
+	}
 
 	// Setup templates
-	templates := template.Must(template.New("").Funcs(s.server.FuncMap).ParseFS(apiTemplates, "assets/tpl/*.gohtml"))
-	s.server.SetHTMLTemplate(templates)
+	s.tpl = respond.NewTemplateRenderer(
+		template.Must(template.New("").ParseFS(apiTemplates, "assets/tpl/*.gohtml")),
+	)
 
 	// Serve static files
 	imgFs := http.FS(fsMust(fs.Sub(apiStatics, "assets/img")))
-	s.server.StaticFS("/css", http.FS(fsMust(fs.Sub(apiStatics, "assets/css"))))
-	s.server.StaticFS("/js", http.FS(fsMust(fs.Sub(apiStatics, "assets/js"))))
-	s.server.StaticFS("/img", imgFs)
-	s.server.StaticFS("/fonts", http.FS(fsMust(fs.Sub(apiStatics, "assets/fonts"))))
-	s.server.StaticFS("/doc", http.FS(fsMust(fs.Sub(apiStatics, "assets/doc"))))
+	s.server.HandleFiles("/css", http.FS(fsMust(fs.Sub(apiStatics, "assets/css"))))
+	s.server.HandleFiles("/js", http.FS(fsMust(fs.Sub(apiStatics, "assets/js"))))
+	s.server.HandleFiles("/img", imgFs)
+	s.server.HandleFiles("/fonts", http.FS(fsMust(fs.Sub(apiStatics, "assets/fonts"))))
+	s.server.HandleFiles("/doc", http.FS(fsMust(fs.Sub(apiStatics, "assets/doc"))))
 
 	// Setup routes
-	s.server.UseRawPath = true
-	s.server.UnescapePathValues = true
 	s.setupRoutes(endpoints...)
 	s.setupFrontendRoutes()
 
@@ -112,37 +106,37 @@ func (s *Server) Run(ctx context.Context, listenAddress string) {
 			err = srv.ListenAndServe()
 		}
 		if err != nil {
-			logrus.Infof("web service on %s exited: %v", listenAddress, err)
+			slog.Info("web service exited", "address", listenAddress, "error", err)
 			cancelFn()
 		}
 	}()
-	logrus.Infof("started web service on %s", listenAddress)
+	slog.Info("started web service", "address", listenAddress)
 
 	// Wait for the main context to end
 	<-srvContext.Done()
 
-	logrus.Debug("web service shutting down, grace period: 5 seconds...")
+	slog.Debug("web service shutting down, grace period: 5 seconds")
 
 	shutdownCtx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
 	defer cancel()
 	_ = srv.Shutdown(shutdownCtx)
 
-	logrus.Debug("web service shut down")
+	slog.Debug("web service shut down")
 }
 
 func (s *Server) setupRoutes(endpoints ...ApiEndpointSetupFunc) {
-	s.server.GET("/api", s.landingPage)
-	s.versions = make(map[ApiVersion]*gin.RouterGroup)
+	s.server.HandleFunc("GET /api", s.landingPage)
+	s.versions = make(map[ApiVersion]*routegroup.Bundle)
 
 	for _, setupFunc := range endpoints {
 		version, groupSetupFn := setupFunc()
 
 		if _, ok := s.versions[version]; !ok {
-			s.versions[version] = s.server.Group(fmt.Sprintf("/api/%s", version))
+			s.versions[version] = s.server.Mount(fmt.Sprintf("/api/%s", version))
 
 			// OpenAPI documentation (via RapiDoc)
-			s.versions[version].GET("/swagger/index.html", s.rapiDocHandler(version)) // Deprecated: old link
-			s.versions[version].GET("/doc.html", s.rapiDocHandler(version))
+			s.versions[version].HandleFunc("GET /swagger/index.html", s.rapiDocHandler(version)) // Deprecated: old link
+			s.versions[version].HandleFunc("GET /doc.html", s.rapiDocHandler(version))
 
 			groupSetupFn(s.versions[version])
 		}
@@ -151,25 +145,27 @@ func (s *Server) setupRoutes(endpoints ...ApiEndpointSetupFunc) {
 
 func (s *Server) setupFrontendRoutes() {
 	// Serve static files
-	s.server.GET("/", func(c *gin.Context) {
-		c.Redirect(http.StatusMovedPermanently, "/app")
+	s.server.HandleFunc("/", func(w http.ResponseWriter, r *http.Request) {
+		respond.Redirect(w, r, http.StatusMovedPermanently, "/app")
 	})
-	s.server.GET("/favicon.ico", func(c *gin.Context) {
-		c.Redirect(http.StatusMovedPermanently, "/app/favicon.ico")
+
+	s.server.HandleFunc("/favicon.ico", func(w http.ResponseWriter, r *http.Request) {
+		respond.Redirect(w, r, http.StatusMovedPermanently, "/app/favicon.ico")
 	})
-	s.server.StaticFS("/app", http.FS(fsMust(fs.Sub(frontendStatics, "frontend-dist"))))
+
+	s.server.HandleFiles("/app", http.FS(fsMust(fs.Sub(frontendStatics, "frontend-dist"))))
 }
 
-func (s *Server) landingPage(c *gin.Context) {
-	c.HTML(http.StatusOK, "index.gohtml", gin.H{
+func (s *Server) landingPage(w http.ResponseWriter, _ *http.Request) {
+	s.tpl.HTML(w, http.StatusOK, "index.gohtml", respond.TplData{
 		"Version": internal.Version,
 		"Year":    time.Now().Year(),
 	})
 }
 
-func (s *Server) rapiDocHandler(version ApiVersion) gin.HandlerFunc {
-	return func(c *gin.Context) {
-		c.HTML(http.StatusOK, "rapidoc.gohtml", gin.H{
+func (s *Server) rapiDocHandler(version ApiVersion) http.HandlerFunc {
+	return func(w http.ResponseWriter, r *http.Request) {
+		s.tpl.HTML(w, http.StatusOK, "rapidoc.gohtml", respond.TplData{
 			"RapiDocSource": "/js/rapidoc-min.js",
 			"ApiSpecUrl":    fmt.Sprintf("/doc/%s_swagger.yaml", version),
 			"Version":       internal.Version,
@@ -184,9 +180,3 @@ func fsMust(f fs.FS, err error) fs.FS {
 	}
 	return f
 }
-
-func uuid(len int) string {
-	bytes := make([]byte, len)
-	random.Read(bytes)
-	return base64.StdEncoding.EncodeToString(bytes)[:len]
-}

internal/app/api/v0/backend/interface_service.go

@@ -0,0 +1,91 @@
+package backend
+
+import (
+	"context"
+	"io"
+
+	"github.com/h44z/wg-portal/internal/config"
+	"github.com/h44z/wg-portal/internal/domain"
+)
+
+// region dependencies
+
+type InterfaceServiceInterfaceManager interface {
+	GetAllInterfacesAndPeers(ctx context.Context) ([]domain.Interface, [][]domain.Peer, error)
+	GetInterfaceAndPeers(ctx context.Context, id domain.InterfaceIdentifier) (*domain.Interface, []domain.Peer, error)
+	CreateInterface(ctx context.Context, in *domain.Interface) (*domain.Interface, error)
+	UpdateInterface(ctx context.Context, in *domain.Interface) (*domain.Interface, []domain.Peer, error)
+	DeleteInterface(ctx context.Context, id domain.InterfaceIdentifier) error
+	PrepareInterface(ctx context.Context) (*domain.Interface, error)
+	ApplyPeerDefaults(ctx context.Context, in *domain.Interface) error
+}
+
+type InterfaceServiceConfigFileManager interface {
+	PersistInterfaceConfig(ctx context.Context, id domain.InterfaceIdentifier) error
+	GetInterfaceConfig(ctx context.Context, id domain.InterfaceIdentifier) (io.Reader, error)
+}
+
+// endregion dependencies
+
+type InterfaceService struct {
+	cfg *config.Config
+
+	interfaces InterfaceServiceInterfaceManager
+	configFile InterfaceServiceConfigFileManager
+}
+
+func NewInterfaceService(
+	cfg *config.Config,
+	interfaces InterfaceServiceInterfaceManager,
+	configFile InterfaceServiceConfigFileManager,
+) *InterfaceService {
+	return &InterfaceService{
+		cfg:        cfg,
+		interfaces: interfaces,
+		configFile: configFile,
+	}
+}
+
+func (i InterfaceService) GetInterfaceAndPeers(ctx context.Context, id domain.InterfaceIdentifier) (
+	*domain.Interface,
+	[]domain.Peer,
+	error,
+) {
+	return i.interfaces.GetInterfaceAndPeers(ctx, id)
+}
+
+func (i InterfaceService) PrepareInterface(ctx context.Context) (*domain.Interface, error) {
+	return i.interfaces.PrepareInterface(ctx)
+}
+
+func (i InterfaceService) CreateInterface(ctx context.Context, in *domain.Interface) (*domain.Interface, error) {
+	return i.interfaces.CreateInterface(ctx, in)
+}
+
+func (i InterfaceService) UpdateInterface(ctx context.Context, in *domain.Interface) (
+	*domain.Interface,
+	[]domain.Peer,
+	error,
+) {
+	return i.interfaces.UpdateInterface(ctx, in)
+}
+
+func (i InterfaceService) DeleteInterface(ctx context.Context, id domain.InterfaceIdentifier) error {
+	return i.interfaces.DeleteInterface(ctx, id)
+}
+
+func (i InterfaceService) GetAllInterfacesAndPeers(ctx context.Context) ([]domain.Interface, [][]domain.Peer, error) {
+	return i.interfaces.GetAllInterfacesAndPeers(ctx)
+}
+
+func (i InterfaceService) GetInterfaceConfig(ctx context.Context, id domain.InterfaceIdentifier) (io.Reader, error) {
+	return i.configFile.GetInterfaceConfig(ctx, id)
+}
+
+func (i InterfaceService) PersistInterfaceConfig(ctx context.Context, id domain.InterfaceIdentifier) error {
+	return i.configFile.PersistInterfaceConfig(ctx, id)
+}
+
+func (i InterfaceService) ApplyPeerDefaults(ctx context.Context, in *domain.Interface) error {
+	return i.interfaces.ApplyPeerDefaults(ctx, in)
+}

internal/app/api/v0/backend/peer_service.go

@@ -0,0 +1,112 @@
+package backend
+
+import (
+	"context"
+	"io"
+
+	"github.com/h44z/wg-portal/internal/config"
+	"github.com/h44z/wg-portal/internal/domain"
+)
+
+// region dependencies
+
+type PeerServicePeerManager interface {
+	GetPeer(ctx context.Context, id domain.PeerIdentifier) (*domain.Peer, error)
+	GetUserPeers(ctx context.Context, id domain.UserIdentifier) ([]domain.Peer, error)
+	GetInterfaceAndPeers(ctx context.Context, id domain.InterfaceIdentifier) (*domain.Interface, []domain.Peer, error)
+	PreparePeer(ctx context.Context, id domain.InterfaceIdentifier) (*domain.Peer, error)
+	CreatePeer(ctx context.Context, peer *domain.Peer) (*domain.Peer, error)
+	UpdatePeer(ctx context.Context, peer *domain.Peer) (*domain.Peer, error)
+	DeletePeer(ctx context.Context, id domain.PeerIdentifier) error
+	CreateMultiplePeers(
+		ctx context.Context,
+		interfaceId domain.InterfaceIdentifier,
+		r *domain.PeerCreationRequest,
+	) ([]domain.Peer, error)
+	GetPeerStats(ctx context.Context, id domain.InterfaceIdentifier) ([]domain.PeerStatus, error)
+}
+
+type PeerServiceConfigFileManager interface {
+	GetPeerConfig(ctx context.Context, id domain.PeerIdentifier) (io.Reader, error)
+	GetPeerConfigQrCode(ctx context.Context, id domain.PeerIdentifier) (io.Reader, error)
+}
+
+type PeerServiceMailManager interface {
+	SendPeerEmail(ctx context.Context, linkOnly bool, peers ...domain.PeerIdentifier) error
+}
+
+// endregion dependencies
+
+type PeerService struct {
+	cfg *config.Config
+
+	peers      PeerServicePeerManager
+	configFile PeerServiceConfigFileManager
+	mailer     PeerServiceMailManager
+}
+
+func NewPeerService(
+	cfg *config.Config,
+	peers PeerServicePeerManager,
+	configFile PeerServiceConfigFileManager,
+	mailer PeerServiceMailManager,
+) *PeerService {
+	return &PeerService{
+		cfg:        cfg,
+		peers:      peers,
+		configFile: configFile,
+		mailer:     mailer,
+	}
+}
+
+func (p PeerService) GetInterfaceAndPeers(ctx context.Context, id domain.InterfaceIdentifier) (
+	*domain.Interface,
+	[]domain.Peer,
+	error,
+) {
+	return p.peers.GetInterfaceAndPeers(ctx, id)
+}
+
+func (p PeerService) PreparePeer(ctx context.Context, id domain.InterfaceIdentifier) (*domain.Peer, error) {
+	return p.peers.PreparePeer(ctx, id)
+}
+
+func (p PeerService) GetPeer(ctx context.Context, id domain.PeerIdentifier) (*domain.Peer, error) {
+	return p.peers.GetPeer(ctx, id)
+}
+
+func (p PeerService) CreatePeer(ctx context.Context, peer *domain.Peer) (*domain.Peer, error) {
+	return p.peers.CreatePeer(ctx, peer)
+}
+
+func (p PeerService) CreateMultiplePeers(
+	ctx context.Context,
+	interfaceId domain.InterfaceIdentifier,
+	r *domain.PeerCreationRequest,
+) ([]domain.Peer, error) {
+	return p.peers.CreateMultiplePeers(ctx, interfaceId, r)
+}
+
+func (p PeerService) UpdatePeer(ctx context.Context, peer *domain.Peer) (*domain.Peer, error) {
+	return p.peers.UpdatePeer(ctx, peer)
+}
+
+func (p PeerService) DeletePeer(ctx context.Context, id domain.PeerIdentifier) error {
+	return p.peers.DeletePeer(ctx, id)
+}
+
+func (p PeerService) GetPeerConfig(ctx context.Context, id domain.PeerIdentifier) (io.Reader, error) {
+	return p.configFile.GetPeerConfig(ctx, id)
+}
+
+func (p PeerService) GetPeerConfigQrCode(ctx context.Context, id domain.PeerIdentifier) (io.Reader, error) {
+	return p.configFile.GetPeerConfigQrCode(ctx, id)
+}
+
+func (p PeerService) SendPeerEmail(ctx context.Context, linkOnly bool, peers ...domain.PeerIdentifier) error {
+	return p.mailer.SendPeerEmail(ctx, linkOnly, peers...)
+}
+
+func (p PeerService) GetPeerStats(ctx context.Context, id domain.InterfaceIdentifier) ([]domain.PeerStatus, error) {
+	return p.peers.GetPeerStats(ctx, id)
+}

internal/app/api/v0/backend/user_service.go

@@ -0,0 +1,83 @@
+package backend
+
+import (
+	"context"
+
+	"github.com/h44z/wg-portal/internal/config"
+	"github.com/h44z/wg-portal/internal/domain"
+)
+
+// region dependencies
+
+type UserServiceUserManager interface {
+	GetUser(ctx context.Context, id domain.UserIdentifier) (*domain.User, error)
+	GetAllUsers(ctx context.Context) ([]domain.User, error)
+	CreateUser(ctx context.Context, user *domain.User) (*domain.User, error)
+	UpdateUser(ctx context.Context, user *domain.User) (*domain.User, error)
+	DeleteUser(ctx context.Context, id domain.UserIdentifier) error
+	ActivateApi(ctx context.Context, id domain.UserIdentifier) (*domain.User, error)
+	DeactivateApi(ctx context.Context, id domain.UserIdentifier) (*domain.User, error)
+}
+
+type UserServiceWireGuardManager interface {
+	GetUserPeers(ctx context.Context, id domain.UserIdentifier) ([]domain.Peer, error)
+	GetUserInterfaces(ctx context.Context, _ domain.UserIdentifier) ([]domain.Interface, error)
+	GetUserPeerStats(ctx context.Context, id domain.UserIdentifier) ([]domain.PeerStatus, error)
+}
+
+// endregion dependencies
+
+type UserService struct {
+	cfg *config.Config
+
+	users UserServiceUserManager
+	wg    UserServiceWireGuardManager
+}
+
+func NewUserService(cfg *config.Config, users UserServiceUserManager, wg UserServiceWireGuardManager) *UserService {
+	return &UserService{
+		cfg:   cfg,
+		users: users,
+		wg:    wg,
+	}
+}
+
+func (u UserService) GetUser(ctx context.Context, id domain.UserIdentifier) (*domain.User, error) {
+	return u.users.GetUser(ctx, id)
+}
+
+func (u UserService) GetAllUsers(ctx context.Context) ([]domain.User, error) {
+	return u.users.GetAllUsers(ctx)
+}
+
+func (u UserService) UpdateUser(ctx context.Context, user *domain.User) (*domain.User, error) {
+	return u.users.UpdateUser(ctx, user)
+}
+
+func (u UserService) CreateUser(ctx context.Context, user *domain.User) (*domain.User, error) {
+	return u.users.CreateUser(ctx, user)
+}
+
+func (u UserService) DeleteUser(ctx context.Context, id domain.UserIdentifier) error {
+	return u.users.DeleteUser(ctx, id)
+}
+
+func (u UserService) ActivateApi(ctx context.Context, id domain.UserIdentifier) (*domain.User, error) {
+	return u.users.ActivateApi(ctx, id)
+}
+
+func (u UserService) DeactivateApi(ctx context.Context, id domain.UserIdentifier) (*domain.User, error) {
+	return u.users.DeactivateApi(ctx, id)
+}
+
+func (u UserService) GetUserPeers(ctx context.Context, id domain.UserIdentifier) ([]domain.Peer, error) {
+	return u.wg.GetUserPeers(ctx, id)
+}
+
+func (u UserService) GetUserPeerStats(ctx context.Context, id domain.UserIdentifier) ([]domain.PeerStatus, error) {
+	return u.wg.GetUserPeerStats(ctx, id)
+}
+
+func (u UserService) GetUserInterfaces(ctx context.Context, id domain.UserIdentifier) ([]domain.Interface, error) {
+	return u.wg.GetUserInterfaces(ctx, id)
+}

internal/app/api/v0/handlers/base.go

@@ -1,23 +1,39 @@
 package handlers
 
 import (
+	"context"
 	"net/http"
-	"strings"
 
-	"github.com/gin-contrib/cors"
-	"github.com/gin-contrib/sessions"
-	"github.com/gin-contrib/sessions/memstore"
-	"github.com/gin-gonic/gin"
-	"github.com/h44z/wg-portal/internal/app"
+	"github.com/go-pkgz/routegroup"
+
 	"github.com/h44z/wg-portal/internal/app/api/core"
-	"github.com/h44z/wg-portal/internal/app/api/v0/model"
-	"github.com/h44z/wg-portal/internal/config"
-	csrf "github.com/utrack/gin-csrf"
+	"github.com/h44z/wg-portal/internal/app/api/core/middleware/cors"
+	"github.com/h44z/wg-portal/internal/app/api/core/middleware/csrf"
+	"github.com/h44z/wg-portal/internal/app/api/core/respond"
 )
 
-type handler interface {
+type SessionMiddleware interface {
+	// SetData sets the session data for the given context.
+	SetData(ctx context.Context, val SessionData)
+	// GetData returns the session data for the given context. If no data is found, the default session data is returned.
+	GetData(ctx context.Context) SessionData
+	// DestroyData destroys the session data for the given context.
+	DestroyData(ctx context.Context)
+
+	// GetString returns the string value for the given key. If no value is found, an empty string is returned.
+	GetString(ctx context.Context, key string) string
+	// Put sets the value for the given key.
+	Put(ctx context.Context, key string, value any)
+	// LoadAndSave is a middleware that loads the session data for the given request and saves it after the request is
+	// finished.
+	LoadAndSave(next http.Handler) http.Handler
+}
+
+type Handler interface {
+	// GetName returns the name of the handler.
 	GetName() string
-	RegisterRoutes(g *gin.RouterGroup, authenticator *authenticationHandler)
+	// RegisterRoutes registers the routes for the handler. The session manager is passed to the handler.
+	RegisterRoutes(g *routegroup.Bundle)
 }
 
 // To compile the API documentation use the
@@ -34,54 +50,35 @@ type handler interface {
 // @BasePath /api/v0
 // @query.collection.format multi
 
-func NewRestApi(cfg *config.Config, app *app.App) core.ApiEndpointSetupFunc {
-	authenticator := &authenticationHandler{
-		app:     app,
-		Session: GinSessionStore{sessionIdentifier: cfg.Web.SessionIdentifier},
-	}
-
-	handlers := make([]handler, 0, 1)
-	handlers = append(handlers, testEndpoint{})
-	handlers = append(handlers, userEndpoint{app: app, authenticator: authenticator})
-	handlers = append(handlers, newConfigEndpoint(app, authenticator))
-	handlers = append(handlers, authEndpoint{app: app, authenticator: authenticator})
-	handlers = append(handlers, interfaceEndpoint{app: app, authenticator: authenticator})
-	handlers = append(handlers, peerEndpoint{app: app, authenticator: authenticator})
-
+func NewRestApi(
+	session SessionMiddleware,
+	handlers ...Handler,
+) core.ApiEndpointSetupFunc {
 	return func() (core.ApiVersion, core.GroupSetupFn) {
-		return "v0", func(group *gin.RouterGroup) {
-			cookieStore := memstore.NewStore([]byte(cfg.Web.SessionSecret))
-			cookieStore.Options(sessions.Options{
-				Path:     "/",
-				MaxAge:   86400, // auth session is valid for 1 day
-				Secure:   strings.HasPrefix(cfg.Web.ExternalUrl, "https"),
-				HttpOnly: true,
-				SameSite: http.SameSiteLaxMode,
+		return "v0", func(group *routegroup.Bundle) {
+			csrfMiddleware := csrf.New(func(r *http.Request) string {
+				return session.GetData(r.Context()).CsrfToken
+			}, func(r *http.Request, token string) {
+				currentSession := session.GetData(r.Context())
+				currentSession.CsrfToken = token
+				session.SetData(r.Context(), currentSession)
 			})
-			group.Use(sessions.Sessions(cfg.Web.SessionIdentifier, cookieStore))
-			group.Use(cors.Default())
-			group.Use(csrf.Middleware(csrf.Options{
-				Secret: cfg.Web.CsrfSecret,
-				ErrorFunc: func(c *gin.Context) {
-					c.JSON(http.StatusBadRequest, model.Error{
-						Code:    http.StatusBadRequest,
-						Message: "CSRF token mismatch",
-					})
-					c.Abort()
-				},
-			}))
 
-			group.GET("/csrf", handleCsrfGet())
+			group.Use(session.LoadAndSave)
+			group.Use(csrfMiddleware.Handler)
+			group.Use(cors.New().Handler)
+
+			group.With(csrfMiddleware.RefreshToken).HandleFunc("GET /csrf", handleCsrfGet())
 
 			// Handler functions
 			for _, h := range handlers {
-				h.RegisterRoutes(group, authenticator)
+				h.RegisterRoutes(group)
 			}
 		}
 	}
 }
 
-// handleCsrfGet returns a gorm handler function.
+// handleCsrfGet returns a gorm Handler function.
 //
 // @ID base_handleCsrfGet
 // @Tags Security
@@ -89,8 +86,33 @@ func NewRestApi(cfg *config.Config, app *app.App) core.ApiEndpointSetupFunc {
 // @Produce json
 // @Success 200 {object} string
 // @Router /csrf [get]
-func handleCsrfGet() gin.HandlerFunc {
-	return func(c *gin.Context) {
-		c.JSON(http.StatusOK, csrf.GetToken(c))
+func handleCsrfGet() http.HandlerFunc {
+	return func(w http.ResponseWriter, r *http.Request) {
+		respond.JSON(w, http.StatusOK, csrf.GetToken(r.Context()))
 	}
 }
+
+// region handler-interfaces
+
+type Authenticator interface {
+	// LoggedIn checks if a user is logged in. If scopes are given, they are validated as well.
+	LoggedIn(scopes ...Scope) func(next http.Handler) http.Handler
+	// UserIdMatch checks if the user id in the session matches the user id in the request. If not, the request is aborted.
+	UserIdMatch(idParameter string) func(next http.Handler) http.Handler
+}
+
+type Session interface {
+	// SetData sets the session data for the given context.
+	SetData(ctx context.Context, val SessionData)
+	// GetData returns the session data for the given context. If no data is found, the default session data is returned.
+	GetData(ctx context.Context) SessionData
+	// DestroyData destroys the session data for the given context.
+	DestroyData(ctx context.Context)
+}
+
+type Validator interface {
+	// Struct validates the given struct.
+	Struct(s interface{}) error
+}
+
+// endregion handler-interfaces

internal/app/api/v0/handlers/encoding.go

@@ -5,6 +5,9 @@ import (
 	"strings"
 )
 
+// Base64UrlDecode decodes a base64 url encoded string.
+// In comparison to the standard base64 encoding, the url encoding uses - instead of + and _ instead of /
+// as well as . instead of =.
 func Base64UrlDecode(in string) string {
 	in = strings.ReplaceAll(in, "-", "=")
 	in = strings.ReplaceAll(in, "_", "/")

internal/app/api/v0/handlers/endpoint_audit.go

@@ -0,0 +1,69 @@
+package handlers
+
+import (
+	"context"
+	"net/http"
+
+	"github.com/go-pkgz/routegroup"
+
+	"github.com/h44z/wg-portal/internal/app/api/core/respond"
+	"github.com/h44z/wg-portal/internal/app/api/v0/model"
+	"github.com/h44z/wg-portal/internal/config"
+	"github.com/h44z/wg-portal/internal/domain"
+)
+
+type AuditService interface {
+	// GetAll returns all audit entries ordered by timestamp. Newest first.
+	GetAll(ctx context.Context) ([]domain.AuditEntry, error)
+}
+
+type AuditEndpoint struct {
+	cfg           *config.Config
+	authenticator Authenticator
+	auditService  AuditService
+}
+
+func NewAuditEndpoint(
+	cfg *config.Config,
+	authenticator Authenticator,
+	auditService AuditService,
+) AuditEndpoint {
+	return AuditEndpoint{
+		cfg:           cfg,
+		authenticator: authenticator,
+		auditService:  auditService,
+	}
+}
+
+func (e AuditEndpoint) GetName() string {
+	return "AuditEndpoint"
+}
+
+func (e AuditEndpoint) RegisterRoutes(g *routegroup.Bundle) {
+	apiGroup := g.Mount("/audit")
+	apiGroup.Use(e.authenticator.LoggedIn(ScopeAdmin))
+
+	apiGroup.HandleFunc("GET /entries", e.handleEntriesGet())
+}
+
+// handleExternalLoginProvidersGet returns a gorm Handler function.
+//
+// @ID audit_handleEntriesGet
+// @Tags Audit
+// @Summary Get all available audit entries. Ordered by timestamp.
+// @Produce json
+// @Success 200 {object} []model.AuditEntry
+// @Router /audit/entries [get]
+func (e AuditEndpoint) handleEntriesGet() http.HandlerFunc {
+	return func(w http.ResponseWriter, r *http.Request) {
+		providers, err := e.auditService.GetAll(r.Context())
+		if err != nil {
+			respond.JSON(w, http.StatusInternalServerError, model.Error{
+				Code: http.StatusInternalServerError, Message: err.Error(),
+			})
+			return
+		}
+
+		respond.JSON(w, http.StatusOK, model.NewAuditEntries(providers))
+	}
+}

internal/app/api/v0/handlers/endpoint_authentication.go

@@ -8,35 +8,68 @@ import (
 	"strings"
 	"time"
 
-	"github.com/gin-gonic/gin"
-	"github.com/h44z/wg-portal/internal/app"
+	"github.com/go-pkgz/routegroup"
+
+	"github.com/h44z/wg-portal/internal/app/api/core/request"
+	"github.com/h44z/wg-portal/internal/app/api/core/respond"
 	"github.com/h44z/wg-portal/internal/app/api/v0/model"
+	"github.com/h44z/wg-portal/internal/config"
 	"github.com/h44z/wg-portal/internal/domain"
 )
 
-type authEndpoint struct {
-	app           *app.App
-	authenticator *authenticationHandler
+type AuthenticationService interface {
+	// GetExternalLoginProviders returns a list of all available external login providers.
+	GetExternalLoginProviders(_ context.Context) []domain.LoginProviderInfo
+	// PlainLogin authenticates a user with a username and password.
+	PlainLogin(ctx context.Context, username, password string) (*domain.User, error)
+	// OauthLoginStep1 initiates the OAuth login flow.
+	OauthLoginStep1(_ context.Context, providerId string) (authCodeUrl, state, nonce string, err error)
+	// OauthLoginStep2 completes the OAuth login flow and logins the user in.
+	OauthLoginStep2(ctx context.Context, providerId, nonce, code string) (*domain.User, error)
 }
 
-func (e authEndpoint) GetName() string {
+type AuthEndpoint struct {
+	cfg           *config.Config
+	authService   AuthenticationService
+	authenticator Authenticator
+	session       Session
+	validate      Validator
+}
+
+func NewAuthEndpoint(
+	cfg *config.Config,
+	authenticator Authenticator,
+	session Session,
+	validator Validator,
+	authService AuthenticationService,
+) AuthEndpoint {
+	return AuthEndpoint{
+		cfg:           cfg,
+		authService:   authService,
+		authenticator: authenticator,
+		session:       session,
+		validate:      validator,
+	}
+}
+
+func (e AuthEndpoint) GetName() string {
 	return "AuthEndpoint"
 }
 
-func (e authEndpoint) RegisterRoutes(g *gin.RouterGroup, authenticator *authenticationHandler) {
-	apiGroup := g.Group("/auth")
+func (e AuthEndpoint) RegisterRoutes(g *routegroup.Bundle) {
+	apiGroup := g.Mount("/auth")
 
-	apiGroup.GET("/providers", e.handleExternalLoginProvidersGet())
-	apiGroup.GET("/session", e.handleSessionInfoGet())
+	apiGroup.HandleFunc("GET /providers", e.handleExternalLoginProvidersGet())
+	apiGroup.HandleFunc("GET /session", e.handleSessionInfoGet())
 
-	apiGroup.GET("/login/:provider/init", e.handleOauthInitiateGet())
-	apiGroup.GET("/login/:provider/callback", e.handleOauthCallbackGet())
+	apiGroup.HandleFunc("GET /login/{provider}/init", e.handleOauthInitiateGet())
+	apiGroup.HandleFunc("GET /login/{provider}/callback", e.handleOauthCallbackGet())
 
-	apiGroup.POST("/login", e.handleLoginPost())
-	apiGroup.POST("/logout", authenticator.LoggedIn(), e.handleLogoutPost())
+	apiGroup.HandleFunc("POST /login", e.handleLoginPost())
+	apiGroup.With(e.authenticator.LoggedIn()).HandleFunc("POST /logout", e.handleLogoutPost())
 }
 
-// handleExternalLoginProvidersGet returns a gorm handler function.
+// handleExternalLoginProvidersGet returns a gorm Handler function.
 //
 // @ID auth_handleExternalLoginProvidersGet
 // @Tags Authentication
@@ -44,16 +77,15 @@ func (e authEndpoint) RegisterRoutes(g *gin.RouterGroup, authenticator *authenti
 // @Produce json
 // @Success 200 {object} []model.LoginProviderInfo
 // @Router /auth/providers [get]
-func (e authEndpoint) handleExternalLoginProvidersGet() gin.HandlerFunc {
-	return func(c *gin.Context) {
-		ctx := domain.SetUserInfoFromGin(c)
-		providers := e.app.Authenticator.GetExternalLoginProviders(ctx)
+func (e AuthEndpoint) handleExternalLoginProvidersGet() http.HandlerFunc {
+	return func(w http.ResponseWriter, r *http.Request) {
+		providers := e.authService.GetExternalLoginProviders(r.Context())
 
-		c.JSON(http.StatusOK, model.NewLoginProviderInfos(providers))
+		respond.JSON(w, http.StatusOK, model.NewLoginProviderInfos(providers))
 	}
 }
 
-// handleSessionInfoGet returns a gorm handler function.
+// handleSessionInfoGet returns a gorm Handler function.
 //
 // @ID auth_handleSessionInfoGet
 // @Tags Authentication
@@ -62,9 +94,9 @@ func (e authEndpoint) handleExternalLoginProvidersGet() gin.HandlerFunc {
 // @Success 200 {object} []model.SessionInfo
 // @Failure 500 {object} model.Error
 // @Router /auth/session [get]
-func (e authEndpoint) handleSessionInfoGet() gin.HandlerFunc {
-	return func(c *gin.Context) {
-		currentSession := e.authenticator.Session.GetData(c)
+func (e AuthEndpoint) handleSessionInfoGet() http.HandlerFunc {
+	return func(w http.ResponseWriter, r *http.Request) {
+		currentSession := e.session.GetData(r.Context())
 
 		var loggedInUid *string
 		var firstname *string
@@ -82,7 +114,7 @@ func (e authEndpoint) handleSessionInfoGet() gin.HandlerFunc {
 			email = &e
 		}
 
-		c.JSON(http.StatusOK, model.SessionInfo{
+		respond.JSON(w, http.StatusOK, model.SessionInfo{
 			LoggedIn:       currentSession.LoggedIn,
 			IsAdmin:        currentSession.IsAdmin,
 			UserIdentifier: loggedInUid,
@@ -93,7 +125,7 @@ func (e authEndpoint) handleSessionInfoGet() gin.HandlerFunc {
 	}
 }
 
-// handleOauthInitiateGet returns a gorm handler function.
+// handleOauthInitiateGet returns a gorm Handler function.
 //
 // @ID auth_handleOauthInitiateGet
 // @Tags Authentication
@@ -101,23 +133,24 @@ func (e authEndpoint) handleSessionInfoGet() gin.HandlerFunc {
 // @Produce json
 // @Success 200 {object} []model.LoginProviderInfo
 // @Router /auth/{provider}/init [get]
-func (e authEndpoint) handleOauthInitiateGet() gin.HandlerFunc {
-	return func(c *gin.Context) {
-		currentSession := e.authenticator.Session.GetData(c)
+func (e AuthEndpoint) handleOauthInitiateGet() http.HandlerFunc {
+	return func(w http.ResponseWriter, r *http.Request) {
+		currentSession := e.session.GetData(r.Context())
 
-		autoRedirect, _ := strconv.ParseBool(c.DefaultQuery("redirect", "false"))
-		returnTo := c.Query("return")
-		provider := c.Param("provider")
+		autoRedirect, _ := strconv.ParseBool(request.QueryDefault(r, "redirect", "false"))
+		returnTo := request.Query(r, "return")
+		provider := request.Path(r, "provider")
 
 		var returnUrl *url.URL
 		var returnParams string
 		redirectToReturn := func() {
-			c.Redirect(http.StatusFound, returnUrl.String()+"?"+returnParams)
+			respond.Redirect(w, r, http.StatusFound, returnUrl.String()+"?"+returnParams)
 		}
 
 		if returnTo != "" {
 			if !e.isValidReturnUrl(returnTo) {
-				c.JSON(http.StatusBadRequest, model.Error{Code: http.StatusBadRequest, Message: "invalid return URL"})
+				respond.JSON(w, http.StatusBadRequest,
+					model.Error{Code: http.StatusBadRequest, Message: "invalid return URL"})
 				return
 			}
 			if u, err := url.Parse(returnTo); err == nil {
@@ -136,34 +169,34 @@ func (e authEndpoint) handleOauthInitiateGet() gin.HandlerFunc {
 				returnParams = queryParams.Encode()
 				redirectToReturn()
 			} else {
-				c.JSON(http.StatusBadRequest, model.Error{Code: http.StatusBadRequest, Message: "already logged in"})
+				respond.JSON(w, http.StatusBadRequest,
+					model.Error{Code: http.StatusBadRequest, Message: "already logged in"})
 			}
 			return
 		}
 
-		ctx := domain.SetUserInfoFromGin(c)
-		authCodeUrl, state, nonce, err := e.app.Authenticator.OauthLoginStep1(ctx, provider)
+		authCodeUrl, state, nonce, err := e.authService.OauthLoginStep1(context.Background(), provider)
 		if err != nil {
 			if autoRedirect && e.isValidReturnUrl(returnTo) {
 				redirectToReturn()
 			} else {
-				c.JSON(http.StatusInternalServerError,
+				respond.JSON(w, http.StatusInternalServerError,
 					model.Error{Code: http.StatusInternalServerError, Message: err.Error()})
 			}
 			return
 		}
 
-		authSession := e.authenticator.Session.DefaultSessionData()
+		authSession := e.session.GetData(r.Context())
 		authSession.OauthState = state
 		authSession.OauthNonce = nonce
 		authSession.OauthProvider = provider
 		authSession.OauthReturnTo = returnTo
-		e.authenticator.Session.SetData(c, authSession)
+		e.session.SetData(r.Context(), authSession)
 
 		if autoRedirect {
-			c.Redirect(http.StatusFound, authCodeUrl)
+			respond.Redirect(w, r, http.StatusFound, authCodeUrl)
 		} else {
-			c.JSON(http.StatusOK, model.OauthInitiationResponse{
+			respond.JSON(w, http.StatusOK, model.OauthInitiationResponse{
 				RedirectUrl: authCodeUrl,
 				State:       state,
 			})
@@ -171,7 +204,7 @@ func (e authEndpoint) handleOauthInitiateGet() gin.HandlerFunc {
 	}
 }
 
-// handleOauthCallbackGet returns a gorm handler function.
+// handleOauthCallbackGet returns a gorm Handler function.
 //
 // @ID auth_handleOauthCallbackGet
 // @Tags Authentication
@@ -179,14 +212,14 @@ func (e authEndpoint) handleOauthInitiateGet() gin.HandlerFunc {
 // @Produce json
 // @Success 200 {object} []model.LoginProviderInfo
 // @Router /auth/{provider}/callback [get]
-func (e authEndpoint) handleOauthCallbackGet() gin.HandlerFunc {
-	return func(c *gin.Context) {
-		currentSession := e.authenticator.Session.GetData(c)
+func (e AuthEndpoint) handleOauthCallbackGet() http.HandlerFunc {
+	return func(w http.ResponseWriter, r *http.Request) {
+		currentSession := e.session.GetData(r.Context())
 
 		var returnUrl *url.URL
 		var returnParams string
 		redirectToReturn := func() {
-			c.Redirect(http.StatusFound, returnUrl.String()+"?"+returnParams)
+			respond.Redirect(w, r, http.StatusFound, returnUrl.String()+"?"+returnParams)
 		}
 
 		if currentSession.OauthReturnTo != "" {
@@ -206,20 +239,20 @@ func (e authEndpoint) handleOauthCallbackGet() gin.HandlerFunc {
 				returnParams = queryParams.Encode()
 				redirectToReturn()
 			} else {
-				c.JSON(http.StatusBadRequest, model.Error{Message: "already logged in"})
+				respond.JSON(w, http.StatusBadRequest, model.Error{Message: "already logged in"})
 			}
 			return
 		}
 
-		provider := c.Param("provider")
-		oauthCode := c.Query("code")
-		oauthState := c.Query("state")
+		provider := request.Path(r, "provider")
+		oauthCode := request.Query(r, "code")
+		oauthState := request.Query(r, "state")
 
 		if provider != currentSession.OauthProvider {
 			if returnUrl != nil && e.isValidReturnUrl(returnUrl.String()) {
 				redirectToReturn()
 			} else {
-				c.JSON(http.StatusBadRequest,
+				respond.JSON(w, http.StatusBadRequest,
 					model.Error{Code: http.StatusBadRequest, Message: "invalid oauth provider"})
 			}
 			return
@@ -228,24 +261,27 @@ func (e authEndpoint) handleOauthCallbackGet() gin.HandlerFunc {
 			if returnUrl != nil && e.isValidReturnUrl(returnUrl.String()) {
 				redirectToReturn()
 			} else {
-				c.JSON(http.StatusBadRequest, model.Error{Code: http.StatusBadRequest, Message: "invalid oauth state"})
+				respond.JSON(w, http.StatusBadRequest,
+					model.Error{Code: http.StatusBadRequest, Message: "invalid oauth state"})
 			}
 			return
 		}
 
 		loginCtx, cancel := context.WithTimeout(context.Background(), 1000*time.Second)
-		user, err := e.app.Authenticator.OauthLoginStep2(loginCtx, provider, currentSession.OauthNonce, oauthCode)
+		user, err := e.authService.OauthLoginStep2(loginCtx, provider, currentSession.OauthNonce,
+			oauthCode)
 		cancel()
 		if err != nil {
 			if returnUrl != nil && e.isValidReturnUrl(returnUrl.String()) {
 				redirectToReturn()
 			} else {
-				c.JSON(http.StatusUnauthorized, model.Error{Code: http.StatusUnauthorized, Message: err.Error()})
+				respond.JSON(w, http.StatusUnauthorized,
+					model.Error{Code: http.StatusUnauthorized, Message: err.Error()})
 			}
 			return
 		}
 
-		e.setAuthenticatedUser(c, user)
+		e.setAuthenticatedUser(r, user)
 
 		if returnUrl != nil && e.isValidReturnUrl(returnUrl.String()) {
 			queryParams := returnUrl.Query()
@@ -253,13 +289,16 @@ func (e authEndpoint) handleOauthCallbackGet() gin.HandlerFunc {
 			returnParams = queryParams.Encode()
 			redirectToReturn()
 		} else {
-			c.JSON(http.StatusOK, user)
+			respond.JSON(w, http.StatusOK, user)
 		}
 	}
 }
 
-func (e authEndpoint) setAuthenticatedUser(c *gin.Context, user *domain.User) {
-	currentSession := e.authenticator.Session.GetData(c)
+func (e AuthEndpoint) setAuthenticatedUser(r *http.Request, user *domain.User) {
+	// start a fresh session
+	e.session.DestroyData(r.Context())
+
+	currentSession := e.session.GetData(r.Context())
 
 	currentSession.LoggedIn = true
 	currentSession.IsAdmin = user.IsAdmin
@@ -273,10 +312,10 @@ func (e authEndpoint) setAuthenticatedUser(c *gin.Context, user *domain.User) {
 	currentSession.OauthProvider = ""
 	currentSession.OauthReturnTo = ""
 
-	e.authenticator.Session.SetData(c, currentSession)
+	e.session.SetData(r.Context(), currentSession)
 }
 
-// handleLoginPost returns a gorm handler function.
+// handleLoginPost returns a gorm Handler function.
 //
 // @ID auth_handleLoginPost
 // @Tags Authentication
@@ -284,11 +323,11 @@ func (e authEndpoint) setAuthenticatedUser(c *gin.Context, user *domain.User) {
 // @Produce json
 // @Success 200 {object} []model.LoginProviderInfo
 // @Router /auth/login [post]
-func (e authEndpoint) handleLoginPost() gin.HandlerFunc {
-	return func(c *gin.Context) {
-		currentSession := e.authenticator.Session.GetData(c)
+func (e AuthEndpoint) handleLoginPost() http.HandlerFunc {
+	return func(w http.ResponseWriter, r *http.Request) {
+		currentSession := e.session.GetData(r.Context())
 		if currentSession.LoggedIn {
-			c.JSON(http.StatusOK, model.Error{Code: http.StatusOK, Message: "already logged in"})
+			respond.JSON(w, http.StatusOK, model.Error{Code: http.StatusOK, Message: "already logged in"})
 			return
 		}
 
@@ -297,49 +336,54 @@ func (e authEndpoint) handleLoginPost() gin.HandlerFunc {
 			Password string `json:"password" binding:"required,min=4"`
 		}
 
-		if err := c.ShouldBindJSON(&loginData); err != nil {
-			c.JSON(http.StatusBadRequest, model.Error{Code: http.StatusBadRequest, Message: err.Error()})
+		if err := request.BodyJson(r, &loginData); err != nil {
+			respond.JSON(w, http.StatusBadRequest, model.Error{Code: http.StatusBadRequest, Message: err.Error()})
+			return
+		}
+		if err := e.validate.Struct(loginData); err != nil {
+			respond.JSON(w, http.StatusBadRequest, model.Error{Code: http.StatusBadRequest, Message: err.Error()})
 			return
 		}
 
-		ctx := domain.SetUserInfoFromGin(c)
-		user, err := e.app.Authenticator.PlainLogin(ctx, loginData.Username, loginData.Password)
+		user, err := e.authService.PlainLogin(context.Background(), loginData.Username,
+			loginData.Password)
 		if err != nil {
-			c.JSON(http.StatusUnauthorized, model.Error{Code: http.StatusUnauthorized, Message: "login failed"})
+			respond.JSON(w, http.StatusUnauthorized,
+				model.Error{Code: http.StatusUnauthorized, Message: "login failed"})
 			return
 		}
 
-		e.setAuthenticatedUser(c, user)
+		e.setAuthenticatedUser(r, user)
 
-		c.JSON(http.StatusOK, user)
+		respond.JSON(w, http.StatusOK, user)
 	}
 }
 
-// handleLogoutPost returns a gorm handler function.
+// handleLogoutPost returns a gorm Handler function.
 //
-// @ID auth_handleLogoutGet
+// @ID auth_handleLogoutPost
 // @Tags Authentication
 // @Summary Get all available external login providers.
 // @Produce json
-// @Success 200 {object} []model.LoginProviderInfo
-// @Router /auth/logout [get]
-func (e authEndpoint) handleLogoutPost() gin.HandlerFunc {
-	return func(c *gin.Context) {
-		currentSession := e.authenticator.Session.GetData(c)
+// @Success 200 {object} model.Error
+// @Router /auth/logout [post]
+func (e AuthEndpoint) handleLogoutPost() http.HandlerFunc {
+	return func(w http.ResponseWriter, r *http.Request) {
+		currentSession := e.session.GetData(r.Context())
 
 		if !currentSession.LoggedIn { // Not logged in
-			c.JSON(http.StatusOK, model.Error{Code: http.StatusOK, Message: "not logged in"})
+			respond.JSON(w, http.StatusOK, model.Error{Code: http.StatusOK, Message: "not logged in"})
 			return
 		}
 
-		e.authenticator.Session.DestroyData(c)
-		c.JSON(http.StatusOK, model.Error{Code: http.StatusOK, Message: "logout ok"})
+		e.session.DestroyData(r.Context())
+		respond.JSON(w, http.StatusOK, model.Error{Code: http.StatusOK, Message: "logout ok"})
 	}
 }
 
 // isValidReturnUrl checks if the given return URL matches the configured external URL of the application.
-func (e authEndpoint) isValidReturnUrl(returnUrl string) bool {
-	if !strings.HasPrefix(returnUrl, e.app.Config.Web.ExternalUrl) {
+func (e AuthEndpoint) isValidReturnUrl(returnUrl string) bool {
+	if !strings.HasPrefix(returnUrl, e.cfg.Web.ExternalUrl) {
 		return false
 	}
 

internal/app/api/v0/handlers/endpoint_config.go

@@ -1,7 +1,6 @@
 package handlers
 
 import (
-	"bytes"
 	"embed"
 	"fmt"
 	"html/template"
@@ -9,56 +8,61 @@ import (
 	"net/http"
 	"net/url"
 
-	"github.com/gin-gonic/gin"
+	"github.com/go-pkgz/routegroup"
+
 	"github.com/h44z/wg-portal/internal"
-	"github.com/h44z/wg-portal/internal/app"
+	"github.com/h44z/wg-portal/internal/app/api/core/request"
+	"github.com/h44z/wg-portal/internal/app/api/core/respond"
 	"github.com/h44z/wg-portal/internal/app/api/v0/model"
+	"github.com/h44z/wg-portal/internal/config"
 )
 
 //go:embed frontend_config.js.gotpl
 var frontendJs embed.FS
 
-type configEndpoint struct {
-	app           *app.App
-	authenticator *authenticationHandler
+type ConfigEndpoint struct {
+	cfg           *config.Config
+	authenticator Authenticator
 
-	tpl *template.Template
+	tpl *respond.TemplateRenderer
 }
 
-func newConfigEndpoint(app *app.App, authenticator *authenticationHandler) configEndpoint {
-	ep := configEndpoint{
-		app:           app,
+func NewConfigEndpoint(cfg *config.Config, authenticator Authenticator) ConfigEndpoint {
+	ep := ConfigEndpoint{
+		cfg:           cfg,
 		authenticator: authenticator,
-		tpl:           template.Must(template.ParseFS(frontendJs, "frontend_config.js.gotpl")),
+		tpl: respond.NewTemplateRenderer(template.Must(template.ParseFS(frontendJs,
+			"frontend_config.js.gotpl"))),
 	}
 
 	return ep
 }
 
-func (e configEndpoint) GetName() string {
+func (e ConfigEndpoint) GetName() string {
 	return "ConfigEndpoint"
 }
 
-func (e configEndpoint) RegisterRoutes(g *gin.RouterGroup, authenticator *authenticationHandler) {
-	apiGroup := g.Group("/config")
+func (e ConfigEndpoint) RegisterRoutes(g *routegroup.Bundle) {
+	apiGroup := g.Mount("/config")
 
-	apiGroup.GET("/frontend.js", e.handleConfigJsGet())
-	apiGroup.GET("/settings", e.authenticator.LoggedIn(), e.handleSettingsGet())
+	apiGroup.HandleFunc("GET /frontend.js", e.handleConfigJsGet())
+	apiGroup.With(e.authenticator.LoggedIn()).HandleFunc("GET /settings", e.handleSettingsGet())
 }
 
-// handleConfigJsGet returns a gorm handler function.
+// handleConfigJsGet returns a gorm Handler function.
 //
 // @ID config_handleConfigJsGet
 // @Tags Configuration
 // @Summary Get the dynamic frontend configuration javascript.
 // @Produce text/javascript
 // @Success 200 string javascript "The JavaScript contents"
+// @Failure 500
 // @Router /config/frontend.js [get]
-func (e configEndpoint) handleConfigJsGet() gin.HandlerFunc {
-	return func(c *gin.Context) {
-		backendUrl := fmt.Sprintf("%s/api/v0", e.app.Config.Web.ExternalUrl)
-		if c.GetHeader("x-wg-dev") != "" {
-			referer := c.Request.Header.Get("Referer")
+func (e ConfigEndpoint) handleConfigJsGet() http.HandlerFunc {
+	return func(w http.ResponseWriter, r *http.Request) {
+		backendUrl := fmt.Sprintf("%s/api/v0", e.cfg.Web.ExternalUrl)
+		if request.Header(r, "x-wg-dev") != "" {
+			referer := request.Header(r, "Referer")
 			host := "localhost"
 			port := "5000"
 			parsedReferer, err := url.Parse(referer)
@@ -68,23 +72,17 @@ func (e configEndpoint) handleConfigJsGet() gin.HandlerFunc {
 			backendUrl = fmt.Sprintf("http://%s:%s/api/v0", host,
 				port) // override if request comes from frontend started with npm run dev
 		}
-		buf := &bytes.Buffer{}
-		err := e.tpl.ExecuteTemplate(buf, "frontend_config.js.gotpl", gin.H{
+
+		e.tpl.Render(w, http.StatusOK, "frontend_config.js.gotpl", "text/javascript", map[string]any{
 			"BackendUrl":      backendUrl,
 			"Version":         internal.Version,
-			"SiteTitle":       e.app.Config.Web.SiteTitle,
-			"SiteCompanyName": e.app.Config.Web.SiteCompanyName,
+			"SiteTitle":       e.cfg.Web.SiteTitle,
+			"SiteCompanyName": e.cfg.Web.SiteCompanyName,
 		})
-		if err != nil {
-			c.Status(http.StatusInternalServerError)
-			return
-		}
-
-		c.Data(http.StatusOK, "application/javascript", buf.Bytes())
 	}
 }
 
-// handleSettingsGet returns a gorm handler function.
+// handleSettingsGet returns a gorm Handler function.
 //
 // @ID config_handleSettingsGet
 // @Tags Configuration
@@ -93,13 +91,13 @@ func (e configEndpoint) handleConfigJsGet() gin.HandlerFunc {
 // @Success 200 {object} model.Settings
 // @Success 200 string javascript "The JavaScript contents"
 // @Router /config/settings [get]
-func (e configEndpoint) handleSettingsGet() gin.HandlerFunc {
-	return func(c *gin.Context) {
-		c.JSON(http.StatusOK, model.Settings{
-			MailLinkOnly:              e.app.Config.Mail.LinkOnly,
-			PersistentConfigSupported: e.app.Config.Advanced.ConfigStoragePath != "",
-			SelfProvisioning:          e.app.Config.Core.SelfProvisioningAllowed,
-			ApiAdminOnly:              e.app.Config.Advanced.ApiAdminOnly,
+func (e ConfigEndpoint) handleSettingsGet() http.HandlerFunc {
+	return func(w http.ResponseWriter, r *http.Request) {
+		respond.JSON(w, http.StatusOK, model.Settings{
+			MailLinkOnly:              e.cfg.Mail.LinkOnly,
+			PersistentConfigSupported: e.cfg.Advanced.ConfigStoragePath != "",
+			SelfProvisioning:          e.cfg.Core.SelfProvisioningAllowed,
+			ApiAdminOnly:              e.cfg.Advanced.ApiAdminOnly,
 		})
 	}
 }

internal/app/api/v0/handlers/endpoint_interfaces.go

@@ -1,40 +1,83 @@
 package handlers
 
 import (
-	"github.com/gin-gonic/gin"
-	"github.com/h44z/wg-portal/internal/app"
-	"github.com/h44z/wg-portal/internal/app/api/v0/model"
-	"github.com/h44z/wg-portal/internal/domain"
+	"context"
 	"io"
 	"net/http"
+
+	"github.com/go-pkgz/routegroup"
+
+	"github.com/h44z/wg-portal/internal/app/api/core/request"
+	"github.com/h44z/wg-portal/internal/app/api/core/respond"
+	"github.com/h44z/wg-portal/internal/app/api/v0/model"
+	"github.com/h44z/wg-portal/internal/config"
+	"github.com/h44z/wg-portal/internal/domain"
 )
 
-type interfaceEndpoint struct {
-	app           *app.App
-	authenticator *authenticationHandler
+type InterfaceService interface {
+	// GetInterfaceAndPeers returns the interface with the given id and all peers associated with it.
+	GetInterfaceAndPeers(ctx context.Context, id domain.InterfaceIdentifier) (*domain.Interface, []domain.Peer, error)
+	// PrepareInterface returns a new interface with default values.
+	PrepareInterface(ctx context.Context) (*domain.Interface, error)
+	// CreateInterface creates a new interface.
+	CreateInterface(ctx context.Context, in *domain.Interface) (*domain.Interface, error)
+	// UpdateInterface updates the interface with the given id.
+	UpdateInterface(ctx context.Context, in *domain.Interface) (*domain.Interface, []domain.Peer, error)
+	// DeleteInterface deletes the interface with the given id.
+	DeleteInterface(ctx context.Context, id domain.InterfaceIdentifier) error
+	// GetAllInterfacesAndPeers returns all interfaces and all peers associated with them.
+	GetAllInterfacesAndPeers(ctx context.Context) ([]domain.Interface, [][]domain.Peer, error)
+	// GetInterfaceConfig returns the interface configuration as string.
+	GetInterfaceConfig(ctx context.Context, id domain.InterfaceIdentifier) (io.Reader, error)
+	// PersistInterfaceConfig persists the interface configuration to a file.
+	PersistInterfaceConfig(ctx context.Context, id domain.InterfaceIdentifier) error
+	// ApplyPeerDefaults applies the peer defaults to all peers of the given interface.
+	ApplyPeerDefaults(ctx context.Context, in *domain.Interface) error
 }
 
-func (e interfaceEndpoint) GetName() string {
+type InterfaceEndpoint struct {
+	cfg              *config.Config
+	interfaceService InterfaceService
+	authenticator    Authenticator
+	validator        Validator
+}
+
+func NewInterfaceEndpoint(
+	cfg *config.Config,
+	authenticator Authenticator,
+	validator Validator,
+	interfaceService InterfaceService,
+) InterfaceEndpoint {
+	return InterfaceEndpoint{
+		cfg:              cfg,
+		interfaceService: interfaceService,
+		authenticator:    authenticator,
+		validator:        validator,
+	}
+}
+
+func (e InterfaceEndpoint) GetName() string {
 	return "InterfaceEndpoint"
 }
 
-func (e interfaceEndpoint) RegisterRoutes(g *gin.RouterGroup, authenticator *authenticationHandler) {
-	apiGroup := g.Group("/interface", e.authenticator.LoggedIn(ScopeAdmin))
+func (e InterfaceEndpoint) RegisterRoutes(g *routegroup.Bundle) {
+	apiGroup := g.Mount("/interface")
+	apiGroup.Use(e.authenticator.LoggedIn(ScopeAdmin))
 
-	apiGroup.GET("/prepare", e.handlePrepareGet())
-	apiGroup.GET("/all", e.handleAllGet())
-	apiGroup.GET("/get/:id", e.handleSingleGet())
-	apiGroup.PUT("/:id", e.handleUpdatePut())
-	apiGroup.DELETE("/:id", e.handleDelete())
-	apiGroup.POST("/new", e.handleCreatePost())
-	apiGroup.GET("/config/:id", e.handleConfigGet())
-	apiGroup.POST("/:id/save-config", e.handleSaveConfigPost())
-	apiGroup.POST("/:id/apply-peer-defaults", e.handleApplyPeerDefaultsPost())
+	apiGroup.HandleFunc("GET /prepare", e.handlePrepareGet())
+	apiGroup.HandleFunc("GET /all", e.handleAllGet())
+	apiGroup.HandleFunc("GET /get/{id}", e.handleSingleGet())
+	apiGroup.HandleFunc("PUT /{id}", e.handleUpdatePut())
+	apiGroup.HandleFunc("DELETE /{id}", e.handleDelete())
+	apiGroup.HandleFunc("POST /new", e.handleCreatePost())
+	apiGroup.HandleFunc("GET /config/{id}", e.handleConfigGet())
+	apiGroup.HandleFunc("POST /{id}/save-config", e.handleSaveConfigPost())
+	apiGroup.HandleFunc("POST /{id}/apply-peer-defaults", e.handleApplyPeerDefaultsPost())
 
-	apiGroup.GET("/peers/:id", e.handlePeersGet())
+	apiGroup.HandleFunc("GET /peers/{id}", e.handlePeersGet())
 }
 
-// handlePrepareGet returns a gorm handler function.
+// handlePrepareGet returns a gorm Handler function.
 //
 // @ID interfaces_handlePrepareGet
 // @Tags Interface
@@ -43,22 +86,21 @@ func (e interfaceEndpoint) RegisterRoutes(g *gin.RouterGroup, authenticator *aut
 // @Success 200 {object} model.Interface
 // @Failure 500 {object} model.Error
 // @Router /interface/prepare [get]
-func (e interfaceEndpoint) handlePrepareGet() gin.HandlerFunc {
-	return func(c *gin.Context) {
-		ctx := domain.SetUserInfoFromGin(c)
-		in, err := e.app.PrepareInterface(ctx)
+func (e InterfaceEndpoint) handlePrepareGet() http.HandlerFunc {
+	return func(w http.ResponseWriter, r *http.Request) {
+		in, err := e.interfaceService.PrepareInterface(r.Context())
 		if err != nil {
-			c.JSON(http.StatusInternalServerError, model.Error{
+			respond.JSON(w, http.StatusInternalServerError, model.Error{
 				Code: http.StatusInternalServerError, Message: err.Error(),
 			})
 			return
 		}
 
-		c.JSON(http.StatusOK, model.NewInterface(in, nil))
+		respond.JSON(w, http.StatusOK, model.NewInterface(in, nil))
 	}
 }
 
-// handleAllGet returns a gorm handler function.
+// handleAllGet returns a gorm Handler function.
 //
 // @ID interfaces_handleAllGet
 // @Tags Interface
@@ -67,22 +109,21 @@ func (e interfaceEndpoint) handlePrepareGet() gin.HandlerFunc {
 // @Success 200 {object} []model.Interface
 // @Failure 500 {object} model.Error
 // @Router /interface/all [get]
-func (e interfaceEndpoint) handleAllGet() gin.HandlerFunc {
-	return func(c *gin.Context) {
-		ctx := domain.SetUserInfoFromGin(c)
-		interfaces, peers, err := e.app.GetAllInterfacesAndPeers(ctx)
+func (e InterfaceEndpoint) handleAllGet() http.HandlerFunc {
+	return func(w http.ResponseWriter, r *http.Request) {
+		interfaces, peers, err := e.interfaceService.GetAllInterfacesAndPeers(r.Context())
 		if err != nil {
-			c.JSON(http.StatusInternalServerError, model.Error{
+			respond.JSON(w, http.StatusInternalServerError, model.Error{
 				Code: http.StatusInternalServerError, Message: err.Error(),
 			})
 			return
 		}
 
-		c.JSON(http.StatusOK, model.NewInterfaces(interfaces, peers))
+		respond.JSON(w, http.StatusOK, model.NewInterfaces(interfaces, peers))
 	}
 }
 
-// handleSingleGet returns a gorm handler function.
+// handleSingleGet returns a gorm Handler function.
 //
 // @ID interfaces_handleSingleGet
 // @Tags Interface
@@ -92,30 +133,29 @@ func (e interfaceEndpoint) handleAllGet() gin.HandlerFunc {
 // @Failure 400 {object} model.Error
 // @Failure 500 {object} model.Error
 // @Router /interface/get/{id} [get]
-func (e interfaceEndpoint) handleSingleGet() gin.HandlerFunc {
-	return func(c *gin.Context) {
-		ctx := domain.SetUserInfoFromGin(c)
-		id := Base64UrlDecode(c.Param("id"))
+func (e InterfaceEndpoint) handleSingleGet() http.HandlerFunc {
+	return func(w http.ResponseWriter, r *http.Request) {
+		id := Base64UrlDecode(request.Path(r, "id"))
 		if id == "" {
-			c.JSON(http.StatusBadRequest, model.Error{
+			respond.JSON(w, http.StatusBadRequest, model.Error{
 				Code: http.StatusInternalServerError, Message: "missing id parameter",
 			})
 			return
 		}
 
-		iface, peers, err := e.app.GetInterfaceAndPeers(ctx, domain.InterfaceIdentifier(id))
+		iface, peers, err := e.interfaceService.GetInterfaceAndPeers(r.Context(), domain.InterfaceIdentifier(id))
 		if err != nil {
-			c.JSON(http.StatusInternalServerError, model.Error{
+			respond.JSON(w, http.StatusInternalServerError, model.Error{
 				Code: http.StatusInternalServerError, Message: err.Error(),
 			})
 			return
 		}
 
-		c.JSON(http.StatusOK, model.NewInterface(iface, peers))
+		respond.JSON(w, http.StatusOK, model.NewInterface(iface, peers))
 	}
 }
 
-// handleConfigGet returns a gorm handler function.
+// handleConfigGet returns a gorm Handler function.
 //
 // @ID interfaces_handleConfigGet
 // @Tags Interface
@@ -125,20 +165,19 @@ func (e interfaceEndpoint) handleSingleGet() gin.HandlerFunc {
 // @Failure 400 {object} model.Error
 // @Failure 500 {object} model.Error
 // @Router /interface/config/{id} [get]
-func (e interfaceEndpoint) handleConfigGet() gin.HandlerFunc {
-	return func(c *gin.Context) {
-		ctx := domain.SetUserInfoFromGin(c)
-		id := Base64UrlDecode(c.Param("id"))
+func (e InterfaceEndpoint) handleConfigGet() http.HandlerFunc {
+	return func(w http.ResponseWriter, r *http.Request) {
+		id := Base64UrlDecode(request.Path(r, "id"))
 		if id == "" {
-			c.JSON(http.StatusBadRequest, model.Error{
+			respond.JSON(w, http.StatusBadRequest, model.Error{
 				Code: http.StatusInternalServerError, Message: "missing id parameter",
 			})
 			return
 		}
 
-		config, err := e.app.GetInterfaceConfig(ctx, domain.InterfaceIdentifier(id))
+		config, err := e.interfaceService.GetInterfaceConfig(r.Context(), domain.InterfaceIdentifier(id))
 		if err != nil {
-			c.JSON(http.StatusInternalServerError, model.Error{
+			respond.JSON(w, http.StatusInternalServerError, model.Error{
 				Code: http.StatusInternalServerError, Message: err.Error(),
 			})
 			return
@@ -146,17 +185,17 @@ func (e interfaceEndpoint) handleConfigGet() gin.HandlerFunc {
 
 		configString, err := io.ReadAll(config)
 		if err != nil {
-			c.JSON(http.StatusInternalServerError, model.Error{
+			respond.JSON(w, http.StatusInternalServerError, model.Error{
 				Code: http.StatusInternalServerError, Message: err.Error(),
 			})
 			return
 		}
 
-		c.JSON(http.StatusOK, string(configString))
+		respond.JSON(w, http.StatusOK, string(configString))
 	}
 }
 
-// handleUpdatePut returns a gorm handler function.
+// handleUpdatePut returns a gorm Handler function.
 //
 // @ID interfaces_handleUpdatePut
 // @Tags Interface
@@ -168,41 +207,44 @@ func (e interfaceEndpoint) handleConfigGet() gin.HandlerFunc {
 // @Failure 400 {object} model.Error
 // @Failure 500 {object} model.Error
 // @Router /interface/{id} [put]
-func (e interfaceEndpoint) handleUpdatePut() gin.HandlerFunc {
-	return func(c *gin.Context) {
-		ctx := domain.SetUserInfoFromGin(c)
-
-		id := Base64UrlDecode(c.Param("id"))
+func (e InterfaceEndpoint) handleUpdatePut() http.HandlerFunc {
+	return func(w http.ResponseWriter, r *http.Request) {
+		id := Base64UrlDecode(request.Path(r, "id"))
 		if id == "" {
-			c.JSON(http.StatusBadRequest, model.Error{Code: http.StatusBadRequest, Message: "missing interface id"})
+			respond.JSON(w, http.StatusBadRequest,
+				model.Error{Code: http.StatusBadRequest, Message: "missing interface id"})
 			return
 		}
 
 		var in model.Interface
-		err := c.BindJSON(&in)
-		if err != nil {
-			c.JSON(http.StatusBadRequest, model.Error{Code: http.StatusBadRequest, Message: err.Error()})
+		if err := request.BodyJson(r, &in); err != nil {
+			respond.JSON(w, http.StatusBadRequest, model.Error{Code: http.StatusBadRequest, Message: err.Error()})
+			return
+		}
+		if err := e.validator.Struct(in); err != nil {
+			respond.JSON(w, http.StatusBadRequest, model.Error{Code: http.StatusBadRequest, Message: err.Error()})
 			return
 		}
 
 		if id != in.Identifier {
-			c.JSON(http.StatusBadRequest, model.Error{Code: http.StatusBadRequest, Message: "interface id mismatch"})
+			respond.JSON(w, http.StatusBadRequest,
+				model.Error{Code: http.StatusBadRequest, Message: "interface id mismatch"})
 			return
 		}
 
-		updatedInterface, peers, err := e.app.UpdateInterface(ctx, model.NewDomainInterface(&in))
+		updatedInterface, peers, err := e.interfaceService.UpdateInterface(r.Context(), model.NewDomainInterface(&in))
 		if err != nil {
-			c.JSON(http.StatusInternalServerError, model.Error{
+			respond.JSON(w, http.StatusInternalServerError, model.Error{
 				Code: http.StatusInternalServerError, Message: err.Error(),
 			})
 			return
 		}
 
-		c.JSON(http.StatusOK, model.NewInterface(updatedInterface, peers))
+		respond.JSON(w, http.StatusOK, model.NewInterface(updatedInterface, peers))
 	}
 }
 
-// handleCreatePost returns a gorm handler function.
+// handleCreatePost returns a gorm Handler function.
 //
 // @ID interfaces_handleCreatePost
 // @Tags Interface
@@ -213,30 +255,31 @@ func (e interfaceEndpoint) handleUpdatePut() gin.HandlerFunc {
 // @Failure 400 {object} model.Error
 // @Failure 500 {object} model.Error
 // @Router /interface/new [post]
-func (e interfaceEndpoint) handleCreatePost() gin.HandlerFunc {
-	return func(c *gin.Context) {
-		ctx := domain.SetUserInfoFromGin(c)
-
+func (e InterfaceEndpoint) handleCreatePost() http.HandlerFunc {
+	return func(w http.ResponseWriter, r *http.Request) {
 		var in model.Interface
-		err := c.BindJSON(&in)
-		if err != nil {
-			c.JSON(http.StatusBadRequest, model.Error{Code: http.StatusBadRequest, Message: err.Error()})
+		if err := request.BodyJson(r, &in); err != nil {
+			respond.JSON(w, http.StatusBadRequest, model.Error{Code: http.StatusBadRequest, Message: err.Error()})
+			return
+		}
+		if err := e.validator.Struct(in); err != nil {
+			respond.JSON(w, http.StatusBadRequest, model.Error{Code: http.StatusBadRequest, Message: err.Error()})
 			return
 		}
 
-		newInterface, err := e.app.CreateInterface(ctx, model.NewDomainInterface(&in))
+		newInterface, err := e.interfaceService.CreateInterface(r.Context(), model.NewDomainInterface(&in))
 		if err != nil {
-			c.JSON(http.StatusInternalServerError, model.Error{
+			respond.JSON(w, http.StatusInternalServerError, model.Error{
 				Code: http.StatusInternalServerError, Message: err.Error(),
 			})
 			return
 		}
 
-		c.JSON(http.StatusOK, model.NewInterface(newInterface, nil))
+		respond.JSON(w, http.StatusOK, model.NewInterface(newInterface, nil))
 	}
 }
 
-// handlePeersGet returns a gorm handler function.
+// handlePeersGet returns a gorm Handler function.
 //
 // @ID interfaces_handlePeersGet
 // @Tags Interface
@@ -245,31 +288,29 @@ func (e interfaceEndpoint) handleCreatePost() gin.HandlerFunc {
 // @Success 200 {object} []model.Peer
 // @Failure 500 {object} model.Error
 // @Router /interface/peers/{id} [get]
-func (e interfaceEndpoint) handlePeersGet() gin.HandlerFunc {
-	return func(c *gin.Context) {
-		ctx := domain.SetUserInfoFromGin(c)
-
-		id := Base64UrlDecode(c.Param("id"))
+func (e InterfaceEndpoint) handlePeersGet() http.HandlerFunc {
+	return func(w http.ResponseWriter, r *http.Request) {
+		id := Base64UrlDecode(request.Path(r, "id"))
 		if id == "" {
-			c.JSON(http.StatusBadRequest, model.Error{
+			respond.JSON(w, http.StatusBadRequest, model.Error{
 				Code: http.StatusInternalServerError, Message: "missing id parameter",
 			})
 			return
 		}
 
-		_, peers, err := e.app.GetInterfaceAndPeers(ctx, domain.InterfaceIdentifier(id))
+		_, peers, err := e.interfaceService.GetInterfaceAndPeers(r.Context(), domain.InterfaceIdentifier(id))
 		if err != nil {
-			c.JSON(http.StatusInternalServerError, model.Error{
+			respond.JSON(w, http.StatusInternalServerError, model.Error{
 				Code: http.StatusInternalServerError, Message: err.Error(),
 			})
 			return
 		}
 
-		c.JSON(http.StatusOK, model.NewPeers(peers))
+		respond.JSON(w, http.StatusOK, model.NewPeers(peers))
 	}
 }
 
-// handleDelete returns a gorm handler function.
+// handleDelete returns a gorm Handler function.
 //
 // @ID interfaces_handleDelete
 // @Tags Interface
@@ -280,29 +321,28 @@ func (e interfaceEndpoint) handlePeersGet() gin.HandlerFunc {
 // @Failure 400 {object} model.Error
 // @Failure 500 {object} model.Error
 // @Router /interface/{id} [delete]
-func (e interfaceEndpoint) handleDelete() gin.HandlerFunc {
-	return func(c *gin.Context) {
-		ctx := domain.SetUserInfoFromGin(c)
-
-		id := Base64UrlDecode(c.Param("id"))
+func (e InterfaceEndpoint) handleDelete() http.HandlerFunc {
+	return func(w http.ResponseWriter, r *http.Request) {
+		id := Base64UrlDecode(request.Path(r, "id"))
 		if id == "" {
-			c.JSON(http.StatusBadRequest, model.Error{Code: http.StatusBadRequest, Message: "missing interface id"})
+			respond.JSON(w, http.StatusBadRequest,
+				model.Error{Code: http.StatusBadRequest, Message: "missing interface id"})
 			return
 		}
 
-		err := e.app.DeleteInterface(ctx, domain.InterfaceIdentifier(id))
+		err := e.interfaceService.DeleteInterface(r.Context(), domain.InterfaceIdentifier(id))
 		if err != nil {
-			c.JSON(http.StatusInternalServerError, model.Error{
+			respond.JSON(w, http.StatusInternalServerError, model.Error{
 				Code: http.StatusInternalServerError, Message: err.Error(),
 			})
 			return
 		}
 
-		c.Status(http.StatusNoContent)
+		respond.Status(w, http.StatusNoContent)
 	}
 }
 
-// handleSaveConfigPost returns a gorm handler function.
+// handleSaveConfigPost returns a gorm Handler function.
 //
 // @ID interfaces_handleSaveConfigPost
 // @Tags Interface
@@ -313,29 +353,28 @@ func (e interfaceEndpoint) handleDelete() gin.HandlerFunc {
 // @Failure 400 {object} model.Error
 // @Failure 500 {object} model.Error
 // @Router /interface/{id}/save-config [post]
-func (e interfaceEndpoint) handleSaveConfigPost() gin.HandlerFunc {
-	return func(c *gin.Context) {
-		ctx := domain.SetUserInfoFromGin(c)
-
-		id := Base64UrlDecode(c.Param("id"))
+func (e InterfaceEndpoint) handleSaveConfigPost() http.HandlerFunc {
+	return func(w http.ResponseWriter, r *http.Request) {
+		id := Base64UrlDecode(request.Path(r, "id"))
 		if id == "" {
-			c.JSON(http.StatusBadRequest, model.Error{Code: http.StatusBadRequest, Message: "missing interface id"})
+			respond.JSON(w, http.StatusBadRequest,
+				model.Error{Code: http.StatusBadRequest, Message: "missing interface id"})
 			return
 		}
 
-		err := e.app.PersistInterfaceConfig(ctx, domain.InterfaceIdentifier(id))
+		err := e.interfaceService.PersistInterfaceConfig(r.Context(), domain.InterfaceIdentifier(id))
 		if err != nil {
-			c.JSON(http.StatusInternalServerError, model.Error{
+			respond.JSON(w, http.StatusInternalServerError, model.Error{
 				Code: http.StatusInternalServerError, Message: err.Error(),
 			})
 			return
 		}
 
-		c.Status(http.StatusNoContent)
+		respond.Status(w, http.StatusNoContent)
 	}
 }
 
-// handleApplyPeerDefaultsPost returns a gorm handler function.
+// handleApplyPeerDefaultsPost returns a gorm Handler function.
 //
 // @ID interfaces_handleApplyPeerDefaultsPost
 // @Tags Interface
@@ -347,36 +386,38 @@ func (e interfaceEndpoint) handleSaveConfigPost() gin.HandlerFunc {
 // @Failure 400 {object} model.Error
 // @Failure 500 {object} model.Error
 // @Router /interface/{id}/apply-peer-defaults [post]
-func (e interfaceEndpoint) handleApplyPeerDefaultsPost() gin.HandlerFunc {
-	return func(c *gin.Context) {
-		ctx := domain.SetUserInfoFromGin(c)
-
-		id := Base64UrlDecode(c.Param("id"))
+func (e InterfaceEndpoint) handleApplyPeerDefaultsPost() http.HandlerFunc {
+	return func(w http.ResponseWriter, r *http.Request) {
+		id := Base64UrlDecode(request.Path(r, "id"))
 		if id == "" {
-			c.JSON(http.StatusBadRequest, model.Error{Code: http.StatusBadRequest, Message: "missing interface id"})
+			respond.JSON(w, http.StatusBadRequest,
+				model.Error{Code: http.StatusBadRequest, Message: "missing interface id"})
 			return
 		}
 
 		var in model.Interface
-		err := c.BindJSON(&in)
-		if err != nil {
-			c.JSON(http.StatusBadRequest, model.Error{Code: http.StatusBadRequest, Message: err.Error()})
+		if err := request.BodyJson(r, &in); err != nil {
+			respond.JSON(w, http.StatusBadRequest, model.Error{Code: http.StatusBadRequest, Message: err.Error()})
+			return
+		}
+		if err := e.validator.Struct(in); err != nil {
+			respond.JSON(w, http.StatusBadRequest, model.Error{Code: http.StatusBadRequest, Message: err.Error()})
 			return
 		}
 
 		if id != in.Identifier {
-			c.JSON(http.StatusBadRequest, model.Error{Code: http.StatusBadRequest, Message: "interface id mismatch"})
+			respond.JSON(w, http.StatusBadRequest,
+				model.Error{Code: http.StatusBadRequest, Message: "interface id mismatch"})
 			return
 		}
 
-		err = e.app.ApplyPeerDefaults(ctx, model.NewDomainInterface(&in))
-		if err != nil {
-			c.JSON(http.StatusInternalServerError, model.Error{
+		if err := e.interfaceService.ApplyPeerDefaults(r.Context(), model.NewDomainInterface(&in)); err != nil {
+			respond.JSON(w, http.StatusInternalServerError, model.Error{
 				Code: http.StatusInternalServerError, Message: err.Error(),
 			})
 			return
 		}
 
-		c.Status(http.StatusNoContent)
+		respond.Status(w, http.StatusNoContent)
 	}
 }

internal/app/api/v0/handlers/endpoint_peers.go

@@ -1,41 +1,92 @@
 package handlers
 
 import (
+	"context"
 	"io"
 	"net/http"
 
-	"github.com/gin-gonic/gin"
-	"github.com/h44z/wg-portal/internal/app"
+	"github.com/go-pkgz/routegroup"
+
+	"github.com/h44z/wg-portal/internal/app/api/core/request"
+	"github.com/h44z/wg-portal/internal/app/api/core/respond"
 	"github.com/h44z/wg-portal/internal/app/api/v0/model"
+	"github.com/h44z/wg-portal/internal/config"
 	"github.com/h44z/wg-portal/internal/domain"
 )
 
-type peerEndpoint struct {
-	app           *app.App
-	authenticator *authenticationHandler
+type PeerService interface {
+	// GetInterfaceAndPeers returns the interface with the given id and all peers associated with it.
+	GetInterfaceAndPeers(ctx context.Context, id domain.InterfaceIdentifier) (*domain.Interface, []domain.Peer, error)
+	// PreparePeer returns a new peer with default values for the given interface.
+	PreparePeer(ctx context.Context, id domain.InterfaceIdentifier) (*domain.Peer, error)
+	// GetPeer returns the peer with the given id.
+	GetPeer(ctx context.Context, id domain.PeerIdentifier) (*domain.Peer, error)
+	// CreatePeer creates a new peer.
+	CreatePeer(ctx context.Context, peer *domain.Peer) (*domain.Peer, error)
+	// CreateMultiplePeers creates multiple new peers.
+	CreateMultiplePeers(
+		ctx context.Context,
+		interfaceId domain.InterfaceIdentifier,
+		r *domain.PeerCreationRequest,
+	) ([]domain.Peer, error)
+	// UpdatePeer updates the peer with the given id.
+	UpdatePeer(ctx context.Context, peer *domain.Peer) (*domain.Peer, error)
+	// DeletePeer deletes the peer with the given id.
+	DeletePeer(ctx context.Context, id domain.PeerIdentifier) error
+	// GetPeerConfig returns the peer configuration for the given id.
+	GetPeerConfig(ctx context.Context, id domain.PeerIdentifier) (io.Reader, error)
+	// GetPeerConfigQrCode returns the peer configuration as qr code for the given id.
+	GetPeerConfigQrCode(ctx context.Context, id domain.PeerIdentifier) (io.Reader, error)
+	// SendPeerEmail sends the peer configuration via email.
+	SendPeerEmail(ctx context.Context, linkOnly bool, peers ...domain.PeerIdentifier) error
+	// GetPeerStats returns the peer stats for the given interface.
+	GetPeerStats(ctx context.Context, id domain.InterfaceIdentifier) ([]domain.PeerStatus, error)
 }
 
-func (e peerEndpoint) GetName() string {
+type PeerEndpoint struct {
+	cfg           *config.Config
+	peerService   PeerService
+	authenticator Authenticator
+	validator     Validator
+}
+
+func NewPeerEndpoint(
+	cfg *config.Config,
+	authenticator Authenticator,
+	validator Validator,
+	peerService PeerService,
+) PeerEndpoint {
+	return PeerEndpoint{
+		cfg:           cfg,
+		peerService:   peerService,
+		authenticator: authenticator,
+		validator:     validator,
+	}
+}
+
+func (e PeerEndpoint) GetName() string {
 	return "PeerEndpoint"
 }
 
-func (e peerEndpoint) RegisterRoutes(g *gin.RouterGroup, authenticator *authenticationHandler) {
-	apiGroup := g.Group("/peer", e.authenticator.LoggedIn())
+func (e PeerEndpoint) RegisterRoutes(g *routegroup.Bundle) {
+	apiGroup := g.Mount("/peer")
+	apiGroup.Use(e.authenticator.LoggedIn())
 
-	apiGroup.GET("/iface/:iface/all", e.authenticator.LoggedIn(ScopeAdmin), e.handleAllGet())
-	apiGroup.GET("/iface/:iface/stats", e.authenticator.LoggedIn(ScopeAdmin), e.handleStatsGet())
-	apiGroup.GET("/iface/:iface/prepare", e.authenticator.LoggedIn(), e.handlePrepareGet())
-	apiGroup.POST("/iface/:iface/new", e.authenticator.LoggedIn(), e.handleCreatePost())
-	apiGroup.POST("/iface/:iface/multiplenew", e.authenticator.LoggedIn(ScopeAdmin), e.handleCreateMultiplePost())
-	apiGroup.GET("/config-qr/:id", e.handleQrCodeGet())
-	apiGroup.POST("/config-mail", e.handleEmailPost())
-	apiGroup.GET("/config/:id", e.handleConfigGet())
-	apiGroup.GET("/:id", e.handleSingleGet())
-	apiGroup.PUT("/:id", e.handleUpdatePut())
-	apiGroup.DELETE("/:id", e.handleDelete())
+	apiGroup.With(e.authenticator.LoggedIn(ScopeAdmin)).HandleFunc("GET /iface/{iface}/all", e.handleAllGet())
+	apiGroup.With(e.authenticator.LoggedIn(ScopeAdmin)).HandleFunc("GET /iface/{iface}/stats", e.handleStatsGet())
+	apiGroup.HandleFunc("GET /iface/{iface}/prepare", e.handlePrepareGet())
+	apiGroup.HandleFunc("POST /iface/{iface}/new", e.handleCreatePost())
+	apiGroup.With(e.authenticator.LoggedIn(ScopeAdmin)).HandleFunc("POST /iface/{iface}/multiplenew",
+		e.handleCreateMultiplePost())
+	apiGroup.HandleFunc("GET /config-qr/{id}", e.handleQrCodeGet())
+	apiGroup.HandleFunc("POST /config-mail", e.handleEmailPost())
+	apiGroup.HandleFunc("GET /config/{id}", e.handleConfigGet())
+	apiGroup.HandleFunc("GET /{id}", e.handleSingleGet())
+	apiGroup.HandleFunc("PUT /{id}", e.handleUpdatePut())
+	apiGroup.HandleFunc("DELETE /{id}", e.handleDelete())
 }
 
-// handleAllGet returns a gorm handler function.
+// handleAllGet returns a gorm Handler function.
 //
 // @ID peers_handleAllGet
 // @Tags Peer
@@ -46,28 +97,27 @@ func (e peerEndpoint) RegisterRoutes(g *gin.RouterGroup, authenticator *authenti
 // @Failure 400 {object} model.Error
 // @Failure 500 {object} model.Error
 // @Router /peer/iface/{iface}/all [get]
-func (e peerEndpoint) handleAllGet() gin.HandlerFunc {
-	return func(c *gin.Context) {
-		ctx := domain.SetUserInfoFromGin(c)
-
-		interfaceId := Base64UrlDecode(c.Param("iface"))
+func (e PeerEndpoint) handleAllGet() http.HandlerFunc {
+	return func(w http.ResponseWriter, r *http.Request) {
+		interfaceId := Base64UrlDecode(request.Path(r, "iface"))
 		if interfaceId == "" {
-			c.JSON(http.StatusBadRequest, model.Error{Code: http.StatusBadRequest, Message: "missing iface parameter"})
+			respond.JSON(w, http.StatusBadRequest,
+				model.Error{Code: http.StatusBadRequest, Message: "missing iface parameter"})
 			return
 		}
 
-		_, peers, err := e.app.GetInterfaceAndPeers(ctx, domain.InterfaceIdentifier(interfaceId))
+		_, peers, err := e.peerService.GetInterfaceAndPeers(r.Context(), domain.InterfaceIdentifier(interfaceId))
 		if err != nil {
-			c.JSON(http.StatusInternalServerError,
+			respond.JSON(w, http.StatusInternalServerError,
 				model.Error{Code: http.StatusInternalServerError, Message: err.Error()})
 			return
 		}
 
-		c.JSON(http.StatusOK, model.NewPeers(peers))
+		respond.JSON(w, http.StatusOK, model.NewPeers(peers))
 	}
 }
 
-// handleSingleGet returns a gorm handler function.
+// handleSingleGet returns a gorm Handler function.
 //
 // @ID peers_handleSingleGet
 // @Tags Peer
@@ -78,28 +128,27 @@ func (e peerEndpoint) handleAllGet() gin.HandlerFunc {
 // @Failure 400 {object} model.Error
 // @Failure 500 {object} model.Error
 // @Router /peer/{id} [get]
-func (e peerEndpoint) handleSingleGet() gin.HandlerFunc {
-	return func(c *gin.Context) {
-		ctx := domain.SetUserInfoFromGin(c)
-
-		peerId := Base64UrlDecode(c.Param("id"))
+func (e PeerEndpoint) handleSingleGet() http.HandlerFunc {
+	return func(w http.ResponseWriter, r *http.Request) {
+		peerId := Base64UrlDecode(request.Path(r, "id"))
 		if peerId == "" {
-			c.JSON(http.StatusBadRequest, model.Error{Code: http.StatusBadRequest, Message: "missing id parameter"})
+			respond.JSON(w, http.StatusBadRequest,
+				model.Error{Code: http.StatusBadRequest, Message: "missing id parameter"})
 			return
 		}
 
-		peer, err := e.app.GetPeer(ctx, domain.PeerIdentifier(peerId))
+		peer, err := e.peerService.GetPeer(r.Context(), domain.PeerIdentifier(peerId))
 		if err != nil {
-			c.JSON(http.StatusInternalServerError,
+			respond.JSON(w, http.StatusInternalServerError,
 				model.Error{Code: http.StatusInternalServerError, Message: err.Error()})
 			return
 		}
 
-		c.JSON(http.StatusOK, model.NewPeer(peer))
+		respond.JSON(w, http.StatusOK, model.NewPeer(peer))
 	}
 }
 
-// handlePrepareGet returns a gorm handler function.
+// handlePrepareGet returns a gorm Handler function.
 //
 // @ID peers_handlePrepareGet
 // @Tags Peer
@@ -110,28 +159,27 @@ func (e peerEndpoint) handleSingleGet() gin.HandlerFunc {
 // @Failure 400 {object} model.Error
 // @Failure 500 {object} model.Error
 // @Router /peer/iface/{iface}/prepare [get]
-func (e peerEndpoint) handlePrepareGet() gin.HandlerFunc {
-	return func(c *gin.Context) {
-		ctx := domain.SetUserInfoFromGin(c)
-
-		interfaceId := Base64UrlDecode(c.Param("iface"))
+func (e PeerEndpoint) handlePrepareGet() http.HandlerFunc {
+	return func(w http.ResponseWriter, r *http.Request) {
+		interfaceId := Base64UrlDecode(request.Path(r, "iface"))
 		if interfaceId == "" {
-			c.JSON(http.StatusBadRequest, model.Error{Code: http.StatusBadRequest, Message: "missing iface parameter"})
+			respond.JSON(w, http.StatusBadRequest,
+				model.Error{Code: http.StatusBadRequest, Message: "missing iface parameter"})
 			return
 		}
 
-		peer, err := e.app.PreparePeer(ctx, domain.InterfaceIdentifier(interfaceId))
+		peer, err := e.peerService.PreparePeer(r.Context(), domain.InterfaceIdentifier(interfaceId))
 		if err != nil {
-			c.JSON(http.StatusInternalServerError,
+			respond.JSON(w, http.StatusInternalServerError,
 				model.Error{Code: http.StatusInternalServerError, Message: err.Error()})
 			return
 		}
 
-		c.JSON(http.StatusOK, model.NewPeer(peer))
+		respond.JSON(w, http.StatusOK, model.NewPeer(peer))
 	}
 }
 
-// handleCreatePost returns a gorm handler function.
+// handleCreatePost returns a gorm Handler function.
 //
 // @ID peers_handleCreatePost
 // @Tags Peer
@@ -143,40 +191,43 @@ func (e peerEndpoint) handlePrepareGet() gin.HandlerFunc {
 // @Failure 400 {object} model.Error
 // @Failure 500 {object} model.Error
 // @Router /peer/iface/{iface}/new [post]
-func (e peerEndpoint) handleCreatePost() gin.HandlerFunc {
-	return func(c *gin.Context) {
-		ctx := domain.SetUserInfoFromGin(c)
-
-		interfaceId := Base64UrlDecode(c.Param("iface"))
+func (e PeerEndpoint) handleCreatePost() http.HandlerFunc {
+	return func(w http.ResponseWriter, r *http.Request) {
+		interfaceId := Base64UrlDecode(request.Path(r, "iface"))
 		if interfaceId == "" {
-			c.JSON(http.StatusBadRequest, model.Error{Code: http.StatusBadRequest, Message: "missing iface parameter"})
+			respond.JSON(w, http.StatusBadRequest,
+				model.Error{Code: http.StatusBadRequest, Message: "missing iface parameter"})
 			return
 		}
 
 		var p model.Peer
-		err := c.BindJSON(&p)
-		if err != nil {
-			c.JSON(http.StatusBadRequest, model.Error{Code: http.StatusBadRequest, Message: err.Error()})
+		if err := request.BodyJson(r, &p); err != nil {
+			respond.JSON(w, http.StatusBadRequest, model.Error{Code: http.StatusBadRequest, Message: err.Error()})
+			return
+		}
+		if err := e.validator.Struct(p); err != nil {
+			respond.JSON(w, http.StatusBadRequest, model.Error{Code: http.StatusBadRequest, Message: err.Error()})
 			return
 		}
 
 		if p.InterfaceIdentifier != interfaceId {
-			c.JSON(http.StatusBadRequest, model.Error{Code: http.StatusBadRequest, Message: "interface id mismatch"})
+			respond.JSON(w, http.StatusBadRequest,
+				model.Error{Code: http.StatusBadRequest, Message: "interface id mismatch"})
 			return
 		}
 
-		newPeer, err := e.app.CreatePeer(ctx, model.NewDomainPeer(&p))
+		newPeer, err := e.peerService.CreatePeer(r.Context(), model.NewDomainPeer(&p))
 		if err != nil {
-			c.JSON(http.StatusInternalServerError,
+			respond.JSON(w, http.StatusInternalServerError,
 				model.Error{Code: http.StatusInternalServerError, Message: err.Error()})
 			return
 		}
 
-		c.JSON(http.StatusOK, model.NewPeer(newPeer))
+		respond.JSON(w, http.StatusOK, model.NewPeer(newPeer))
 	}
 }
 
-// handleCreateMultiplePost returns a gorm handler function.
+// handleCreateMultiplePost returns a gorm Handler function.
 //
 // @ID peers_handleCreateMultiplePost
 // @Tags Peer
@@ -188,36 +239,38 @@ func (e peerEndpoint) handleCreatePost() gin.HandlerFunc {
 // @Failure 400 {object} model.Error
 // @Failure 500 {object} model.Error
 // @Router /peer/iface/{iface}/multiplenew [post]
-func (e peerEndpoint) handleCreateMultiplePost() gin.HandlerFunc {
-	return func(c *gin.Context) {
-		ctx := domain.SetUserInfoFromGin(c)
-
-		interfaceId := Base64UrlDecode(c.Param("iface"))
+func (e PeerEndpoint) handleCreateMultiplePost() http.HandlerFunc {
+	return func(w http.ResponseWriter, r *http.Request) {
+		interfaceId := Base64UrlDecode(request.Path(r, "iface"))
 		if interfaceId == "" {
-			c.JSON(http.StatusBadRequest, model.Error{Code: http.StatusBadRequest, Message: "missing iface parameter"})
+			respond.JSON(w, http.StatusBadRequest,
+				model.Error{Code: http.StatusBadRequest, Message: "missing iface parameter"})
 			return
 		}
 
 		var req model.MultiPeerRequest
-		err := c.BindJSON(&req)
-		if err != nil {
-			c.JSON(http.StatusBadRequest, model.Error{Code: http.StatusBadRequest, Message: err.Error()})
+		if err := request.BodyJson(r, &req); err != nil {
+			respond.JSON(w, http.StatusBadRequest, model.Error{Code: http.StatusBadRequest, Message: err.Error()})
+			return
+		}
+		if err := e.validator.Struct(req); err != nil {
+			respond.JSON(w, http.StatusBadRequest, model.Error{Code: http.StatusBadRequest, Message: err.Error()})
 			return
 		}
 
-		newPeers, err := e.app.CreateMultiplePeers(ctx, domain.InterfaceIdentifier(interfaceId),
+		newPeers, err := e.peerService.CreateMultiplePeers(r.Context(), domain.InterfaceIdentifier(interfaceId),
 			model.NewDomainPeerCreationRequest(&req))
 		if err != nil {
-			c.JSON(http.StatusInternalServerError,
+			respond.JSON(w, http.StatusInternalServerError,
 				model.Error{Code: http.StatusInternalServerError, Message: err.Error()})
 			return
 		}
 
-		c.JSON(http.StatusOK, model.NewPeers(newPeers))
+		respond.JSON(w, http.StatusOK, model.NewPeers(newPeers))
 	}
 }
 
-// handleUpdatePut returns a gorm handler function.
+// handleUpdatePut returns a gorm Handler function.
 //
 // @ID peers_handleUpdatePut
 // @Tags Peer
@@ -229,40 +282,43 @@ func (e peerEndpoint) handleCreateMultiplePost() gin.HandlerFunc {
 // @Failure 400 {object} model.Error
 // @Failure 500 {object} model.Error
 // @Router /peer/{id} [put]
-func (e peerEndpoint) handleUpdatePut() gin.HandlerFunc {
-	return func(c *gin.Context) {
-		ctx := domain.SetUserInfoFromGin(c)
-
-		peerId := Base64UrlDecode(c.Param("id"))
+func (e PeerEndpoint) handleUpdatePut() http.HandlerFunc {
+	return func(w http.ResponseWriter, r *http.Request) {
+		peerId := Base64UrlDecode(request.Path(r, "id"))
 		if peerId == "" {
-			c.JSON(http.StatusBadRequest, model.Error{Code: http.StatusBadRequest, Message: "missing id parameter"})
+			respond.JSON(w, http.StatusBadRequest,
+				model.Error{Code: http.StatusBadRequest, Message: "missing id parameter"})
 			return
 		}
 
 		var p model.Peer
-		err := c.BindJSON(&p)
-		if err != nil {
-			c.JSON(http.StatusBadRequest, model.Error{Code: http.StatusBadRequest, Message: err.Error()})
+		if err := request.BodyJson(r, &p); err != nil {
+			respond.JSON(w, http.StatusBadRequest, model.Error{Code: http.StatusBadRequest, Message: err.Error()})
+			return
+		}
+		if err := e.validator.Struct(p); err != nil {
+			respond.JSON(w, http.StatusBadRequest, model.Error{Code: http.StatusBadRequest, Message: err.Error()})
 			return
 		}
 
 		if p.Identifier != peerId {
-			c.JSON(http.StatusBadRequest, model.Error{Code: http.StatusBadRequest, Message: "peer id mismatch"})
+			respond.JSON(w, http.StatusBadRequest,
+				model.Error{Code: http.StatusBadRequest, Message: "peer id mismatch"})
 			return
 		}
 
-		updatedPeer, err := e.app.UpdatePeer(ctx, model.NewDomainPeer(&p))
+		updatedPeer, err := e.peerService.UpdatePeer(r.Context(), model.NewDomainPeer(&p))
 		if err != nil {
-			c.JSON(http.StatusInternalServerError,
+			respond.JSON(w, http.StatusInternalServerError,
 				model.Error{Code: http.StatusInternalServerError, Message: err.Error()})
 			return
 		}
 
-		c.JSON(http.StatusOK, model.NewPeer(updatedPeer))
+		respond.JSON(w, http.StatusOK, model.NewPeer(updatedPeer))
 	}
 }
 
-// handleDelete returns a gorm handler function.
+// handleDelete returns a gorm Handler function.
 //
 // @ID peers_handleDelete
 // @Tags Peer
@@ -273,28 +329,26 @@ func (e peerEndpoint) handleUpdatePut() gin.HandlerFunc {
 // @Failure 400 {object} model.Error
 // @Failure 500 {object} model.Error
 // @Router /peer/{id} [delete]
-func (e peerEndpoint) handleDelete() gin.HandlerFunc {
-	return func(c *gin.Context) {
-		ctx := domain.SetUserInfoFromGin(c)
-
-		id := Base64UrlDecode(c.Param("id"))
+func (e PeerEndpoint) handleDelete() http.HandlerFunc {
+	return func(w http.ResponseWriter, r *http.Request) {
+		id := Base64UrlDecode(request.Path(r, "id"))
 		if id == "" {
-			c.JSON(http.StatusBadRequest, model.Error{Code: http.StatusBadRequest, Message: "missing peer id"})
+			respond.JSON(w, http.StatusBadRequest, model.Error{Code: http.StatusBadRequest, Message: "missing peer id"})
 			return
 		}
 
-		err := e.app.DeletePeer(ctx, domain.PeerIdentifier(id))
+		err := e.peerService.DeletePeer(r.Context(), domain.PeerIdentifier(id))
 		if err != nil {
-			c.JSON(http.StatusInternalServerError,
+			respond.JSON(w, http.StatusInternalServerError,
 				model.Error{Code: http.StatusInternalServerError, Message: err.Error()})
 			return
 		}
 
-		c.Status(http.StatusNoContent)
+		respond.Status(w, http.StatusNoContent)
 	}
 }
 
-// handleConfigGet returns a gorm handler function.
+// handleConfigGet returns a gorm Handler function.
 //
 // @ID peers_handleConfigGet
 // @Tags Peer
@@ -305,39 +359,37 @@ func (e peerEndpoint) handleDelete() gin.HandlerFunc {
 // @Failure 400 {object} model.Error
 // @Failure 500 {object} model.Error
 // @Router /peer/config/{id} [get]
-func (e peerEndpoint) handleConfigGet() gin.HandlerFunc {
-	return func(c *gin.Context) {
-		ctx := domain.SetUserInfoFromGin(c)
-
-		id := Base64UrlDecode(c.Param("id"))
+func (e PeerEndpoint) handleConfigGet() http.HandlerFunc {
+	return func(w http.ResponseWriter, r *http.Request) {
+		id := Base64UrlDecode(request.Path(r, "id"))
 		if id == "" {
-			c.JSON(http.StatusBadRequest, model.Error{
+			respond.JSON(w, http.StatusBadRequest, model.Error{
 				Code: http.StatusInternalServerError, Message: "missing id parameter",
 			})
 			return
 		}
 
-		config, err := e.app.GetPeerConfig(ctx, domain.PeerIdentifier(id))
+		configTxt, err := e.peerService.GetPeerConfig(r.Context(), domain.PeerIdentifier(id))
 		if err != nil {
-			c.JSON(http.StatusInternalServerError, model.Error{
+			respond.JSON(w, http.StatusInternalServerError, model.Error{
 				Code: http.StatusInternalServerError, Message: err.Error(),
 			})
 			return
 		}
 
-		configString, err := io.ReadAll(config)
+		configTxtString, err := io.ReadAll(configTxt)
 		if err != nil {
-			c.JSON(http.StatusInternalServerError, model.Error{
+			respond.JSON(w, http.StatusInternalServerError, model.Error{
 				Code: http.StatusInternalServerError, Message: err.Error(),
 			})
 			return
 		}
 
-		c.JSON(http.StatusOK, string(configString))
+		respond.JSON(w, http.StatusOK, string(configTxtString))
 	}
 }
 
-// handleQrCodeGet returns a gorm handler function.
+// handleQrCodeGet returns a gorm Handler function.
 //
 // @ID peers_handleQrCodeGet
 // @Tags Peer
@@ -349,38 +401,37 @@ func (e peerEndpoint) handleConfigGet() gin.HandlerFunc {
 // @Failure 400 {object} model.Error
 // @Failure 500 {object} model.Error
 // @Router /peer/config-qr/{id} [get]
-func (e peerEndpoint) handleQrCodeGet() gin.HandlerFunc {
-	return func(c *gin.Context) {
-		ctx := domain.SetUserInfoFromGin(c)
-		id := Base64UrlDecode(c.Param("id"))
+func (e PeerEndpoint) handleQrCodeGet() http.HandlerFunc {
+	return func(w http.ResponseWriter, r *http.Request) {
+		id := Base64UrlDecode(request.Path(r, "id"))
 		if id == "" {
-			c.JSON(http.StatusBadRequest, model.Error{
+			respond.JSON(w, http.StatusBadRequest, model.Error{
 				Code: http.StatusInternalServerError, Message: "missing id parameter",
 			})
 			return
 		}
 
-		config, err := e.app.GetPeerConfigQrCode(ctx, domain.PeerIdentifier(id))
+		configQr, err := e.peerService.GetPeerConfigQrCode(r.Context(), domain.PeerIdentifier(id))
 		if err != nil {
-			c.JSON(http.StatusInternalServerError, model.Error{
+			respond.JSON(w, http.StatusInternalServerError, model.Error{
 				Code: http.StatusInternalServerError, Message: err.Error(),
 			})
 			return
 		}
 
-		configData, err := io.ReadAll(config)
+		configQrData, err := io.ReadAll(configQr)
 		if err != nil {
-			c.JSON(http.StatusInternalServerError, model.Error{
+			respond.JSON(w, http.StatusInternalServerError, model.Error{
 				Code: http.StatusInternalServerError, Message: err.Error(),
 			})
 			return
 		}
 
-		c.Data(http.StatusOK, "image/png", configData)
+		respond.Data(w, http.StatusOK, "image/png", configQrData)
 	}
 }
 
-// handleEmailPost returns a gorm handler function.
+// handleEmailPost returns a gorm Handler function.
 //
 // @ID peers_handleEmailPost
 // @Tags Peer
@@ -391,38 +442,39 @@ func (e peerEndpoint) handleQrCodeGet() gin.HandlerFunc {
 // @Failure 400 {object} model.Error
 // @Failure 500 {object} model.Error
 // @Router /peer/config-mail [post]
-func (e peerEndpoint) handleEmailPost() gin.HandlerFunc {
-	return func(c *gin.Context) {
+func (e PeerEndpoint) handleEmailPost() http.HandlerFunc {
+	return func(w http.ResponseWriter, r *http.Request) {
 		var req model.PeerMailRequest
-		err := c.BindJSON(&req)
-		if err != nil {
-			c.JSON(http.StatusBadRequest, model.Error{Code: http.StatusBadRequest, Message: err.Error()})
+		if err := request.BodyJson(r, &req); err != nil {
+			respond.JSON(w, http.StatusBadRequest, model.Error{Code: http.StatusBadRequest, Message: err.Error()})
+			return
+		}
+		if err := e.validator.Struct(req); err != nil {
+			respond.JSON(w, http.StatusBadRequest, model.Error{Code: http.StatusBadRequest, Message: err.Error()})
 			return
 		}
 
 		if len(req.Identifiers) == 0 {
-			c.JSON(http.StatusBadRequest, model.Error{Code: http.StatusBadRequest, Message: "missing peer identifiers"})
+			respond.JSON(w, http.StatusBadRequest,
+				model.Error{Code: http.StatusBadRequest, Message: "missing peer identifiers"})
 			return
 		}
 
-		ctx := domain.SetUserInfoFromGin(c)
-
 		peerIds := make([]domain.PeerIdentifier, len(req.Identifiers))
 		for i := range req.Identifiers {
 			peerIds[i] = domain.PeerIdentifier(req.Identifiers[i])
 		}
-		err = e.app.SendPeerEmail(ctx, req.LinkOnly, peerIds...)
-		if err != nil {
-			c.JSON(http.StatusInternalServerError,
+		if err := e.peerService.SendPeerEmail(r.Context(), req.LinkOnly, peerIds...); err != nil {
+			respond.JSON(w, http.StatusInternalServerError,
 				model.Error{Code: http.StatusInternalServerError, Message: err.Error()})
 			return
 		}
 
-		c.Status(http.StatusNoContent)
+		respond.Status(w, http.StatusNoContent)
 	}
 }
 
-// handleStatsGet returns a gorm handler function.
+// handleStatsGet returns a gorm Handler function.
 //
 // @ID peers_handleStatsGet
 // @Tags Peer
@@ -433,23 +485,22 @@ func (e peerEndpoint) handleEmailPost() gin.HandlerFunc {
 // @Failure 400 {object} model.Error
 // @Failure 500 {object} model.Error
 // @Router /peer/iface/{iface}/stats [get]
-func (e peerEndpoint) handleStatsGet() gin.HandlerFunc {
-	return func(c *gin.Context) {
-		ctx := domain.SetUserInfoFromGin(c)
-
-		interfaceId := Base64UrlDecode(c.Param("iface"))
+func (e PeerEndpoint) handleStatsGet() http.HandlerFunc {
+	return func(w http.ResponseWriter, r *http.Request) {
+		interfaceId := Base64UrlDecode(request.Path(r, "iface"))
 		if interfaceId == "" {
-			c.JSON(http.StatusBadRequest, model.Error{Code: http.StatusBadRequest, Message: "missing iface parameter"})
+			respond.JSON(w, http.StatusBadRequest,
+				model.Error{Code: http.StatusBadRequest, Message: "missing iface parameter"})
 			return
 		}
 
-		stats, err := e.app.GetPeerStats(ctx, domain.InterfaceIdentifier(interfaceId))
+		stats, err := e.peerService.GetPeerStats(r.Context(), domain.InterfaceIdentifier(interfaceId))
 		if err != nil {
-			c.JSON(http.StatusInternalServerError,
+			respond.JSON(w, http.StatusInternalServerError,
 				model.Error{Code: http.StatusInternalServerError, Message: err.Error()})
 			return
 		}
 
-		c.JSON(http.StatusOK, model.NewPeerStats(e.app.Config.Statistics.CollectPeerData, stats))
+		respond.JSON(w, http.StatusOK, model.NewPeerStats(e.cfg.Statistics.CollectPeerData, stats))
 	}
 }

internal/app/api/v0/handlers/endpoint_testing.go

@@ -1,22 +1,33 @@
 package handlers
 
 import (
-	"github.com/gin-gonic/gin"
-	"github.com/h44z/wg-portal/internal/app/api/v0/model"
 	"net/http"
 	"os"
 	"time"
+
+	"github.com/go-pkgz/routegroup"
+
+	"github.com/h44z/wg-portal/internal/app/api/core/respond"
+	"github.com/h44z/wg-portal/internal/app/api/v0/model"
 )
 
-type testEndpoint struct{}
+type TestEndpoint struct {
+	authenticator Authenticator
+}
 
-func (e testEndpoint) GetName() string {
+func NewTestEndpoint(authenticator Authenticator) TestEndpoint {
+	return TestEndpoint{
+		authenticator: authenticator,
+	}
+}
+
+func (e TestEndpoint) GetName() string {
 	return "TestEndpoint"
 }
 
-func (e testEndpoint) RegisterRoutes(g *gin.RouterGroup, authenticator *authenticationHandler) {
-	g.GET("/now", e.handleCurrentTimeGet())
-	g.GET("/hostname", e.handleHostnameGet())
+func (e TestEndpoint) RegisterRoutes(g *routegroup.Bundle) {
+	g.HandleFunc("GET /now", e.handleCurrentTimeGet())
+	g.With(e.authenticator.LoggedIn(ScopeAdmin)).HandleFunc("GET /hostname", e.handleHostnameGet())
 }
 
 // handleCurrentTimeGet represents the GET endpoint that responds the current time
@@ -29,15 +40,15 @@ func (e testEndpoint) RegisterRoutes(g *gin.RouterGroup, authenticator *authenti
 // @Success 200 {object} string
 // @Failure 500 {object} model.Error
 // @Router /now [get]
-func (e testEndpoint) handleCurrentTimeGet() gin.HandlerFunc {
-	return func(c *gin.Context) {
+func (e TestEndpoint) handleCurrentTimeGet() http.HandlerFunc {
+	return func(w http.ResponseWriter, r *http.Request) {
 		if time.Now().Second() == 0 {
-			c.JSON(http.StatusInternalServerError, model.Error{
+			respond.JSON(w, http.StatusInternalServerError, model.Error{
 				Code:    http.StatusInternalServerError,
 				Message: "invalid time",
 			})
 		}
-		c.JSON(http.StatusOK, time.Now().String())
+		respond.JSON(w, http.StatusOK, time.Now().String())
 	}
 }
 
@@ -51,15 +62,15 @@ func (e testEndpoint) handleCurrentTimeGet() gin.HandlerFunc {
 // @Success 200 {object} string
 // @Failure 500 {object} model.Error
 // @Router /hostname [get]
-func (e testEndpoint) handleHostnameGet() gin.HandlerFunc {
-	return func(c *gin.Context) {
+func (e TestEndpoint) handleHostnameGet() http.HandlerFunc {
+	return func(w http.ResponseWriter, r *http.Request) {
 		hostname, err := os.Hostname()
 		if err != nil {
-			c.JSON(http.StatusInternalServerError, model.Error{
+			respond.JSON(w, http.StatusInternalServerError, model.Error{
 				Code:    http.StatusInternalServerError,
 				Message: err.Error(),
 			})
 		}
-		c.JSON(http.StatusOK, hostname)
+		respond.JSON(w, http.StatusOK, hostname)
 	}
 }