- Fix for #465

GluuFederation · Feb 1, 2017 · ac46049 · ac46049
1 parent 0e72c6e
commit ac46049
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 70 deletions.
diff --git a/...e/shibboleth3/idp/ProfileConfiguration/SAML1ArtifactResolutionProfileConfiguration.xml.vm b/...e/shibboleth3/idp/ProfileConfiguration/SAML1ArtifactResolutionProfileConfiguration.xml.vm
diff --git a/...plate/shibboleth3/idp/ProfileConfiguration/SAML1AttributeQueryProfileConfiguration.xml.vm b/...plate/shibboleth3/idp/ProfileConfiguration/SAML1AttributeQueryProfileConfiguration.xml.vm
diff --git a/...on/template/shibboleth3/idp/ProfileConfiguration/ShibbolethSSOProfileConfiguration.xml.vm b/...on/template/shibboleth3/idp/ProfileConfiguration/ShibbolethSSOProfileConfiguration.xml.vm
diff --git a/configuration/template/shibboleth3/idp/idp-metadata.xml.vm b/configuration/template/shibboleth3/idp/idp-metadata.xml.vm
@@ -30,10 +30,6 @@ $idpEncryptionCertificate
             </ds:KeyInfo>
         </KeyDescriptor>
 
-        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
-                                   Location="$idpHost:9443/idp/profile/SAML1/SOAP/ArtifactResolution"
-                                   index="1"/>
-
         <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
                                    Location="$idpHost:9443/idp/profile/SAML2/SOAP/ArtifactResolution"
                                    index="2"/>
@@ -42,7 +38,6 @@ $idpEncryptionCertificate
         <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
         <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
 
-        <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="$idpHost/idp/profile/Shibboleth/SSO" />
         <SingleSignOnService Binding="urn:mace:shibboleth:2.0:profiles:AuthnRequest" Location="$idpHost/idp/profile/SAML2/Unsolicited/SSO"/>
         <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="$idpHost/idp/profile/SAML2/POST/SSO"/>
         <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="$idpHost/idp/profile/SAML2/POST-SimpleSign/SSO"/>
@@ -57,43 +52,6 @@ $idpEncryptionCertificate
 
     </IDPSSODescriptor>
 
-    <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
-        <Extensions>
-            <shibmd:Scope regexp="false">$domain</shibmd:Scope>
-        </Extensions>
-
-        <KeyDescriptor use="signing">
-            <ds:KeyInfo>
-                <ds:X509Data>
-                    <ds:X509Certificate>
-$idpSigningCertificate
-                    </ds:X509Certificate>
-                </ds:X509Data>
-            </ds:KeyInfo>
-        </KeyDescriptor>
-        <KeyDescriptor use="encryption">
-            <ds:KeyInfo>
-                <ds:X509Data>
-                    <ds:X509Certificate>
-$idpEncryptionCertificate
-                    </ds:X509Certificate>
-                </ds:X509Data>
-            </ds:KeyInfo>
-        </KeyDescriptor>
-
-        <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
-                          Location="$idpHost:9443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-
-        <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
-                          Location="$idpHost:9443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-
-        <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-        <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-        <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
-
-    </AttributeAuthorityDescriptor>
-
     <Organization>
         <OrganizationName xml:lang="en">$orgName</OrganizationName>
         <OrganizationDisplayName xml:lang="en">$orgShortName</OrganizationDisplayName>

diff --git a/server/src/main/webapp/WEB-INF/incl/trustmanager/configureRelyingPartyPanel.xhtml b/server/src/main/webapp/WEB-INF/incl/trustmanager/configureRelyingPartyPanel.xhtml
@@ -92,6 +92,7 @@
 
                 <h:panelGroup id="ProfileConfigurationConfigMenu">
                     <h:panelGroup style="overflow:auto; height: 300px; width: 900px;" layout="block" rendered="#{relyingPartyAction.profileConfigurations.size() > 0}">
+                        <!--
                         <ui:decorate template="/WEB-INF/incl/trustmanager/profileConfiguration/saml1sso.xhtml">
                             <ui:param name="_relyingPartyAction" value="#{relyingPartyAction}" />
                         </ui:decorate>
@@ -103,7 +104,8 @@
                         <ui:decorate template="/WEB-INF/incl/trustmanager/profileConfiguration/saml1aq.xhtml">
                             <ui:param name="_relyingPartyAction" value="#{relyingPartyAction}" />
                         </ui:decorate>
-
+                         -->
+
                         <ui:decorate template="/WEB-INF/incl/trustmanager/profileConfiguration/saml2sso.xhtml">
                             <ui:param name="_relyingPartyAction" value="#{relyingPartyAction}" />
                         </ui:decorate>