Correct unspec name id format
authorlajoie <lajoie@ab3bd59b-922f-494d-bb5f-6f0a3c29deca>
Thu, 24 Jan 2008 13:32:23 +0000 (13:32 +0000)
committerlajoie <lajoie@ab3bd59b-922f-494d-bb5f-6f0a3c29deca>
Thu, 24 Jan 2008 13:32:23 +0000 (13:32 +0000)
git-svn-id: https://subversion.switch.ch/svn/shibboleth/java-idp/trunk@2600 ab3bd59b-922f-494d-bb5f-6f0a3c29deca

resources/conf/attribute-resolver.xml
resources/metadata/idp-metadata.xml
src/edu/internet2/middleware/shibboleth/idp/profile/saml2/AbstractSAML2ProfileHandler.java
test/data/conf1/attribute-resolver.xml

index cfed2de..0341b05 100644 (file)
 
         <resolver:AttributeEncoder xsi:type="SAML2StringNameID" xmlns="urn:mace:shibboleth:2.0:attribute:encoder"
             nameFormat="urn:oasis:names:tc:SAML:2.0:nameid-format:transient" />
-            
-        <resolver:AttributeEncoder xsi:type="SAML2StringNameID" xmlns="urn:mace:shibboleth:2.0:attribute:encoder"
-            nameFormat="urn:oasis:names:tc:SAML:2.0:nameid-format:unspecified" />
     </resolver:AttributeDefinition>
 
     <!-- ========================================== -->
 
     <resolver:PrincipalConnector xsi:type="Transient" xmlns="urn:mace:shibboleth:2.0:resolver:pc" id="saml2Transient"
         nameIDFormat="urn:oasis:names:tc:SAML:2.0:nameid-format:transient" />
-        
-    <resolver:PrincipalConnector xsi:type="Transient" xmlns="urn:mace:shibboleth:2.0:resolver:pc" id="saml2Unspec"
-        nameIDFormat="urn:oasis:names:tc:SAML:2.0:nameid-format:unspecified" />
 
 </AttributeResolver>
\ No newline at end of file
index 1da7ff8..e8721d6 100644 (file)
@@ -25,11 +25,11 @@ $IDP_CERTIFICATE$
         <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
         
         <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
-                                   Location="https://$IDP_HOSTNAME$/idp/profile/SAML1/SOAP/ArtifactResolution" 
+                                   Location="https://$IDP_HOSTNAME$:8443/idp/profile/SAML1/SOAP/ArtifactResolution" 
                                    index="1"/>
 
         <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
-                                   Location="https://$IDP_HOSTNAME$/idp/profile/SAML2/SOAP/ArtifactResolution" 
+                                   Location="https://$IDP_HOSTNAME$:8443/idp/profile/SAML2/SOAP/ArtifactResolution" 
                                    index="2"/>
 
         <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" 
@@ -64,10 +64,10 @@ $IDP_CERTIFICATE$
         </KeyDescriptor>
 
         <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" 
-                          Location="https://$IDP_HOSTNAME$/idp/profile/SAML1/SOAP/AttributeQuery" />
+                          Location="https://$IDP_HOSTNAME$:8443/idp/profile/SAML1/SOAP/AttributeQuery" />
         
         <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
-                          Location="https://$IDP_HOSTNAME$/idp/profile/SAML2/SOAP/AttributeQuery" />
+                          Location="https://$IDP_HOSTNAME$:8443/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>    
index d25adce..32af60e 100644 (file)
@@ -736,7 +736,7 @@ public abstract class AbstractSAML2ProfileHandler extends AbstractSAMLProfileHan
         }
 
         if (nameFormats.isEmpty()) {
-            nameFormats.add("urn:oasis:names:tc:SAML:2.0:nameid-format:unspecified");
+            nameFormats.add("urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified");
         }
 
         // If authn request and name ID policy format specified, make sure it's in the list of supported formats
index 3fcf8ce..896d182 100644 (file)
@@ -23,7 +23,7 @@
                                    nameFormat="urn:oasis:names:tc:SAML:1.0:nameid-format:unspecified" />
 
         <resolver:AttributeEncoder xsi:type="SAML2StringNameID" xmlns="urn:mace:shibboleth:2.0:attribute:encoder"
-                                   nameFormat="urn:oasis:names:tc:SAML:2.0:nameid-format:unspecified" />
+                                   nameFormat="urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified" />
    </resolver:AttributeDefinition>
     
     <!-- Example attribute defintions -->