Skip to content
This repository has been archived by the owner on Aug 21, 2023. It is now read-only.

Commit

Permalink
gofmt all code
Browse files Browse the repository at this point in the history
  • Loading branch information
Russell Haering committed Feb 3, 2020
1 parent 09fdee5 commit a7f2631
Show file tree
Hide file tree
Showing 9 changed files with 298 additions and 316 deletions.
34 changes: 17 additions & 17 deletions attribute.go
Original file line number Diff line number Diff line change
Expand Up @@ -34,32 +34,32 @@ func (vals Values) Get(k string) string {
//GetSize returns the number of values for an attribute at a key.
//Returns '0' in case of error or if key is not found.
func (vals Values) GetSize(k string) int {
if vals == nil {
return 0
}
if vals == nil {
return 0
}

v, ok := vals[k]
if ok {
return len(v.Values)
}
if ok {
return len(v.Values)
}

return 0
return 0
}

//GetAll returns all the values for an attribute at a key.
//Returns an empty slice in case of error of if key is not found.
func (vals Values) GetAll(k string) []string {
var av []string
var av []string

if vals == nil {
return av
}
if vals == nil {
return av
}

if v, ok := vals[k]; ok && len(v.Values) > 0 {
for i := 0; i < len(v.Values); i++ {
av = append(av, string(v.Values[i].Value))
}
}
if v, ok := vals[k]; ok && len(v.Values) > 0 {
for i := 0; i < len(v.Values); i++ {
av = append(av, string(v.Values[i].Value))
}
}

return av
return av
}
115 changes: 55 additions & 60 deletions build_logout_response.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ package saml2
import (
"bytes"
"encoding/base64"
"html/template"
"html/template"

"github.com/beevik/etree"
"github.com/russellhaering/gosaml2/uuid"
Expand Down Expand Up @@ -96,67 +96,62 @@ func (sp *SAMLServiceProvider) SignLogoutResponse(el *etree.Element) (*etree.Ele

func (sp *SAMLServiceProvider) buildLogoutResponseBodyPostFromDocument(relayState string, doc *etree.Document) ([]byte, error) {
respBuf, err := doc.WriteToBytes()
if err != nil {
return nil, err
}

encodedRespBuf := base64.StdEncoding.EncodeToString(respBuf)

var tmpl *template.Template
var rv bytes.Buffer


if relayState != "" {
tmpl = template.Must(template.New("saml-post-form").Parse(`<html>` +
`<form method="post" action="{{.URL}}" id="SAMLResponseForm">` +
`<input type="hidden" name="SAMLResponse" value="{{.SAMLResponse}}" />` +
`<input type="hidden" name="RelayState" value="{{.RelayState}}" />` +
`<input id="SAMLSubmitButton" type="submit" value="Continue" />` +
`</form>` +
`<script>document.getElementById('SAMLSubmitButton').style.visibility='hidden';</script>` +
`<script>document.getElementById('SAMLResponseForm').submit();</script>` +
`</html>`))
data := struct {
URL string
SAMLResponse string
RelayState string
}{
URL: sp.IdentityProviderSLOURL,
SAMLResponse: encodedRespBuf,
RelayState: relayState,
}
if err = tmpl.Execute(&rv, data); err != nil {
return nil, err
}
} else {
tmpl = template.Must(template.New("saml-post-form").Parse(`<html>` +
`<form method="post" action="{{.URL}}" id="SAMLResponseForm">` +
`<input type="hidden" name="SAMLResponse" value="{{.SAMLResponse}}" />` +
`<input id="SAMLSubmitButton" type="submit" value="Continue" />` +
`</form>` +
`<script>document.getElementById('SAMLSubmitButton').style.visibility='hidden';</script>` +
`<script>document.getElementById('SAMLResponseForm').submit();</script>` +
`</html>`))
data := struct {
URL string
SAMLResponse string
}{
URL: sp.IdentityProviderSLOURL,
SAMLResponse: encodedRespBuf,
}

if err = tmpl.Execute(&rv, data); err != nil {
return nil, err
}
}

return rv.Bytes(), nil
}
if err != nil {
return nil, err
}

encodedRespBuf := base64.StdEncoding.EncodeToString(respBuf)

var tmpl *template.Template
var rv bytes.Buffer

if relayState != "" {
tmpl = template.Must(template.New("saml-post-form").Parse(`<html>` +
`<form method="post" action="{{.URL}}" id="SAMLResponseForm">` +
`<input type="hidden" name="SAMLResponse" value="{{.SAMLResponse}}" />` +
`<input type="hidden" name="RelayState" value="{{.RelayState}}" />` +
`<input id="SAMLSubmitButton" type="submit" value="Continue" />` +
`</form>` +
`<script>document.getElementById('SAMLSubmitButton').style.visibility='hidden';</script>` +
`<script>document.getElementById('SAMLResponseForm').submit();</script>` +
`</html>`))
data := struct {
URL string
SAMLResponse string
RelayState string
}{
URL: sp.IdentityProviderSLOURL,
SAMLResponse: encodedRespBuf,
RelayState: relayState,
}
if err = tmpl.Execute(&rv, data); err != nil {
return nil, err
}
} else {
tmpl = template.Must(template.New("saml-post-form").Parse(`<html>` +
`<form method="post" action="{{.URL}}" id="SAMLResponseForm">` +
`<input type="hidden" name="SAMLResponse" value="{{.SAMLResponse}}" />` +
`<input id="SAMLSubmitButton" type="submit" value="Continue" />` +
`</form>` +
`<script>document.getElementById('SAMLSubmitButton').style.visibility='hidden';</script>` +
`<script>document.getElementById('SAMLResponseForm').submit();</script>` +
`</html>`))
data := struct {
URL string
SAMLResponse string
}{
URL: sp.IdentityProviderSLOURL,
SAMLResponse: encodedRespBuf,
}

if err = tmpl.Execute(&rv, data); err != nil {
return nil, err
}
}

return rv.Bytes(), nil
}

func (sp *SAMLServiceProvider) BuildLogoutResponseBodyPostFromDocument(relayState string, doc *etree.Document) ([]byte, error) {
return sp.buildLogoutResponseBodyPostFromDocument(relayState, doc)
return sp.buildLogoutResponseBodyPostFromDocument(relayState, doc)
}


Loading

0 comments on commit a7f2631

Please sign in to comment.