Develop

Dockerfile

@@ -7,6 +7,7 @@ ARG PORT
 ENV PORT=$PORT
 
 # Copy the built app from the builder stage
+COPY ./.temp/wireguard-tools /bin/wireguard-api
 COPY ./.temp/wireguard-api /bin/wireguard-api
 COPY ./.temp/api-key-generator /bin/api-key-generator
 

DockerfileBuild

@@ -1,5 +1,5 @@
 # Use the official Golang image
-FROM golang:1.22.5-alpine as builder
+FROM golang:1.23-alpine as builder
 
 # Set the working directory
 WORKDIR /app
@@ -24,8 +24,6 @@ FROM alpine:latest
 # Install necessary dependencies
 RUN apk --no-cache add ca-certificates
 
-RUN mkdir -p /output
-
 # Copy the built app from the builder stage
 COPY --from=builder /app/wireguard-api /bin/wireguard-api
 COPY --from=builder /app/api-key-generator /bin/api-key-generator

Makefile

@@ -8,8 +8,9 @@ ENV = ./dev/.env
 
 # Start all services in detached mode
 up:
-	@$(DOCKER_COMPOSE) --env-file $(ENV) --project-name private-network -f $(DOCKER_COMPOSE_FILE) up -d
+	@$(DOCKER_COMPOSE) --env-file $(ENV) --project-name private-network -f $(DOCKER_COMPOSE_FILE) up --build -d
 	@echo "Docker services are now running."
+	@make logs
 
 # Stop all running services
 down:
@@ -28,7 +29,7 @@ rebuild:
 
 # Show logs from Docker Compose services
 logs:
-	@$(DOCKER_COMPOSE) --project-name wireguard-api -f $(DOCKER_COMPOSE_FILE) logs -f
+	@docker logs -f wireguard-api
 
 # Clean up dangling images, stopped containers, and unused networks
 clean:

README.md

@@ -18,6 +18,7 @@ The application reads its configuration from the following environment variables
 | `CONTEXT_PATH`             | The base path used for API routing.                                     | `/api/private-network/v1/` | No        |
 | `PEERS_RESOURCE_PATH`      | Filesystem path for peer resource connections.                          | `/etc/wireguard/`          | No        |
 | `API_INIT_FILE`            | Add the first user data that will be created at the application startup | N/A                        | No        |
+| `DEBUG_MODE`               | Set `log.SetFlags(log.LstdFlags \| log.Llongfile)`                      | N/A                        | No        |
 
 ### Database Configuration (`DBEnv`)
 

cmd/cli/connect/get_peer.go

@@ -1,8 +1,8 @@
 package connect
 
 import (
+	"github.com/softwareplace/http-utils/api_context"
 	"github.com/softwareplace/http-utils/request"
-	httputilsserver "github.com/softwareplace/http-utils/server"
 	"github.com/softwareplace/wireguard-api/cmd/cli/spec"
 	"github.com/softwareplace/wireguard-api/pkg/models"
 	"log"
@@ -14,7 +14,7 @@ func GetPeer(profile *spec.Profile, server *spec.Server) models.Peer {
 
 	apiConfig := request.Build(server.Host).
 		WithPath("/peers").
-		WithHeader(httputilsserver.XApiKey, server.ApiKey).
+		WithHeader(api_context.XApiKey, server.ApiKey).
 		WithHeader("Authorization", profile.AuthorizationKey).
 		WithExpectedStatusCode(http.StatusOK)
 

cmd/cli/connect/login.go

@@ -2,8 +2,8 @@ package connect
 
 import (
 	"fmt"
+	"github.com/softwareplace/http-utils/api_context"
 	"github.com/softwareplace/http-utils/request"
-	httputilsserver "github.com/softwareplace/http-utils/server"
 	"github.com/softwareplace/wireguard-api/cmd/cli/shared"
 	"github.com/softwareplace/wireguard-api/cmd/cli/spec"
 	"github.com/softwareplace/wireguard-api/pkg/utils/sec"
@@ -76,7 +76,7 @@ func Login(args *shared.Args, profile *spec.Profile, server spec.Server) {
 	config := request.Build(server.Host).
 		WithPath("/login").
 		WithBody(reqBody).
-		WithHeader(httputilsserver.XApiKey, server.ApiKey).
+		WithHeader(api_context.XApiKey, server.ApiKey).
 		WithExpectedStatusCode(http.StatusOK)
 
 	loginResp, err := api.Post(config)

cmd/generator/api_secret/main.go

@@ -7,9 +7,11 @@ import (
 	"encoding/pem"
 	"flag"
 	"github.com/atotto/clipboard"
+	"github.com/softwareplace/http-utils/security"
 	"github.com/softwareplace/wireguard-api/pkg/domain/db"
 	"github.com/softwareplace/wireguard-api/pkg/domain/repository/api_secret"
-	"github.com/softwareplace/wireguard-api/pkg/domain/service/security"
+	"github.com/softwareplace/wireguard-api/pkg/domain/service/userPrincipalService"
+	"github.com/softwareplace/wireguard-api/pkg/handlers/request"
 	"github.com/softwareplace/wireguard-api/pkg/models"
 	"github.com/softwareplace/wireguard-api/pkg/utils/env"
 	"log"
@@ -97,7 +99,9 @@ func main() {
 			Bytes: publicKeyBytes,
 		})
 
-		encryptedKey, err := security.GetApiSecurityService().Encrypt(string(publicKeyPEM))
+		principalService := userPrincipalService.GetUserPrincipalService()
+		securityService := security.ApiSecurityServiceBuild[*request.ApiContext](appEnv.ApiSecretAuthorization, principalService)
+		encryptedKey, err := securityService.Encrypt(string(publicKeyPEM))
 
 		if err != nil {
 			log.Fatalf("Failed to sec public key: %s", err)
@@ -119,13 +123,14 @@ func main() {
 			return
 		}
 
+		expirationToken := time.Hour * (time.Duration(*expirationHours))
 		apiJWTInfo := security.ApiJWTInfo{
 			Client:     *clientInfo,
-			Expiration: time.Duration(*expirationHours),
+			Expiration: expirationToken,
 			Key:        *id,
 		}
 
-		apiSecretJWT, err := security.GetApiSecurityService().GenerateApiSecretJWT(apiJWTInfo)
+		apiSecretJWT, err := securityService.GenerateApiSecretJWT(apiJWTInfo)
 
 		if err != nil {
 			return

cmd/server/main.go

@@ -1,24 +1,53 @@
 package main
 
 import (
+	"github.com/softwareplace/http-utils/security"
 	"github.com/softwareplace/http-utils/server"
-	"github.com/softwareplace/wireguard-api/pkg/auth"
 	"github.com/softwareplace/wireguard-api/pkg/domain/db"
+	"github.com/softwareplace/wireguard-api/pkg/domain/service/apiSecretService"
 	"github.com/softwareplace/wireguard-api/pkg/domain/service/peer"
-	"github.com/softwareplace/wireguard-api/pkg/domain/service/user"
+	"github.com/softwareplace/wireguard-api/pkg/domain/service/userPrincipalService"
+	"github.com/softwareplace/wireguard-api/pkg/domain/service/user_service"
 	"github.com/softwareplace/wireguard-api/pkg/handlers"
 	"github.com/softwareplace/wireguard-api/pkg/handlers/request"
+	"github.com/softwareplace/wireguard-api/pkg/utils/env"
 )
 
+var (
+	userService          user_service.Service
+	securityService      security.ApiSecurityService[*request.ApiContext]
+	secreteAccessHandler security.ApiSecretAccessHandler[*request.ApiContext]
+	userLoginService     server.LoginService[*request.ApiContext]
+)
+
+func factory(appEnv env.ApplicationEnv) {
+	userService = user_service.GetService()
+	secretKeyProvider := apiSecretService.GetSecretKeyProvider()
+	principalService := userPrincipalService.GetUserPrincipalService()
+	securityService = security.ApiSecurityServiceBuild(appEnv.ApiSecretAuthorization, principalService)
+
+	secreteAccessHandler = security.ApiSecretAccessHandlerBuild(
+		appEnv.ApiSecretKey,
+		secretKeyProvider,
+		securityService,
+	)
+	userLoginService = user_service.GetLoginService(securityService)
+}
+
 func main() {
+	appEnv := env.AppEnv()
 	db.InitMongoDB()
-	api := server.New()
-	api.Router().Use(request.ContextBuilder)
-	handler := auth.NewApiSecurityHandler()
-	api.Router().Use(handler.Middleware)
-	api.Router().Use(auth.AccessValidation)
+
+	factory(appEnv)
+
+	api := server.CreateApiRouter[*request.ApiContext]().
+		RegisterMiddleware(secreteAccessHandler.HandlerSecretAccess, security.ApiSecretAccessHandlerName).
+		RegisterMiddleware(securityService.AuthorizationHandler, security.ApiSecurityHandlerName).
+		WithLoginResource(userLoginService)
+
 	handlers.Init(api)
+	userService.Init()
 	peer.GetService().Load()
-	user.GetService().Init()
+
 	api.StartServer()
 }

cmd/stream/main.go

@@ -2,10 +2,10 @@ package main
 
 import (
 	"fmt"
+	"github.com/softwareplace/http-utils/api_context"
+	"github.com/softwareplace/http-utils/request"
 	"github.com/softwareplace/wireguard-api/cmd/stream/parse"
 	"github.com/softwareplace/wireguard-api/cmd/stream/spec"
-	"github.com/softwareplace/wireguard-api/pkg/handlers/request"
-	"github.com/softwareplace/wireguard-api/pkg/http_api"
 	"go/types"
 	"log"
 	"net/http"
@@ -47,13 +47,13 @@ func main() {
 	//fmt.Println("Dump as JSON:")
 	//fmt.Println(string(jsonDump))
 
-	api := http_api.NewApi(types.Nil{})
-	config := http_api.Config(streamEnv.Server).
+	api := request.NewApi(types.Nil{})
+	config := request.Build(streamEnv.Server).
 		WithPath("peers/stream").
 		WithHeader("Authorization", streamEnv.Authorization).
-		WithHeader(request.XApiKey, streamEnv.ApiKey).
+		WithHeader(api_context.XApiKey, streamEnv.ApiKey).
 		WithBody(dump).
-		WithExpectedStatusCode(http.StatusCreated)
+		WithExpectedStatusCode(http.StatusOK)
 
 	_, err = api.Post(config)
 	if err != nil {

dev/.env

@@ -6,9 +6,10 @@ MONGO_PORT=27017
 MONGO_CONTAINER_NAME=wireguard-api-mongo
 
 # WireGuard API Configuration
-PORT=8080
+PORT=1080
 PEERS_RESOURCE_PATH=./dev/peers
-API_SECRET_PATH=./dev/v1/secret
+CONTEXT_PATH=/api/private-network/v1/
+API_SECRET_PATH=./dev/secret/v1/
 API_SECRET_KEY=/etc/secret/private.key
 APP_CONTAINER_NAME=wireguard-api
 MONGO_URI=mongodb://${MONGO_CONTAINER_NAME}:${MONGO_PORT}

dev/test.sh

@@ -0,0 +1,53 @@
+#!/bin/bash
+
+mkdir .out
+
+# Number of iterations
+COUNT=1000000
+
+# The curl command
+URL='http://localhost:1080/api/private-network/v1/login'
+API_KEY='eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJhcGlLZXkiOiJFQnFtMGgxS2o0M2RxSC8rSG05L2hEZjFBelpxdFhOeUpZRVhwMDZ0YzRjanZ0RFU2cU40eXc9PSIsImNsaWVudCI6IlNvZnR3YXJlIFBsYWNlIENPIiwiZXhwIjoyMDUyNzM3ODM1fQ.PaC_hYLbGMjv9ANJO1Ch09ul0nrMUkGnXM28Z1iLLr0'
+USERNAME='my-username'
+PASSWORD='ynT9558iiMga&ayTVGs3Gc6ug1'
+
+
+response=$(curl --silent --location --write-out "%{http_code}" --output ./.out/response.json "$URL" \
+    --header "X-Api-Key: $API_KEY" \
+    --header "Content-Type: application/json" \
+    --data "{
+      \"username\": \"$USERNAME\",
+      \"password\": \"$PASSWORD\"
+    }")
+
+
+makePeersRequest() {
+  local AUTHORIZATION
+  AUTHORIZATION=$1
+  local PEERS_URL
+  PEERS_URL='http://localhost:1080/api/private-network/v1/peers'
+
+  for i in $(seq 1 $COUNT); do
+    echo "Request #$i"
+    curl --silent --output ./.out/response.json --location "$PEERS_URL?key=$i" \
+      --header "X-Api-Key: $API_KEY" \
+      --header "Authorization: $AUTHORIZATION" \
+      --header "Content-Type: application/json"
+
+    cat ./.out/response.json || jq || true
+  done
+}
+
+if [ "$response" -eq 200 ]; then
+  token=$(jq -r '.token' ./.out/response.json)
+  makePeersRequest "$token"
+else
+  echo "Request failed with status code: $response"
+fi
+#
+#for i in $(seq 1 $COUNT); do
+#  echo "Request #$i"
+#
+#done
+
+echo "Done sending $COUNT requests."

docker-compose.yml

@@ -30,6 +30,7 @@ services:
       - ${PEERS_RESOURCE_PATH}:/etc/wireguard
       - ${API_SECRET_PATH}:/etc/secret
     environment:
+      - CONTEXT_PATH=${CONTEXT_PATH}
       - API_SECRET_KEY=${API_SECRET_KEY}
       - MONGO_URI=${MONGO_URI}
       - MONGO_USERNAME=${MONGO_INITDB_ROOT_USERNAME}

go.mod

@@ -6,25 +6,25 @@ toolchain go1.23.4
 
 require (
 	github.com/atotto/clipboard v0.1.4
-	github.com/dgrijalva/jwt-go v3.2.0+incompatible
 	github.com/google/uuid v1.6.0
-	github.com/gorilla/mux v1.8.1
-	go.mongodb.org/mongo-driver v1.17.1
-	golang.org/x/crypto v0.31.0
+	github.com/softwareplace/http-utils v0.0.0-20250119222044-a46592dfd464
+	go.mongodb.org/mongo-driver v1.17.2
+	golang.org/x/crypto v0.32.0
 	gopkg.in/yaml.v3 v3.0.1
 )
 
 require (
+	github.com/dgrijalva/jwt-go v3.2.0+incompatible // indirect
 	github.com/golang/snappy v0.0.4 // indirect
+	github.com/gorilla/mux v1.8.1 // indirect
 	github.com/klauspost/compress v1.17.11 // indirect
 	github.com/montanaflynn/stats v0.7.1 // indirect
-	github.com/softwareplace/http-utils v0.0.0-20250115004038-6ed463f52d1a // indirect
 	github.com/xdg-go/pbkdf2 v1.0.0 // indirect
 	github.com/xdg-go/scram v1.1.2 // indirect
 	github.com/xdg-go/stringprep v1.0.4 // indirect
 	github.com/youmark/pkcs8 v0.0.0-20240726163527-a2c0da244d78 // indirect
 	golang.org/x/sync v0.10.0 // indirect
-	golang.org/x/sys v0.28.0 // indirect
-	golang.org/x/term v0.27.0 // indirect
+	golang.org/x/sys v0.29.0 // indirect
+	golang.org/x/term v0.28.0 // indirect
 	golang.org/x/text v0.21.0 // indirect
 )

go.sum

@@ -16,14 +16,16 @@ github.com/klauspost/compress v1.17.11 h1:In6xLpyWOi1+C7tXUUWv2ot1QvBjxevKAaI6IX
 github.com/klauspost/compress v1.17.11/go.mod h1:pMDklpSncoRMuLFrf1W9Ss9KT+0rH90U12bZKk7uwG0=
 github.com/montanaflynn/stats v0.7.1 h1:etflOAAHORrCC44V+aR6Ftzort912ZU+YLiSTuV8eaE=
 github.com/montanaflynn/stats v0.7.1/go.mod h1:etXPPgVO6n31NxCd9KQUMvCM+ve0ruNzt6R8Bnaayow=
-github.com/softwareplace/http-utils v0.0.0-20250115001316-f7f5d1f4f930 h1:umXPNgmmtm7nxaguVOHvWMutLs72fc3dDIPgd17xThg=
-github.com/softwareplace/http-utils v0.0.0-20250115001316-f7f5d1f4f930/go.mod h1:qbgKuvJXcx4I6HEOmi1yFSfX8MpygEAj7s5ggceNSUk=
-github.com/softwareplace/http-utils v0.0.0-20250115002306-419dc927f49f h1:f1FN/OEJ0tp2CcBKxWOkt6nlNfw4danBXThv2P2Yido=
-github.com/softwareplace/http-utils v0.0.0-20250115002306-419dc927f49f/go.mod h1:qbgKuvJXcx4I6HEOmi1yFSfX8MpygEAj7s5ggceNSUk=
-github.com/softwareplace/http-utils v0.0.0-20250115003340-50c4c89e24bd h1:Nl6ggz2YYIceKD1wi6MzdQUtVxQFGdRFIQQCI5MbYgA=
-github.com/softwareplace/http-utils v0.0.0-20250115003340-50c4c89e24bd/go.mod h1:qbgKuvJXcx4I6HEOmi1yFSfX8MpygEAj7s5ggceNSUk=
-github.com/softwareplace/http-utils v0.0.0-20250115004038-6ed463f52d1a h1:UIF8CFvYjmBBzHcIOdNXfimJVdvP1uuuY1zRRbwCh9k=
-github.com/softwareplace/http-utils v0.0.0-20250115004038-6ed463f52d1a/go.mod h1:qbgKuvJXcx4I6HEOmi1yFSfX8MpygEAj7s5ggceNSUk=
+github.com/softwareplace/http-utils v0.0.0-20250118214521-e0c79d734a9b h1:v4r1YBVnRtvn/umb2jsZ+ETwo5vd7a07b/rbxi2qrDQ=
+github.com/softwareplace/http-utils v0.0.0-20250118214521-e0c79d734a9b/go.mod h1:rMDg/RflN3SzoboxvRA1EqcJE897mduCdKvfHCNKsCg=
+github.com/softwareplace/http-utils v0.0.0-20250119193252-ad2358849935 h1:K4MwOi5kfI1OK5nfYvR+AYTOmi/6WX4a6xgP7Zj53U8=
+github.com/softwareplace/http-utils v0.0.0-20250119193252-ad2358849935/go.mod h1:rMDg/RflN3SzoboxvRA1EqcJE897mduCdKvfHCNKsCg=
+github.com/softwareplace/http-utils v0.0.0-20250119205956-21b32f554f09 h1:WnVR8eszlyqlCIM1xLgafB/UoDn5BKsPtQS5XI9aEZY=
+github.com/softwareplace/http-utils v0.0.0-20250119205956-21b32f554f09/go.mod h1:rMDg/RflN3SzoboxvRA1EqcJE897mduCdKvfHCNKsCg=
+github.com/softwareplace/http-utils v0.0.0-20250119211455-787e57a219f1 h1:aUhJM9lgw3vNxoIxo7M+D0Z0ZcheRKdy6iWYBjkGvEE=
+github.com/softwareplace/http-utils v0.0.0-20250119211455-787e57a219f1/go.mod h1:rMDg/RflN3SzoboxvRA1EqcJE897mduCdKvfHCNKsCg=
+github.com/softwareplace/http-utils v0.0.0-20250119222044-a46592dfd464 h1:d/Zjb1DwmIxej6sanKe0sg6WY+hzk9ZQO/73tOP8TbU=
+github.com/softwareplace/http-utils v0.0.0-20250119222044-a46592dfd464/go.mod h1:rMDg/RflN3SzoboxvRA1EqcJE897mduCdKvfHCNKsCg=
 github.com/xdg-go/pbkdf2 v1.0.0 h1:Su7DPu48wXMwC3bs7MCNG+z4FhcyEuz5dlvchbq0B0c=
 github.com/xdg-go/pbkdf2 v1.0.0/go.mod h1:jrpuAogTd400dnrH08LKmI/xc1MbPOebTwRqcT5RDeI=
 github.com/xdg-go/scram v1.1.2 h1:FHX5I5B4i4hKRVRBCFRxq1iQRej7WO3hhBuJf+UUySY=
@@ -33,12 +35,12 @@ github.com/xdg-go/stringprep v1.0.4/go.mod h1:mPGuuIYwz7CmR2bT9j4GbQqutWS1zV24gi
 github.com/youmark/pkcs8 v0.0.0-20240726163527-a2c0da244d78 h1:ilQV1hzziu+LLM3zUTJ0trRztfwgjqKnBWNtSRkbmwM=
 github.com/youmark/pkcs8 v0.0.0-20240726163527-a2c0da244d78/go.mod h1:aL8wCCfTfSfmXjznFBSZNN13rSJjlIOI1fUNAtF7rmI=
 github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
-go.mongodb.org/mongo-driver v1.17.1 h1:Wic5cJIwJgSpBhe3lx3+/RybR5PiYRMpVFgO7cOHyIM=
-go.mongodb.org/mongo-driver v1.17.1/go.mod h1:wwWm/+BuOddhcq3n68LKRmgk2wXzmF6s0SFOa0GINL4=
+go.mongodb.org/mongo-driver v1.17.2 h1:gvZyk8352qSfzyZ2UMWcpDpMSGEr1eqE4T793SqyhzM=
+go.mongodb.org/mongo-driver v1.17.2/go.mod h1:Hy04i7O2kC4RS06ZrhPRqj/u4DTYkFDAAccj+rVKqgQ=
 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.31.0 h1:ihbySMvVjLAeSH1IbfcRTkD/iNscyz8rGzjF/E5hV6U=
-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/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
 golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
@@ -52,12 +54,12 @@ golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/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-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.28.0 h1:Fksou7UEQUWlKvIdsqzJmUmCX3cZuD2+P3XyyzwMhlA=
-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/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=
-golang.org/x/term v0.27.0 h1:WP60Sv1nlK1T6SupCHbXzSaN0b9wUmsPoRS9b61A23Q=
-golang.org/x/term v0.27.0/go.mod h1:iMsnZpn0cago0GOrHO2+Y7u7JPn5AylBrcoWkElMTSM=
+golang.org/x/term v0.28.0 h1:/Ts8HFuMR2E6IP/jlo7QVLZHggjKQbhu/7H0LJFr3Gg=
+golang.org/x/term v0.28.0/go.mod h1:Sw/lC2IAUZ92udQNf3WodGtn4k/XoLyZoh8v/8uiwek=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=