From 704217b69883944c9386690ce28bfd020e4265bc Mon Sep 17 00:00:00 2001
From: Nick Craig-Wood <nick@craig-wood.com>
Date: Thu, 5 Dec 2024 16:26:16 +0000
Subject: [PATCH] lib/oauthutil: return error messages from the oauth process
better
---
lib/oauthutil/oauthutil.go | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/lib/oauthutil/oauthutil.go b/lib/oauthutil/oauthutil.go
index dae98a3f2..50b2d2079 100644
--- a/lib/oauthutil/oauthutil.go
+++ b/lib/oauthutil/oauthutil.go
@@ -813,10 +813,17 @@ func (s *authServer) handleAuth(w http.ResponseWriter, req *http.Request) {
// get code, error if empty
code := req.Form.Get("code")
if code == "" {
- reply(http.StatusBadRequest, &AuthResult{
+ err := &AuthResult{
Name: "Auth Error",
Description: "No code returned by remote server",
- })
+ }
+ if errorCode := req.Form.Get("error"); errorCode != "" {
+ err.Description += ": " + errorCode
+ }
+ if errorMessage := req.Form.Get("error_description"); errorMessage != "" {
+ err.Description += ": " + errorMessage
+ }
+ reply(http.StatusBadRequest, err)
return
}