admin/hspguard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix+feat: use verify oauth client helper in token as well

Browse Source
This commit is contained in:
Amir Adal
2025-06-09 15:55:36 +02:00
parent 299e7eddc4
commit dc41521a99
4 changed files with 48 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
internal/oauth/client.go
View File

@ -1,22 +1,23 @@
package oauth
import (
"context"
"fmt"
"net/http"
"slices"
"strings"
)
type VerifyOAuthClientParams struct {
ClientID string `json:"client_id"`
RedirectURI string `json:"redirect_uri"`
State string `json:"state"`
ClientID string `json:"client_id"`
RedirectURI *string `json:"redirect_uri"`
State string `json:"state"`
Scopes *[]string `json:"scopes"`
}
func (h *OAuthHandler) verifyOAuthClient(w http.ResponseWriter, r *http.Request, params *VerifyOAuthClientParams) (string, error) {
client, err := h.repo.GetApiServiceCID(r.Context(), params.ClientID)
func (h *OAuthHandler) verifyOAuthClient(ctx context.Context, params *VerifyOAuthClientParams) (string, error) {
client, err := h.repo.GetApiServiceCID(ctx, params.ClientID)
if err != nil {
uri := fmt.Sprintf("%s?error=access_denied&error_description=Service+not+authorized", params.RedirectURI)
uri := fmt.Sprintf("%s?error=access_denied&error_description=Service+not+authorized", *params.RedirectURI)
if params.State != "" {
uri += "&state=" + params.State
}
@ -24,32 +25,33 @@ func (h *OAuthHandler) verifyOAuthClient(w http.ResponseWriter, r *http.Request,
}
if !client.IsActive {
uri := fmt.Sprintf("%s?error=temporarily_unavailable&error_description=Service+not+active", params.RedirectURI)
uri := fmt.Sprintf("%s?error=temporarily_unavailable&error_description=Service+not+active", *params.RedirectURI)
if params.State != "" {
uri += "&state=" + params.State
}
return uri, fmt.Errorf("target oauth service with client id '%s' is not available", client.ClientID)
}
scopes := strings.SplitSeq(strings.TrimSpace(r.URL.Query().Get("scope")), " ")
for scope := range scopes {
if !slices.Contains(client.Scopes, scope) {
uri := fmt.Sprintf("%s?error=invalid_scope&error_description=Scope+%s+is+not+allowed", params.RedirectURI, strings.ReplaceAll(scope, " ", "+"))
if params.State != "" {
uri += "&state=" + params.State
if params.Scopes != nil {
for _, scope := range *params.Scopes {
if !slices.Contains(client.Scopes, scope) {
uri := fmt.Sprintf("%s?error=invalid_scope&error_description=Scope+%s+is+not+allowed", *params.RedirectURI, strings.ReplaceAll(scope, " ", "+"))
if params.State != "" {
uri += "&state=" + params.State
}
return uri, fmt.Errorf("unallowed scope '%s' requested", scope)
}
return uri, fmt.Errorf("unallowed scope '%s' requested", scope)
}
}
if !slices.Contains(client.RedirectUris, params.RedirectURI) {
uri := fmt.Sprintf("%s?error=invalid_request&error_description=Redirect+URI+is+not+allowed", params.RedirectURI)
if params.State != "" {
uri += "&state=" + params.State
if params.RedirectURI != nil {
if !slices.Contains(client.RedirectUris, *params.RedirectURI) {
uri := fmt.Sprintf("%s?error=invalid_request&error_description=Redirect+URI+is+not+allowed", *params.RedirectURI)
if params.State != "" {
uri += "&state=" + params.State
}
return uri, fmt.Errorf("redirect uri '%s' is unallowed", *params.RedirectURI)
}
http.Redirect(w, r, uri, http.StatusFound)
return uri, fmt.Errorf("redirect uri '%s' is unallowed", params.RedirectURI)
}
return "", nil