UniqueSoft/wg-portal
2
0
Fork 0
mirror of https://github.com/h44z/wg-portal synced 2025-06-26 18:16:21 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix missing /auth/login prefix with oauth provider and use redirect url from config if existing

Browse Source
This commit is contained in:
Tim Dithmer 2024-11-15 14:38:30 +01:00
parent 486a6ac038
commit 63f3b610ec
1 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -6,14 +6,15 @@ import (
"encoding/base64"
"errors"
"fmt"
"github.com/h44z/wg-portal/internal/app"
"github.com/sirupsen/logrus"
"io"
"net/url"
"path"
"strings"
"time"
"github.com/h44z/wg-portal/internal/app"
"github.com/sirupsen/logrus"
"github.com/coreos/go-oidc/v3/oidc"
evbus "github.com/vardius/message-bus"
@ -88,8 +89,19 @@ func (a *Authenticator) setupExternalAuthProviders(ctx context.Context) error {
return fmt.Errorf("auth provider with name %s is already registerd", providerId)
}
redirectUrl := *extUrl
redirectUrl.Path = path.Join(redirectUrl.Path, "/auth/login/", providerId, "/callback")
var redirectUrl url.URL
if providerCfg.RedirectURL != "" {
configRedirectUrl, err := url.Parse(providerCfg.RedirectURL)
if err != nil {
return fmt.Errorf("failed to parse redirect Url from oauth authentication provider config of %s: %w", providerId, err)
}
redirectUrl = *configRedirectUrl
} else {
// TODO: Fix bug that e.g. microsoft entra ID wants an absolute uri
redirectUrl = *extUrl
redirectUrl.Path = path.Join(redirectUrl.Path, "/auth/login/", providerId, "/callback")
}
provider, err := newPlainOauthAuthenticator(ctx, redirectUrl.String(), providerCfg)
if err != nil {
@ -141,8 +153,8 @@ func (a *Authenticator) GetExternalLoginProviders(_ context.Context) []domain.Lo
authProviders = append(authProviders, domain.LoginProviderInfo{
Identifier: providerId,
Name: providerName,
ProviderUrl: fmt.Sprintf("%s/%s/init", a.cfg.CallbackUrlPrefix, providerId),
CallbackUrl: fmt.Sprintf("%s/%s/callback", a.cfg.CallbackUrlPrefix, providerId),
ProviderUrl: fmt.Sprintf("%s/auth/login/%s/init", a.cfg.CallbackUrlPrefix, providerId),
CallbackUrl: fmt.Sprintf("%s/auth/login/%s/callback", a.cfg.CallbackUrlPrefix, providerId),
})
}