Author: jonananas Date: 2011-05-04 03:45:26 -0400 (Wed, 04 May 2011) New Revision: 928 Modified: picketlink-seam/trunk/seam-sp/src/main/java/org/picketlink/identity/seam/federation/Authenticator.java picketlink-seam/trunk/seam-sp/src/main/resources/saml-entities.xml Log: PLFED-183 seam-sp does not work with ssocircle as IDP - Enabled commented away code needed for the app to allow SAML SSO Modified: picketlink-seam/trunk/seam-sp/src/main/java/org/picketlink/identity/seam/federation/Authenticator.java =================================================================== --- picketlink-seam/trunk/seam-sp/src/main/java/org/picketlink/identity/seam/federation/Authenticator.java 2011-05-04 03:59:09 UTC (rev 927) +++ picketlink-seam/trunk/seam-sp/src/main/java/org/picketlink/identity/seam/federation/Authenticator.java 2011-05-04 07:45:26 UTC (rev 928) @@ -25,7 +25,7 @@ import java.util.List; import org.jboss.seam.annotations.Name; -import org.jboss.seam.security.Identity; +import org.jboss.seam.security.Identity; import org.picketlink.identity.federation.newmodel.saml.v2.assertion.AttributeType; /** @@ -44,28 +44,20 @@ { return false; } - else + for (AttributeType attribute : samlPrincipal.getAttributes()) { - throw new RuntimeException();/* - for (AttributeType attribute : samlPrincipal.getAttributes()) + if (attribute.getName().equals("role")) { - if (attribute.getName().equals("role")) + List<Object> value = attribute.getAttributeValue(); + if (value != null && value.size() > 0) { - List<Object> value = attribute.getAttributeValue(); - if (value != null && value.size() > 0) - { - roles.add((String) value.get(0)); - } + roles.add((String) value.get(0)); } - }*/ - - //return true; + } } - } - else - { return true; } + return true; } public String localLogout() Modified: picketlink-seam/trunk/seam-sp/src/main/resources/saml-entities.xml =================================================================== --- picketlink-seam/trunk/seam-sp/src/main/resources/saml-entities.xml 2011-05-04 03:59:09 UTC (rev 927) +++ picketlink-seam/trunk/seam-sp/src/main/resources/saml-entities.xml 2011-05-04 07:45:26 UTC (rev 928) @@ -9,18 +9,18 @@ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#"> <ds:X509Data> <ds:X509Certificate> -MIICQDCCAakCBEeNB0swDQYJKoZIhvcNAQEEBQAwZzELMAkGA1UEBhMCVVMxEzARBgNVBAgTCkNh -bGlmb3JuaWExFDASBgNVBAcTC1NhbnRhIENsYXJhMQwwCgYDVQQKEwNTdW4xEDAOBgNVBAsTB09w -ZW5TU08xDTALBgNVBAMTBHRlc3QwHhcNMDgwMTE1MTkxOTM5WhcNMTgwMTEyMTkxOTM5WjBnMQsw -CQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEUMBIGA1UEBxMLU2FudGEgQ2xhcmExDDAK -BgNVBAoTA1N1bjEQMA4GA1UECxMHT3BlblNTTzENMAsGA1UEAxMEdGVzdDCBnzANBgkqhkiG9w0B -AQEFAAOBjQAwgYkCgYEArSQc/U75GB2AtKhbGS5piiLkmJzqEsp64rDxbMJ+xDrye0EN/q1U5Of+ -RkDsaN/igkAvV1cuXEgTL6RlafFPcUX7QxDhZBhsYF9pbwtMzi4A4su9hnxIhURebGEmxKW9qJNY -Js0Vo5+IgjxuEWnjnnVgHTs1+mq5QYTA7E6ZyL8CAwEAATANBgkqhkiG9w0BAQQFAAOBgQB3Pw/U -QzPKTPTYi9upbFXlrAKMwtFf2OW4yvGWWvlcwcNSZJmTJ8ARvVYOMEVNbsT4OFcfu2/PeYoAdiDA -cGy/F2Zuj8XJJpuQRSE6PtQqBuDEHjjmOQJ0rV/r8mO1ZCtHRhpZ5zYRjhRC9eCbjx9VrFax0JDC -/FfwWigmrW0Y0Q== - </ds:X509Certificate> + MIICQDCCAakCBEeNB0swDQYJKoZIhvcNAQEEBQAwZzELMAkGA1UEBhMCVVMxEzARBgNVBAgTCkNh + bGlmb3JuaWExFDASBgNVBAcTC1NhbnRhIENsYXJhMQwwCgYDVQQKEwNTdW4xEDAOBgNVBAsTB09w + ZW5TU08xDTALBgNVBAMTBHRlc3QwHhcNMDgwMTE1MTkxOTM5WhcNMTgwMTEyMTkxOTM5WjBnMQsw + CQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEUMBIGA1UEBxMLU2FudGEgQ2xhcmExDDAK + BgNVBAoTA1N1bjEQMA4GA1UECxMHT3BlblNTTzENMAsGA1UEAxMEdGVzdDCBnzANBgkqhkiG9w0B + AQEFAAOBjQAwgYkCgYEArSQc/U75GB2AtKhbGS5piiLkmJzqEsp64rDxbMJ+xDrye0EN/q1U5Of+ + RkDsaN/igkAvV1cuXEgTL6RlafFPcUX7QxDhZBhsYF9pbwtMzi4A4su9hnxIhURebGEmxKW9qJNY + Js0Vo5+IgjxuEWnjnnVgHTs1+mq5QYTA7E6ZyL8CAwEAATANBgkqhkiG9w0BAQQFAAOBgQB3Pw/U + QzPKTPTYi9upbFXlrAKMwtFf2OW4yvGWWvlcwcNSZJmTJ8ARvVYOMEVNbsT4OFcfu2/PeYoAdiDA + cGy/F2Zuj8XJJpuQRSE6PtQqBuDEHjjmOQJ0rV/r8mO1ZCtHRhpZ5zYRjhRC9eCbjx9VrFax0JDC + /FfwWigmrW0Y0Q== + </ds:X509Certificate> </ds:X509Data> </ds:KeyInfo> </KeyDescriptor>