Mirrors/wg-portal
1
0
Fork 0
mirror of https://github.com/h44z/wg-portal.git synced 2025-09-14 06:51:15 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

chore: cleanup code formatting

Browse Source
This commit is contained in:
Christoph Haas
2025-02-28 08:29:40 +01:00
parent f7d7038829
commit e24acfa57d
67 changed files with 232 additions and 489 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
internal/app/auth/auth.go
View File

@@ -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

7
internal/app/auth/auth_ldap.go
View File

@@ -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)

14
internal/app/auth/auth_oauth.go
View File

@@ -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)
}

11
internal/app/auth/auth_oidc.go
View File

@@ -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)
}

2
internal/app/auth/oauth_common.go
View File

@@ -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

11
internal/app/auth/oauth_common_test.go
View File

@@ -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)