lordwelch/aws-oidc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Give the http server its own Mux

Browse Source 
This prevents issues with registering the same path twice
This commit is contained in:
lordwelch 2020-08-07 14:15:21 -07:00
parent dd6ec82cba
commit ae5f06816f
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
provider/provider.go
View File

@ -85,6 +85,10 @@ func (p ProviderConfig) Authenticate(t *OAuth2Token) error {
ctx := context.Background() ctx := context.Background()
resultChannel := make(chan *oauth2.Token) resultChannel := make(chan *oauth2.Token)
errorChannel := make(chan error) errorChannel := make(chan error)
Mux := http.NewServeMux()
server := &http.Server{
Handler: Mux,
}
provider, err := oidc.NewProvider(ctx, p.ProviderURL) provider, err := oidc.NewProvider(ctx, p.ProviderURL)
if err != nil { if err != nil {
@ -156,12 +160,12 @@ func (p ProviderConfig) Authenticate(t *OAuth2Token) error {
authCodeOptions = append(authCodeOptions, oauth2.SetAuthURLParam("nonce", nonce)) authCodeOptions = append(authCodeOptions, oauth2.SetAuthURLParam("nonce", nonce))
} }
http.HandleFunc("/", func(w http.ResponseWriter, r *http.Request) { Mux.HandleFunc("/", func(w http.ResponseWriter, r *http.Request) {
url := config.AuthCodeURL(state, authCodeOptions...) url := config.AuthCodeURL(state, authCodeOptions...)
http.Redirect(w, r, url, http.StatusFound) http.Redirect(w, r, url, http.StatusFound)
}) })
http.HandleFunc("/auth/callback", func(w http.ResponseWriter, r *http.Request) { Mux.HandleFunc("/auth/callback", func(w http.ResponseWriter, r *http.Request) {
if r.URL.Query().Get("state") != state { if r.URL.Query().Get("state") != state {
http.Error(w, "state did not match", http.StatusBadRequest) http.Error(w, "state did not match", http.StatusBadRequest)
errorChannel <- errors.New("state did not match") errorChannel <- errors.New("state did not match")
@ -222,7 +226,6 @@ func (p ProviderConfig) Authenticate(t *OAuth2Token) error {
cmd.Start() cmd.Start()
cmd.Process.Release() cmd.Process.Release()
server := &http.Server{}
go func() { go func() {
server.Serve(listener) server.Serve(listener)
}() }()