resolves SWAMIDOPS-6788

3 files changed, 64 insertions, 0 deletions

diff --git a/swamid-1.0.mxml b/swamid-1.0.mxml
index 9ead5066..50463c24 100644
--- a/swamid-1.0.mxml
+++ b/swamid-1.0.mxml
@@ -217,4 +217,5 @@
   <xi:include href="swamid-1.0/idp2.hv.se.xml"/>
   <xi:include href="swamid-1.0/iidp3.hv.se.xml"/>
   <xi:include href="swamid-1.0/account.mdh.se.xml"/>
+  <xi:include href="swamid-1.0/adfs01.fhs.se.xml"/>
 </EntitiesDescriptor>
diff --git a/swamid-1.0/adfs01.fhs.se.xml b/swamid-1.0/adfs01.fhs.se.xml
new file mode 100644
index 00000000..6b636442
--- /dev/null
+++ b/swamid-1.0/adfs01.fhs.se.xml
@@ -0,0 +1,62 @@
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="http://adfs01.fhs.se/adfs/services/trust">
+  <Extensions>
+    <shibmd:Scope regexp="false">fhs.se</shibmd:Scope>
+  </Extensions>
+  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <KeyDescriptor use="encryption">
+      <KeyInfo xmlns="http://www.w3.org/2000/09/xmldsig#">
+        <X509Data>
+          <X509Certificate>MIIC3DCCAcSgAwIBAgIQTa58Ax8v6rVMQDDG2RT/8jANBgkqhkiG9w0BAQsFADAqMSgwJgYDVQQDEx9BREZTIEVuY3J5cHRpb24gLSBhZGZzMDEuZmhzLnNlMB4XDTEzMDEyNTExMTYzNloXDTE0MDEyNTExMTYzNlowKjEoMCYGA1UEAxMfQURGUyBFbmNyeXB0aW9uIC0gYWRmczAxLmZocy5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALKTZiDPXFEiefxhJzAhIUEqxhDmESvd/fzZDnfm3YHuIqDQRwy0chjIBULg2eBcbLhPpyaGzJPkwADbGmkDNMVG/QfZKGE6sthOOy7CHFbcw+Z9zv0bpuzoZMPofncx4L7QZqkgH0a9fMvPpoyJLJZ+xJhJH0f7dLT+eN1YklynfHPIcqO4H4P9OJj5qs9xLEHAPsK6fxcLhgSQrVQmXsCiwlU7Z8ODtTqKhP+Px22rNNswGJVKx53JTr4ilhSgwixCfsioZDkr1BXy8XYx0JbQTlXB0pOtTG8ryWq+xlmsQ34s1JKTX4ObJ22Rw25D64xORLQt7N2ihT7R8QnPevUCAwEAATANBgkqhkiG9w0BAQsFAAOCAQEAo44KNhB4i6HEvI4fndgskDvZX07NR+d0cMLqxbTF0ypLJ7Bu9e/kmQUMXKsb4e/SfeFf6qwgWOINojTUuopZ62s1qJscxT1Hag4/iwp86Lgk8Z47GEmTpp666F1VzmGB3UIqsYYfIPS2AuSfrgma/quYfQzMyHC+hOiI9WYO8DduIj0ucp1qZcC1yrIoCFxIngmpW5YIfX+L3Qb5U+pBr2iKpfMJc19jMWz1ldEuuyVNIUE4n6yit9t5PBSwmvx+dtnIkz4eBvnXRdSlkW/M7efTQJpm07/W9eSkjfcN8Xw5caAtkb+EhmX+QavDiQ0quVftR+TpXRZM2MyOdaj9Hw==</X509Certificate>
+        </X509Data>
+      </KeyInfo>
+    </KeyDescriptor>
+    <KeyDescriptor use="signing">
+      <KeyInfo xmlns="http://www.w3.org/2000/09/xmldsig#">
+        <X509Data>
+          <X509Certificate>MIIC1jCCAb6gAwIBAgIQGpau6ax7GqZH1kZlbNFd+jANBgkqhkiG9w0BAQsFADAnMSUwIwYDVQQDExxBREZTIFNpZ25pbmcgLSBhZGZzMDEuZmhzLnNlMB4XDTEzMDEyNTExMTYzNloXDTE0MDEyNTExMTYzNlowJzElMCMGA1UEAxMcQURGUyBTaWduaW5nIC0gYWRmczAxLmZocy5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALN0JQIf7ryr5MQc3PU1GxT+cZ+y/PFVkt35y3Mt7o53HRPfPuPSUQBRbLdTgtJpdnbvVbqNuFz78afJWNhSIgCDvsLccwvZd/0NmDP2p9021aPuNmsg9X6HdiAT7R9edvsyf+vDULZmqS20vV1r3BTGbvAoTlxQ0YncWienYJR573OHUepqsK0WZbH2Qn5aATtGpABEThTiJJbhxVXUBb2vb4i7Clglnv59Q9/zw2jgjGNdANcw3HJuiP3b/Bp9sGsIdSs5Ji67nROy9cXdGSObcqVap+wUYxDCE2GvHKMcIqhv4lKQrmEtAzQ/3Nr8ZUzsr3FYjYR0f0PcDYoNB+0CAwEAATANBgkqhkiG9w0BAQsFAAOCAQEADH0bHypij+Aid1LEuW5TSSYuTiRDDCIdU4VKJ5KpTkCRW1JQzUW3P8Kiq18VpU+x1wFworEDP+cc1Xxuwki5DP/WgxgWNiRh4OoXiuwj7aYzpSw9BCoaoP9EBjqLeB+RLSdyHT/FScUjkiD+b2W+5IF6lAD/96WmsEd0pyA1XGKJqLzMLiTeyMAGsxeN7HfW7UgkqoyYai7VFRG7Xve8P9x/jNrUI732bnnl88o2aMMmpSxm6sKUe1s0hbHiaosxpoXIRkIt1Rwhf1swO2FfeuPxsxkn2Gs9Qf7GlNIEW5DHxUOEHLHKwsTu076rN48ZMmw8s6jIoTVD9nKhS1AoFg==</X509Certificate>
+        </X509Data>
+      </KeyInfo>
+    </KeyDescriptor>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://adfs01.fhs.se/adfs/ls/"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://adfs01.fhs.se/adfs/ls/"/>
+    <NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://adfs01.fhs.se/adfs/ls/"/>
+    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://adfs01.fhs.se/adfs/ls/"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://adfs01.fhs.se/adfs/ls/"/>
+    <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/emailaddress" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="E-Mail Address"/>
+    <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/givenname" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Given Name"/>
+    <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/name" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Name"/>
+    <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/upn" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="UPN"/>
+    <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/claims/CommonName" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Common Name"/>
+    <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/claims/EmailAddress" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="AD FS 1.x E-Mail Address"/>
+    <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/claims/Group" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Group"/>
+    <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/claims/UPN" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="AD FS 1.x UPN"/>
+    <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/role" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Role"/>
+    <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/surname" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Surname"/>
+    <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/privatepersonalidentifier" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="PPID"/>
+    <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/nameidentifier" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Name ID"/>
+    <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/authenticationinstant" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Authentication time stamp"/>
+    <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/authenticationmethod" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Authentication method"/>
+    <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/denyonlysid" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Deny only group SID"/>
+    <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/denyonlyprimarysid" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Deny only primary SID"/>
+    <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/denyonlyprimarygroupsid" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Deny only primary group SID"/>
+    <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/groupsid" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Group SID"/>
+    <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/primarygroupsid" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Primary group SID"/>
+    <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/primarysid" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Primary SID"/>
+    <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/windowsaccountname" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Windows account name"/>
+    <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/claims/eduPersonScopedAffiliation" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonScopedAffiliation"/>
+  </IDPSSODescriptor>
+  <Organization>
+    <OrganizationName xml:lang="sv-SE">F&#246;rsvarsh&#246;gskolan</OrganizationName>
+    <OrganizationDisplayName xml:lang="sv-SE">F&#246;rsvarsh&#246;gskolan</OrganizationDisplayName>
+    <OrganizationURL xml:lang="sv-SE">http://www.fhs.se/</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="support">
+    <GivenName>Alex</GivenName>
+    <SurName>Sj&#246;blom</SurName>
+    <EmailAddress>helpdesk@fhs.se</EmailAddress>
+    <TelephoneNumber>+46(0)855342545</TelephoneNumber>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-idp-2.0.mxml b/swamid-idp-2.0.mxml
index 942a88be..dfb85d19 100644
--- a/swamid-idp-2.0.mxml
+++ b/swamid-idp-2.0.mxml
@@ -35,4 +35,5 @@
   <xi:include href="swamid-1.0/idp.student.bth.se.xml"/>
   <xi:include href="swamid-1.0/identity.mdh.se.xml"/>
   <xi:include href="swamid-1.0/idp.it.gu.se.xml"/>
+  <xi:include href="swamid-1.0/adfs01.fhs.se.xml"/>
 </md:EntitiesDescriptor>