From 96fee63f6c14d6313f230f9a451a92b268909ebc Mon Sep 17 00:00:00 2001
From: Christopher Goulet <christophergoulet@iMac-4.local>
Date: Mon, 1 Apr 2019 16:35:39 -0700
Subject: [PATCH] omit validUntil if empty

---
 metadata.go         | 2 +-
 metadata_test.go    | 2 +-
 service_provider.go | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/metadata.go b/metadata.go
index 8b39a86d..54383c35 100644
--- a/metadata.go
+++ b/metadata.go
@@ -133,7 +133,7 @@ type ContactPerson struct {
 // See http://docs.oasis-open.org/security/saml/v2.0/saml-metadata-2.0-os.pdf §2.4.1
 type RoleDescriptor struct {
 	ID                         string        `xml:",attr,omitempty"`
-	ValidUntil                 time.Time     `xml:"validUntil,attr,omitempty"`
+	ValidUntil                 *time.Time    `xml:"validUntil,attr,omitempty"`
 	CacheDuration              time.Duration `xml:"cacheDuration,attr,omitempty"`
 	ProtocolSupportEnumeration string        `xml:"protocolSupportEnumeration,attr"`
 	ErrorURL                   string        `xml:"errorURL,attr,omitempty"`
diff --git a/metadata_test.go b/metadata_test.go
index 9d1059b0..2bdba5de 100644
--- a/metadata_test.go
+++ b/metadata_test.go
@@ -153,7 +153,7 @@ cvCsEFiJZ4AbF+DgmO6TarJ8O05t8zvnOwJlNCASPZRH/JmF8tX0hoHuAQ==`,
 	c.Assert(err, IsNil)
 	c.Assert(string(buf), Equals, ""+
 		"<EntityDescriptor xmlns=\"urn:oasis:names:tc:SAML:2.0:metadata\" validUntil=\"2013-03-10T00:32:19.104Z\" cacheDuration=\"PT1H\" entityID=\"http://localhost:5000/e087a985171710fb9fb30f30f41384f9/saml2/metadata/\">\n"+
-		"  <SPSSODescriptor xmlns=\"urn:oasis:names:tc:SAML:2.0:metadata\" validUntil=\"0001-01-01T00:00:00Z\" protocolSupportEnumeration=\"urn:oasis:names:tc:SAML:2.0:protocol\" AuthnRequestsSigned=\"true\" WantAssertionsSigned=\"true\">\n"+
+		"  <SPSSODescriptor xmlns=\"urn:oasis:names:tc:SAML:2.0:metadata\" protocolSupportEnumeration=\"urn:oasis:names:tc:SAML:2.0:protocol\" AuthnRequestsSigned=\"true\" WantAssertionsSigned=\"true\">\n"+
 		"    <KeyDescriptor use=\"encryption\">\n"+
 		"      <KeyInfo xmlns=\"http://www.w3.org/2000/09/xmldsig#\">\n"+
 		"        <X509Data>\n"+
diff --git a/service_provider.go b/service_provider.go
index 6061b04a..1b031c97 100644
--- a/service_provider.go
+++ b/service_provider.go
@@ -138,7 +138,7 @@ func (sp *ServiceProvider) Metadata() *EntityDescriptor {
 								},
 							},
 						},
-						ValidUntil: validUntil,
+						ValidUntil: &validUntil,
 					},
 				},
 				AuthnRequestsSigned:  &authnRequestsSigned,