Change name of token-cookie set by SAML library

providers/shibboleth/shibboleth_client.go

@@ -134,6 +134,14 @@ func (sp *SPClient) initializeSPClient(configToSet *model.ShibbolethConfig) erro
 		log.Errorf("Error initializing SAML SP instance from the config %v, error %v", configToSet, err)
 	}
 
+	cookieStore := samlsp.ClientCookies{
+		ServiceProvider: &samlspInstance.ServiceProvider,
+		Name:            "samlToken",
+		Domain:          actURL.Host,
+	}
+	samlspInstance.ClientState = &cookieStore
+	samlspInstance.ClientToken = &cookieStore
+
 	if idpURL != "" {
 		tr := &http.Transport{
 			TLSClientConfig: &tls.Config{InsecureSkipVerify: true},

service/route_handlers.go

@@ -255,8 +255,8 @@ func Reload(w http.ResponseWriter, r *http.Request) {
 func HandleSamlPost(w http.ResponseWriter, r *http.Request) {
 	//get all X-Saml- headers and pass it to the provider
 	log.Debugf("HandleSamlPost: request url is %v", r.URL.String())
-	cookie, _ := r.Cookie("token")
-	log.Infof("token cookie: %v", cookie)
+	cookie, _ := r.Cookie("samlToken")
+	log.Infof("token cookie: %#v", cookie)
 
 	samlData := make(map[string][]string)
 

trash.conf

@@ -13,7 +13,7 @@ github.com/rancher/go-rancher cc9af4572762fc6ae01f5f9bebbc359506c2f6dd
 github.com/tomnomnom/linkheader	0.1.0-5-g236df73
 golang.org/x/sys	a646d33
 github.com/urfave/cli v1.18.0
-github.com/crewjam/saml c1c892357b136a16a617ef802d7b6da7d3b414dc https://github.com/mrajashree/saml
+github.com/crewjam/saml ce1532152fdecd37a8b9a059dc0129730174200d https://github.com/rancher/saml
 github.com/crewjam/errset f78d65de925cf59a953184a376cbfe07cfe65e3d
 gopkg.in/ldap.v2 v2.5.0
 gopkg.in/asn1-ber.v1 v1.1