Merge pull request #1 from yp-engineering/request_url

Add support for X-Forwarded-Proto header when building service URL.

Author: geoffgarside

client.go

@@ -71,7 +71,9 @@ func requestURL(r *http.Request) (*url.URL, error) {
 	u.Host = r.Host
 	u.Scheme = "http"
 
-	if r.TLS != nil {
+	if scheme := r.Header.Get("X-Forwarded-Proto"); scheme != "" {
+		u.Scheme = scheme
+	} else if r.TLS != nil {
 		u.Scheme = "https"
 	}
 

client_test.go

@@ -47,6 +47,18 @@ func TestUnauthenticatedRequestShouldRedirectToCasURL(t *testing.T) {
 		t.Errorf("Expected response to have Set-Cookie header with <%v>, got <%v>",
 			sessionCookieName, setCookie)
 	}
+
+	req.Header.Set("X-Forwarded-Proto", "https")
+	handler.ServeHTTP(w, req)
+	if w.Code != http.StatusFound {
+		t.Errorf("Expected HTTP response code to be <%v>, got <%v>", http.StatusFound, w.Code)
+	}
+
+	loc = w.Header().Get("Location")
+	exp = "https://cas.example.com/login?service=https%3A%2F%2Fexample.com%2F"
+	if loc != exp {
+		t.Errorf("Expected HTTP redirect to <%s>, got <%s>", exp, loc)
+	}
 }
 
 func TestInvalidServiceTicket(t *testing.T) {

doc_test.go

@@ -6,7 +6,7 @@ import (
 	"net/http"
 	"net/url"
 
-	"gopkg.in/cas.v0"
+	"gopkg.in/cas.v1"
 )
 
 func ExampleRedirectToLogin() {