Commit a67c80a0 authored by Rohith Jayawardene's avatar Rohith Jayawardene Committed by GitHub
Browse files

FIXES: (#201)

* Fixes a bug in authentication, which permitted double slashed url entry [#PR200](https://github.com/gambol99/keycloak-proxy/pull/200)

FEATURES:
 * Grabbing the revocation-url from the idp config if user override is not specified [#PR193](https://github.com/gambol99/keycloak-proxy/pull/193)
parent 0baa898c
#### **2.0.4**
FIXES:
* Fixes a bug in authentication, which permitted double slashed url entry [#PR200](https://github.com/gambol99/keycloak-proxy/pull/200)
FEATURES:
* Grabbing the revocation-url from the idp config if user override is not specified [#PR193](https://github.com/gambol99/keycloak-proxy/pull/193)
......
......@@ -24,7 +24,7 @@ import (
)
var (
release = "v2.0.3"
release = "v2.0.4"
gitsha = "no gitsha provided"
version = release + " (git+sha: " + gitsha + ")"
)
......
......@@ -16,6 +16,7 @@ limitations under the License.
package main
import (
"bytes"
"fmt"
"regexp"
"strings"
......@@ -33,6 +34,22 @@ const (
cxEnforce = "Enforcing"
)
// filterMiddleware is custom filtering for incoming requests
func (r *oauthProxy) filterMiddleware() gin.HandlerFunc {
return func(cx *gin.Context) {
var p rune
var b bytes.Buffer
for _, c := range cx.Request.URL.Path {
if c == '/' && p == '/' {
continue
}
p = c
b.WriteRune(c)
}
cx.Request.URL.Path = b.String()
}
}
// loggingMiddleware is a custom http logger
func (r *oauthProxy) loggingMiddleware() gin.HandlerFunc {
return func(cx *gin.Context) {
......
......@@ -93,6 +93,54 @@ func TestRolePermissionsMiddleware(t *testing.T) {
Redirects: true,
Expects: http.StatusOK,
},
{ // check for escaping
URI: "//admin%2Ftest",
Redirects: true,
Expects: http.StatusTemporaryRedirect,
},
{ // check for escaping
URI: "/admin%2Ftest",
Redirects: true,
Expects: http.StatusTemporaryRedirect,
},
{ // check for prefix slashs
URI: "//admin/test",
Redirects: true,
Expects: http.StatusTemporaryRedirect,
},
{ // check for prefix slashs
URI: "/admin//test",
Redirects: true,
Expects: http.StatusTemporaryRedirect,
},
{ // check for prefix slashs
URI: "/admin//test",
Redirects: false,
HasToken: true,
Expects: http.StatusForbidden,
},
{ // check for dodgy url
URI: "//admin/../admin/test",
Redirects: true,
Expects: http.StatusTemporaryRedirect,
},
{ // check for dodgy url
URI: "/help/../admin/test",
Redirects: true,
Expects: http.StatusTemporaryRedirect,
},
{ // check for it works
URI: "//admin/test",
HasToken: true,
Roles: []string{fakeAdminRole},
Expects: http.StatusOK,
},
{ // check for it works
URI: "//admin//test",
HasToken: true,
Roles: []string{fakeAdminRole},
Expects: http.StatusOK,
},
{ // check with a token
URI: "/",
Redirects: false,
......
......@@ -154,6 +154,9 @@ func (r *oauthProxy) createReverseProxy() error {
// step: create the gin router
engine := gin.New()
engine.Use(gin.Recovery())
// step: custom filtering
engine.Use(r.filterMiddleware())
// step: is profiling enabled?
if r.config.EnableProfiling {
log.Warn("Enabling the debug profiling on /debug/pprof")
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment