Merge pull request #35 from asenyshyn/master

removed IDPSSODescriptor from SP metadata
russellhaering · Mar 6, 2018 · 23b0b0c · 23b0b0c
2 parents 0130619 + 9a79382
commit 23b0b0c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/saml.go b/saml.go
@@ -79,7 +79,7 @@ func (sp *SAMLServiceProvider) Metadata() (*types.EntityDescriptor, error) {
 	return &types.EntityDescriptor{
 		ValidUntil: time.Now().UTC().Add(time.Hour * 24 * 7), // 7 days
 		EntityID:   sp.ServiceProviderIssuer,
-		SPSSODescriptor: types.SPSSODescriptor{
+		SPSSODescriptor: &types.SPSSODescriptor{
 			AuthnRequestsSigned:        sp.SignAuthnRequests,
 			WantAssertionsSigned:       !sp.SkipSignatureValidation,
 			ProtocolSupportEnumeration: SAMLProtocolNamespace,

diff --git a/types/metadata.go b/types/metadata.go
@@ -11,9 +11,9 @@ type EntityDescriptor struct {
 	XMLName    xml.Name  `xml:"urn:oasis:names:tc:SAML:2.0:metadata EntityDescriptor"`
 	ValidUntil time.Time `xml:"validUntil,attr"`
 	// SAML 2.0 8.3.6 Entity Identifier could be used to represent issuer
-	EntityID         string           `xml:"entityID,attr"`
-	SPSSODescriptor  SPSSODescriptor  `xml:"SPSSODescriptor"`
-	IDPSSODescriptor IDPSSODescriptor `xml:"IDPSSODescriptor"`
+	EntityID         string            `xml:"entityID,attr"`
+	SPSSODescriptor  *SPSSODescriptor  `xml:"SPSSODescriptor,omitempty"`
+	IDPSSODescriptor *IDPSSODescriptor `xml:"IDPSSODescriptor,omitempty"`
 }
 
 type Endpoint struct {