From 036a384fbfd65d38a9131c11ae447722297bb170 Mon Sep 17 00:00:00 2001 From: jwijenbergh Date: Thu, 13 Oct 2022 15:14:15 +0200 Subject: OAuth: Return HTML response on authorized HTML Template adapted from: https://github.com/eduvpn/apple/blob/5b18f834be7aebfed00570ae0c2f7bcbaf1c69cc/EduVPN/Helpers/Mac/OAuthRedirectHTTPHandler.m#L25 --- internal/oauth/oauth.go | 62 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 62 insertions(+) diff --git a/internal/oauth/oauth.go b/internal/oauth/oauth.go index 8db2d7e..2d97056 100644 --- a/internal/oauth/oauth.go +++ b/internal/oauth/oauth.go @@ -7,6 +7,7 @@ import ( "encoding/json" "errors" "fmt" + "html/template" "net" "net/http" "net/url" @@ -225,6 +226,61 @@ func (oauth *OAuth) getTokensWithRefresh() error { return nil } +// Adapted from: https://github.com/eduvpn/apple/blob/5b18f834be7aebfed00570ae0c2f7bcbaf1c69cc/EduVPN/Helpers/Mac/OAuthRedirectHTTPHandler.m#L25 +const responseTemplate string = ` + + + + +{{.Title}} + + + +

+ + +` + +type oauthResponseHTML struct { + Title string + Message string +} + +func writeResponseHTML(w http.ResponseWriter, title string, message string) error { + template, templateErr := template.New("oauth-response").Parse(responseTemplate) + if templateErr != nil { + return templateErr + } + + template.Execute(w, oauthResponseHTML{ + Title: title, + Message: message, + }) + return nil +} + // //// The callback to retrieve the authorization code: https://datatracker.ietf.org/doc/html/draft-ietf-oauth-v2-1-04#section-1.3.1 func (oauth *OAuth) Callback(w http.ResponseWriter, req *http.Request) { @@ -233,6 +289,12 @@ func (oauth *OAuth) Callback(w http.ResponseWriter, req *http.Request) { code, success := req.URL.Query()["code"] // Shutdown after we're done defer func() { + // writing the html is best effort + if oauth.Session.CallbackError != nil { + _ = writeResponseHTML(w, "Authorization Failed", "The authorization has failed. See the log file for more information.") + } else { + _ = writeResponseHTML(w, "Authorized", "The client has been successfully authorized. You can close this browser window.") + } if oauth.Session.Server != nil { go oauth.Session.Server.Shutdown(oauth.Session.Context) //nolint:errcheck } -- cgit v1.2.3