Merge pull request #1189 from aledbf/fix-auth-rd

Fix sign in URL redirect parameter

Author: aledbf

controllers/nginx/pkg/template/template.go

@@ -22,6 +22,7 @@ import (
 	"encoding/json"
 	"fmt"
 	"net"
+	"net/url"
 	"os"
 	"os/exec"
 	"strings"
@@ -149,6 +150,7 @@ var (
 		"serverConfig": func(all config.TemplateConfig, server *ingress.Server) interface{} {
 			return struct{ First, Second interface{} }{all, server}
 		},
+		"buildAuthSignURL": buildAuthSignURL,
 	}
 )
 
@@ -502,3 +504,18 @@ func buildNextUpstream(input interface{}) string {
 
 	return strings.Join(nextUpstreamCodes, " ")
 }
+
+func buildAuthSignURL(input interface{}) string {
+	s, ok := input.(string)
+	if !ok {
+		glog.Errorf("expected an string type but %T was returned", input)
+	}
+
+	u, _ := url.Parse(s)
+	q := u.Query()
+	if len(q) == 0 {
+		return fmt.Sprintf("%v?rd=$request_uri", s)
+	}
+
+	return fmt.Sprintf("%v&rd=$request_uri", s)
+}

controllers/nginx/rootfs/etc/nginx/template/nginx.tmpl

@@ -585,7 +585,7 @@ stream {
         {{ end }}
 
         {{ if not (empty $location.ExternalAuth.SigninURL) }}
-        error_page 401 = {{ $location.ExternalAuth.SigninURL }}?rd=$request_uri;
+        error_page 401 = {{ buildAuthSignURL $location.ExternalAuth.SigninURL }};
         {{ end }}
 
         {{/* if the location contains a rate limit annotation, create one */}}