From e24acfa57d42f8fd66ee3c167c14b202dc5ddd11 Mon Sep 17 00:00:00 2001 From: Christoph Haas Date: Fri, 28 Feb 2025 08:29:40 +0100 Subject: [PATCH] chore: cleanup code formatting --- cmd/api_build_tool/main.go | 2 +- cmd/wg-portal/main.go | 12 +- go.mod | 1 - go.sum | 56 +------ internal/adapters/database.go | 20 +-- .../adapters/database_integration_test.go | 5 +- internal/adapters/filesystem.go | 5 +- internal/adapters/mailer.go | 8 +- internal/adapters/metrics.go | 10 +- internal/adapters/wgquick.go | 3 +- internal/adapters/wireguard.go | 5 +- .../adapters/wireguard_integration_test.go | 33 ++-- internal/app/api/core/server.go | 6 +- internal/app/api/v0/handlers/base.go | 3 +- .../v0/handlers/endpoint_authentication.go | 1 + .../app/api/v0/handlers/endpoint_config.go | 1 + .../api/v0/handlers/endpoint_interfaces.go | 6 +- .../app/api/v0/handlers/endpoint_peers.go | 1 + .../app/api/v0/handlers/endpoint_testing.go | 6 +- .../app/api/v0/handlers/endpoint_users.go | 1 + .../v0/handlers/middleware_authentication.go | 7 +- internal/app/api/v0/model/models_interface.go | 1 - internal/app/api/v1/handlers/base.go | 1 + .../app/api/v1/handlers/endpoint_interface.go | 1 + .../app/api/v1/handlers/endpoint_metrics.go | 1 + internal/app/api/v1/handlers/endpoint_peer.go | 1 + .../api/v1/handlers/endpoint_provisioning.go | 1 + internal/app/api/v1/handlers/endpoint_user.go | 1 + .../v1/handlers/middleware_authentication.go | 1 + internal/app/app.go | 5 +- internal/app/audit/recorder.go | 8 +- internal/app/audit/repos.go | 1 + internal/app/auth/auth.go | 7 +- internal/app/auth/auth_ldap.go | 7 +- internal/app/auth/auth_oauth.go | 14 +- internal/app/auth/auth_oidc.go | 11 +- internal/app/auth/oauth_common.go | 2 +- internal/app/auth/oauth_common_test.go | 11 +- internal/app/cli.go | 7 +- internal/app/configfile/manager.go | 7 +- internal/app/configfile/repos.go | 3 +- internal/app/configfile/template.go | 8 +- internal/app/mail/manager.go | 14 +- internal/app/mail/repos.go | 3 +- internal/app/mail/template.go | 14 +- internal/app/migrate_v1.go | 5 +- internal/app/route/repos.go | 1 + internal/app/route/routes.go | 9 +- internal/app/users/ldap_helper.go | 1 + internal/app/users/user_manager.go | 12 +- internal/app/wireguard/statistics.go | 7 +- internal/app/wireguard/wireguard.go | 3 +- .../app/wireguard/wireguard_interfaces.go | 11 +- internal/app/wireguard/wireguard_peers.go | 3 +- internal/config/config.go | 1 - internal/domain/auth.go | 8 +- internal/domain/base.go | 15 +- internal/domain/context.go | 3 +- internal/domain/crypto.go | 4 - internal/domain/interface.go | 9 +- internal/domain/ip.go | 11 +- internal/domain/peer.go | 4 +- internal/domain/user.go | 3 +- internal/ldap_utils.go | 2 +- internal/lowlevel/mocks/NetlinkClient.go | 157 ------------------ internal/lowlevel/mocks/WireGuardClient.go | 87 ---------- internal/util.go | 43 ++--- 67 files changed, 232 insertions(+), 489 deletions(-) delete mode 100644 internal/lowlevel/mocks/NetlinkClient.go delete mode 100644 internal/lowlevel/mocks/WireGuardClient.go diff --git a/cmd/api_build_tool/main.go b/cmd/api_build_tool/main.go index 9907d47..94555f8 100644 --- a/cmd/api_build_tool/main.go +++ b/cmd/api_build_tool/main.go @@ -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) diff --git a/cmd/wg-portal/main.go b/cmd/wg-portal/main.go index 771a70c..af7a43c 100644 --- a/cmd/wg-portal/main.go +++ b/cmd/wg-portal/main.go @@ -7,6 +7,12 @@ import ( "syscall" "time" + "github.com/sirupsen/logrus" + 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" handlersV0 "github.com/h44z/wg-portal/internal/app/api/v0/handlers" backendV1 "github.com/h44z/wg-portal/internal/app/api/v1/backend" @@ -18,13 +24,7 @@ import ( "github.com/h44z/wg-portal/internal/app/route" "github.com/h44z/wg-portal/internal/app/users" "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 diff --git a/go.mod b/go.mod index af833ab..6498be8 100644 --- a/go.mod +++ b/go.mod @@ -96,7 +96,6 @@ require ( github.com/prometheus/procfs v0.15.1 // indirect github.com/quasoft/memstore v0.0.0-20191010062613-2bce066d2b0b // 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-20250226130143-9025cce95817 // indirect github.com/twitchyliquid64/golang-asm v0.15.1 // indirect github.com/ugorji/go/codec v1.2.12 // indirect diff --git a/go.sum b/go.sum index 5761db9..dd9d1c9 100644 --- a/go.sum +++ b/go.sum @@ -25,8 +25,6 @@ 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= @@ -36,19 +34,13 @@ github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6r 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 v1.12.9 h1:Od1BvK55NnewtGaJsTDeAOSnLVO2BTSLOe0+ooKokmQ= github.com/bytedance/sonic v1.12.9/go.mod h1:uVvFidNmlt9+wa31S1urfwwthTWteBgG0hWuoKAXTx8= 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/bytedance/sonic/loader v0.2.3 h1:yctD0Q3v2NOGfSWPLPvG2ggA2kV6TS6s4wioyEqssH0= github.com/bytedance/sonic/loader v0.2.3/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/base64x v0.1.5 h1:XPciSp1xaq2VCSt6lF0phncD4koWyULpl5bUxbfCyP4= github.com/cloudwego/base64x v0.1.5/go.mod h1:0zlkT4Wn5C6NdauXdJRhSKRlJvmclQ1hhJgA0rcu/8w= github.com/cloudwego/iasm v0.2.0/go.mod h1:8rXZaNYT2n95jn+zTI1sDr+IgcD2GVs0nlbbQPiEFhY= @@ -85,8 +77,6 @@ github.com/glebarez/sqlite v1.11.0/go.mod h1:h8/o8j5wiAsqSPoWELDUdJXhjAhsVliSn7b 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-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-ldap/ldap/v3 v3.4.10 h1:ot/iwPOhfpNVgB1o+AVXljizWZ9JTp7YF5oeyONmcJU= @@ -105,19 +95,13 @@ github.com/go-playground/locales v0.14.1 h1:EWaQ/wswjilfKLTECiXz7Rh+3BjFhfDFKv/o 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.25.0 h1:5Dh7cjvzR7BRZadnsVOzPhWsrwUr0nmsZJxEAnFLNO8= github.com/go-playground/validator/v10 v10.25.0/go.mod h1:GGzBIJMuE98Ic/kJsBXbz1x/7cByt++cQ+YOuDM5wus= 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.0 h1:Y0zIbQXhQKmQgTp44Y1dp3wTXcn804QoTptLZT1vtvo= github.com/go-sql-driver/mysql v1.9.0/go.mod h1:pDetrLJeA3oMujJuvXc8RJoasr589B6A9fwzD3QMrqw= 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/goccy/go-json v0.10.5 h1:Fq85nIqj+gXn/S5ahsiTlK3TmC85qgirsdTP/+DeaC4= github.com/goccy/go-json v0.10.5/go.mod h1:oq7eo15ShAhp70Anwd5lgX2pLfOS3QCiwU/PULtXL6M= github.com/golang-jwt/jwt/v5 v5.0.0/go.mod h1:pqrtFR0X4osieyHYxtmOUWsAWrfe1Q5UVIyoH402zdk= @@ -131,7 +115,6 @@ github.com/golang-sql/sqlexp v0.1.0/go.mod h1:J4ad9Vo8ZCWQ2GMrC4UCQy1JpCbwU9m3EO 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/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8= github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU= @@ -190,13 +173,9 @@ github.com/json-iterator/go v1.1.5/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCV 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/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/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/klauspost/cpuid/v2 v2.2.10 h1:tBs3QSyvjDyFTq3uoc/9xFpCuOsJQFNPiAhYdw2skhE= github.com/klauspost/cpuid/v2 v2.2.10/go.mod h1:hqwkgyIinND0mEev00jJYCxPNVRVXFQeu1XKlok6oO0= github.com/knz/go-libedit v1.10.1/go.mod h1:MZTVkCWyz0oBc7JOWP3wNAzd002ZbM/5hgShxwh4x8M= @@ -269,7 +248,6 @@ github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVs 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= @@ -286,8 +264,6 @@ github.com/swaggo/swag v1.16.4/go.mod h1:VBsHJRsDvfYvqoiMKnsdwhNV9LEMHgEDZcyVYX0 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/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/twitchyliquid64/golang-asm v0.15.1 h1:SU5vSMR7hnwNxj24w34ZyCi/FmDZTkS4MhqMhdFk5YI= @@ -313,8 +289,6 @@ github.com/yeqown/go-qrcode/writer/compressed v1.0.1/go.mod h1:BJScsGUIKM+eg0CCL 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/arch v0.14.0 h1:z9JUEZWr8x4rR0OU6c4/4t6E6jOZ8/QBS2bBYBm4tx4= golang.org/x/arch v0.14.0/go.mod h1:FEVrYAQjsQXMVJ1nsMoVVXPZg6p2JE2mx8psSWTDQys= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= @@ -330,12 +304,8 @@ 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.34.0 h1:+/C6tk6rf/+t5DhUketUbD1aNGqiSX3j15Z6xuIDlBA= -golang.org/x/crypto v0.34.0/go.mod h1:dy7dXNW32cAb/6/PRuTNsix8T+vJAqvuIy5Bli/x0YQ= golang.org/x/crypto v0.35.0 h1:b15kiHdrGCHrP6LvwaQ3c03kgNhhiMgvlhxHQhmg2Xs= golang.org/x/crypto v0.35.0/go.mod h1:dy7dXNW32cAb/6/PRuTNsix8T+vJAqvuIy5Bli/x0YQ= -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/exp v0.0.0-20250218142911-aa4b98e5adaa h1:t2QcU6V556bFjYgu4L6C+6VrCPyJZ+eyRsABUPs1mz4= golang.org/x/exp v0.0.0-20250218142911-aa4b98e5adaa/go.mod h1:BHOTPb3L19zxehTsLoJXVaTktb06DFgmdW6Wb9s8jqk= golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= @@ -343,8 +313,8 @@ 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/mod v0.23.0 h1:Zb7khfcRGKk+kqfxFaP5tZqCnDZMjC5VtUBs87Hr6QM= +golang.org/x/mod v0.23.0/go.mod h1:6SkKJ3Xj0I0BrPOZoBy3bdMptDDU9oJrpohJ3eWZ1fY= golang.org/x/net v0.0.0-20181220203305-927f97764cc3/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= 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= @@ -363,12 +333,8 @@ 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/net v0.35.0 h1:T5GQRQb2y08kTAByq9L4/bz8cipCdA8FbRTXewonqY8= golang.org/x/net v0.35.0/go.mod h1:EglIi67kWsHKlRzzVMUD93VMSWGFOMSZgxFjparz1Qk= -golang.org/x/oauth2 v0.26.0 h1:afQXWNNaeC4nvZ0Ed9XvCCzXM6UHJG7iCg0W4fPqSBE= -golang.org/x/oauth2 v0.26.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI= golang.org/x/oauth2 v0.27.0 h1:da9Vo7/tDv5RH/7nZDz1eMGS/q1Vv1N/7FCrBhI9I3M= golang.org/x/oauth2 v0.27.0/go.mod h1:onh5ek6nERTohokkhCD/y2cV4Do3fxFHFuAejCkRWT8= golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -440,8 +406,6 @@ 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.30.0 h1:BgcpHewrV5AUp2G9MebG4XPFI1E2W41zU1SaqVA9vJY= golang.org/x/tools v0.30.0/go.mod h1:c347cR/OJfw5TI+GfX7RUPNMdDRRbjvYTS0jPyvsVtY= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= @@ -449,8 +413,6 @@ golang.zx2c4.com/wireguard v0.0.0-20231211153847-12269c276173 h1:/jFs0duh4rdb8uI 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= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= @@ -480,28 +442,22 @@ 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/ccgo/v4 v4.23.16 h1:Z2N+kk38b7SfySC1ZkpGLN2vthNJP1+ZzGZIlH7uBxo= +modernc.org/ccgo/v4 v4.23.16/go.mod h1:nNma8goMTY7aQZQNTyN9AIoJfxav4nvTnvKThAeMDdo= 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/libc v1.61.13 h1:3LRd6ZO1ezsFiX1y+bHd1ipyEHIJKvuprv0sLTBwLW8= modernc.org/libc v1.61.13/go.mod h1:8F/uJWL/3nNil0Lgt1Dpz+GgkApWh04N3el3hxJcA6E= 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.8.2 h1:cL9L4bcoAObu4NkxOlKWBWtNHIsnnACGF/TbqQ6sbcI= modernc.org/memory v1.8.2/go.mod h1:ZbjSvMO5NQ1A2i3bWeDiVMxIorXwdClKE/0SZ+BMotU= 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.0 h1:EQXNRn4nIS+gfsKeUTymHIz1waxuv5BzU7558dHSfH8= modernc.org/sqlite v1.36.0/go.mod h1:7MPwH7Z6bREicF9ZVUR78P1IKuxfZ8mRIDHD0iD+8TU= modernc.org/strutil v1.2.1 h1:UneZBkQA+DX2Rp35KcM69cSsNES9ly8mQWD71HKlOA0= diff --git a/internal/adapters/database.go b/internal/adapters/database.go index 6e75f40..be4f4c5 100644 --- a/internal/adapters/database.go +++ b/internal/adapters/database.go @@ -9,18 +9,18 @@ import ( "strings" "time" - "github.com/sirupsen/logrus" - "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" + "github.com/sirupsen/logrus" gormMySQL "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/h44z/wg-portal/internal/config" + "github.com/h44z/wg-portal/internal/domain" ) // SchemaVersion describes the current database schema version. It must be incremented if a manual migration is needed. @@ -60,21 +60,21 @@ 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...) } -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...) } -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 } diff --git a/internal/adapters/database_integration_test.go b/internal/adapters/database_integration_test.go index 0ad8419..7e4661b 100644 --- a/internal/adapters/database_integration_test.go +++ b/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) diff --git a/internal/adapters/filesystem.go b/internal/adapters/filesystem.go index 22bccc4..4cc5c4d 100644 --- a/internal/adapters/filesystem.go +++ b/internal/adapters/filesystem.go @@ -2,10 +2,11 @@ package adapters import ( "fmt" - "github.com/sirupsen/logrus" "io" "os" "path/filepath" + + "github.com/sirupsen/logrus" ) type FilesystemRepo struct { @@ -36,7 +37,7 @@ 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 { diff --git a/internal/adapters/mailer.go b/internal/adapters/mailer.go index becd433..3fceb8b 100644 --- a/internal/adapters/mailer.go +++ b/internal/adapters/mailer.go @@ -5,12 +5,14 @@ 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 { diff --git a/internal/adapters/metrics.go b/internal/adapters/metrics.go index 82abdb7..6319e92 100644 --- a/internal/adapters/metrics.go +++ b/internal/adapters/metrics.go @@ -2,16 +2,18 @@ package adapters import ( "context" + "errors" "net/http" "time" - "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" + + "github.com/h44z/wg-portal/internal" + "github.com/h44z/wg-portal/internal/config" + "github.com/h44z/wg-portal/internal/domain" ) type MetricsServer struct { @@ -88,7 +90,7 @@ func NewMetricsServer(cfg *config.Config) *MetricsServer { 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 { + if err := m.ListenAndServe(); err != nil && !errors.Is(err, http.ErrServerClosed) { logrus.Errorf("metrics service on %s exited: %v", m.Addr, err) } }() diff --git a/internal/adapters/wgquick.go b/internal/adapters/wgquick.go index 879f728..fbac30b 100644 --- a/internal/adapters/wgquick.go +++ b/internal/adapters/wgquick.go @@ -6,9 +6,10 @@ import ( "os/exec" "strings" + "github.com/sirupsen/logrus" + "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. diff --git a/internal/adapters/wireguard.go b/internal/adapters/wireguard.go index 9978d46..36b56a6 100644 --- a/internal/adapters/wireguard.go +++ b/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. diff --git a/internal/adapters/wireguard_integration_test.go b/internal/adapters/wireguard_integration_test.go index 07b35f2..9bbdd4a 100644 --- a/internal/adapters/wireguard_integration_test.go +++ b/internal/adapters/wireguard_integration_test.go @@ -12,11 +12,10 @@ import ( "strings" "testing" + "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "github.com/h44z/wg-portal/internal/domain" - - "github.com/stretchr/testify/assert" ) // setup WireGuard manager with no linked store @@ -68,13 +67,14 @@ func TestWireGuardCreateInterface(t *testing.T) { ipV6Address := "1337:d34d:b33f::2" defer 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 @@ -102,13 +102,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 diff --git a/internal/app/api/core/server.go b/internal/app/api/core/server.go index 6a3bb53..aea7e7c 100644 --- a/internal/app/api/core/server.go +++ b/internal/app/api/core/server.go @@ -12,12 +12,12 @@ import ( "os" "time" - "github.com/h44z/wg-portal/internal" - "github.com/h44z/wg-portal/internal/config" - "github.com/gin-gonic/gin" "github.com/sirupsen/logrus" ginlogrus "github.com/toorop/gin-logrus" + + "github.com/h44z/wg-portal/internal" + "github.com/h44z/wg-portal/internal/config" ) var ( diff --git a/internal/app/api/v0/handlers/base.go b/internal/app/api/v0/handlers/base.go index b880402..ecbe5aa 100644 --- a/internal/app/api/v0/handlers/base.go +++ b/internal/app/api/v0/handlers/base.go @@ -8,11 +8,12 @@ import ( "github.com/gin-contrib/sessions" "github.com/gin-contrib/sessions/memstore" "github.com/gin-gonic/gin" + csrf "github.com/utrack/gin-csrf" + "github.com/h44z/wg-portal/internal/app" "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" ) type handler interface { diff --git a/internal/app/api/v0/handlers/endpoint_authentication.go b/internal/app/api/v0/handlers/endpoint_authentication.go index 4ef5cc7..ce1b975 100644 --- a/internal/app/api/v0/handlers/endpoint_authentication.go +++ b/internal/app/api/v0/handlers/endpoint_authentication.go @@ -9,6 +9,7 @@ import ( "time" "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" diff --git a/internal/app/api/v0/handlers/endpoint_config.go b/internal/app/api/v0/handlers/endpoint_config.go index fedb22c..e437e55 100644 --- a/internal/app/api/v0/handlers/endpoint_config.go +++ b/internal/app/api/v0/handlers/endpoint_config.go @@ -10,6 +10,7 @@ import ( "net/url" "github.com/gin-gonic/gin" + "github.com/h44z/wg-portal/internal" "github.com/h44z/wg-portal/internal/app" "github.com/h44z/wg-portal/internal/app/api/v0/model" diff --git a/internal/app/api/v0/handlers/endpoint_interfaces.go b/internal/app/api/v0/handlers/endpoint_interfaces.go index d9bb218..335b62c 100644 --- a/internal/app/api/v0/handlers/endpoint_interfaces.go +++ b/internal/app/api/v0/handlers/endpoint_interfaces.go @@ -1,12 +1,14 @@ package handlers import ( + "io" + "net/http" + "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" - "io" - "net/http" ) type interfaceEndpoint struct { diff --git a/internal/app/api/v0/handlers/endpoint_peers.go b/internal/app/api/v0/handlers/endpoint_peers.go index 3eb65ba..53a897e 100644 --- a/internal/app/api/v0/handlers/endpoint_peers.go +++ b/internal/app/api/v0/handlers/endpoint_peers.go @@ -5,6 +5,7 @@ import ( "net/http" "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" diff --git a/internal/app/api/v0/handlers/endpoint_testing.go b/internal/app/api/v0/handlers/endpoint_testing.go index a534e92..c56d154 100644 --- a/internal/app/api/v0/handlers/endpoint_testing.go +++ b/internal/app/api/v0/handlers/endpoint_testing.go @@ -1,11 +1,13 @@ package handlers import ( - "github.com/gin-gonic/gin" - "github.com/h44z/wg-portal/internal/app/api/v0/model" "net/http" "os" "time" + + "github.com/gin-gonic/gin" + + "github.com/h44z/wg-portal/internal/app/api/v0/model" ) type testEndpoint struct{} diff --git a/internal/app/api/v0/handlers/endpoint_users.go b/internal/app/api/v0/handlers/endpoint_users.go index 5302b9b..24becb2 100644 --- a/internal/app/api/v0/handlers/endpoint_users.go +++ b/internal/app/api/v0/handlers/endpoint_users.go @@ -4,6 +4,7 @@ import ( "net/http" "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" diff --git a/internal/app/api/v0/handlers/middleware_authentication.go b/internal/app/api/v0/handlers/middleware_authentication.go index f15446b..74014e5 100644 --- a/internal/app/api/v0/handlers/middleware_authentication.go +++ b/internal/app/api/v0/handlers/middleware_authentication.go @@ -1,11 +1,13 @@ package handlers import ( + "net/http" + "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" - "net/http" ) type Scope string @@ -44,7 +46,8 @@ func (h authenticationHandler) LoggedIn(scopes ...Scope) gin.HandlerFunc { if !h.app.Authenticator.IsUserValid(c.Request.Context(), domain.UserIdentifier(session.UserIdentifier)) { h.Session.DestroyData(c) c.Abort() - c.JSON(http.StatusUnauthorized, model.Error{Code: http.StatusUnauthorized, Message: "session no longer available"}) + c.JSON(http.StatusUnauthorized, + model.Error{Code: http.StatusUnauthorized, Message: "session no longer available"}) return } diff --git a/internal/app/api/v0/model/models_interface.go b/internal/app/api/v0/model/models_interface.go index 2d7b7b9..f339d65 100644 --- a/internal/app/api/v0/model/models_interface.go +++ b/internal/app/api/v0/model/models_interface.go @@ -4,7 +4,6 @@ import ( "time" "github.com/h44z/wg-portal/internal" - "github.com/h44z/wg-portal/internal/domain" ) diff --git a/internal/app/api/v1/handlers/base.go b/internal/app/api/v1/handlers/base.go index f1d0de7..6772688 100644 --- a/internal/app/api/v1/handlers/base.go +++ b/internal/app/api/v1/handlers/base.go @@ -6,6 +6,7 @@ import ( "github.com/gin-contrib/cors" "github.com/gin-gonic/gin" + "github.com/h44z/wg-portal/internal/app/api/core" "github.com/h44z/wg-portal/internal/app/api/v1/models" "github.com/h44z/wg-portal/internal/domain" diff --git a/internal/app/api/v1/handlers/endpoint_interface.go b/internal/app/api/v1/handlers/endpoint_interface.go index 95e74cd..e1b2cf1 100644 --- a/internal/app/api/v1/handlers/endpoint_interface.go +++ b/internal/app/api/v1/handlers/endpoint_interface.go @@ -5,6 +5,7 @@ import ( "net/http" "github.com/gin-gonic/gin" + "github.com/h44z/wg-portal/internal/app/api/v1/models" "github.com/h44z/wg-portal/internal/domain" ) diff --git a/internal/app/api/v1/handlers/endpoint_metrics.go b/internal/app/api/v1/handlers/endpoint_metrics.go index 4890c76..c9bb2b0 100644 --- a/internal/app/api/v1/handlers/endpoint_metrics.go +++ b/internal/app/api/v1/handlers/endpoint_metrics.go @@ -5,6 +5,7 @@ import ( "net/http" "github.com/gin-gonic/gin" + "github.com/h44z/wg-portal/internal/app/api/v1/models" "github.com/h44z/wg-portal/internal/domain" ) diff --git a/internal/app/api/v1/handlers/endpoint_peer.go b/internal/app/api/v1/handlers/endpoint_peer.go index fa6f334..1f17cf2 100644 --- a/internal/app/api/v1/handlers/endpoint_peer.go +++ b/internal/app/api/v1/handlers/endpoint_peer.go @@ -5,6 +5,7 @@ import ( "net/http" "github.com/gin-gonic/gin" + "github.com/h44z/wg-portal/internal/app/api/v1/models" "github.com/h44z/wg-portal/internal/domain" ) diff --git a/internal/app/api/v1/handlers/endpoint_provisioning.go b/internal/app/api/v1/handlers/endpoint_provisioning.go index f31aed6..548521d 100644 --- a/internal/app/api/v1/handlers/endpoint_provisioning.go +++ b/internal/app/api/v1/handlers/endpoint_provisioning.go @@ -6,6 +6,7 @@ import ( "strings" "github.com/gin-gonic/gin" + "github.com/h44z/wg-portal/internal/app/api/v1/models" "github.com/h44z/wg-portal/internal/domain" ) diff --git a/internal/app/api/v1/handlers/endpoint_user.go b/internal/app/api/v1/handlers/endpoint_user.go index 8b33898..9279487 100644 --- a/internal/app/api/v1/handlers/endpoint_user.go +++ b/internal/app/api/v1/handlers/endpoint_user.go @@ -5,6 +5,7 @@ import ( "net/http" "github.com/gin-gonic/gin" + "github.com/h44z/wg-portal/internal/app/api/v1/models" "github.com/h44z/wg-portal/internal/domain" ) diff --git a/internal/app/api/v1/handlers/middleware_authentication.go b/internal/app/api/v1/handlers/middleware_authentication.go index 514dcab..6a91bc3 100644 --- a/internal/app/api/v1/handlers/middleware_authentication.go +++ b/internal/app/api/v1/handlers/middleware_authentication.go @@ -5,6 +5,7 @@ import ( "net/http" "github.com/gin-gonic/gin" + "github.com/h44z/wg-portal/internal/app/api/v0/model" "github.com/h44z/wg-portal/internal/domain" ) diff --git a/internal/app/app.go b/internal/app/app.go index 11f41ab..977553f 100644 --- a/internal/app/app.go +++ b/internal/app/app.go @@ -6,10 +6,11 @@ import ( "fmt" "time" - "github.com/h44z/wg-portal/internal/config" - "github.com/h44z/wg-portal/internal/domain" "github.com/sirupsen/logrus" evbus "github.com/vardius/message-bus" + + "github.com/h44z/wg-portal/internal/config" + "github.com/h44z/wg-portal/internal/domain" ) type App struct { diff --git a/internal/app/audit/recorder.go b/internal/app/audit/recorder.go index 8373acd..50decbc 100644 --- a/internal/app/audit/recorder.go +++ b/internal/app/audit/recorder.go @@ -3,12 +3,14 @@ package audit import ( "context" "fmt" + "time" + + "github.com/sirupsen/logrus" + evbus "github.com/vardius/message-bus" + "github.com/h44z/wg-portal/internal/app" "github.com/h44z/wg-portal/internal/config" "github.com/h44z/wg-portal/internal/domain" - "github.com/sirupsen/logrus" - evbus "github.com/vardius/message-bus" - "time" ) type Recorder struct { diff --git a/internal/app/audit/repos.go b/internal/app/audit/repos.go index 965ea2e..d64b49b 100644 --- a/internal/app/audit/repos.go +++ b/internal/app/audit/repos.go @@ -2,6 +2,7 @@ package audit import ( "context" + "github.com/h44z/wg-portal/internal/domain" ) diff --git a/internal/app/auth/auth.go b/internal/app/auth/auth.go index f3098e1..6076237 100644 --- a/internal/app/auth/auth.go +++ b/internal/app/auth/auth.go @@ -13,11 +13,12 @@ import ( "time" "github.com/coreos/go-oidc/v3/oidc" + "github.com/sirupsen/logrus" + evbus "github.com/vardius/message-bus" + "github.com/h44z/wg-portal/internal/app" "github.com/h44z/wg-portal/internal/config" "github.com/h44z/wg-portal/internal/domain" - "github.com/sirupsen/logrus" - evbus "github.com/vardius/message-bus" ) type UserManager interface { @@ -412,7 +413,7 @@ func (a *Authenticator) registerNewUser( return user, nil } -func (a *Authenticator) getAuthenticatorConfig(id string) (interface{}, error) { +func (a *Authenticator) getAuthenticatorConfig(id string) (any, error) { for i := range a.cfg.OpenIDConnect { if a.cfg.OpenIDConnect[i].ProviderName == id { return a.cfg.OpenIDConnect[i], nil diff --git a/internal/app/auth/auth_ldap.go b/internal/app/auth/auth_ldap.go index 177c920..1e9d144 100644 --- a/internal/app/auth/auth_ldap.go +++ b/internal/app/auth/auth_ldap.go @@ -7,10 +7,11 @@ import ( "strings" "github.com/go-ldap/ldap/v3" + "github.com/sirupsen/logrus" + "github.com/h44z/wg-portal/internal" "github.com/h44z/wg-portal/internal/config" "github.com/h44z/wg-portal/internal/domain" - "github.com/sirupsen/logrus" ) type LdapAuthenticator struct { @@ -81,7 +82,7 @@ func (l LdapAuthenticator) PlaintextAuthentication(userId domain.UserIdentifier, } func (l LdapAuthenticator) GetUserInfo(_ context.Context, userId domain.UserIdentifier) ( - map[string]interface{}, + map[string]any, error, ) { conn, err := internal.LdapConnect(l.cfg) @@ -122,7 +123,7 @@ func (l LdapAuthenticator) GetUserInfo(_ context.Context, userId domain.UserIden return users[0], nil } -func (l LdapAuthenticator) ParseUserInfo(raw map[string]interface{}) (*domain.AuthenticatorUserInfo, error) { +func (l LdapAuthenticator) ParseUserInfo(raw map[string]any) (*domain.AuthenticatorUserInfo, error) { isAdmin, err := internal.LdapIsMemberOf(raw[l.cfg.FieldMap.GroupMembership].([][]byte), l.cfg.ParsedAdminGroupDN) if err != nil { return nil, fmt.Errorf("failed to check admin group: %w", err) diff --git a/internal/app/auth/auth_oauth.go b/internal/app/auth/auth_oauth.go index 14b3ae7..1604a23 100644 --- a/internal/app/auth/auth_oauth.go +++ b/internal/app/auth/auth_oauth.go @@ -8,10 +8,12 @@ import ( "net/http" "time" - "github.com/h44z/wg-portal/internal/config" - "github.com/h44z/wg-portal/internal/domain" "github.com/sirupsen/logrus" "golang.org/x/oauth2" + + "github.com/h44z/wg-portal/internal" + "github.com/h44z/wg-portal/internal/config" + "github.com/h44z/wg-portal/internal/domain" ) type PlainOauthAuthenticator struct { @@ -84,7 +86,7 @@ func (p PlainOauthAuthenticator) GetUserInfo( ctx context.Context, token *oauth2.Token, _ string, -) (map[string]interface{}, error) { +) (map[string]any, error) { req, err := http.NewRequest("GET", p.userInfoEndpoint, nil) if err != nil { return nil, fmt.Errorf("failed to create user info get request: %w", err) @@ -96,13 +98,13 @@ func (p PlainOauthAuthenticator) GetUserInfo( if err != nil { return nil, fmt.Errorf("failed to get user info: %w", err) } - defer response.Body.Close() + defer internal.LogClose(response.Body) contents, err := io.ReadAll(response.Body) if err != nil { return nil, fmt.Errorf("failed to read response body: %w", err) } - var userFields map[string]interface{} + var userFields map[string]any err = json.Unmarshal(contents, &userFields) if err != nil { return nil, fmt.Errorf("failed to parse user info: %w", err) @@ -115,6 +117,6 @@ func (p PlainOauthAuthenticator) GetUserInfo( return userFields, nil } -func (p PlainOauthAuthenticator) ParseUserInfo(raw map[string]interface{}) (*domain.AuthenticatorUserInfo, error) { +func (p PlainOauthAuthenticator) ParseUserInfo(raw map[string]any) (*domain.AuthenticatorUserInfo, error) { return parseOauthUserInfo(p.userInfoMapping, p.userAdminMapping, raw) } diff --git a/internal/app/auth/auth_oidc.go b/internal/app/auth/auth_oidc.go index 974bdf7..03210ba 100644 --- a/internal/app/auth/auth_oidc.go +++ b/internal/app/auth/auth_oidc.go @@ -7,10 +7,11 @@ import ( "fmt" "github.com/coreos/go-oidc/v3/oidc" - "github.com/h44z/wg-portal/internal/config" - "github.com/h44z/wg-portal/internal/domain" "github.com/sirupsen/logrus" "golang.org/x/oauth2" + + "github.com/h44z/wg-portal/internal/config" + "github.com/h44z/wg-portal/internal/domain" ) type OidcAuthenticator struct { @@ -83,7 +84,7 @@ func (o OidcAuthenticator) Exchange(ctx context.Context, code string, opts ...oa } func (o OidcAuthenticator) GetUserInfo(ctx context.Context, token *oauth2.Token, nonce string) ( - map[string]interface{}, + map[string]any, error, ) { rawIDToken, ok := token.Extra("id_token").(string) @@ -98,7 +99,7 @@ func (o OidcAuthenticator) GetUserInfo(ctx context.Context, token *oauth2.Token, return nil, errors.New("nonce mismatch") } - var tokenFields map[string]interface{} + var tokenFields map[string]any if err = idToken.Claims(&tokenFields); err != nil { return nil, fmt.Errorf("failed to parse extra claims: %w", err) } @@ -111,6 +112,6 @@ func (o OidcAuthenticator) GetUserInfo(ctx context.Context, token *oauth2.Token, return tokenFields, nil } -func (o OidcAuthenticator) ParseUserInfo(raw map[string]interface{}) (*domain.AuthenticatorUserInfo, error) { +func (o OidcAuthenticator) ParseUserInfo(raw map[string]any) (*domain.AuthenticatorUserInfo, error) { return parseOauthUserInfo(o.userInfoMapping, o.userAdminMapping, raw) } diff --git a/internal/app/auth/oauth_common.go b/internal/app/auth/oauth_common.go index 7f610e1..b5927cc 100644 --- a/internal/app/auth/oauth_common.go +++ b/internal/app/auth/oauth_common.go @@ -12,7 +12,7 @@ import ( func parseOauthUserInfo( mapping config.OauthFields, adminMapping *config.OauthAdminMapping, - raw map[string]interface{}, + raw map[string]any, ) (*domain.AuthenticatorUserInfo, error) { var isAdmin bool diff --git a/internal/app/auth/oauth_common_test.go b/internal/app/auth/oauth_common_test.go index cccf02f..0bcca98 100644 --- a/internal/app/auth/oauth_common_test.go +++ b/internal/app/auth/oauth_common_test.go @@ -4,9 +4,10 @@ import ( "encoding/json" "testing" - "github.com/h44z/wg-portal/internal/config" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + + "github.com/h44z/wg-portal/internal/config" ) func Test_parseOauthUserInfo_no_admin(t *testing.T) { @@ -26,7 +27,7 @@ func Test_parseOauthUserInfo_no_admin(t *testing.T) { } ` - userInfo := map[string]interface{}{} + userInfo := map[string]any{} err := json.Unmarshal([]byte(userInfoStr), &userInfo) require.NoError(t, err) @@ -72,7 +73,7 @@ func Test_parseOauthUserInfo_admin_group(t *testing.T) { } ` - userInfo := map[string]interface{}{} + userInfo := map[string]any{} err := json.Unmarshal([]byte(userInfoStr), &userInfo) require.NoError(t, err) @@ -115,7 +116,7 @@ func Test_parseOauthUserInfo_admin_value(t *testing.T) { } ` - userInfo := map[string]interface{}{} + userInfo := map[string]any{} err := json.Unmarshal([]byte(userInfoStr), &userInfo) require.NoError(t, err) @@ -156,7 +157,7 @@ func Test_parseOauthUserInfo_admin_value_custom(t *testing.T) { } ` - userInfo := map[string]interface{}{} + userInfo := map[string]any{} err := json.Unmarshal([]byte(userInfoStr), &userInfo) require.NoError(t, err) diff --git a/internal/app/cli.go b/internal/app/cli.go index 110798e..c1ada04 100644 --- a/internal/app/cli.go +++ b/internal/app/cli.go @@ -2,13 +2,16 @@ package app import ( "flag" - "github.com/h44z/wg-portal/internal/config" + "gorm.io/gorm" + + "github.com/h44z/wg-portal/internal/config" ) func HandleProgramArgs(cfg *config.Config, db *gorm.DB) (exit bool, err error) { migrationSource := flag.String("migrateFrom", "", "path to v1 database file or DSN") - migrationDbType := flag.String("migrateFromType", string(config.DatabaseSQLite), "old database type, either mysql, mssql, postgres or sqlite") + migrationDbType := flag.String("migrateFromType", string(config.DatabaseSQLite), + "old database type, either mysql, mssql, postgres or sqlite") flag.Parse() if *migrationSource != "" { diff --git a/internal/app/configfile/manager.go b/internal/app/configfile/manager.go index 9a7269c..e5c624f 100644 --- a/internal/app/configfile/manager.go +++ b/internal/app/configfile/manager.go @@ -9,13 +9,14 @@ import ( "os" "strings" - "github.com/h44z/wg-portal/internal/app" - "github.com/h44z/wg-portal/internal/config" - "github.com/h44z/wg-portal/internal/domain" "github.com/sirupsen/logrus" evbus "github.com/vardius/message-bus" "github.com/yeqown/go-qrcode/v2" "github.com/yeqown/go-qrcode/writer/compressed" + + "github.com/h44z/wg-portal/internal/app" + "github.com/h44z/wg-portal/internal/config" + "github.com/h44z/wg-portal/internal/domain" ) type Manager struct { diff --git a/internal/app/configfile/repos.go b/internal/app/configfile/repos.go index e43687b..c7c9b30 100644 --- a/internal/app/configfile/repos.go +++ b/internal/app/configfile/repos.go @@ -2,8 +2,9 @@ package configfile import ( "context" - "github.com/h44z/wg-portal/internal/domain" "io" + + "github.com/h44z/wg-portal/internal/domain" ) type UserDatabaseRepo interface { diff --git a/internal/app/configfile/template.go b/internal/app/configfile/template.go index 8f4e9ae..5d2bdde 100644 --- a/internal/app/configfile/template.go +++ b/internal/app/configfile/template.go @@ -37,10 +37,10 @@ func newTemplateHandler() (*TemplateHandler, error) { func (c TemplateHandler) GetInterfaceConfig(cfg *domain.Interface, peers []domain.Peer) (io.Reader, error) { var tplBuff bytes.Buffer - err := c.templates.ExecuteTemplate(&tplBuff, "wg_interface.tpl", map[string]interface{}{ + err := c.templates.ExecuteTemplate(&tplBuff, "wg_interface.tpl", map[string]any{ "Interface": cfg, "Peers": peers, - "Portal": map[string]interface{}{ + "Portal": map[string]any{ "Version": "unknown", }, }) @@ -54,9 +54,9 @@ func (c TemplateHandler) GetInterfaceConfig(cfg *domain.Interface, peers []domai func (c TemplateHandler) GetPeerConfig(peer *domain.Peer) (io.Reader, error) { var tplBuff bytes.Buffer - err := c.templates.ExecuteTemplate(&tplBuff, "wg_peer.tpl", map[string]interface{}{ + err := c.templates.ExecuteTemplate(&tplBuff, "wg_peer.tpl", map[string]any{ "Peer": peer, - "Portal": map[string]interface{}{ + "Portal": map[string]any{ "Version": "unknown", }, }) diff --git a/internal/app/mail/manager.go b/internal/app/mail/manager.go index 3f54bd4..6ef868f 100644 --- a/internal/app/mail/manager.go +++ b/internal/app/mail/manager.go @@ -3,10 +3,12 @@ package mail import ( "context" "fmt" + "io" + + "github.com/sirupsen/logrus" + "github.com/h44z/wg-portal/internal/config" "github.com/h44z/wg-portal/internal/domain" - "github.com/sirupsen/logrus" - "io" ) type Manager struct { @@ -19,7 +21,13 @@ type Manager struct { wg WireguardDatabaseRepo } -func NewMailManager(cfg *config.Config, mailer Mailer, configFiles ConfigFileManager, users UserDatabaseRepo, wg WireguardDatabaseRepo) (*Manager, error) { +func NewMailManager( + cfg *config.Config, + mailer Mailer, + configFiles ConfigFileManager, + users UserDatabaseRepo, + wg WireguardDatabaseRepo, +) (*Manager, error) { tplHandler, err := newTemplateHandler(cfg.Web.ExternalUrl) if err != nil { return nil, fmt.Errorf("failed to initialize template handler: %w", err) diff --git a/internal/app/mail/repos.go b/internal/app/mail/repos.go index 9eb0f04..79b3ea9 100644 --- a/internal/app/mail/repos.go +++ b/internal/app/mail/repos.go @@ -2,8 +2,9 @@ package mail import ( "context" - "github.com/h44z/wg-portal/internal/domain" "io" + + "github.com/h44z/wg-portal/internal/domain" ) type Mailer interface { diff --git a/internal/app/mail/template.go b/internal/app/mail/template.go index 979bdd2..3aea4de 100644 --- a/internal/app/mail/template.go +++ b/internal/app/mail/template.go @@ -44,7 +44,7 @@ func (c TemplateHandler) GetConfigMail(user *domain.User, link string) (io.Reade var tplBuff bytes.Buffer var htmlTplBuff bytes.Buffer - err := c.textTemplates.ExecuteTemplate(&tplBuff, "mail_with_link.gotpl", map[string]interface{}{ + err := c.textTemplates.ExecuteTemplate(&tplBuff, "mail_with_link.gotpl", map[string]any{ "User": user, "Link": link, "PortalUrl": c.portalUrl, @@ -53,7 +53,7 @@ func (c TemplateHandler) GetConfigMail(user *domain.User, link string) (io.Reade return nil, nil, fmt.Errorf("failed to execute template mail_with_link.gotpl: %w", err) } - err = c.htmlTemplates.ExecuteTemplate(&htmlTplBuff, "mail_with_link.gohtml", map[string]interface{}{ + err = c.htmlTemplates.ExecuteTemplate(&htmlTplBuff, "mail_with_link.gohtml", map[string]any{ "User": user, "Link": link, "PortalUrl": c.portalUrl, @@ -65,11 +65,15 @@ func (c TemplateHandler) GetConfigMail(user *domain.User, link string) (io.Reade return &tplBuff, &htmlTplBuff, nil } -func (c TemplateHandler) GetConfigMailWithAttachment(user *domain.User, cfgName, qrName string) (io.Reader, io.Reader, error) { +func (c TemplateHandler) GetConfigMailWithAttachment(user *domain.User, cfgName, qrName string) ( + io.Reader, + io.Reader, + error, +) { var tplBuff bytes.Buffer var htmlTplBuff bytes.Buffer - err := c.textTemplates.ExecuteTemplate(&tplBuff, "mail_with_attachment.gotpl", map[string]interface{}{ + err := c.textTemplates.ExecuteTemplate(&tplBuff, "mail_with_attachment.gotpl", map[string]any{ "User": user, "ConfigFileName": cfgName, "QrcodePngName": qrName, @@ -79,7 +83,7 @@ func (c TemplateHandler) GetConfigMailWithAttachment(user *domain.User, cfgName, return nil, nil, fmt.Errorf("failed to execute template mail_with_attachment.gotpl: %w", err) } - err = c.htmlTemplates.ExecuteTemplate(&htmlTplBuff, "mail_with_attachment.gohtml", map[string]interface{}{ + err = c.htmlTemplates.ExecuteTemplate(&htmlTplBuff, "mail_with_attachment.gohtml", map[string]any{ "User": user, "ConfigFileName": cfgName, "QrcodePngName": qrName, diff --git a/internal/app/migrate_v1.go b/internal/app/migrate_v1.go index 27902c0..bb1fbda 100644 --- a/internal/app/migrate_v1.go +++ b/internal/app/migrate_v1.go @@ -6,11 +6,12 @@ import ( "os" "time" + "github.com/sirupsen/logrus" + "gorm.io/gorm" + "github.com/h44z/wg-portal/internal/adapters" "github.com/h44z/wg-portal/internal/config" "github.com/h44z/wg-portal/internal/domain" - "github.com/sirupsen/logrus" - "gorm.io/gorm" ) func migrateFromV1(cfg *config.Config, db *gorm.DB, source, typ string) error { diff --git a/internal/app/route/repos.go b/internal/app/route/repos.go index b6e0a5c..e9eb533 100644 --- a/internal/app/route/repos.go +++ b/internal/app/route/repos.go @@ -2,6 +2,7 @@ package route import ( "context" + "github.com/h44z/wg-portal/internal/domain" ) diff --git a/internal/app/route/routes.go b/internal/app/route/routes.go index 9d94d5b..aa511fb 100644 --- a/internal/app/route/routes.go +++ b/internal/app/route/routes.go @@ -4,16 +4,17 @@ import ( "context" "fmt" - "github.com/h44z/wg-portal/internal/app" - "github.com/h44z/wg-portal/internal/config" - "github.com/h44z/wg-portal/internal/domain" - "github.com/h44z/wg-portal/internal/lowlevel" "github.com/sirupsen/logrus" evbus "github.com/vardius/message-bus" "github.com/vishvananda/netlink" "golang.org/x/sys/unix" "golang.zx2c4.com/wireguard/wgctrl" "golang.zx2c4.com/wireguard/wgctrl/wgtypes" + + "github.com/h44z/wg-portal/internal/app" + "github.com/h44z/wg-portal/internal/config" + "github.com/h44z/wg-portal/internal/domain" + "github.com/h44z/wg-portal/internal/lowlevel" ) type routeRuleInfo struct { diff --git a/internal/app/users/ldap_helper.go b/internal/app/users/ldap_helper.go index dfd75b6..938af35 100644 --- a/internal/app/users/ldap_helper.go +++ b/internal/app/users/ldap_helper.go @@ -6,6 +6,7 @@ import ( "time" "github.com/go-ldap/ldap/v3" + "github.com/h44z/wg-portal/internal" "github.com/h44z/wg-portal/internal/config" "github.com/h44z/wg-portal/internal/domain" diff --git a/internal/app/users/user_manager.go b/internal/app/users/user_manager.go index 03c0358..3db15bb 100644 --- a/internal/app/users/user_manager.go +++ b/internal/app/users/user_manager.go @@ -8,17 +8,13 @@ import ( "sync" "time" - "github.com/google/uuid" - "github.com/h44z/wg-portal/internal/app" - - "github.com/h44z/wg-portal/internal" - "github.com/go-ldap/ldap/v3" - + "github.com/google/uuid" "github.com/sirupsen/logrus" - evbus "github.com/vardius/message-bus" + "github.com/h44z/wg-portal/internal" + "github.com/h44z/wg-portal/internal/app" "github.com/h44z/wg-portal/internal/config" "github.com/h44z/wg-portal/internal/domain" ) @@ -509,7 +505,7 @@ func (m Manager) updateLdapUsers( if existingUser == nil { // create new user logrus.Tracef("creating new user %s from provider %s...", user.Identifier, provider.ProviderName) - + err := m.NewUser(tctx, user) if err != nil { cancel() diff --git a/internal/app/wireguard/statistics.go b/internal/app/wireguard/statistics.go index a9e2983..c891741 100644 --- a/internal/app/wireguard/statistics.go +++ b/internal/app/wireguard/statistics.go @@ -5,12 +5,13 @@ import ( "sync" "time" - "github.com/h44z/wg-portal/internal/app" - "github.com/h44z/wg-portal/internal/config" - "github.com/h44z/wg-portal/internal/domain" probing "github.com/prometheus-community/pro-bing" "github.com/sirupsen/logrus" evbus "github.com/vardius/message-bus" + + "github.com/h44z/wg-portal/internal/app" + "github.com/h44z/wg-portal/internal/config" + "github.com/h44z/wg-portal/internal/domain" ) type StatisticsCollector struct { diff --git a/internal/app/wireguard/wireguard.go b/internal/app/wireguard/wireguard.go index ab8a007..07f2b09 100644 --- a/internal/app/wireguard/wireguard.go +++ b/internal/app/wireguard/wireguard.go @@ -4,11 +4,10 @@ import ( "context" "time" - "github.com/h44z/wg-portal/internal/app" "github.com/sirupsen/logrus" - evbus "github.com/vardius/message-bus" + "github.com/h44z/wg-portal/internal/app" "github.com/h44z/wg-portal/internal/config" "github.com/h44z/wg-portal/internal/domain" ) diff --git a/internal/app/wireguard/wireguard_interfaces.go b/internal/app/wireguard/wireguard_interfaces.go index 02f9e3d..15c2c9a 100644 --- a/internal/app/wireguard/wireguard_interfaces.go +++ b/internal/app/wireguard/wireguard_interfaces.go @@ -5,12 +5,13 @@ import ( "errors" "fmt" "os" + "slices" "time" - "github.com/h44z/wg-portal/internal" + "github.com/sirupsen/logrus" + "github.com/h44z/wg-portal/internal/app" "github.com/h44z/wg-portal/internal/domain" - "github.com/sirupsen/logrus" ) func (m Manager) GetImportableInterfaces(ctx context.Context) ([]domain.PhysicalInterface, error) { @@ -120,11 +121,11 @@ func (m Manager) ImportNewInterfaces(ctx context.Context, filter ...domain.Inter imported := 0 for _, physicalInterface := range physicalInterfaces { - if internal.SliceContains(excludedInterfaces, physicalInterface.Identifier) { + if slices.Contains(excludedInterfaces, physicalInterface.Identifier) { continue } - if len(filter) != 0 && !internal.SliceContains(filter, physicalInterface.Identifier) { + if len(filter) != 0 && !slices.Contains(filter, physicalInterface.Identifier) { continue } @@ -193,7 +194,7 @@ func (m Manager) RestoreInterfaceState( } for _, iface := range interfaces { - if len(filter) != 0 && !internal.SliceContains(filter, iface.Identifier) { + if len(filter) != 0 && !slices.Contains(filter, iface.Identifier) { continue // ignore filtered interface } diff --git a/internal/app/wireguard/wireguard_peers.go b/internal/app/wireguard/wireguard_peers.go index 0696bf5..fb679c7 100644 --- a/internal/app/wireguard/wireguard_peers.go +++ b/internal/app/wireguard/wireguard_peers.go @@ -6,9 +6,10 @@ import ( "fmt" "time" + "github.com/sirupsen/logrus" + "github.com/h44z/wg-portal/internal/app" "github.com/h44z/wg-portal/internal/domain" - "github.com/sirupsen/logrus" ) func (m Manager) CreateDefaultPeer(ctx context.Context, userId domain.UserIdentifier) error { diff --git a/internal/config/config.go b/internal/config/config.go index bf2f837..3336086 100644 --- a/internal/config/config.go +++ b/internal/config/config.go @@ -7,7 +7,6 @@ import ( "github.com/a8m/envsubst" "github.com/sirupsen/logrus" - "gopkg.in/yaml.v2" ) diff --git a/internal/domain/auth.go b/internal/domain/auth.go index 2173e33..f501ec7 100644 --- a/internal/domain/auth.go +++ b/internal/domain/auth.go @@ -37,15 +37,15 @@ type OauthAuthenticator interface { GetType() AuthenticatorType AuthCodeURL(state string, opts ...oauth2.AuthCodeOption) string Exchange(ctx context.Context, code string, opts ...oauth2.AuthCodeOption) (*oauth2.Token, error) - GetUserInfo(ctx context.Context, token *oauth2.Token, nonce string) (map[string]interface{}, error) - ParseUserInfo(raw map[string]interface{}) (*AuthenticatorUserInfo, error) + GetUserInfo(ctx context.Context, token *oauth2.Token, nonce string) (map[string]any, error) + ParseUserInfo(raw map[string]any) (*AuthenticatorUserInfo, error) RegistrationEnabled() bool } type LdapAuthenticator interface { GetName() string PlaintextAuthentication(userId UserIdentifier, plainPassword string) error - GetUserInfo(ctx context.Context, username UserIdentifier) (map[string]interface{}, error) - ParseUserInfo(raw map[string]interface{}) (*AuthenticatorUserInfo, error) + GetUserInfo(ctx context.Context, username UserIdentifier) (map[string]any, error) + ParseUserInfo(raw map[string]any) (*AuthenticatorUserInfo, error) RegistrationEnabled() bool } diff --git a/internal/domain/base.go b/internal/domain/base.go index d2a67d8..5512baa 100644 --- a/internal/domain/base.go +++ b/internal/domain/base.go @@ -15,22 +15,25 @@ type BaseModel struct { type PrivateString string -func (PrivateString) MarshalJSON() ([]byte, error) { +func (ps *PrivateString) MarshalJSON() ([]byte, error) { return []byte(`""`), nil } -func (PrivateString) String() string { +func (ps *PrivateString) String() string { return "" } -func (ps PrivateString) Value() (driver.Value, error) { - if len(ps) == 0 { +func (ps *PrivateString) Value() (driver.Value, error) { + if ps == nil { return nil, nil } - return string(ps), nil + if len(*ps) == 0 { + return nil, nil + } + return string(*ps), nil } -func (ps *PrivateString) Scan(value interface{}) error { +func (ps *PrivateString) Scan(value any) error { if value == nil { *ps = "" return nil diff --git a/internal/domain/context.go b/internal/domain/context.go index 80b1fb1..4bb9ac1 100644 --- a/internal/domain/context.go +++ b/internal/domain/context.go @@ -4,9 +4,8 @@ import ( "context" "fmt" - "github.com/sirupsen/logrus" - "github.com/gin-gonic/gin" + "github.com/sirupsen/logrus" ) const CtxUserInfo = "userInfo" diff --git a/internal/domain/crypto.go b/internal/domain/crypto.go index 8f029d3..165a107 100644 --- a/internal/domain/crypto.go +++ b/internal/domain/crypto.go @@ -54,10 +54,6 @@ func NewPreSharedKey() (PreSharedKey, error) { return PreSharedKey(preSharedKey.String()), nil } -func KeyBytesToString(key []byte) string { - return base64.StdEncoding.EncodeToString(key) -} - func PublicKeyFromPrivateKey(key string) string { privKey, err := wgtypes.ParseKey(key) if err != nil { diff --git a/internal/domain/interface.go b/internal/domain/interface.go index 892aaef..32471d2 100644 --- a/internal/domain/interface.go +++ b/internal/domain/interface.go @@ -9,8 +9,9 @@ import ( "strings" "time" - "github.com/h44z/wg-portal/internal" "github.com/sirupsen/logrus" + + "github.com/h44z/wg-portal/internal" ) const ( @@ -19,6 +20,8 @@ const ( InterfaceTypeAny InterfaceType = "any" ) +var allowedFileNameRegex = regexp.MustCompile("[^a-zA-Z0-9-_]+") + type InterfaceIdentifier string type InterfaceType string @@ -119,10 +122,8 @@ func (i *Interface) CopyCalculatedAttributes(src *Interface) { } func (i *Interface) GetConfigFileName() string { - reg := regexp.MustCompile("[^a-zA-Z0-9-_]+") - filename := internal.TruncateString(string(i.Identifier), 8) - filename = reg.ReplaceAllString(filename, "") + filename = allowedFileNameRegex.ReplaceAllString(filename, "") filename += ".conf" return filename diff --git a/internal/domain/ip.go b/internal/domain/ip.go index 1d48a68..ee67413 100644 --- a/internal/domain/ip.go +++ b/internal/domain/ip.go @@ -1,10 +1,11 @@ package domain import ( - "github.com/vishvananda/netlink" "net" "net/netip" "strings" + + "github.com/vishvananda/netlink" ) type Cidr struct { @@ -48,14 +49,6 @@ func CidrsFromString(str string) ([]Cidr, error) { return cidrs, nil } -func CidrsMust(cidrs []Cidr, err error) []Cidr { - if err != nil { - panic(err) - } - - return cidrs -} - func CidrsFromArray(strs []string) ([]Cidr, error) { cidrs := make([]Cidr, len(strs)) diff --git a/internal/domain/peer.go b/internal/domain/peer.go index 34dfab6..78cf2d7 100644 --- a/internal/domain/peer.go +++ b/internal/domain/peer.go @@ -7,9 +7,9 @@ import ( "strings" "time" - "github.com/h44z/wg-portal/internal" - "golang.zx2c4.com/wireguard/wgctrl/wgtypes" + + "github.com/h44z/wg-portal/internal" ) type PeerIdentifier string diff --git a/internal/domain/user.go b/internal/domain/user.go index 9e0c38f..c85e78e 100644 --- a/internal/domain/user.go +++ b/internal/domain/user.go @@ -83,8 +83,7 @@ func (u *User) EditAllowed(new *User) error { } // for users which are not database users, only the notes field and the disabled flag can be updated - updateOk := true - updateOk = updateOk && u.Identifier == new.Identifier + updateOk := u.Identifier == new.Identifier updateOk = updateOk && u.Source == new.Source updateOk = updateOk && u.IsAdmin == new.IsAdmin updateOk = updateOk && u.Email == new.Email diff --git a/internal/ldap_utils.go b/internal/ldap_utils.go index fb6033f..26d4b9e 100644 --- a/internal/ldap_utils.go +++ b/internal/ldap_utils.go @@ -5,9 +5,9 @@ import ( "fmt" "os" + "github.com/go-ldap/ldap/v3" "github.com/sirupsen/logrus" - "github.com/go-ldap/ldap/v3" "github.com/h44z/wg-portal/internal/config" ) diff --git a/internal/lowlevel/mocks/NetlinkClient.go b/internal/lowlevel/mocks/NetlinkClient.go deleted file mode 100644 index 2922725..0000000 --- a/internal/lowlevel/mocks/NetlinkClient.go +++ /dev/null @@ -1,157 +0,0 @@ -// Code generated by mockery v2.10.0. DO NOT EDIT. - -package mocks - -import ( - mock "github.com/stretchr/testify/mock" - netlink "github.com/vishvananda/netlink" -) - -// NetlinkClient is an autogenerated mock type for the NetlinkClient type -type NetlinkClient struct { - mock.Mock -} - -// AddrAdd provides a mock function with given fields: link, addr -func (_m *NetlinkClient) AddrAdd(link netlink.Link, addr *netlink.Addr) error { - ret := _m.Called(link, addr) - - var r0 error - if rf, ok := ret.Get(0).(func(netlink.Link, *netlink.Addr) error); ok { - r0 = rf(link, addr) - } else { - r0 = ret.Error(0) - } - - return r0 -} - -// AddrList provides a mock function with given fields: link -func (_m *NetlinkClient) AddrList(link netlink.Link) ([]netlink.Addr, error) { - ret := _m.Called(link) - - var r0 []netlink.Addr - if rf, ok := ret.Get(0).(func(netlink.Link) []netlink.Addr); ok { - r0 = rf(link) - } else { - if ret.Get(0) != nil { - r0 = ret.Get(0).([]netlink.Addr) - } - } - - var r1 error - if rf, ok := ret.Get(1).(func(netlink.Link) error); ok { - r1 = rf(link) - } else { - r1 = ret.Error(1) - } - - return r0, r1 -} - -// AddrReplace provides a mock function with given fields: link, addr -func (_m *NetlinkClient) AddrReplace(link netlink.Link, addr *netlink.Addr) error { - ret := _m.Called(link, addr) - - var r0 error - if rf, ok := ret.Get(0).(func(netlink.Link, *netlink.Addr) error); ok { - r0 = rf(link, addr) - } else { - r0 = ret.Error(0) - } - - return r0 -} - -// LinkAdd provides a mock function with given fields: link -func (_m *NetlinkClient) LinkAdd(link netlink.Link) error { - ret := _m.Called(link) - - var r0 error - if rf, ok := ret.Get(0).(func(netlink.Link) error); ok { - r0 = rf(link) - } else { - r0 = ret.Error(0) - } - - return r0 -} - -// LinkByName provides a mock function with given fields: name -func (_m *NetlinkClient) LinkByName(name string) (netlink.Link, error) { - ret := _m.Called(name) - - var r0 netlink.Link - if rf, ok := ret.Get(0).(func(string) netlink.Link); ok { - r0 = rf(name) - } else { - if ret.Get(0) != nil { - r0 = ret.Get(0).(netlink.Link) - } - } - - var r1 error - if rf, ok := ret.Get(1).(func(string) error); ok { - r1 = rf(name) - } else { - r1 = ret.Error(1) - } - - return r0, r1 -} - -// LinkDel provides a mock function with given fields: link -func (_m *NetlinkClient) LinkDel(link netlink.Link) error { - ret := _m.Called(link) - - var r0 error - if rf, ok := ret.Get(0).(func(netlink.Link) error); ok { - r0 = rf(link) - } else { - r0 = ret.Error(0) - } - - return r0 -} - -// LinkSetDown provides a mock function with given fields: link -func (_m *NetlinkClient) LinkSetDown(link netlink.Link) error { - ret := _m.Called(link) - - var r0 error - if rf, ok := ret.Get(0).(func(netlink.Link) error); ok { - r0 = rf(link) - } else { - r0 = ret.Error(0) - } - - return r0 -} - -// LinkSetMTU provides a mock function with given fields: link, mtu -func (_m *NetlinkClient) LinkSetMTU(link netlink.Link, mtu int) error { - ret := _m.Called(link, mtu) - - var r0 error - if rf, ok := ret.Get(0).(func(netlink.Link, int) error); ok { - r0 = rf(link, mtu) - } else { - r0 = ret.Error(0) - } - - return r0 -} - -// LinkSetUp provides a mock function with given fields: link -func (_m *NetlinkClient) LinkSetUp(link netlink.Link) error { - ret := _m.Called(link) - - var r0 error - if rf, ok := ret.Get(0).(func(netlink.Link) error); ok { - r0 = rf(link) - } else { - r0 = ret.Error(0) - } - - return r0 -} diff --git a/internal/lowlevel/mocks/WireGuardClient.go b/internal/lowlevel/mocks/WireGuardClient.go deleted file mode 100644 index e566b3c..0000000 --- a/internal/lowlevel/mocks/WireGuardClient.go +++ /dev/null @@ -1,87 +0,0 @@ -// Code generated by mockery v2.10.0. DO NOT EDIT. - -package mocks - -import ( - mock "github.com/stretchr/testify/mock" - wgtypes "golang.zx2c4.com/wireguard/wgctrl/wgtypes" -) - -// WireGuardClient is an autogenerated mock type for the WireGuardClient type -type WireGuardClient struct { - mock.Mock -} - -// Close provides a mock function with given fields: -func (_m *WireGuardClient) Close() error { - ret := _m.Called() - - var r0 error - if rf, ok := ret.Get(0).(func() error); ok { - r0 = rf() - } else { - r0 = ret.Error(0) - } - - return r0 -} - -// ConfigureDevice provides a mock function with given fields: name, cfg -func (_m *WireGuardClient) ConfigureDevice(name string, cfg wgtypes.Config) error { - ret := _m.Called(name, cfg) - - var r0 error - if rf, ok := ret.Get(0).(func(string, wgtypes.Config) error); ok { - r0 = rf(name, cfg) - } else { - r0 = ret.Error(0) - } - - return r0 -} - -// Device provides a mock function with given fields: name -func (_m *WireGuardClient) Device(name string) (*wgtypes.Device, error) { - ret := _m.Called(name) - - var r0 *wgtypes.Device - if rf, ok := ret.Get(0).(func(string) *wgtypes.Device); ok { - r0 = rf(name) - } else { - if ret.Get(0) != nil { - r0 = ret.Get(0).(*wgtypes.Device) - } - } - - var r1 error - if rf, ok := ret.Get(1).(func(string) error); ok { - r1 = rf(name) - } else { - r1 = ret.Error(1) - } - - return r0, r1 -} - -// Devices provides a mock function with given fields: -func (_m *WireGuardClient) Devices() ([]*wgtypes.Device, error) { - ret := _m.Called() - - var r0 []*wgtypes.Device - if rf, ok := ret.Get(0).(func() []*wgtypes.Device); ok { - r0 = rf() - } else { - if ret.Get(0) != nil { - r0 = ret.Get(0).([]*wgtypes.Device) - } - } - - var r1 error - if rf, ok := ret.Get(1).(func() error); ok { - r1 = rf() - } else { - r1 = ret.Error(1) - } - - return r0, r1 -} diff --git a/internal/util.go b/internal/util.go index cd2d4bd..d8cbac7 100644 --- a/internal/util.go +++ b/internal/util.go @@ -3,12 +3,22 @@ package internal import ( "context" "fmt" + "io" "os" "os/signal" "strings" "syscall" + + "github.com/sirupsen/logrus" ) +// LogClose closes the given Closer and logs any error that occurs +func LogClose(c io.Closer) { + if err := c.Close(); err != nil { + logrus.Errorf("error during Close(): %v", err) + } +} + // SignalAwareContext returns a context that gets closed once a given signal is retrieved. // By default, the following signals are handled: syscall.SIGINT, syscall.SIGTERM, syscall.SIGHUP func SignalAwareContext(ctx context.Context, sig ...os.Signal) context.Context { @@ -45,23 +55,8 @@ func AssertNoError(err error) { } } -// ByteCountSI returns the byte count as string, see: https://yourbasic.org/golang/formatting-byte-size-to-human-readable-format/ -func ByteCountSI(b int64) string { - const unit = 1000 - if b < unit { - return fmt.Sprintf("%d B", b) - } - div, exp := int64(unit), 0 - for n := b / unit; n >= unit; n /= unit { - div *= unit - exp++ - } - return fmt.Sprintf("%.1f %cB", - float64(b)/float64(div), "kMGTPE"[exp]) -} - // MapDefaultString returns the string value for the given key or a default value -func MapDefaultString(m map[string]interface{}, key string, dflt string) string { +func MapDefaultString(m map[string]any, key string, dflt string) string { if m == nil { return dflt } @@ -80,7 +75,7 @@ func MapDefaultString(m map[string]interface{}, key string, dflt string) string } // MapDefaultStringSlice returns the string slice value for the given key or a default value -func MapDefaultStringSlice(m map[string]interface{}, key string, dflt []string) []string { +func MapDefaultStringSlice(m map[string]any, key string, dflt []string) []string { if m == nil { return dflt } @@ -124,16 +119,7 @@ func UniqueStringSlice(slice []string) []string { return uniqueSlice } -func SliceContains[T comparable](slice []T, needle T) bool { - for _, elem := range slice { - if elem == needle { - return true - } - } - - return false -} - +// SliceString returns a string slice from a comma-separated string func SliceString(str string) []string { strParts := strings.Split(str, ",") stringSlice := make([]string, 0, len(strParts)) @@ -148,10 +134,12 @@ func SliceString(str string) []string { return stringSlice } +// SliceToString returns a comma-separated string from a string slice func SliceToString(slice []string) string { return strings.Join(slice, ",") } +// TruncateString returns a string truncated to the given length func TruncateString(s string, max int) string { if max > len(s) { return s @@ -159,6 +147,7 @@ func TruncateString(s string, max int) string { return s[:max] } +// BoolToFloat64 converts a boolean to a float64. True is 1.0, false is 0.0 func BoolToFloat64(b bool) float64 { if b { return 1.0