Skip to content

Commit 1e43230

Browse files
committed
Fix bogus query param escaping
1 parent 1f5a651 commit 1e43230

File tree

2 files changed

+3
-9
lines changed

2 files changed

+3
-9
lines changed

components/iam/pkg/oidc/service.go

+2-7
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ import (
1111
"errors"
1212
"io"
1313
"net/http"
14-
"net/url"
1514

1615
"github.com/coreos/go-oidc/v3/oidc"
1716
"github.com/gitpod-io/gitpod/common-go/log"
@@ -104,15 +103,11 @@ func (service *OIDCService) GetClientConfigFromRequest(r *http.Request) (*OIDCCl
104103
return nil, errors.New("issuer param not specified")
105104
}
106105
log.WithField("issuerParam", issuerParam).Trace("GetClientConfigFromRequest")
107-
issuer, err := url.QueryUnescape(issuerParam)
108-
if err != nil {
109-
return nil, errors.New("bad issuer param")
110-
}
111-
log.WithField("issuer", issuer).Trace("at GetClientConfigFromRequest")
106+
log.WithField("issuer", issuerParam).Trace("at GetClientConfigFromRequest")
112107

113108
for id, value := range service.configsById {
114109
log.WithField("issuer", value.Issuer).WithField("id", id).Trace("GetClientConfigFromRequest (candidate)")
115-
if value.Issuer == issuer {
110+
if value.Issuer == issuerParam {
116111
return value, nil
117112
}
118113
}

components/iam/pkg/oidc/service_test.go

+1-2
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ import (
1010
"log"
1111
"net/http"
1212
"net/http/httptest"
13-
"net/url"
1413
"testing"
1514

1615
"github.com/coreos/go-oidc/v3/oidc"
@@ -72,7 +71,7 @@ func TestGetClientConfigFromRequest(t *testing.T) {
7271
ExpectedId: "",
7372
},
7473
{
75-
Location: "/start?issuer=" + url.QueryEscape(issuer),
74+
Location: "/start?issuer=" + issuer,
7675
ExpectedError: false,
7776
ExpectedId: "google-1",
7877
},

0 commit comments

Comments
 (0)