simplify

samlidp/session.go

@@ -68,7 +68,7 @@ func (s *Server) GetSession(w http.ResponseWriter, r *http.Request, req *saml.Id
 			Value:    session.ID,
 			MaxAge:   int(sessionMaxAge.Seconds()),
 			HttpOnly: true,
-			Secure:   saml.IsHTTPS(r),
+			Secure:   r.URL.Scheme == "https",
 			Path:     "/",
 		})
 		return session

samlsp/middleware.go

@@ -151,7 +151,7 @@ func (m *Middleware) RequireAccount(handler http.Handler) http.Handler {
 			Value:    signedState,
 			MaxAge:   int(saml.MaxIssueDelay.Seconds()),
 			HttpOnly: true,
-			Secure:   saml.IsHTTPS(r),
+			Secure:   r.URL.Scheme == "https",
 			Path:     m.ServiceProvider.AcsURL.Path,
 		})
 
@@ -283,7 +283,7 @@ func (m *Middleware) Authorize(w http.ResponseWriter, r *http.Request, assertion
 		Value:    signedToken,
 		MaxAge:   int(m.CookieMaxAge.Seconds()),
 		HttpOnly: true,
-		Secure:   saml.IsHTTPS(r),
+		Secure:   r.URL.Scheme == "https",
 		Path:     "/",
 	})
 

util.go

@@ -2,7 +2,6 @@ package saml
 
 import (
 	"crypto/rand"
-	"net/http"
 	"time"
 
 	dsig "github.com/russellhaering/goxmldsig"
@@ -28,11 +27,3 @@ func randomBytes(n int) []byte {
 	}
 	return rv
 }
-
-// IsHTTPS returns true if the given request is for an https host
-func IsHTTPS(r *http.Request) bool {
-	if r.URL.Scheme == "https" {
-		return true
-	}
-	return false
-}