Adding child elements to the metadata generator handler.

CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.2.1
+
+* Added `node['shibboleth-sp']['Handler']['MetadataGenerator']['childElements']` attribute. 
+
 ## 0.2.0
 
 * Added `node['shibboleth-sp']['logging']` attributes and shibd.logger template

README.md

@@ -60,6 +60,8 @@ Installs/Configures Shibboleth Service Provider.
 * `node['shibboleth-sp']['Hanlder']['Status']['acl']` - IPs that can access the
   status handler. Defaults to `127.0.0.1 ::1`. If set to a blank string no acl
   is applied.
+* `node['shibboleth-sp']['Handler']['MetadataGenerator']
+['childElements']` - Child elements to add to the generated metadata.
 * `node['shibboleth-sp']['attribute-map']['name-id']` - A hash with the NameID
   name and id to map from the IdP.
 * `node['shibboleth-sp']['MetadataProvider']['path']` - Path to IdP metadata file.

attributes/default.rb

@@ -44,6 +44,9 @@
 # Status Handler ACL
 default['shibboleth-sp']['Handler']['Status']['acl'] = "127.0.0.1 ::1"
 
+# Metadata Handler Child Elements
+default['shibboleth-sp']['Handler']['MetadataGenerator']['childElements'] = nil
+
 # Logging
 default['shibboleth-sp']['logging']['root'] = "INFO"
 default['shibboleth-sp']['logging']['OpenSAML']['MessageDecoder'] = nil

metadata.rb

@@ -3,7 +3,7 @@
 maintainer_email  "[email protected]"
 license           "Apache 2.0"
 description       "Installs/Configures Shibboleth Service Provider"
-version           "0.2.0"
+version           "0.2.1"
 recipe            "shibboleth-sp", "Installs and enables base Shibboleth Service Provider."
 recipe            "shibboleth-sp::apache", "Base recipe and Apache handling."
 recipe            "shibboleth-sp::iis", "Base recipe and IIS handling."

templates/default/shibboleth2.xml.erb

@@ -7,6 +7,7 @@
 	xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion"
 	xmlns:samlp="urn:oasis:names:tc:SAML:2.0:protocol"    
 	xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata"
+	xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui"
 	clockSkew="180">
 
 	<% if node['shibboleth-sp']['iis'] && node['shibboleth-sp']['iis']['sites'] -%>
@@ -131,7 +132,13 @@
 			<Logout>SAML2 Local</Logout>
 
 			<!-- Extension service that generates "approximate" metadata based on SP configuration. -->
+			<% if node['shibboleth-sp']['Handler']['MetadataGenerator']['childElements'] -%>
+			<Handler type="MetadataGenerator" Location="/Metadata" signing="false">
+				<%= node['shibboleth-sp']['Handler']['MetadataGenerator']['childElements'] %>
+			</Handler>
+			<% else -%>			
 			<Handler type="MetadataGenerator" Location="/Metadata" signing="false"/>
+			<% end -%>
 
 			<!-- Status reporting service. -->
 			<Handler type="Status" Location="/Status"