Normalize URL

- normal the url before we apply the protection middleware against it
- adding additional unit tests
- adding the extra dependencies
- updated the CHANGELOG for later release

Author: gambol99

CHANGELOG.md

@@ -1,4 +1,9 @@
 
+#### **2.0.5 (unreleased)**
+
+FIXES:
+ * We normalize all urls before the protection middleware is applied [#PR202](https://github.com/gambol99/keycloak-proxy/pull/202)
+
 #### **2.0.4**
 
 FIXES:

Godeps/Godeps.json

@@ -29,6 +29,9 @@ import (
 // reverseProxyMiddleware is responsible for handles reverse proxy request to the upstream endpoint
 func (r *oauthProxy) reverseProxyMiddleware() gin.HandlerFunc {
 	return func(cx *gin.Context) {
+		// step: continue the flow
+		cx.Next()
+		// step: check its cool to continue
 		if cx.IsAborted() {
 			return
 		}

forwarding.go

@@ -262,8 +262,8 @@ func TestAuthorizationURL(t *testing.T) {
 			ExpectedCode: http.StatusTemporaryRedirect,
 		},
 		{
-			URL:          "/admin/../",
-			ExpectedURL:  "/oauth/authorize?state=L2FkbWluLy4uLw==",
+			URL:          "/help/../admin",
+			ExpectedURL:  "/oauth/authorize?state=L2FkbWlu",
 			ExpectedCode: http.StatusTemporaryRedirect,
 		},
 		{

handlers_test.go

@@ -16,12 +16,12 @@ limitations under the License.
 package main
 
 import (
-	"bytes"
 	"fmt"
 	"regexp"
 	"strings"
 	"time"
 
+	"github.com/PuerkitoBio/purell"
 	log "github.com/Sirupsen/logrus"
 	"github.com/coreos/go-oidc/jose"
 	"github.com/gin-gonic/gin"
@@ -34,19 +34,19 @@ const (
 	cxEnforce = "Enforcing"
 )
 
+const normalizeFlags purell.NormalizationFlags = purell.FlagRemoveDotSegments | purell.FlagRemoveDuplicateSlashes
+
 // 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()
+		// step: keep a copy of the original
+		orig := cx.Request.URL.Path
+		// step: normalize the url
+		purell.NormalizeURL(cx.Request.URL, normalizeFlags)
+		// step: continue the flow
+		cx.Next()
+		// step: place back the original
+		cx.Request.URL.Path = orig
 	}
 }