Skip to content

Issue #351 - forward dex error message to login page #425

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
alexmt merged 2 commits into from
Jul 17, 2018
Merged

Issue #351 - forward dex error message to login page #425

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ed2a828
Issue #351 - forward dex error message to login page
Jul 17, 2018
82a7e69
Address reviewer notes: sort imports, move regex to package level var
Jul 17, 2018
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
31 changes: 31 additions & 0 deletions util/dex/dex.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,16 @@ import (
"context"
"encoding/json"
"fmt"
"html"
"io/ioutil"
"math/rand"
"net"
"net/http"
"net/http/httputil"
"net/url"
"os"
"regexp"
"strconv"
"time"

"github.com/coreos/dex/api"
Expand All @@ -34,6 +38,8 @@ const (
DexgRPCAPIAddr = "localhost:5557"
)

var messageRe = regexp.MustCompile(`<p>(.*)([\s\S]*?)<\/p>`)

type DexAPIClient struct {
api.DexClient
}
Expand All @@ -46,6 +52,31 @@ func NewDexHTTPReverseProxy() func(writer http.ResponseWriter, request *http.Req
target, err := url.Parse(DexReverseProxyAddr)
errors.CheckError(err)
proxy := httputil.NewSingleHostReverseProxy(target)
proxy.ModifyResponse = func(resp *http.Response) error {
if resp.StatusCode == 500 {
b, err := ioutil.ReadAll(resp.Body)
if err != nil {
return err
}
err = resp.Body.Close()
if err != nil {
return err
}
var message string
matches := messageRe.FindSubmatch(b)
if len(matches) > 1 {
message = html.UnescapeString(string(matches[1]))
} else {
message = "Unknown error"
}
resp.ContentLength = 0
resp.Header.Set("Content-Length", strconv.Itoa(0))
resp.Header.Set("Location", fmt.Sprintf("/login?sso_error=%s", url.QueryEscape(message)))
resp.StatusCode = http.StatusSeeOther
return nil
}
return nil
}
return func(w http.ResponseWriter, r *http.Request) {
proxy.ServeHTTP(w, r)
}
Expand Down