Skip to content

fix: fix issues with oauth handling and add proper json message handling #32

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 28, 2025
Merged

fix: fix issues with oauth handling and add proper json message handling #32

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
74 changes: 43 additions & 31 deletions web/oauth_handlers.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,10 @@ import (
"crypto/rand"
"encoding/hex"
"encoding/json"
"io"
"log/slog"
"net/http"
"sync"
"time"

"github.com/ory/fosite"
Expand All @@ -29,6 +31,7 @@ type OAuthHandler struct {
KCManager *kc.Manager
Logger *slog.Logger
AppConfig AppConfig
clientRegMutex sync.Mutex
}

// AppConfig holds configuration required by the OAuth handlers.
Expand All @@ -51,6 +54,29 @@ func NewOAuthHandler(provider fosite.OAuth2Provider, store *oauth.InMemoryStore,
// Authorize is the handler for the /authorize endpoint.
func (h *OAuthHandler) Authorize(w http.ResponseWriter, r *http.Request) {
ctx := r.Context()
clientID := r.URL.Query().Get("client_id")
redirectURI := r.URL.Query().Get("redirect_uri")

if clientID == "" || redirectURI == "" {
http.Error(w, "Missing required parameters", http.StatusBadRequest)
return
}

// Auto-register client if not found
h.clientRegMutex.Lock()
defer h.clientRegMutex.Unlock()
if _, err := h.FositeStore.GetClient(ctx, clientID); err != nil {
autoClient := &fosite.DefaultClient{
ID: clientID,
Public: true,
RedirectURIs: []string{redirectURI},
GrantTypes: fosite.Arguments{"authorization_code", "refresh_token"},
Scopes: fosite.Arguments{"default", "openid"},
}
h.FositeStore.AddClient(autoClient)
}

// Process authorization request
ar, err := h.FositeProvider.NewAuthorizeRequest(ctx, r)
if err != nil {
h.FositeProvider.WriteAuthorizeError(ctx, w, ar, err)
Expand Down Expand Up @@ -181,48 +207,34 @@ func (h *OAuthHandler) Callback(w http.ResponseWriter, r *http.Request) {

// Register is the handler for the /register endpoint.
func (h *OAuthHandler) Register(w http.ResponseWriter, r *http.Request) {
client := &fosite.DefaultClient{
GrantTypes: fosite.Arguments{"authorization_code", "refresh_token", "client_credentials"},
ResponseTypes: fosite.Arguments{"code", "id_token"},
Scopes: fosite.Arguments{"openid", "offline"},
}

decoder := json.NewDecoder(r.Body)
var registrationRequest struct {
body, _ := io.ReadAll(r.Body)
var req struct {
ClientName string `json:"client_name"`
RedirectURIs []string `json:"redirect_uris"`
GrantTypes []string `json:"grant_types"`
}
if err := decoder.Decode(&registrationRequest); err != nil {
http.Error(w, "Invalid request body", http.StatusBadRequest)
return
}

client.ID = "client-" + mustGenerateRandomString(12)
client.RedirectURIs = registrationRequest.RedirectURIs
if len(registrationRequest.GrantTypes) > 0 {
client.GrantTypes = registrationRequest.GrantTypes
}
json.Unmarshal(body, &req)

secret := "secret-" + mustGenerateRandomString(24)
hashedSecret, err := oauth.HashSecret(secret)
if err != nil {
http.Error(w, "Internal Server Error", http.StatusInternalServerError)
return
client := &fosite.DefaultClient{
ID: "client-" + mustGenerateRandomString(12),
Secret: []byte("secret-" + mustGenerateRandomString(24)),
RedirectURIs: req.RedirectURIs,
GrantTypes: fosite.Arguments{"authorization_code", "refresh_token"},
ResponseTypes: fosite.Arguments{"code"},
Scopes: fosite.Arguments{"openid", "openid"},
}
client.Secret = hashedSecret

h.FositeStore.AddClient(client)
h.Logger.Info("Successfully registered new dynamic client", "client_id", client.ID)

w.Header().Set("Content-Type", "application/json")
w.WriteHeader(http.StatusCreated)
json.NewEncoder(w).Encode(map[string]interface{}{
"client_id": client.GetID(),
"client_secret": secret,
"client_id": client.ID,
"client_secret": client.Secret,
"grant_types": client.GetGrantTypes(),
"redirect_uris": client.GetRedirectURIs(),
"client_name": registrationRequest.ClientName,
"scopes_supported": []string{"default", "openid"},
"redirect_uris": client.RedirectURIs,
"client_name": req.ClientName,
"client_id_issued_at": time.Now().Unix(),
"client_secret_expires_at": 0,
})
Expand All @@ -237,7 +249,7 @@ func (h *OAuthHandler) Discovery(w http.ResponseWriter, r *http.Request) {
"token_endpoint": issuer + "/token",
"jwks_uri": issuer + "/.well-known/jwks.json", // Placeholder
"registration_endpoint": issuer + "/register",
"scopes_supported": []string{"openid", "offline"},
"scopes_supported": []string{"openid"},
"response_types_supported": []string{
"code",
"id_token",
Expand Down Expand Up @@ -266,7 +278,7 @@ func (h *OAuthHandler) ProtectedResourceMetadata(w http.ResponseWriter, r *http.
"authorization_servers": []string{
issuer,
},
"scopes_supported": []string{"default", "offline", "openid"},
"scopes_supported": []string{"default", "openid"},
"bearer_methods_supported": []string{"header"},
}

Expand Down