September 2010 - picketlink-commits

Picketlink SVN: r423 - in federation/trunk: picketlink-fed-parser and 6 other directories.

by picketlink-commits＠lists.jboss.org

Author: sguilhen(a)redhat.com Date: 2010-09-30 17:45:34 -0400 (Thu, 30 Sep 2010) New Revision: 423 Added: federation/trunk/picketlink-fed-parser/ federation/trunk/picketlink-fed-parser/src/ federation/trunk/picketlink-fed-parser/src/main/ federation/trunk/picketlink-fed-parser/src/main/java/ federation/trunk/picketlink-fed-parser/src/main/resources/ federation/trunk/picketlink-fed-parser/src/test/ federation/trunk/picketlink-fed-parser/src/test/java/ federation/trunk/picketlink-fed-parser/src/test/resources/ federation/trunk/picketlink-fed-parser/src/test/resources/config/ federation/trunk/picketlink-fed-parser/src/test/resources/config/picketlink-sts.xml federation/trunk/picketlink-fed-parser/src/test/resources/wstrust/ federation/trunk/picketlink-fed-parser/src/test/resources/wstrust/wst-batch-issue.xml federation/trunk/picketlink-fed-parser/src/test/resources/wstrust/wst-batch-validate.xml federation/trunk/picketlink-fed-parser/src/test/resources/wstrust/wst-cancel-saml.xml federation/trunk/picketlink-fed-parser/src/test/resources/wstrust/wst-issue-appliesto.xml federation/trunk/picketlink-fed-parser/src/test/resources/wstrust/wst-issue-onbehalfof.xml federation/trunk/picketlink-fed-parser/src/test/resources/wstrust/wst-issue-public-certificate.xml federation/trunk/picketlink-fed-parser/src/test/resources/wstrust/wst-issue-public-key.xml federation/trunk/picketlink-fed-parser/src/test/resources/wstrust/wst-issue-symmetric-key.xml federation/trunk/picketlink-fed-parser/src/test/resources/wstrust/wst-issue.xml federation/trunk/picketlink-fed-parser/src/test/resources/wstrust/wst-renew-saml.xml federation/trunk/picketlink-fed-parser/src/test/resources/wstrust/wst-validate-saml.xml Log: Created picketlink-fed-parser module and added sample configuration/ws-trust XML files for testing Added: federation/trunk/picketlink-fed-parser/src/test/resources/config/picketlink-sts.xml =================================================================== --- federation/trunk/picketlink-fed-parser/src/test/resources/config/picketlink-sts.xml (rev 0) +++ federation/trunk/picketlink-fed-parser/src/test/resources/config/picketlink-sts.xml 2010-09-30 21:45:34 UTC (rev 423) @@ -0,0 +1,20 @@ +<PicketLinkSTS xmlns="urn:picketlink:identity-federation:config:1.0" + STSName="PicketLinkSTS" TokenTimeout="7200" EncryptToken="false"> + <KeyProvider ClassName="org.picketlink.identity.federation.core.impl.KeyStoreKeyManager"> + <Auth Key="KeyStoreURL" Value="sts_keystore.jks"/> + <Auth Key="KeyStorePass" Value="testpass"/> + <Auth Key="SigningKeyAlias" Value="sts"/> + <Auth Key="SigningKeyPass" Value="keypass"/> + <ValidatingAlias Key="http://services.testcorp.org/provider1" Value="service1"/> + </KeyProvider> + <TokenProviders> + <TokenProvider ProviderClass="org.picketlink.identity.federation.core.wstrust.plugins.saml.SAML20TokenProvider" + TokenType="http://docs.oasis-open.org/wss/oasis-wss-saml-token-profile-1.1#SAMLV2.0" + TokenElement="Assertion" + TokenElementNS="urn:oasis:names:tc:SAML:2.0:assertion"/> + </TokenProviders> + <ServiceProviders> + <ServiceProvider Endpoint="http://services.testcorp.org/provider1" TokenType="http://docs.oasis-open.org/wss/oasis-wss-saml-token-profile-1.1#SAMLV2.0" + TruststoreAlias="service1"/> + </ServiceProviders> +</PicketLinkSTS> Added: federation/trunk/picketlink-fed-parser/src/test/resources/wstrust/wst-batch-issue.xml =================================================================== --- federation/trunk/picketlink-fed-parser/src/test/resources/wstrust/wst-batch-issue.xml (rev 0) +++ federation/trunk/picketlink-fed-parser/src/test/resources/wstrust/wst-batch-issue.xml 2010-09-30 21:45:34 UTC (rev 423) @@ -0,0 +1,10 @@ +<wst:RequestSecurityTokenCollection xmlns:wst="http://docs.oasis-open.org/ws-sx/ws-trust/200512"> + <wst:RequestSecurityToken Context="context1"> + <wst:RequestType>http://docs.oasis-open.org/ws-sx/ws-trust/200512/BatchIssue</wst:RequestType> + <wst:TokenType>http://docs.oasis-open.org/wss/oasis-wss-saml-token-profile-1.1#SAMLV2.0</wst:TokenType> + </wst:RequestSecurityToken> + <wst:RequestSecurityToken Context="context2"> + <wst:RequestType>http://docs.oasis-open.org/ws-sx/ws-trust/200512/BatchIssue</wst:RequestType> + <wst:TokenType>http://www.tokens.org/SpecialToken</wst:TokenType> + </wst:RequestSecurityToken> +</wst:RequestSecurityTokenCollection> Added: federation/trunk/picketlink-fed-parser/src/test/resources/wstrust/wst-batch-validate.xml =================================================================== --- federation/trunk/picketlink-fed-parser/src/test/resources/wstrust/wst-batch-validate.xml (rev 0) +++ federation/trunk/picketlink-fed-parser/src/test/resources/wstrust/wst-batch-validate.xml 2010-09-30 21:45:34 UTC (rev 423) @@ -0,0 +1,98 @@ +<wst:RequestSecurityTokenCollection xmlns:wst="http://docs.oasis-open.org/ws-sx/ws-trust/200512"> + <wst:RequestSecurityToken Context="validatecontext1"> + <wst:RequestType>http://docs.oasis-open.org/ws-sx/ws-trust/200512/BatchValidate</wst:RequestType> + <wst:TokenType>http://docs.oasis-open.org/ws-sx/ws-trust/200512/RSTR/Status</wst:TokenType> + <wst:ValidateTarget> + <saml2:Assertion xmlns:saml2="urn:oasis:names:tc:SAML:2.0:assertion" ID="ID_ab0392ef-b557-4453-95a8-a7e168da8ac5" + IssueInstant="2010-09-30T19:13:37.869Z" Version="2.0"> + <saml2:Issuer>Test STS</saml2:Issuer> + <saml2:Subject> + <saml2:NameID NameQualifier="urn:picketlink:identity-federation">jduke</saml2:NameID> + <saml2:SubjectConfirmation Method="urn:oasis:names:tc:SAML:2.0:cm:bearer"/> + </saml2:Subject> + <saml2:Conditions NotBefore="2010-09-30T19:13:37.869Z" NotOnOrAfter="2010-09-30T21:13:37.869Z"/> + <ds:Signature xmlns:ds="http://www.w3.org/2000/09/xmldsig#"> + <ds:SignedInfo> + <ds:CanonicalizationMethod Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#WithComments"/> + <ds:SignatureMethod Algorithm="http://www.w3.org/2000/09/xmlds#rsa-sha1"/> + <ds:Reference URI="#ID_ab0392ef-b557-4453-95a8-a7e168da8ac5"> + <ds:Transforms> + <ds:Transform Algorithm="http://www.w3.org/2000/09/xmlds#enveloped-signature"/> + <ds:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/> + </ds:Transforms> + <ds:DigestMethod Algorithm="http://www.w3.org/2000/09/xmlds#sha1"/> + <ds:DigestValue>0Y9QM5c5qCShz5UWmbFzBmbuTus=</ds:DigestValue> + </ds:Reference> + </ds:SignedInfo> + <ds:SignatureValue> +se/flQ2htUQ0IUYieVkXNn9cfjnfgv6H99nFarsTNTpRI9xuSlw5OTai/2PYdZI2Va9+QzzBf99m +VFyigfFdfrqug6aKFhF0lsujzlFfPfmXBbDRiTFX+4SkBeV71uuy7rOUI/jRiitEA0QrKqs0e/pV ++C8PoaariisK96Mtt7A= + </ds:SignatureValue> + <ds:KeyInfo> + <ds:KeyValue> + <ds:RSAKeyValue> + <ds:Modulus> +suGIyhVTbFvDwZdx8Av62zmP+aGOlsBN8WUE3eEEcDtOIZgO78SImMQGwB2C0eIVMhiLRzVPqoW1 +dCPAveTm653zHOmubaps1fY0lLJDSZbTbhjeYhoQmmaBro/tDpVw5lKJwspqVnMuRK19ju2dxpKw +lYGGtrP5VQv00dfNPbs= + </ds:Modulus> + <ds:Exponent>AQAB</ds:Exponent> + </ds:RSAKeyValue> + </ds:KeyValue> + </ds:KeyInfo> + </ds:Signature> + </saml2:Assertion> + </wst:ValidateTarget> + </wst:RequestSecurityToken> + <wst:RequestSecurityToken Context="validatecontext2"> + <wst:RequestType>http://docs.oasis-open.org/ws-sx/ws-trust/200512/BatchValidate</wst:RequestType> + <wst:TokenType>http://docs.oasis-open.org/ws-sx/ws-trust/200512/RSTR/Status</wst:TokenType> + <wst:ValidateTarget> + <saml2:Assertion xmlns:saml2="urn:oasis:names:tc:SAML:2.0:assertion" ID="ID_cf9efbf0-9d7f-4b4a-b77f-d83ecaafd374" + IssueInstant="2010-09-30T19:13:37.911Z" Version="2.0"> + <saml2:Issuer>Test STS</saml2:Issuer> + <saml2:Subject> + <saml2:NameID NameQualifier="urn:picketlink:identity-federation">jduke</saml2:NameID> + <saml2:SubjectConfirmation Method="urn:oasis:names:tc:SAML:2.0:cm:bearer"/> + </saml2:Subject> + <saml2:Conditions NotBefore="2010-09-30T19:13:37.911Z" NotOnOrAfter="2010-09-30T21:13:37.911Z"> + <saml2:AudienceRestriction> + <saml2:Audience>http://services.testcorp.org/provider2</saml2:Audience> + </saml2:AudienceRestriction> + </saml2:Conditions> + <ds:Signature xmlns:ds="http://www.w3.org/2000/09/xmldsig#"> + <ds:SignedInfo> + <ds:CanonicalizationMethod Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#WithComments"/> + <ds:SignatureMethod Algorithm="http://www.w3.org/2000/09/xmlds#rsa-sha1"/> + <ds:Reference URI="#ID_cf9efbf0-9d7f-4b4a-b77f-d83ecaafd374"> + <ds:Transforms> + <ds:Transform Algorithm="http://www.w3.org/2000/09/xmlds#enveloped-signature"/> + <ds:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/> + </ds:Transforms> + <ds:DigestMethod Algorithm="http://www.w3.org/2000/09/xmlds#sha1"/> + <ds:DigestValue>TMZdBOA0MvR7aNpCAg2CXggkdZc=</ds:DigestValue> + </ds:Reference> + </ds:SignedInfo> + <ds:SignatureValue> +Q8mEzGWlnWmSmb+KUkP0wju4LOINaUYXBBXNF5vRhYVBixSUe8HSHKzNIdQ+ZGtijaV1vh0LUFbT +//faZKyHRgPXtskDn8cJTVT6obp7rUIOCKMoCs5p9/bUAbtaQHYjfWpifdT3PaTdlehpS8INK2P0 +JUQYU3q8F3u7je9VHbA= + </ds:SignatureValue> + <ds:KeyInfo> + <ds:KeyValue> + <ds:RSAKeyValue> + <ds:Modulus> +suGIyhVTbFvDwZdx8Av62zmP+aGOlsBN8WUE3eEEcDtOIZgO78SImMQGwB2C0eIVMhiLRzVPqoW1 +dCPAveTm653zHOmubaps1fY0lLJDSZbTbhjeYhoQmmaBro/tDpVw5lKJwspqVnMuRK19ju2dxpKw +lYGGtrP5VQv00dfNPbs= + </ds:Modulus> + <ds:Exponent>AQAB</ds:Exponent> + </ds:RSAKeyValue> + </ds:KeyValue> + </ds:KeyInfo> + </ds:Signature> + </saml2:Assertion> + </wst:ValidateTarget> + </wst:RequestSecurityToken> +</wst:RequestSecurityTokenCollection> Added: federation/trunk/picketlink-fed-parser/src/test/resources/wstrust/wst-cancel-saml.xml =================================================================== --- federation/trunk/picketlink-fed-parser/src/test/resources/wstrust/wst-cancel-saml.xml (rev 0) +++ federation/trunk/picketlink-fed-parser/src/test/resources/wstrust/wst-cancel-saml.xml 2010-09-30 21:45:34 UTC (rev 423) @@ -0,0 +1,45 @@ +<wst:RequestSecurityToken xmlns:wst="http://docs.oasis-open.org/ws-sx/ws-trust/200512" Context="cancelcontext"> + <wst:RequestType>http://docs.oasis-open.org/ws-sx/ws-trust/200512/Cancel</wst:RequestType> + <wst:CancelTarget> + <saml2:Assertion ID="ID_cb1eadf5-50a6-4fdf-96bc-412514f52882" IssueInstant="2010-09-30T19:13:37.603Z" Version="2.0" + xmlns:saml2="urn:oasis:names:tc:SAML:2.0:assertion"> + <saml2:Issuer>Test STS</saml2:Issuer> + <saml2:Subject> + <saml2:NameID NameQualifier="urn:picketlink:identity-federation">jduke</saml2:NameID> + <saml2:SubjectConfirmation Method="urn:oasis:names:tc:SAML:2.0:cm:bearer"/> + </saml2:Subject> + <saml2:Conditions NotBefore="2010-09-30T19:13:37.603Z" NotOnOrAfter="2010-09-30T21:13:37.603Z"/> + <ds:Signature xmlns:ds="http://www.w3.org/2000/09/xmldsig#"> + <ds:SignedInfo> + <ds:CanonicalizationMethod Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#WithComments"/> + <ds:SignatureMethod Algorithm="http://www.w3.org/2000/09/xmlds#rsa-sha1"/> + <ds:Reference URI="#ID_cb1eadf5-50a6-4fdf-96bc-412514f52882"> + <ds:Transforms> + <ds:Transform Algorithm="http://www.w3.org/2000/09/xmlds#enveloped-signature"/> + <ds:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/> + </ds:Transforms> + <ds:DigestMethod Algorithm="http://www.w3.org/2000/09/xmlds#sha1"/> + <ds:DigestValue >KaqeDCxTv3d8Xp646yGGAF7Kxw0=</ds:DigestValue> + </ds:Reference> + </ds:SignedInfo> + <ds:SignatureValue> +rkl4IPZ1slJVbCUI39D0bKp/OvIGrU7FqigVORbl18gbVXcO7RLiubPefhc9xm2gG+YQ5itF4Az0 +xcqVuphJumo9tOG1czwS61JlKGabvFumL1DDV5V3oa0iIAw5GhXs7ZLs70eDj3CM3WVlD8vBgjy9 +xP7h9NFumidraXsFK9Q= + </ds:SignatureValue> + <ds:KeyInfo> + <ds:KeyValue> + <ds:RSAKeyValue> + <ds:Modulus> +suGIyhVTbFvDwZdx8Av62zmP+aGOlsBN8WUE3eEEcDtOIZgO78SImMQGwB2C0eIVMhiLRzVPqoW1 +dCPAveTm653zHOmubaps1fY0lLJDSZbTbhjeYhoQmmaBro/tDpVw5lKJwspqVnMuRK19ju2dxpKw +lYGGtrP5VQv00dfNPbs= + </ds:Modulus> + <ds:Exponent>AQAB</ds:Exponent> + </ds:RSAKeyValue> + </ds:KeyValue> + </ds:KeyInfo> + </ds:Signature> + </saml2:Assertion> + </wst:CancelTarget> +</wst:RequestSecurityToken> Added: federation/trunk/picketlink-fed-parser/src/test/resources/wstrust/wst-issue-appliesto.xml =================================================================== --- federation/trunk/picketlink-fed-parser/src/test/resources/wstrust/wst-issue-appliesto.xml (rev 0) +++ federation/trunk/picketlink-fed-parser/src/test/resources/wstrust/wst-issue-appliesto.xml 2010-09-30 21:45:34 UTC (rev 423) @@ -0,0 +1,8 @@ +<wst:RequestSecurityToken xmlns:wst="http://docs.oasis-open.org/ws-sx/ws-trust/200512" Context="testcontext"> + <wst:RequestType>http://docs.oasis-open.org/ws-sx/ws-trust/200512/Issue</wst:RequestType> + <wsp:AppliesTo xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy"> + <wsa:EndpointReference xmlns:wsa="http://www.w3.org/2005/08/addressing"> + <wsa:Address>http://services.testcorp.org/provider2</wsa:Address> + </wsa:EndpointReference> + </wsp:AppliesTo> +</wst:RequestSecurityToken> Added: federation/trunk/picketlink-fed-parser/src/test/resources/wstrust/wst-issue-onbehalfof.xml =================================================================== --- federation/trunk/picketlink-fed-parser/src/test/resources/wstrust/wst-issue-onbehalfof.xml (rev 0) +++ federation/trunk/picketlink-fed-parser/src/test/resources/wstrust/wst-issue-onbehalfof.xml 2010-09-30 21:45:34 UTC (rev 423) @@ -0,0 +1,10 @@ +<wst:RequestSecurityToken xmlns:wst="http://docs.oasis-open.org/ws-sx/ws-trust/200512" Context="testcontext"> + <wst:RequestType>http://docs.oasis-open.org/ws-sx/ws-trust/200512/Issue</wst:RequestType> + <wst:TokenType>http://docs.oasis-open.org/wss/oasis-wss-saml-token-profile-1.1#SAMLV2.0</wst:TokenType> + <wst:OnBehalfOf> + <wsse:UsernameToken wsu:Id="id" xmlns:wsse="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext..." + xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utilit..."> + <wsse:Username>anotherduke</wsse:Username> + </wsse:UsernameToken> + </wst:OnBehalfOf> +</wst:RequestSecurityToken> Added: federation/trunk/picketlink-fed-parser/src/test/resources/wstrust/wst-issue-public-certificate.xml =================================================================== --- federation/trunk/picketlink-fed-parser/src/test/resources/wstrust/wst-issue-public-certificate.xml (rev 0) +++ federation/trunk/picketlink-fed-parser/src/test/resources/wstrust/wst-issue-public-certificate.xml 2010-09-30 21:45:34 UTC (rev 423) @@ -0,0 +1,15 @@ +<wst:RequestSecurityToken xmlns:wst="http://docs.oasis-open.org/ws-sx/ws-trust/200512" Context="testcontext"> + <wst:RequestType>http://docs.oasis-open.org/ws-sx/ws-trust/200512/Issue</wst:RequestType> + <wsp:AppliesTo xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy"> + <wsa:EndpointReference xmlns:wsa="http://www.w3.org/2005/08/addressing"> + <wsa:Address>http://services.testcorp.org/provider2</wsa:Address> + </wsa:EndpointReference> + </wsp:AppliesTo> + <wst:KeyType>http://docs.oasis-open.org/ws-sx/ws-trust/200512/PublicKey</wst:KeyType> + <wst:UseKey> + <ds:X509Certificate xmlns:ds="http://www.w3.org/2000/09/xmldsig#"> +MIICVDCCAb0CBEn2ANAwDQYJKoZIhvcNAQEEBQAwcTELMAkGA1UEBhMCVVMxCzAJBgNVBAgTAkZMMQ4wDAYDVQQHEwVNaWFtaTESMBAGA1UEChMJVGVjaG5vYnVnMRQwEgYDVQQLEwtTYW1wbGUgVW5pdDEbMBkGA1UEAxMSU2VydmljZSBQcm92aWRlciAxMB4XDTA5MDQyNzE5MDAzMloXDTA5MDcyNjE5MDAzMlowcTELMAkGA1UEBhMCVVMxCzAJBgNVBAgTAkZMMQ4wDAYDVQQHEwVNaWFtaTESMBAGA1UEChMJVGVjaG5vYnVnMRQwEgYDVQQLEwtTYW1wbGUgVW5pdDEbMBkGA1UEAxMSU2VydmljZSBQcm92aWRlciAxMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC1yAvTR3PaBfYU77dznEb6PRPJWwAn3XDvp1kIObmaV2rkDwb+8dDkS2Y0pfl52ubKKK82kg/PA6GeL1c0/MCGCRnrZdCaQgKW/Tj+jh1SzZdLlMdBxYuV39jRUXoHJYgfhm7FZjew2SXo40T/qbeKYGhBS6D1tDPngxU1umB/hwIDAQABMA0GCSqGSIb3DQEBBAUAA4GBAK33IhDY8BGFf5A4gk4iQ8pOpfxq7khBerj5+5VaW5fdxbfs9vIpD2lLNkk0OnIEs5cd7ERqi2W7pb/M4yHVJ2/09JqAqVEbZYW/Gi88ZrxdfPexP5F9SnHkRwdMNPAV/XUXc0m6Jw44t02xzrgOVRyOaLE+X1Wvb1YWpLkgIua2 + </ds:X509Certificate> + </wst:UseKey> +</wst:RequestSecurityToken> + Added: federation/trunk/picketlink-fed-parser/src/test/resources/wstrust/wst-issue-public-key.xml =================================================================== --- federation/trunk/picketlink-fed-parser/src/test/resources/wstrust/wst-issue-public-key.xml (rev 0) +++ federation/trunk/picketlink-fed-parser/src/test/resources/wstrust/wst-issue-public-key.xml 2010-09-30 21:45:34 UTC (rev 423) @@ -0,0 +1,19 @@ +<wst:RequestSecurityToken xmlns:wst="http://docs.oasis-open.org/ws-sx/ws-trust/200512" Context="testcontext"> + <wst:RequestType>http://docs.oasis-open.org/ws-sx/ws-trust/200512/Issue</wst:RequestType> + <wsp:AppliesTo xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy"> + <wsa:EndpointReference xmlns:wsa="http://www.w3.org/2005/08/addressing"> + <wsa:Address>http://services.testcorp.org/provider2</wsa:Address> + </wsa:EndpointReference> + </wsp:AppliesTo> + <wst:KeyType>http://docs.oasis-open.org/ws-sx/ws-trust/200512/PublicKey</wst:KeyType> + <wst:UseKey> + <ds:KeyValue xmlns:ds="http://www.w3.org/2000/09/xmldsig#"> + <ds:RSAKeyValue> + <ds:Modulus> +ALXIC9NHc9oF9hTvt3OcRvo9E8lbACfdcO+nWQg5uZpXauQPBv7x0ORLZjSl+Xna5soorzaSD88DoZ4vVzT8wIYJGetl0JpCApb9OP6OHVLNl0uUx0HFi5Xf2NFRegcliB+GbsVmN7DZJejjRP+pt4pgaEFLoPW0M+eDFTW6YH+H + </ds:Modulus> + <ds:Exponent>AQAB</ds:Exponent> + </ds:RSAKeyValue> + </ds:KeyValue> + </wst:UseKey> +</wst:RequestSecurityToken> Added: federation/trunk/picketlink-fed-parser/src/test/resources/wstrust/wst-issue-symmetric-key.xml =================================================================== --- federation/trunk/picketlink-fed-parser/src/test/resources/wstrust/wst-issue-symmetric-key.xml (rev 0) +++ federation/trunk/picketlink-fed-parser/src/test/resources/wstrust/wst-issue-symmetric-key.xml 2010-09-30 21:45:34 UTC (rev 423) @@ -0,0 +1,13 @@ +<wst:RequestSecurityToken xmlns:wst="http://docs.oasis-open.org/ws-sx/ws-trust/200512" Context="testcontext"> + <wst:RequestType>http://docs.oasis-open.org/ws-sx/ws-trust/200512/Issue</wst:RequestType> + <wsp:AppliesTo xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy"> + <wsa:EndpointReference xmlns:wsa="http://www.w3.org/2005/08/addressing"> + <wsa:Address>http://services.testcorp.org/provider2</wsa:Address> + </wsa:EndpointReference> + </wsp:AppliesTo> + <wst:KeyType>http://docs.oasis-open.org/ws-sx/ws-trust/200512/SymmetricKey</wst:KeyType> + <wst:Entropy> + <wst:BinarySecret Type="http://docs.oasis-open.org/ws-sx/ws-trust/200512/Nonce">M0/7qLpV49c=</wst:BinarySecret> + </wst:Entropy> + <wst:KeySize>64</wst:KeySize> +</wst:RequestSecurityToken> Added: federation/trunk/picketlink-fed-parser/src/test/resources/wstrust/wst-issue.xml =================================================================== --- federation/trunk/picketlink-fed-parser/src/test/resources/wstrust/wst-issue.xml (rev 0) +++ federation/trunk/picketlink-fed-parser/src/test/resources/wstrust/wst-issue.xml 2010-09-30 21:45:34 UTC (rev 423) @@ -0,0 +1,4 @@ +<wst:RequestSecurityToken xmlns:wst="http://docs.oasis-open.org/ws-sx/ws-trust/200512" Context="testcontext"> + <wst:RequestType>http://docs.oasis-open.org/ws-sx/ws-trust/200512/Issue</wst:RequestType> + <wst:TokenType>http://docs.oasis-open.org/wss/oasis-wss-saml-token-profile-1.1#SAMLV2.0</wst:TokenType> +</wst:RequestSecurityToken> Added: federation/trunk/picketlink-fed-parser/src/test/resources/wstrust/wst-renew-saml.xml =================================================================== --- federation/trunk/picketlink-fed-parser/src/test/resources/wstrust/wst-renew-saml.xml (rev 0) +++ federation/trunk/picketlink-fed-parser/src/test/resources/wstrust/wst-renew-saml.xml 2010-09-30 21:45:34 UTC (rev 423) @@ -0,0 +1,50 @@ +<wst:RequestSecurityToken xmlns:wst="http://docs.oasis-open.org/ws-sx/ws-trust/200512" Context="renewcontext"> + <wst:RequestType>http://docs.oasis-open.org/ws-sx/ws-trust/200512/Renew</wst:RequestType> + <wst:TokenType>http://docs.oasis-open.org/wss/oasis-wss-saml-token-profile-1.1#SAMLV2.0</wst:TokenType> + <wst:RenewTarget> + <saml2:Assertion ID="ID_654b6092-c725-40ea-8044-de453b59cb28" IssueInstant="2010-09-30T19:13:37.429Z" Version="2.0" + xmlns:saml2="urn:oasis:names:tc:SAML:2.0:assertion"> + <saml2:Issuer>Test STS</saml2:Issuer> + <saml2:Subject> + <saml2:NameID NameQualifier="urn:picketlink:identity-federation">jduke</saml2:NameID> + <saml2:SubjectConfirmation Method="urn:oasis:names:tc:SAML:2.0:cm:bearer"/> + </saml2:Subject> + <saml2:Conditions NotBefore="2010-09-30T19:13:37.429Z" NotOnOrAfter="2010-09-30T21:13:37.429Z"> + <saml2:AudienceRestriction> + <saml2:Audience>http://services.testcorp.org/provider2</saml2:Audience> + </saml2:AudienceRestriction> + </saml2:Conditions> + <ds:Signature xmlns:ds="http://www.w3.org/2000/09/xmldsig#"> + <ds:SignedInfo> + <ds:CanonicalizationMethod Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#WithComments"/> + <ds:SignatureMethod Algorithm="http://www.w3.org/2000/09/xmlds#rsa-sha1"/> + <ds:Reference URI="#ID_654b6092-c725-40ea-8044-de453b59cb28"> + <ds:Transforms> + <ds:Transform Algorithm="http://www.w3.org/2000/09/xmlds#enveloped-signature"/> + <ds:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/> + </ds:Transforms> + <ds:DigestMethod Algorithm="http://www.w3.org/2000/09/xmlds#sha1"/> + <ds:DigestValue>4OfF2Py9LTKN6qp+dcXupdPJM+Y=</ds:DigestValue> + </ds:Reference> + </ds:SignedInfo> + <ds:SignatureValue> +MukTucsxjAyVtWwPMFQpfhREgZtl9Z+7+DlaaP3Ar2gJXg7GjkOpJmDQ72ASLWQeELUoTseqiOmZ +slAQPV/RlLXXjLFenEMgO56gpBQdEZ4VVriegkTSXJhfz9c244oOnKKHCSH/7XMASt7DXRX+EOZF +j3hJtAxbNgGTUOwMSLw= + </ds:SignatureValue> + <ds:KeyInfo> + <ds:KeyValue> + <ds:RSAKeyValue> + <ds:Modulus> +suGIyhVTbFvDwZdx8Av62zmP+aGOlsBN8WUE3eEEcDtOIZgO78SImMQGwB2C0eIVMhiLRzVPqoW1 +dCPAveTm653zHOmubaps1fY0lLJDSZbTbhjeYhoQmmaBro/tDpVw5lKJwspqVnMuRK19ju2dxpKw +lYGGtrP5VQv00dfNPbs= + </ds:Modulus> + <ds:Exponent>AQAB</ds:Exponent> + </ds:RSAKeyValue> + </ds:KeyValue> + </ds:KeyInfo> + </ds:Signature> + </saml2:Assertion> + </wst:RenewTarget> +</wst:RequestSecurityToken> Added: federation/trunk/picketlink-fed-parser/src/test/resources/wstrust/wst-validate-saml.xml =================================================================== --- federation/trunk/picketlink-fed-parser/src/test/resources/wstrust/wst-validate-saml.xml (rev 0) +++ federation/trunk/picketlink-fed-parser/src/test/resources/wstrust/wst-validate-saml.xml 2010-09-30 21:45:34 UTC (rev 423) @@ -0,0 +1,46 @@ +<wst:RequestSecurityToken xmlns:wst="http://docs.oasis-open.org/ws-sx/ws-trust/200512" Context="validatecontext"> + <wst:RequestType>http://docs.oasis-open.org/ws-sx/ws-trust/200512/Validate</wst:RequestType> + <wst:TokenType>http://docs.oasis-open.org/ws-sx/ws-trust/200512/RSTR/Status</wst:TokenType> + <wst:ValidateTarget> + <saml2:Assertion ID="ID_654b6092-c725-40ea-8044-de453b59cb28" IssueInstant="2010-09-30T19:13:37.186Z" Version="2.0" + xmlns:saml2="urn:oasis:names:tc:SAML:2.0:assertion"> + <saml2:Issuer>Test STS</saml2:Issuer> + <saml2:Subject> + <saml2:NameID NameQualifier="urn:picketlink:identity-federation">jduke</saml2:NameID> + <saml2:SubjectConfirmation Method="urn:oasis:names:tc:SAML:2.0:cm:bearer"/> + </saml2:Subject> + <saml2:Conditions NotBefore="2010-09-30T19:13:37.186Z" NotOnOrAfter="2010-09-30T21:13:37.186Z"/> + <ds:Signature xmlns:ds="http://www.w3.org/2000/09/xmldsig#"> + <ds:SignedInfo> + <ds:CanonicalizationMethod Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#WithComments"/> + <ds:SignatureMethod Algorithm="http://www.w3.org/2000/09/xmlds#rsa-sha1"/> + <ds:Reference URI="#ID_c63aec28-2234-41f4-97da-a8b2a4d97a22"> + <ds:Transforms> + <ds:Transform Algorithm="http://www.w3.org/2000/09/xmlds#enveloped-signature"/> + <ds:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/> + </ds:Transforms> + <ds:DigestMethod Algorithm="http://www.w3.org/2000/09/xmlds#sha1"/> + <ds:DigestValue>vLs6l7ECkKmthkW9/WR11mwhQDY=</ds:DigestValue> + </ds:Reference> + </ds:SignedInfo> + <ds:SignatureValue> +lm6qC8xGp+BYFYmxV96xWT5nQ/97cvbKFpsOt8tWpJblVL6f/PpEkTxk8zYIF2Wz0zCseqyOQeFC +0agSExcJulle6HAL5/4CHSR+MxQtXxUqNdAH4bQIFbPKzchRlkxZEy5u+OTt+iON/fLbtHCiEAk8 +m7elK6x1NYQ56RhTR0Q= + </ds:SignatureValue> + <ds:KeyInfo> + <ds:KeyValue> + <ds:RSAKeyValue> + <ds:Modulus> +suGIyhVTbFvDwZdx8Av62zmP+aGOlsBN8WUE3eEEcDtOIZgO78SImMQGwB2C0eIVMhiLRzVPqoW1 +dCPAveTm653zHOmubaps1fY0lLJDSZbTbhjeYhoQmmaBro/tDpVw5lKJwspqVnMuRK19ju2dxpKw +lYGGtrP5VQv00dfNPbs= + </ds:Modulus> + <ds:Exponent>AQAB</ds:Exponent> + </ds:RSAKeyValue> + </ds:KeyValue> + </ds:KeyInfo> + </ds:Signature> + </saml2:Assertion> + </wst:ValidateTarget> +</wst:RequestSecurityToken>

14 years, 2 months

1
0
0 / 0

Picketlink SVN: r422 - in federation/trunk: picketlink-seam/src/main/java/org/picketlink/identity/seam/federation and 5 other directories.

by picketlink-commits＠lists.jboss.org

Author: marcelkolsteren Date: 2010-09-26 17:20:08 -0400 (Sun, 26 Sep 2010) New Revision: 422 Added: federation/trunk/picketlink-seam/src/main/java/org/picketlink/identity/seam/federation/AuthenticationProtocol.java federation/trunk/picketlink-seam/src/main/java/org/picketlink/identity/seam/federation/FacebookConstants.java federation/trunk/picketlink-seam/src/main/java/org/picketlink/identity/seam/federation/FacebookLoginReceiver.java federation/trunk/picketlink-seam/src/main/java/org/picketlink/identity/seam/federation/FacebookLoginSender.java federation/trunk/picketlink-seam/src/main/java/org/picketlink/identity/seam/federation/FacebookPrincipal.java federation/trunk/picketlink-seam/src/main/java/org/picketlink/identity/seam/federation/OAuthConstants.java federation/trunk/picketlink-seam/src/main/java/org/picketlink/identity/seam/federation/configuration/FacebookConfiguration.java federation/trunk/picketlink-webapps/seam-sp/src/main/webapp/images/ federation/trunk/picketlink-webapps/seam-sp/src/main/webapp/images/login_with_facebook.png federation/trunk/picketlink-webapps/seam-sp/src/main/webapp/styles.css Modified: federation/trunk/picketlink-seam/pom.xml federation/trunk/picketlink-seam/src/main/java/org/picketlink/identity/seam/federation/ExternalAuthenticationFilter.java federation/trunk/picketlink-seam/src/main/java/org/picketlink/identity/seam/federation/ExternalAuthenticationService.java federation/trunk/picketlink-seam/src/main/java/org/picketlink/identity/seam/federation/ExternalAuthenticator.java federation/trunk/picketlink-seam/src/main/java/org/picketlink/identity/seam/federation/PagesSupportingExternalAuthentication.java federation/trunk/picketlink-seam/src/main/java/org/picketlink/identity/seam/federation/configuration/ServiceProvider.java federation/trunk/picketlink-seam/src/main/resources/schema/config/external-authentication-config.xsd federation/trunk/picketlink-webapps/seam-sp/src/main/resources/external-authentication-config.xml federation/trunk/picketlink-webapps/seam-sp/src/main/webapp/Login.xhtml federation/trunk/picketlink-webapps/seam-sp/src/main/webapp/PrincipalInfoFragment.xhtml Log: PLFED-105: add support for logging in with Facebook, based on the new OAuth 2.0 API Modified: federation/trunk/picketlink-seam/pom.xml =================================================================== --- federation/trunk/picketlink-seam/pom.xml 2010-09-24 09:49:09 UTC (rev 421) +++ federation/trunk/picketlink-seam/pom.xml 2010-09-26 21:20:08 UTC (rev 422) @@ -1,220 +1,225 @@ <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - <parent> - <groupId>org.picketlink</groupId> - <artifactId>picketlink-fed-parent</artifactId> - <version>2.0.0-SNAPSHOT</version> - <relativePath>../parent</relativePath> - </parent> - <modelVersion>4.0.0</modelVersion> - <artifactId>picketlink-seam</artifactId> - <packaging>jar</packaging> - <name>PicketLink Federation Bindings for Seam</name> - <url>http://labs.jboss.org/portal/picketlink/ + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <parent> + <groupId>org.picketlink</groupId> + <artifactId>picketlink-fed-parent</artifactId> + <version>2.0.0-SNAPSHOT</version> + <relativePath>../parent</relativePath> + </parent> + <modelVersion>4.0.0</modelVersion> + <artifactId>picketlink-seam</artifactId> + <packaging>jar</packaging> + <name>PicketLink Federation Bindings for Seam</name> + <url>http://labs.jboss.org/portal/picketlink/ </url> - <description>PicketLink Seam bindings contain the default + <description>PicketLink Seam bindings contain the default bindings needed for Seam web applications.</description> - <licenses> - <license> - <name>lgpl</name> - <url>http://repository.jboss.com/licenses/lgpl.txt + <licenses> + <license> + <name>lgpl</name> + <url>http://repository.jboss.com/licenses/lgpl.txt </url> - </license> - </licenses> - <organization> - <name>JBoss Inc.</name> - <url>http://www.jboss.org</url> - </organization> - <build> - <plugins> - <plugin> - <artifactId>maven-surefire-plugin</artifactId> - <version>2.4.3</version> - <configuration> - <printSummary>true</printSummary> - <disableXmlReport>false</disableXmlReport> - <testFailureIgnore>false</testFailureIgnore> - <includes> - <include>**/**TestCase.java</include> - </includes> - <forkMode>pertest</forkMode> - <argLine> - -Djava.endorsed.dirs=${basedir}/src/test/resources/endorsed + </license> + </licenses> + <organization> + <name>JBoss Inc.</name> + <url>http://www.jboss.org</url> + </organization> + <build> + <plugins> + <plugin> + <artifactId>maven-surefire-plugin</artifactId> + <version>2.4.3</version> + <configuration> + <printSummary>true</printSummary> + <disableXmlReport>false</disableXmlReport> + <testFailureIgnore>false</testFailureIgnore> + <includes> + <include>**/**TestCase.java</include> + </includes> + <forkMode>pertest</forkMode> + <argLine> + -Djava.endorsed.dirs=${basedir}/src/test/resources/endorsed </argLine> - <useFile>false</useFile> - <trimStackTrace>false</trimStackTrace> - </configuration> - </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>jaxb2-maven-plugin</artifactId> - <version>1.3</version> - <executions> - <execution> - <id>jaxb-xrds</id> - <configuration> - <schemaDirectory>${basedir}/src/main/resources/schema/xrds</schemaDirectory> - <packageName>org.picketlink.identity.seam.federation.jaxb.xrds</packageName> - <outputDirectory>${basedir}/src/main/generated-source</outputDirectory> - <clearOutputDir>true</clearOutputDir> - <staleFile>${project.build.directory}/generated-sources/jaxb/.staleFlag_xrds</staleFile> - </configuration> - <goals> - <goal>xjc</goal> - </goals> - </execution> - <execution> - <id>jaxb-config</id> - <configuration> - <schemaDirectory>${basedir}/src/main/resources/schema/config</schemaDirectory> - <packageName>org.picketlink.identity.seam.federation.jaxb.config</packageName> - <outputDirectory>${basedir}/src/main/generated-source</outputDirectory> - <clearOutputDir>false</clearOutputDir> - <staleFile>${project.build.directory}/generated-sources/jaxb/.staleFlag_config</staleFile> - </configuration> - <goals> - <goal>xjc</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </build> - <dependencies> - <dependency> - <groupId>org.picketlink</groupId> - <artifactId>picketlink-fed-model</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.picketlink</groupId> - <artifactId>picketlink-fed-api</artifactId> - <version>${project.version}</version> - <exclusions> - <exclusion> - <groupId>org.jboss.security</groupId> - <artifactId>jboss-security-spi</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.picketlink</groupId> - <artifactId>picketlink-web</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> - <version>2.5</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.jboss.seam</groupId> - <artifactId>jboss-seam</artifactId> - <version>2.1.2.GA</version> - <type>ejb</type> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>sun-jaf</groupId> - <artifactId>activation</artifactId> - <version>1.1</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>sun-jaf</groupId> - <artifactId>activation</artifactId> - <version>1.1</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>javax.faces</groupId> - <artifactId>jsf-api</artifactId> - <version>1.2</version> - <scope>provided</scope> - </dependency> -  - <dependency> - <groupId>org.htmlparser</groupId> - <artifactId>htmlparser</artifactId> - <version>1.6</version> - </dependency> - <dependency> - <groupId>org.openxri</groupId> - <artifactId>openxri-client</artifactId> - <version>1.2.0</version> - <exclusions> - <exclusion> - <artifactId>xercesImpl</artifactId> - <groupId>xerces</groupId> - </exclusion> - <exclusion> - <artifactId>xalan</artifactId> - <groupId>xalan</groupId> - </exclusion> - <exclusion> - <artifactId>log4j</artifactId> - <groupId>log4j</groupId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.openxri</groupId> - <artifactId>openxri-syntax</artifactId> - <version>1.2.0</version> - <exclusions> - <exclusion> - <artifactId>log4j</artifactId> - <groupId>log4j</groupId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>commons-httpclient</groupId> - <artifactId>commons-httpclient</artifactId> - <version>3.1</version> - </dependency> - <dependency> - <groupId>net.sourceforge.nekohtml</groupId> - <artifactId>nekohtml</artifactId> - <version>1.9.13</version> - <exclusions> - <exclusion> - <artifactId>xercesImpl</artifactId> - <groupId>xerces</groupId> - </exclusion> - </exclusions> - </dependency> -  - </dependencies> - <reporting> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-javadoc-plugin</artifactId> - <configuration> - <doclet>org.jboss.apiviz.APIviz</doclet> - <docletArtifact> - <groupId>org.jboss.apiviz</groupId> - <artifactId>apiviz</artifactId> - <version>1.2.5.GA</version> - </docletArtifact> - <additionalparam> -charset UTF-8 -docencoding UTF-8 -version - -author -breakiterator -windowtitle "${project.name} - ${project.version} API Reference" -doctitle "${project.name} - ${project.version} API Reference" -bottom "Copyright © - ${project.inceptionYear}-Present ${project.organization.name}. All - Rights Reserved." -link http://java.sun.com/javase/6/docs/api/ - -sourceclasspath ${project.build.outputDirectory} + <useFile>false</useFile> + <trimStackTrace>false</trimStackTrace> + </configuration> + </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>jaxb2-maven-plugin</artifactId> + <version>1.3</version> + <executions> + <execution> + <id>jaxb-xrds</id> + <configuration> + <schemaDirectory>${basedir}/src/main/resources/schema/xrds</schemaDirectory> + <packageName>org.picketlink.identity.seam.federation.jaxb.xrds</packageName> + <outputDirectory>${basedir}/src/main/generated-source</outputDirectory> + <clearOutputDir>true</clearOutputDir> + <staleFile>${project.build.directory}/generated-sources/jaxb/.staleFlag_xrds</staleFile> + </configuration> + <goals> + <goal>xjc</goal> + </goals> + </execution> + <execution> + <id>jaxb-config</id> + <configuration> + <schemaDirectory>${basedir}/src/main/resources/schema/config</schemaDirectory> + <packageName>org.picketlink.identity.seam.federation.jaxb.config</packageName> + <outputDirectory>${basedir}/src/main/generated-source</outputDirectory> + <clearOutputDir>false</clearOutputDir> + <staleFile>${project.build.directory}/generated-sources/jaxb/.staleFlag_config</staleFile> + </configuration> + <goals> + <goal>xjc</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> + <dependencies> + <dependency> + <groupId>org.picketlink</groupId> + <artifactId>picketlink-fed-model</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.picketlink</groupId> + <artifactId>picketlink-fed-api</artifactId> + <version>${project.version}</version> + <exclusions> + <exclusion> + <groupId>org.jboss.security</groupId> + <artifactId>jboss-security-spi</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.picketlink</groupId> + <artifactId>picketlink-web</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> + <version>2.5</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.jboss.seam</groupId> + <artifactId>jboss-seam</artifactId> + <version>2.1.2.GA</version> + <type>ejb</type> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>sun-jaf</groupId> + <artifactId>activation</artifactId> + <version>1.1</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>sun-jaf</groupId> + <artifactId>activation</artifactId> + <version>1.1</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>javax.faces</groupId> + <artifactId>jsf-api</artifactId> + <version>1.2</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.json</groupId> + <artifactId>json</artifactId> + <version>20090211</version> + </dependency> +  + <dependency> + <groupId>org.htmlparser</groupId> + <artifactId>htmlparser</artifactId> + <version>1.6</version> + </dependency> + <dependency> + <groupId>org.openxri</groupId> + <artifactId>openxri-client</artifactId> + <version>1.2.0</version> + <exclusions> + <exclusion> + <artifactId>xercesImpl</artifactId> + <groupId>xerces</groupId> + </exclusion> + <exclusion> + <artifactId>xalan</artifactId> + <groupId>xalan</groupId> + </exclusion> + <exclusion> + <artifactId>log4j</artifactId> + <groupId>log4j</groupId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.openxri</groupId> + <artifactId>openxri-syntax</artifactId> + <version>1.2.0</version> + <exclusions> + <exclusion> + <artifactId>log4j</artifactId> + <groupId>log4j</groupId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>commons-httpclient</groupId> + <artifactId>commons-httpclient</artifactId> + <version>3.1</version> + </dependency> + <dependency> + <groupId>net.sourceforge.nekohtml</groupId> + <artifactId>nekohtml</artifactId> + <version>1.9.13</version> + <exclusions> + <exclusion> + <artifactId>xercesImpl</artifactId> + <groupId>xerces</groupId> + </exclusion> + </exclusions> + </dependency> +  + </dependencies> + <reporting> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-javadoc-plugin</artifactId> + <configuration> + <doclet>org.jboss.apiviz.APIviz</doclet> + <docletArtifact> + <groupId>org.jboss.apiviz</groupId> + <artifactId>apiviz</artifactId> + <version>1.2.5.GA</version> + </docletArtifact> + <additionalparam> -charset UTF-8 -docencoding UTF-8 -version + -author -breakiterator -windowtitle "${project.name} + ${project.version} API Reference" -doctitle "${project.name} + ${project.version} API Reference" -bottom "Copyright © + ${project.inceptionYear}-Present ${project.organization.name}. All + Rights Reserved." -link http://java.sun.com/javase/6/docs/api/ + -sourceclasspath ${project.build.outputDirectory} </additionalparam> - <encoding>UTF-8</encoding> - </configuration> - </plugin> - </plugins> - </reporting> + <encoding>UTF-8</encoding> + </configuration> + </plugin> + </plugins> + </reporting> </project> Added: federation/trunk/picketlink-seam/src/main/java/org/picketlink/identity/seam/federation/AuthenticationProtocol.java =================================================================== --- federation/trunk/picketlink-seam/src/main/java/org/picketlink/identity/seam/federation/AuthenticationProtocol.java (rev 0) +++ federation/trunk/picketlink-seam/src/main/java/org/picketlink/identity/seam/federation/AuthenticationProtocol.java 2010-09-26 21:20:08 UTC (rev 422) @@ -0,0 +1,30 @@ +/* +* JBoss, Home of Professional Open Source. +* Copyright 2008, Red Hat Middleware LLC, and individual contributors +* as indicated by the @author tags. See the copyright.txt file in the +* distribution for a full listing of individual contributors. +* +* This is free software; you can redistribute it and/or modify it +* under the terms of the GNU Lesser General Public License as +* published by the Free Software Foundation; either version 2.1 of +* the License, or (at your option) any later version. +* +* This software is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +* Lesser General Public License for more details. +* +* You should have received a copy of the GNU Lesser General Public +* License along with this software; if not, write to the Free +* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA +* 02110-1301 USA, or see the FSF site: http://www.fsf.org. +*/ +package org.picketlink.identity.seam.federation; + +/** +* @author Marcel Kolsteren +* @since Sep 25, 2010 +*/ +public enum AuthenticationProtocol { + SAML, OPEN_ID, FACEBOOK +} Property changes on: federation/trunk/picketlink-seam/src/main/java/org/picketlink/identity/seam/federation/AuthenticationProtocol.java ___________________________________________________________________ Name: svn + eol-style=native Name: svn:keywords + Revision Author Date Modified: federation/trunk/picketlink-seam/src/main/java/org/picketlink/identity/seam/federation/ExternalAuthenticationFilter.java =================================================================== --- federation/trunk/picketlink-seam/src/main/java/org/picketlink/identity/seam/federation/ExternalAuthenticationFilter.java 2010-09-24 09:49:09 UTC (rev 421) +++ federation/trunk/picketlink-seam/src/main/java/org/picketlink/identity/seam/federation/ExternalAuthenticationFilter.java 2010-09-26 21:20:08 UTC (rev 422) @@ -70,6 +70,8 @@ public static final String OPEN_ID_PARAMETER = "openId"; + public static final String AUTHENTICATION_PROTOCOL_PARAMETER = "authProtocol"; + @Logger private Log log; @@ -156,33 +158,46 @@ case AUTHENTICATION_SERVICE : String returnUrl = httpRequest.getParameter(RETURN_URL_PARAMETER); - String providerName = httpRequest.getParameter(IDP_ENTITY_ID_PARAMETER); - if (providerName != null) + String authenticationProtocolParam = httpRequest.getParameter(AUTHENTICATION_PROTOCOL_PARAMETER); + AuthenticationProtocol authProtocol = Enum.valueOf(AuthenticationProtocol.class, + authenticationProtocolParam); + + switch (authProtocol) { - SamlIdentityProvider identityProvider = Configuration.instance().getServiceProvider() - .getSamlConfiguration().getSamlIdentityProviderByEntityId(providerName); + case SAML : { + String providerName = httpRequest.getParameter(IDP_ENTITY_ID_PARAMETER); + SamlIdentityProvider identityProvider = Configuration.instance().getServiceProvider() + .getSamlConfiguration().getSamlIdentityProviderByEntityId(providerName); - // User requested a page for which login is required. Return a page - // that instructs the browser to post an authentication request to the IDP. - if (identityProvider instanceof SamlIdentityProvider) - { - SamlSingleSignOnSender samlSingleSignOnSender = (SamlSingleSignOnSender) Component - .getInstance(SamlSingleSignOnSender.class); - samlSingleSignOnSender.sendAuthenticationRequestToIDP(httpRequest, httpResponse, - (SamlIdentityProvider) identityProvider, returnUrl); + // User requested a page for which login is required. Return a page + // that instructs the browser to post an authentication request to the IDP. + if (identityProvider instanceof SamlIdentityProvider) + { + SamlSingleSignOnSender samlSingleSignOnSender = (SamlSingleSignOnSender) Component + .getInstance(SamlSingleSignOnSender.class); + samlSingleSignOnSender.sendAuthenticationRequestToIDP(httpRequest, httpResponse, + (SamlIdentityProvider) identityProvider, returnUrl); + } + else + { + throw new RuntimeException("Only SAML identity providers are supported in this version"); + } + break; } - else - { - throw new RuntimeException("Only SAML identity providers are supported in this version"); + case OPEN_ID : { + OpenIdSingleLoginSender openIdSingleLoginSender = (OpenIdSingleLoginSender) Component + .getInstance(OpenIdSingleLoginSender.class); + String openId = httpRequest.getParameter(OPEN_ID_PARAMETER); + openIdSingleLoginSender.sendAuthRequest(openId, returnUrl, httpResponse); + break; } + case FACEBOOK : { + FacebookLoginSender facebookLoginSender = (FacebookLoginSender) Component + .getInstance(FacebookLoginSender.class); + facebookLoginSender.sendAuthorizeRequest(returnUrl, httpResponse); + break; + } } - else - { - OpenIdSingleLoginSender openIdSingleLoginSender = (OpenIdSingleLoginSender) Component - .getInstance(OpenIdSingleLoginSender.class); - String openId = httpRequest.getParameter(OPEN_ID_PARAMETER); - openIdSingleLoginSender.sendAuthRequest(openId, returnUrl, httpResponse); - } break; case LOGOUT_SERVICE : Identity identity = (Identity) Component.getInstance(Identity.class); @@ -221,6 +236,12 @@ httpResponse.setContentType("application/xrds+xml"); httpResponse.flushBuffer(); break; + case FACEBOOK_SERVICE : + FacebookLoginReceiver facebookLoginReceiver = (FacebookLoginReceiver) Component + .getInstance(FacebookLoginReceiver.class); + + facebookLoginReceiver.handleAuthenticationResponse(httpRequest, httpResponse); + break; default : throw new RuntimeException("Unsupported service " + service); } Modified: federation/trunk/picketlink-seam/src/main/java/org/picketlink/identity/seam/federation/ExternalAuthenticationService.java =================================================================== --- federation/trunk/picketlink-seam/src/main/java/org/picketlink/identity/seam/federation/ExternalAuthenticationService.java 2010-09-24 09:49:09 UTC (rev 421) +++ federation/trunk/picketlink-seam/src/main/java/org/picketlink/identity/seam/federation/ExternalAuthenticationService.java 2010-09-26 21:20:08 UTC (rev 422) @@ -39,8 +39,10 @@ OPEN_ID_SERVICE("OpenIdService"), - OPEN_ID_XRDS_SERVICE("OpenIdXrdsService"); + OPEN_ID_XRDS_SERVICE("OpenIdXrdsService"), + FACEBOOK_SERVICE("FacebookService"); + private String name; private ExternalAuthenticationService(String name) Modified: federation/trunk/picketlink-seam/src/main/java/org/picketlink/identity/seam/federation/ExternalAuthenticator.java =================================================================== --- federation/trunk/picketlink-seam/src/main/java/org/picketlink/identity/seam/federation/ExternalAuthenticator.java 2010-09-24 09:49:09 UTC (rev 421) +++ federation/trunk/picketlink-seam/src/main/java/org/picketlink/identity/seam/federation/ExternalAuthenticator.java 2010-09-26 21:20:08 UTC (rev 422) @@ -75,6 +75,7 @@ String authenticationServiceURL = serviceProvider .getServiceURL(ExternalAuthenticationService.AUTHENTICATION_SERVICE); Map<String, String> params = new HashMap<String, String>(); + params.put(ExternalAuthenticationFilter.AUTHENTICATION_PROTOCOL_PARAMETER, AuthenticationProtocol.SAML.name()); params.put(ExternalAuthenticationFilter.IDP_ENTITY_ID_PARAMETER, idpEntityId); params.put(ExternalAuthenticationFilter.RETURN_URL_PARAMETER, returnUrl); redirect(authenticationServiceURL, params); @@ -94,11 +95,26 @@ String authenticationServiceURL = serviceProvider .getServiceURL(ExternalAuthenticationService.AUTHENTICATION_SERVICE); Map<String, String> params = new HashMap<String, String>(); + params.put(ExternalAuthenticationFilter.AUTHENTICATION_PROTOCOL_PARAMETER, AuthenticationProtocol.OPEN_ID.name()); params.put(ExternalAuthenticationFilter.RETURN_URL_PARAMETER, returnUrl); params.put(ExternalAuthenticationFilter.OPEN_ID_PARAMETER, openId); redirect(authenticationServiceURL, params); } + public void facebookLogin() + { + if (serviceProvider.getFacebookConfiguration() == null) + { + throw new RuntimeException("Facebook is not configured."); + } + String authenticationServiceURL = serviceProvider + .getServiceURL(ExternalAuthenticationService.AUTHENTICATION_SERVICE); + Map<String, String> params = new HashMap<String, String>(); + params.put(ExternalAuthenticationFilter.AUTHENTICATION_PROTOCOL_PARAMETER, AuthenticationProtocol.FACEBOOK.name()); + params.put(ExternalAuthenticationFilter.RETURN_URL_PARAMETER, returnUrl); + redirect(authenticationServiceURL, params); + } + public void singleLogout() { if (!identity.isLoggedIn()) Added: federation/trunk/picketlink-seam/src/main/java/org/picketlink/identity/seam/federation/FacebookConstants.java =================================================================== --- federation/trunk/picketlink-seam/src/main/java/org/picketlink/identity/seam/federation/FacebookConstants.java (rev 0) +++ federation/trunk/picketlink-seam/src/main/java/org/picketlink/identity/seam/federation/FacebookConstants.java 2010-09-26 21:20:08 UTC (rev 422) @@ -0,0 +1,35 @@ +/* +* JBoss, Home of Professional Open Source. +* Copyright 2008, Red Hat Middleware LLC, and individual contributors +* as indicated by the @author tags. See the copyright.txt file in the +* distribution for a full listing of individual contributors. +* +* This is free software; you can redistribute it and/or modify it +* under the terms of the GNU Lesser General Public License as +* published by the Free Software Foundation; either version 2.1 of +* the License, or (at your option) any later version. +* +* This software is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +* Lesser General Public License for more details. +* +* You should have received a copy of the GNU Lesser General Public +* License along with this software; if not, write to the Free +* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA +* 02110-1301 USA, or see the FSF site: http://www.fsf.org. +*/ +package org.picketlink.identity.seam.federation; + +/** +* @author Marcel Kolsteren +* @since Sep 26, 2010 +*/ +public class FacebookConstants +{ + public static final String AUTHENTICATION_ENDPOINT_URL = "https://graph.facebook.com/oauth/authorize"; + + public static final String ACCESS_TOKEN_ENDPOINT_URL = "https://graph.facebook.com/oauth/access_token"; + + public static final String PROFILE_ENDPOINT_URL = "https://graph.facebook.com/me"; +} Property changes on: federation/trunk/picketlink-seam/src/main/java/org/picketlink/identity/seam/federation/FacebookConstants.java ___________________________________________________________________ Name: svn + eol-style=native Name: svn:keywords + Revision Author Date Added: federation/trunk/picketlink-seam/src/main/java/org/picketlink/identity/seam/federation/FacebookLoginReceiver.java =================================================================== --- federation/trunk/picketlink-seam/src/main/java/org/picketlink/identity/seam/federation/FacebookLoginReceiver.java (rev 0) +++ federation/trunk/picketlink-seam/src/main/java/org/picketlink/identity/seam/federation/FacebookLoginReceiver.java 2010-09-26 21:20:08 UTC (rev 422) @@ -0,0 +1,226 @@ +/* +* JBoss, Home of Professional Open Source. +* Copyright 2008, Red Hat Middleware LLC, and individual contributors +* as indicated by the @author tags. See the copyright.txt file in the +* distribution for a full listing of individual contributors. +* +* This is free software; you can redistribute it and/or modify it +* under the terms of the GNU Lesser General Public License as +* published by the Free Software Foundation; either version 2.1 of +* the License, or (at your option) any later version. +* +* This software is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +* Lesser General Public License for more details. +* +* You should have received a copy of the GNU Lesser General Public +* License along with this software; if not, write to the Free +* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA +* 02110-1301 USA, or see the FSF site: http://www.fsf.org. +*/ +package org.picketlink.identity.seam.federation; + +import java.io.IOException; +import java.io.InputStreamReader; +import java.io.Reader; +import java.io.UnsupportedEncodingException; +import java.net.URL; +import java.net.URLConnection; +import java.net.URLDecoder; +import java.net.URLEncoder; +import java.util.HashMap; +import java.util.Map; + +import javax.security.auth.login.LoginException; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import org.jboss.seam.annotations.AutoCreate; +import org.jboss.seam.annotations.In; +import org.jboss.seam.annotations.Name; +import org.jboss.seam.core.Events; +import org.jboss.seam.security.Identity; +import org.json.JSONException; +import org.json.JSONObject; +import org.picketlink.identity.seam.federation.configuration.ServiceProvider; + +/** +* @author Marcel Kolsteren +* @since Sep 25, 2010 +*/ +@Name("org.picketlink.identity.seam.federation.facebookLoginReceiver") +@AutoCreate +public class FacebookLoginReceiver +{ + @In + private FacebookLoginSender facebookLoginSender; + + @In + private InternalAuthenticator internalAuthenticator; + + @In + private ServiceProvider serviceProvider; + + public void handleAuthenticationResponse(HttpServletRequest request, HttpServletResponse response) + { + String error = request.getParameter(OAuthConstants.ERROR_PARAMETER); + if (error != null) + { + sendErrorRedirect(response, error); + } + else + { + String returnUrl = request.getParameter(ExternalAuthenticationFilter.RETURN_URL_PARAMETER); + if (returnUrl == null) + { + throw new RuntimeException("Return URL parameter not found"); + } + String authorizationCode = request.getParameter(OAuthConstants.CODE_PARAMETER); + if (returnUrl == null) + { + throw new RuntimeException("Authorization code parameter not found"); + } + + URLConnection connection = facebookLoginSender.sendAccessTokenRequest(returnUrl, authorizationCode, response); + + if (connection.getContentType().startsWith("text/plain")) + { + Map<String, String> params = formUrlDecode(readUrlContent(connection)); + String accessToken = params.get(OAuthConstants.ACCESS_TOKEN_PARAMETER); + if (accessToken == null) + { + throw new RuntimeException("No access token found"); + } + else + { + login(request, response, accessToken, returnUrl); + } + } + else if (connection.getContentType().equals("application/json")) + { + sendErrorRedirect(response, readUrlContent(connection)); + } + else + { + throw new RuntimeException("Unsupported content type: " + connection.getContentType()); + } + } + } + + private Map<String, String> formUrlDecode(String encodedData) + { + Map<String, String> params = new HashMap<String, String>(); + String[] elements = encodedData.split("&"); + for (String element : elements) + { + String[] pair = element.split("="); + if (pair.length == 2) + { + String paramName = pair[0]; + String paramValue; + try + { + paramValue = URLDecoder.decode(pair[1], "UTF-8"); + } + catch (UnsupportedEncodingException e) + { + throw new RuntimeException(e); + } + params.put(paramName, paramValue); + } + else + { + throw new RuntimeException("Unexpected name-value pair in response: " + element); + } + } + return params; + } + + public void login(HttpServletRequest request, HttpServletResponse response, String accessToken, String returnUrl) + { + FacebookPrincipal facebookPrincipal = null; + try + { + String urlString = new StringBuilder(FacebookConstants.PROFILE_ENDPOINT_URL).append("?access_token=").append( + URLEncoder.encode(accessToken, "UTF-8")).toString(); + URL profileUrl = new URL(urlString); + String profileContent = readUrlContent(profileUrl.openConnection()); + JSONObject jsonObject = new JSONObject(profileContent); + + facebookPrincipal = new FacebookPrincipal(); + facebookPrincipal.setAccessToken(accessToken); + facebookPrincipal.setId(jsonObject.getString("id")); + facebookPrincipal.setName(jsonObject.getString("name")); + facebookPrincipal.setFirstName(jsonObject.getString("first_name")); + facebookPrincipal.setLastName(jsonObject.getString("last_name")); + facebookPrincipal.setGender(jsonObject.getString("gender")); + facebookPrincipal.setTimezone(jsonObject.getString("timezone")); + facebookPrincipal.setLocale(jsonObject.getString("locale")); + if (jsonObject.getString("email") != null) + { + facebookPrincipal.setEmail(jsonObject.getString("email")); + } + } + catch (JSONException e) + { + throw new RuntimeException(e); + } + catch (IOException e) + { + throw new RuntimeException(e); + } + + boolean authenticated = internalAuthenticator.authenticate(facebookPrincipal, request); + + try + { + if (authenticated) + { + response.sendRedirect(returnUrl); + } + else + { + sendErrorRedirect(response, null); + } + } + catch (IOException e) + { + throw new RuntimeException(e); + } + } + + private void sendErrorRedirect(HttpServletResponse response, String message) + { + LoginException exception = message != null ? new LoginException(message) : new LoginException(); + Events.instance().raiseEvent(Identity.EVENT_LOGIN_FAILED, exception); + try + { + response.sendRedirect(serviceProvider.getFailedAuthenticationUrl()); + } + catch (IOException e) + { + throw new RuntimeException(e); + } + } + + private String readUrlContent(URLConnection connection) + { + StringBuilder result = new StringBuilder(); + try + { + Reader reader = new InputStreamReader(connection.getInputStream()); + char[] buffer = new char[50]; + int nrOfChars; + while ((nrOfChars = reader.read(buffer)) != -1) + { + result.append(buffer, 0, nrOfChars); + } + } + catch (IOException e) + { + throw new RuntimeException(e); + } + return result.toString(); + } +} Property changes on: federation/trunk/picketlink-seam/src/main/java/org/picketlink/identity/seam/federation/FacebookLoginReceiver.java ___________________________________________________________________ Name: svn + eol-style=native Name: svn:keywords + Revision Author Date Added: federation/trunk/picketlink-seam/src/main/java/org/picketlink/identity/seam/federation/FacebookLoginSender.java =================================================================== --- federation/trunk/picketlink-seam/src/main/java/org/picketlink/identity/seam/federation/FacebookLoginSender.java (rev 0) +++ federation/trunk/picketlink-seam/src/main/java/org/picketlink/identity/seam/federation/FacebookLoginSender.java 2010-09-26 21:20:08 UTC (rev 422) @@ -0,0 +1,145 @@ +/* +* JBoss, Home of Professional Open Source. +* Copyright 2008, Red Hat Middleware LLC, and individual contributors +* as indicated by the @author tags. See the copyright.txt file in the +* distribution for a full listing of individual contributors. +* +* This is free software; you can redistribute it and/or modify it +* under the terms of the GNU Lesser General Public License as +* published by the Free Software Foundation; either version 2.1 of +* the License, or (at your option) any later version. +* +* This software is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +* Lesser General Public License for more details. +* +* You should have received a copy of the GNU Lesser General Public +* License along with this software; if not, write to the Free +* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA +* 02110-1301 USA, or see the FSF site: http://www.fsf.org. +*/ +package org.picketlink.identity.seam.federation; + +import java.io.IOException; +import java.io.UnsupportedEncodingException; +import java.net.URL; +import java.net.URLConnection; +import java.net.URLEncoder; +import java.util.HashMap; +import java.util.Map; + +import javax.servlet.http.HttpServletResponse; + +import org.jboss.seam.annotations.AutoCreate; +import org.jboss.seam.annotations.In; +import org.jboss.seam.annotations.Name; +import org.jboss.seam.core.Events; +import org.jboss.seam.security.Identity; +import org.picketlink.identity.seam.federation.configuration.ServiceProvider; + +/** +* Component for sending login requests to Facebook. +* +* @author Marcel Kolsteren +* @since Sep 25, 2010 +*/ +@Name("org.picketlink.identity.seam.federation.facebookLoginSender") +@AutoCreate +public class FacebookLoginSender +{ + + @In + private ServiceProvider serviceProvider; + + public void sendAuthorizeRequest(String returnUrl, HttpServletResponse response) + { + Events.instance().raiseEvent(Identity.EVENT_PRE_AUTHENTICATE); + + String returnUri = getReturnUri(returnUrl); + String clientId = serviceProvider.getFacebookConfiguration().getClientId(); + Map<String, String> params = new HashMap<String, String>(); + params.put(OAuthConstants.REDIRECT_URI_PARAMETER, returnUri); + params.put(OAuthConstants.CLIENT_ID_PARAMETER, clientId); + String scope = serviceProvider.getFacebookConfiguration().getScope(); + if (scope != null) + { + params.put(OAuthConstants.SCOPE_PARAMETER, scope); + } + String location = new StringBuilder(FacebookConstants.AUTHENTICATION_ENDPOINT_URL).append("?").append( + createQueryString(params)).toString(); + try + { + response.sendRedirect(location); + } + catch (IOException e) + { + throw new RuntimeException(e); + } + } + + public URLConnection sendAccessTokenRequest(String returnUrl, String authorizationCode, HttpServletResponse response) + { + String returnUri = getReturnUri(returnUrl); + String clientId = serviceProvider.getFacebookConfiguration().getClientId(); + String clientSecret = serviceProvider.getFacebookConfiguration().getClientSecret(); + + Map<String, String> params = new HashMap<String, String>(); + params.put(OAuthConstants.REDIRECT_URI_PARAMETER, returnUri); + params.put(OAuthConstants.CLIENT_ID_PARAMETER, clientId); + params.put(OAuthConstants.CLIENT_SECRET_PARAMETER, clientSecret); + params.put(OAuthConstants.CODE_PARAMETER, authorizationCode); + String location = new StringBuilder(FacebookConstants.ACCESS_TOKEN_ENDPOINT_URL).append("?").append( + createQueryString(params)).toString(); + + try + { + URL url = new URL(location); + URLConnection connection = url.openConnection(); + return connection; + } + catch (IOException e) + { + throw new RuntimeException(e); + } + } + + private String getReturnUri(String returnUrl) + { + String serviceUrl = serviceProvider.getServiceURL(ExternalAuthenticationService.FACEBOOK_SERVICE); + Map<String, String> params = new HashMap<String, String>(); + params.put(ExternalAuthenticationFilter.RETURN_URL_PARAMETER, returnUrl); + return new StringBuilder(serviceUrl).append("?").append(createQueryString(params)).toString(); + } + + private String createQueryString(Map<String, String> params) + { + StringBuilder queryString = new StringBuilder(); + boolean first = true; + for (Map.Entry<String, String> entry : params.entrySet()) + { + String paramName = entry.getKey(); + String paramValue = entry.getValue(); + if (first) + { + first = false; + } + else + { + queryString.append("&"); + } + queryString.append(paramName).append("="); + String encodedParamValue; + try + { + encodedParamValue = URLEncoder.encode(paramValue, "UTF-8"); + } + catch (UnsupportedEncodingException e) + { + throw new RuntimeException(e); + } + queryString.append(encodedParamValue); + } + return queryString.toString(); + } +} Property changes on: federation/trunk/picketlink-seam/src/main/java/org/picketlink/identity/seam/federation/FacebookLoginSender.java ___________________________________________________________________ Name: svn + eol-style=native Name: svn:keywords + Revision Author Date Added: federation/trunk/picketlink-seam/src/main/java/org/picketlink/identity/seam/federation/FacebookPrincipal.java =================================================================== --- federation/trunk/picketlink-seam/src/main/java/org/picketlink/identity/seam/federation/FacebookPrincipal.java (rev 0) +++ federation/trunk/picketlink-seam/src/main/java/org/picketlink/identity/seam/federation/FacebookPrincipal.java 2010-09-26 21:20:08 UTC (rev 422) @@ -0,0 +1,139 @@ +/* +* JBoss, Home of Professional Open Source. +* Copyright 2008, Red Hat Middleware LLC, and individual contributors +* as indicated by the @author tags. See the copyright.txt file in the +* distribution for a full listing of individual contributors. +* +* This is free software; you can redistribute it and/or modify it +* under the terms of the GNU Lesser General Public License as +* published by the Free Software Foundation; either version 2.1 of +* the License, or (at your option) any later version. +* +* This software is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +* Lesser General Public License for more details. +* +* You should have received a copy of the GNU Lesser General Public +* License along with this software; if not, write to the Free +* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA +* 02110-1301 USA, or see the FSF site: http://www.fsf.org. +*/ +package org.picketlink.identity.seam.federation; + +import java.security.Principal; + +/** +* @author Marcel Kolsteren +* @since Sep 26, 2010 +*/ +public class FacebookPrincipal implements Principal +{ + private String accessToken; + + private String id; + + private String name; + + private String firstName; + + private String lastName; + + private String gender; + + private String timezone; + + private String locale; + + private String email; + + public String getAccessToken() + { + return accessToken; + } + + public void setAccessToken(String accessToken) + { + this.accessToken = accessToken; + } + + public String getId() + { + return id; + } + + public void setId(String id) + { + this.id = id; + } + + public String getFirstName() + { + return firstName; + } + + public void setFirstName(String firstName) + { + this.firstName = firstName; + } + + public String getLastName() + { + return lastName; + } + + public void setLastName(String lastName) + { + this.lastName = lastName; + } + + public String getGender() + { + return gender; + } + + public void setGender(String gender) + { + this.gender = gender; + } + + public String getTimezone() + { + return timezone; + } + + public void setTimezone(String timezone) + { + this.timezone = timezone; + } + + public String getLocale() + { + return locale; + } + + public void setLocale(String locale) + { + this.locale = locale; + } + + public void setName(String name) + { + this.name = name; + } + + public String getName() + { + return name; + } + + public String getEmail() + { + return email; + } + + public void setEmail(String email) + { + this.email = email; + } +} Property changes on: federation/trunk/picketlink-seam/src/main/java/org/picketlink/identity/seam/federation/FacebookPrincipal.java ___________________________________________________________________ Name: svn + eol-style=native Name: svn:keywords + Revision Author Date Added: federation/trunk/picketlink-seam/src/main/java/org/picketlink/identity/seam/federation/OAuthConstants.java =================================================================== --- federation/trunk/picketlink-seam/src/main/java/org/picketlink/identity/seam/federation/OAuthConstants.java (rev 0) +++ federation/trunk/picketlink-seam/src/main/java/org/picketlink/identity/seam/federation/OAuthConstants.java 2010-09-26 21:20:08 UTC (rev 422) @@ -0,0 +1,43 @@ +/* +* JBoss, Home of Professional Open Source. +* Copyright 2008, Red Hat Middleware LLC, and individual contributors +* as indicated by the @author tags. See the copyright.txt file in the +* distribution for a full listing of individual contributors. +* +* This is free software; you can redistribute it and/or modify it +* under the terms of the GNU Lesser General Public License as +* published by the Free Software Foundation; either version 2.1 of +* the License, or (at your option) any later version. +* +* This software is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +* Lesser General Public License for more details. +* +* You should have received a copy of the GNU Lesser General Public +* License along with this software; if not, write to the Free +* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA +* 02110-1301 USA, or see the FSF site: http://www.fsf.org. +*/ +package org.picketlink.identity.seam.federation; + +/** +* @author Marcel Kolsteren +* @since Sep 26, 2010 +*/ +public class OAuthConstants +{ + public static final String CODE_PARAMETER = "code"; + + public static final String CLIENT_ID_PARAMETER = "client_id"; + + public static final String CLIENT_SECRET_PARAMETER = "client_secret"; + + public static final String SCOPE_PARAMETER = "scope"; + + public static final String REDIRECT_URI_PARAMETER = "redirect_uri"; + + public static final String ACCESS_TOKEN_PARAMETER = "access_token"; + + public static final String ERROR_PARAMETER = "error"; +} Property changes on: federation/trunk/picketlink-seam/src/main/java/org/picketlink/identity/seam/federation/OAuthConstants.java ___________________________________________________________________ Name: svn + eol-style=native Name: svn:keywords + Revision Author Date Modified: federation/trunk/picketlink-seam/src/main/java/org/picketlink/identity/seam/federation/PagesSupportingExternalAuthentication.java =================================================================== --- federation/trunk/picketlink-seam/src/main/java/org/picketlink/identity/seam/federation/PagesSupportingExternalAuthentication.java 2010-09-24 09:49:09 UTC (rev 421) +++ federation/trunk/picketlink-seam/src/main/java/org/picketlink/identity/seam/federation/PagesSupportingExternalAuthentication.java 2010-09-26 21:20:08 UTC (rev 422) @@ -37,6 +37,7 @@ import org.jboss.seam.faces.FacesManager; import org.jboss.seam.navigation.Pages; import org.picketlink.identity.seam.federation.configuration.Configuration; +import org.picketlink.identity.seam.federation.configuration.FacebookConfiguration; import org.picketlink.identity.seam.federation.configuration.OpenIdConfiguration; import org.picketlink.identity.seam.federation.configuration.SamlConfiguration; import org.picketlink.identity.seam.federation.configuration.ServiceProvider; @@ -63,11 +64,11 @@ .getRequest(); StringBuffer returnUrl = httpRequest.getRequestURL(); - + //PLFED-98: missing query parameters String queryString = httpRequest.getQueryString(); - if( queryString != null && queryString.length() > 0 ) - returnUrl.append( "?" ).append( queryString ); + if (queryString != null && queryString.length() > 0) + returnUrl.append("?").append(queryString); ExternalAuthenticator externalAuthenticator = (ExternalAuthenticator) Component .getInstance(ExternalAuthenticator.class); @@ -91,14 +92,23 @@ } else { - // Otherwise, redirect to the login view, so that the user can choose an IDP - if (getLoginViewId() == null) + // Otherwise, use Facebook, if configured + FacebookConfiguration facebookConfiguration = serviceProvider.getFacebookConfiguration(); + if (facebookConfiguration != null) { - throw new RuntimeException("Login view id not specified in pages.xml."); + externalAuthenticator.facebookLogin(); } - Map<String, Object> parameters = new HashMap<String, Object>(); - parameters.put(ExternalAuthenticationFilter.RETURN_URL_PARAMETER, returnUrl); - FacesManager.instance().redirect(getLoginViewId(), parameters, false); + else + { + // Otherwise, redirect to the login view, so that the user can choose an IDP + if (getLoginViewId() == null) + { + throw new RuntimeException("Login view id not specified in pages.xml."); + } + Map<String, Object> parameters = new HashMap<String, Object>(); + parameters.put(ExternalAuthenticationFilter.RETURN_URL_PARAMETER, returnUrl); + FacesManager.instance().redirect(getLoginViewId(), parameters, false); + } } } } Added: federation/trunk/picketlink-seam/src/main/java/org/picketlink/identity/seam/federation/configuration/FacebookConfiguration.java =================================================================== --- federation/trunk/picketlink-seam/src/main/java/org/picketlink/identity/seam/federation/configuration/FacebookConfiguration.java (rev 0) +++ federation/trunk/picketlink-seam/src/main/java/org/picketlink/identity/seam/federation/configuration/FacebookConfiguration.java 2010-09-26 21:20:08 UTC (rev 422) @@ -0,0 +1,64 @@ +/* +* JBoss, Home of Professional Open Source. +* Copyright 2008, Red Hat Middleware LLC, and individual contributors +* as indicated by the @author tags. See the copyright.txt file in the +* distribution for a full listing of individual contributors. +* +* This is free software; you can redistribute it and/or modify it +* under the terms of the GNU Lesser General Public License as +* published by the Free Software Foundation; either version 2.1 of +* the License, or (at your option) any later version. +* +* This software is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +* Lesser General Public License for more details. +* +* You should have received a copy of the GNU Lesser General Public +* License along with this software; if not, write to the Free +* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA +* 02110-1301 USA, or see the FSF site: http://www.fsf.org. +*/ +package org.picketlink.identity.seam.federation.configuration; + +import org.picketlink.identity.seam.federation.jaxb.config.FacebookConfigType; + +/** +* @author Marcel Kolsteren +* @since Jan 28, 2010 +*/ +public class FacebookConfiguration +{ + private String clientId; + + private String clientSecret; + + private String scope; + + public FacebookConfiguration(FacebookConfigType facebookConfiguration) + { + clientId = facebookConfiguration.getClientId(); + clientSecret = facebookConfiguration.getClientSecret(); + scope = facebookConfiguration.getScope(); + } + + public String getClientId() + { + return clientId; + } + + public String getClientSecret() + { + return clientSecret; + } + + public String getScope() + { + return scope; + } + + public void setScope(String scope) + { + this.scope = scope; + } +} Property changes on: federation/trunk/picketlink-seam/src/main/java/org/picketlink/identity/seam/federation/configuration/FacebookConfiguration.java ___________________________________________________________________ Name: svn + eol-style=native Name: svn:keywords + Revision Author Date Modified: federation/trunk/picketlink-seam/src/main/java/org/picketlink/identity/seam/federation/configuration/ServiceProvider.java =================================================================== --- federation/trunk/picketlink-seam/src/main/java/org/picketlink/identity/seam/federation/configuration/ServiceProvider.java 2010-09-24 09:49:09 UTC (rev 421) +++ federation/trunk/picketlink-seam/src/main/java/org/picketlink/identity/seam/federation/configuration/ServiceProvider.java 2010-09-26 21:20:08 UTC (rev 422) @@ -43,6 +43,8 @@ private OpenIdConfiguration openIdConfiguration; + private FacebookConfiguration facebookConfiguration; + private String hostname; private String protocol; @@ -96,6 +98,11 @@ { openIdConfiguration = new OpenIdConfiguration(serviceProvider.getOpenIdConfig()); } + + if (serviceProvider.getFacebookConfig() != null) + { + facebookConfiguration = new FacebookConfiguration(serviceProvider.getFacebookConfig()); + } } public String getServiceURL(ExternalAuthenticationService service) @@ -138,6 +145,11 @@ return openIdConfiguration; } + public FacebookConfiguration getFacebookConfiguration() + { + return facebookConfiguration; + } + public String getHostname() { return hostname; Modified: federation/trunk/picketlink-seam/src/main/resources/schema/config/external-authentication-config.xsd =================================================================== --- federation/trunk/picketlink-seam/src/main/resources/schema/config/external-authentication-config.xsd 2010-09-24 09:49:09 UTC (rev 421) +++ federation/trunk/picketlink-seam/src/main/resources/schema/config/external-authentication-config.xsd 2010-09-26 21:20:08 UTC (rev 422) @@ -26,6 +26,8 @@ minOccurs="0" /> <element name="OpenIdConfig" type="tns:OpenIdConfigType" minOccurs="0" /> + <element name="FacebookConfig" type="tns:FacebookConfigType" + minOccurs="0" /> </sequence> <attribute name="protocol" type="tns:ProtocolTypes" use="optional" default="https"> @@ -155,6 +157,31 @@ </annotation> </attribute> </complexType> + <complexType name="FacebookConfigType"> + <annotation> + <documentation> + Configuration for Facebook. + </documentation> + </annotation> + <attribute name="clientId" type="string" use="required"> + <annotation> + <documentation>Client application id. + </documentation> + </annotation> + </attribute> + <attribute name="clientSecret" type="string" use="required"> + <annotation> + <documentation>Client application secret. + </documentation> + </annotation> + </attribute> + <attribute name="scope" type="string" use="optional"> + <annotation> + <documentation>Space separated list of requested permissions. + </documentation> + </annotation> + </attribute> + </complexType> <complexType name="OpenIdAttributeType"> <annotation> <documentation> Modified: federation/trunk/picketlink-webapps/seam-sp/src/main/resources/external-authentication-config.xml =================================================================== --- federation/trunk/picketlink-webapps/seam-sp/src/main/resources/external-authentication-config.xml 2010-09-24 09:49:09 UTC (rev 421) +++ federation/trunk/picketlink-webapps/seam-sp/src/main/resources/external-authentication-config.xml 2010-09-26 21:20:08 UTC (rev 422) @@ -11,8 +11,8 @@ failedAuthenticationUrl="http://localhost:8080/seam-sp/FailedAuthenticationPage.seam" internalAuthenticationMethod="#{authenticator.internalAuthenticate}"> <SamlConfig serviceProviderEntityId="http://localhost:8080/seam-sp" - keyStoreUrl="classpath:/picketlink_test_keystore.jks" - keyStorePass="store456" signingKeyAlias="servercert" signingKeyPass="pass456"> + keyStoreUrl="classpath:/picketlink_test_keystore.jks" keyStorePass="store456" + signingKeyAlias="servercert" signingKeyPass="pass456"> <SamlIdentityProvider entityId="http://idp.ssocircle.com" /> <SamlIdentityProvider entityId="http://localhost:8888/opensso" /> </SamlConfig> @@ -51,4 +51,12 @@ internalAuthenticationMethod="#{authenticator.internalAuthenticate}"> <OpenIdConfig defaultOpenIdProvider="https://www.google.com/accounts/o8/id" /> </ServiceProvider> + <ServiceProvider protocol="http" hostname="facebook.picketlink.org" + unsolicitedAuthenticationUrl="http://facebook.picketlink.org:8080/seam-sp/PublicPage.seam" + loggedOutUrl="http://facebook.picketlink.org:8080/seam-sp/PublicPage.seam" + failedAuthenticationUrl="http://facebook.picketlink.org:8080/seam-sp/FailedAuthenticationPage.seam" + internalAuthenticationMethod="#{authenticator.internalAuthenticate}"> + <FacebookConfig clientId="156872394341240" + clientSecret="7b6919b80e544f0faf2ee05875f48f46" scope="email publish_stream"/> + </ServiceProvider> </ExternalAuthenticationConfig> Modified: federation/trunk/picketlink-webapps/seam-sp/src/main/webapp/Login.xhtml =================================================================== --- federation/trunk/picketlink-webapps/seam-sp/src/main/webapp/Login.xhtml 2010-09-24 09:49:09 UTC (rev 421) +++ federation/trunk/picketlink-webapps/seam-sp/src/main/webapp/Login.xhtml 2010-09-26 21:20:08 UTC (rev 422) @@ -1,49 +1,65 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> <html xmlns="http://www.w3.org/1999/xhtml" xmlns:h="http://java.sun.com/jsf/html" + xmlns:c="http://java.sun.com/jstl/core" xmlns:f="http://java.sun.com/jsf/core"> <body> <h:messages /> <h1>Identity provider selection</h1> -<h2>SAML</h2> -<p>Choose one of the following identity providers to sign on:</p> -<h:form> - <h:dataTable - value="#{configuration.serviceProvider.samlConfiguration.identityProviders}" - var="identityProvider"> - <h:column> - <h:outputText value="#{identityProvider.entityId}" /> - </h:column> - <h:column> - <h:commandLink - action="#{externalAuthenticator.samlSignOn(identityProvider.entityId)}" - value="Login" /> - </h:column> - </h:dataTable> -</h:form> -<h2>OpenID</h2> -<h:form> - <p>Choose your OpenID provider (using "directed identity"): <ul> - <li><h:commandLink - action="#{externalAuthenticator.openIdSignOn('https://www.google.com/accounts/o8/id')}" - value="Google" /> </li> - <li><h:commandLink - action="#{externalAuthenticator.openIdSignOn('https://me.yahoo.com')}" - value="Yahoo" /> </li> - <li><h:commandLink - action="#{externalAuthenticator.openIdSignOn('https://myopenid.com')}" - value="myOpenID" /> </li> - <li><h:commandLink - action="#{externalAuthenticator.openIdSignOn('http://myspace.com')}" - value="MySpace" /> </li> - </ul></p> -</h:form> -<h:form> - <p>Or use your OpenID URL: <h:inputText - value="#{externalAuthenticator.openId}" required="true" /> <h:commandLink - action="#{externalAuthenticator.openIdSignOn}" value="Sign On" /></p> -</h:form> +<c:if + test="#{configuration.serviceProvider.samlConfiguration != null}"> + <h2>SAML</h2> + <p>Choose one of the following identity providers to sign on:</p> + <h:form> + <h:dataTable + value="#{configuration.serviceProvider.samlConfiguration.identityProviders}" + var="identityProvider"> + <h:column> + <h:outputText value="#{identityProvider.entityId}" /> + </h:column> + <h:column> + <h:commandLink + action="#{externalAuthenticator.samlSignOn(identityProvider.entityId)}" + value="Login" /> + </h:column> + </h:dataTable> + </h:form> +</c:if> +<c:if + test="#{configuration.serviceProvider.openIdConfiguration != null}"> + <h2>OpenID</h2> + <h:form> + <p>Choose your OpenID provider (using "directed identity"): <ul> + <li><h:commandLink + action="#{externalAuthenticator.openIdSignOn('https://www.google.com/accounts/o8/id')}" + value="Google" /> </li> + <li><h:commandLink + action="#{externalAuthenticator.openIdSignOn('https://me.yahoo.com')}" + value="Yahoo" /> </li> + <li><h:commandLink + action="#{externalAuthenticator.openIdSignOn('https://myopenid.com')}" + value="myOpenID" /> </li> + <li><h:commandLink + action="#{externalAuthenticator.openIdSignOn('http://myspace.com')}" + value="MySpace" /> </li> + </ul></p> + </h:form> + <h:form> + <p>Or use your OpenID URL: <h:inputText + value="#{externalAuthenticator.openId}" required="true" /> <h:commandLink + action="#{externalAuthenticator.openIdSignOn}" value="Sign On" /></p> + </h:form> +</c:if> +<c:if + test="#{configuration.serviceProvider.facebookConfiguration != null}"> + <h2>Facebook</h2> + <h:form> + <h:commandLink action="#{externalAuthenticator.facebookLogin}"> + <h:graphicImage value="/images/login_with_facebook.png" /> + </h:commandLink> + </h:form> +</c:if> </body> </html> \ No newline at end of file Modified: federation/trunk/picketlink-webapps/seam-sp/src/main/webapp/PrincipalInfoFragment.xhtml =================================================================== --- federation/trunk/picketlink-webapps/seam-sp/src/main/webapp/PrincipalInfoFragment.xhtml 2010-09-24 09:49:09 UTC (rev 421) +++ federation/trunk/picketlink-webapps/seam-sp/src/main/webapp/PrincipalInfoFragment.xhtml 2010-09-26 21:20:08 UTC (rev 422) @@ -4,11 +4,14 @@ xmlns:c="http://java.sun.com/jstl/core" xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core"> + <head> + <link type="text/css" rel="stylesheet" href="styles.css" /> + </head> <c:choose> <c:when test="#{identity.principal.getClass().getSimpleName() == 'SeamSamlPrincipal'}"> - <h2>Logged on via SAML</h2> - <h:panelGrid columns="2"> + <h2>Logged on with SAML</h2> + <h:panelGrid columns="2" columnClasses="propertyName, propertyValue"> <h:outputText value="NameID" /> <h:outputText value="#{identity.principal.nameId.value}" /> <h:outputText value="NameID format" /> @@ -41,9 +44,10 @@ <p><h:commandLink action="#{externalAuthenticator.singleLogout}" value="Single logout" /></p> </c:when> - <c:otherwise> - <h2>Logged on via OpenID</h2> - <h:panelGrid columns="2"> + <c:when + test="#{identity.principal.getClass().getSimpleName() == 'OpenIdPrincipal'}"> + <h2>Logged on with OpenID</h2> + <h:panelGrid columns="2" columnClasses="propertyName, propertyValue"> <h:outputText value="Identifier" /> <h:outputText value="#{identity.principal.identifier}" /> <h:outputText value="Provider" /> @@ -61,6 +65,29 @@ </ul> </h:panelGroup> </h:panelGrid> + </c:when> + <c:otherwise> + <h2>Logged on with Facebook</h2> + <h:panelGrid columns="2" columnClasses="propertyName, propertyValue"> + <h:outputText value="Access token" /> + <h:outputText value="#{identity.principal.accessToken}" /> + <h:outputText value="ID" /> + <h:outputText value="#{identity.principal.id}" /> + <h:outputText value="Name" /> + <h:outputText value="#{identity.principal.name}" /> + <h:outputText value="First name" /> + <h:outputText value="#{identity.principal.firstName}" /> + <h:outputText value="Last name" /> + <h:outputText value="#{identity.principal.lastName}" /> + <h:outputText value="Email" /> + <h:outputText value="#{identity.principal.email}" /> + <h:outputText value="Gender" /> + <h:outputText value="#{identity.principal.gender}" /> + <h:outputText value="Timezone" /> + <h:outputText value="#{identity.principal.timezone}" /> + <h:outputText value="Locale" /> + <h:outputText value="#{identity.principal.locale}" /> + </h:panelGrid> </c:otherwise> </c:choose> <p><h:commandLink action="#{authenticator.localLogout}" Added: federation/trunk/picketlink-webapps/seam-sp/src/main/webapp/images/login_with_facebook.png =================================================================== (Binary files differ) Property changes on: federation/trunk/picketlink-webapps/seam-sp/src/main/webapp/images/login_with_facebook.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: federation/trunk/picketlink-webapps/seam-sp/src/main/webapp/styles.css =================================================================== --- federation/trunk/picketlink-webapps/seam-sp/src/main/webapp/styles.css (rev 0) +++ federation/trunk/picketlink-webapps/seam-sp/src/main/webapp/styles.css 2010-09-26 21:20:08 UTC (rev 422) @@ -0,0 +1,9 @@ +.propertyName { + padding: 5px; + background-color: #aaaaaa; +} + +.propertyValue { + padding: 5px; + background-color: #dddddd; +} \ No newline at end of file

14 years, 2 months

1
0
0 / 0

Picketlink SVN: r421 - in idm/branches/1.1.0: assembly and 18 other directories.

by picketlink-commits＠lists.jboss.org

Author: bdaw Date: 2010-09-24 05:49:09 -0400 (Fri, 24 Sep 2010) New Revision: 421 Modified: idm/branches/1.1.0/assembly/pom.xml idm/branches/1.1.0/example/auth-simple/pom.xml idm/branches/1.1.0/example/auth/pom.xml idm/branches/1.1.0/example/simple/pom.xml idm/branches/1.1.0/integration/deployer/pom.xml idm/branches/1.1.0/integration/jboss5/pom.xml idm/branches/1.1.0/integration/pom.xml idm/branches/1.1.0/parent/pom.xml idm/branches/1.1.0/picketlink-idm-api/pom.xml idm/branches/1.1.0/picketlink-idm-auth/pom.xml idm/branches/1.1.0/picketlink-idm-cache/pom.xml idm/branches/1.1.0/picketlink-idm-common/pom.xml idm/branches/1.1.0/picketlink-idm-core/pom.xml idm/branches/1.1.0/picketlink-idm-docs/ReferenceGuide/pom.xml idm/branches/1.1.0/picketlink-idm-docs/pom.xml idm/branches/1.1.0/picketlink-idm-hibernate/pom.xml idm/branches/1.1.0/picketlink-idm-ldap/pom.xml idm/branches/1.1.0/picketlink-idm-spi/pom.xml idm/branches/1.1.0/picketlink-idm-testsuite/pom.xml idm/branches/1.1.0/pom.xml Log: [maven-release-plugin] prepare for next development iteration Modified: idm/branches/1.1.0/assembly/pom.xml =================================================================== --- idm/branches/1.1.0/assembly/pom.xml 2010-09-24 09:48:33 UTC (rev 420) +++ idm/branches/1.1.0/assembly/pom.xml 2010-09-24 09:49:09 UTC (rev 421) @@ -8,7 +8,7 @@ <parent> <groupId>org.picketlink.idm</groupId> <artifactId>picketlink-idm-parent</artifactId> - <version>1.1.6.CR01</version> + <version>1.1.6.CR02-SNAPSHOT</version> <relativePath>../parent</relativePath> </parent> Modified: idm/branches/1.1.0/example/auth/pom.xml =================================================================== --- idm/branches/1.1.0/example/auth/pom.xml 2010-09-24 09:48:33 UTC (rev 420) +++ idm/branches/1.1.0/example/auth/pom.xml 2010-09-24 09:49:09 UTC (rev 421) @@ -1,7 +1,7 @@ <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <groupId>org.picketlink.idm.example</groupId> - <version>1.1.6.CR01</version> + <version>1.1.6.CR02-SNAPSHOT</version> <artifactId>example-auth</artifactId> <packaging>jar</packaging> <name>Example - JEE authentication</name> Modified: idm/branches/1.1.0/example/auth-simple/pom.xml =================================================================== --- idm/branches/1.1.0/example/auth-simple/pom.xml 2010-09-24 09:48:33 UTC (rev 420) +++ idm/branches/1.1.0/example/auth-simple/pom.xml 2010-09-24 09:49:09 UTC (rev 421) @@ -1,7 +1,7 @@ <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <groupId>org.picketlink.idm.example</groupId> - <version>1.1.6.CR01</version> + <version>1.1.6.CR02-SNAPSHOT</version> <artifactId>example-auth-simple</artifactId> <packaging>jar</packaging> <name>Example - JEE authentication (using deployer)</name> Modified: idm/branches/1.1.0/example/simple/pom.xml =================================================================== --- idm/branches/1.1.0/example/simple/pom.xml 2010-09-24 09:48:33 UTC (rev 420) +++ idm/branches/1.1.0/example/simple/pom.xml 2010-09-24 09:49:09 UTC (rev 421) @@ -1,7 +1,7 @@ <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <groupId>org.picketlink.idm.example</groupId> - <version>1.1.6.CR01</version> + <version>1.1.6.CR02-SNAPSHOT</version> <artifactId>example-simple</artifactId> <packaging>jar</packaging> <name>Example - Simple PicketLink IDM Maven2 project</name> Modified: idm/branches/1.1.0/integration/deployer/pom.xml =================================================================== --- idm/branches/1.1.0/integration/deployer/pom.xml 2010-09-24 09:48:33 UTC (rev 420) +++ idm/branches/1.1.0/integration/deployer/pom.xml 2010-09-24 09:49:09 UTC (rev 421) @@ -10,7 +10,7 @@ <parent> <groupId>org.picketlink.idm</groupId> <artifactId>picketlink-idm-integration</artifactId> - <version>1.1.6.CR01</version> + <version>1.1.6.CR02-SNAPSHOT</version> </parent> <properties> Modified: idm/branches/1.1.0/integration/jboss5/pom.xml =================================================================== --- idm/branches/1.1.0/integration/jboss5/pom.xml 2010-09-24 09:48:33 UTC (rev 420) +++ idm/branches/1.1.0/integration/jboss5/pom.xml 2010-09-24 09:49:09 UTC (rev 421) @@ -10,7 +10,7 @@ <parent> <groupId>org.picketlink.idm</groupId> <artifactId>picketlink-idm-integration</artifactId> - <version>1.1.6.CR01</version> + <version>1.1.6.CR02-SNAPSHOT</version> </parent> <dependencies> Modified: idm/branches/1.1.0/integration/pom.xml =================================================================== --- idm/branches/1.1.0/integration/pom.xml 2010-09-24 09:48:33 UTC (rev 420) +++ idm/branches/1.1.0/integration/pom.xml 2010-09-24 09:49:09 UTC (rev 421) @@ -12,7 +12,7 @@ <parent> <groupId>org.picketlink.idm</groupId> <artifactId>picketlink-idm-parent</artifactId> - <version>1.1.6.CR01</version> + <version>1.1.6.CR02-SNAPSHOT</version> <relativePath>../parent/pom.xml</relativePath> </parent> Modified: idm/branches/1.1.0/parent/pom.xml =================================================================== --- idm/branches/1.1.0/parent/pom.xml 2010-09-24 09:48:33 UTC (rev 420) +++ idm/branches/1.1.0/parent/pom.xml 2010-09-24 09:49:09 UTC (rev 421) @@ -8,7 +8,7 @@ <groupId>org.picketlink.idm</groupId> <artifactId>picketlink-idm-parent</artifactId> <packaging>pom</packaging> - <version>1.1.6.CR01</version> + <version>1.1.6.CR02-SNAPSHOT</version> <name>PicketLink IDM- Parent</name> <url>http://labs.jboss.org/portal/jbosssecurity/</url> <description>PicketLink is a cross-cutting project that handles identity needs for the JEMS projects</description> @@ -520,10 +520,4 @@ </dependency> </dependencies> </dependencyManagement> - - <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/maven/poms/jboss-parent-pom/tags/1...</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/maven/poms/jboss-parent-pom/tags/1.1....</developerConnection> - <url>http://anonsvn.jboss.org/repos/maven/poms/jboss-parent-pom/tags/1.1.6.CR01</url> - </scm> </project> Modified: idm/branches/1.1.0/picketlink-idm-api/pom.xml =================================================================== --- idm/branches/1.1.0/picketlink-idm-api/pom.xml 2010-09-24 09:48:33 UTC (rev 420) +++ idm/branches/1.1.0/picketlink-idm-api/pom.xml 2010-09-24 09:49:09 UTC (rev 421) @@ -2,7 +2,7 @@ <parent> <groupId>org.picketlink.idm</groupId> <artifactId>picketlink-idm-parent</artifactId> - <version>1.1.6.CR01</version> + <version>1.1.6.CR02-SNAPSHOT</version> <relativePath>../parent</relativePath> </parent> <modelVersion>4.0.0</modelVersion> Modified: idm/branches/1.1.0/picketlink-idm-auth/pom.xml =================================================================== --- idm/branches/1.1.0/picketlink-idm-auth/pom.xml 2010-09-24 09:48:33 UTC (rev 420) +++ idm/branches/1.1.0/picketlink-idm-auth/pom.xml 2010-09-24 09:49:09 UTC (rev 421) @@ -2,7 +2,7 @@ <parent> <groupId>org.picketlink.idm</groupId> <artifactId>picketlink-idm-parent</artifactId> - <version>1.1.6.CR01</version> + <version>1.1.6.CR02-SNAPSHOT</version> <relativePath>../parent</relativePath> </parent> <modelVersion>4.0.0</modelVersion> Modified: idm/branches/1.1.0/picketlink-idm-cache/pom.xml =================================================================== --- idm/branches/1.1.0/picketlink-idm-cache/pom.xml 2010-09-24 09:48:33 UTC (rev 420) +++ idm/branches/1.1.0/picketlink-idm-cache/pom.xml 2010-09-24 09:49:09 UTC (rev 421) @@ -2,7 +2,7 @@ <parent> <groupId>org.picketlink.idm</groupId> <artifactId>picketlink-idm-parent</artifactId> - <version>1.1.6.CR01</version> + <version>1.1.6.CR02-SNAPSHOT</version> <relativePath>../parent</relativePath> </parent> <modelVersion>4.0.0</modelVersion> Modified: idm/branches/1.1.0/picketlink-idm-common/pom.xml =================================================================== --- idm/branches/1.1.0/picketlink-idm-common/pom.xml 2010-09-24 09:48:33 UTC (rev 420) +++ idm/branches/1.1.0/picketlink-idm-common/pom.xml 2010-09-24 09:49:09 UTC (rev 421) @@ -2,7 +2,7 @@ <parent> <groupId>org.picketlink.idm</groupId> <artifactId>picketlink-idm-parent</artifactId> - <version>1.1.6.CR01</version> + <version>1.1.6.CR02-SNAPSHOT</version> <relativePath>../parent</relativePath> </parent> <modelVersion>4.0.0</modelVersion> Modified: idm/branches/1.1.0/picketlink-idm-core/pom.xml =================================================================== --- idm/branches/1.1.0/picketlink-idm-core/pom.xml 2010-09-24 09:48:33 UTC (rev 420) +++ idm/branches/1.1.0/picketlink-idm-core/pom.xml 2010-09-24 09:49:09 UTC (rev 421) @@ -2,7 +2,7 @@ <parent> <groupId>org.picketlink.idm</groupId> <artifactId>picketlink-idm-parent</artifactId> - <version>1.1.6.CR01</version> + <version>1.1.6.CR02-SNAPSHOT</version> <relativePath>../parent</relativePath> </parent> <modelVersion>4.0.0</modelVersion> Modified: idm/branches/1.1.0/picketlink-idm-docs/ReferenceGuide/pom.xml =================================================================== --- idm/branches/1.1.0/picketlink-idm-docs/ReferenceGuide/pom.xml 2010-09-24 09:48:33 UTC (rev 420) +++ idm/branches/1.1.0/picketlink-idm-docs/ReferenceGuide/pom.xml 2010-09-24 09:49:09 UTC (rev 421) @@ -2,7 +2,7 @@ <parent> <groupId>org.picketlink.idm</groupId> <artifactId>picketlink-idm-parent</artifactId> - <version>1.1.6.CR01</version> + <version>1.1.6.CR02-SNAPSHOT</version> <relativePath>../../parent</relativePath> </parent> Modified: idm/branches/1.1.0/picketlink-idm-docs/pom.xml =================================================================== --- idm/branches/1.1.0/picketlink-idm-docs/pom.xml 2010-09-24 09:48:33 UTC (rev 420) +++ idm/branches/1.1.0/picketlink-idm-docs/pom.xml 2010-09-24 09:49:09 UTC (rev 421) @@ -2,7 +2,7 @@ <parent> <groupId>org.picketlink.idm</groupId> <artifactId>picketlink-idm-parent</artifactId> - <version>1.1.6.CR01</version> + <version>1.1.6.CR02-SNAPSHOT</version> <relativePath>../parent</relativePath> </parent> <modelVersion>4.0.0</modelVersion> Modified: idm/branches/1.1.0/picketlink-idm-hibernate/pom.xml =================================================================== --- idm/branches/1.1.0/picketlink-idm-hibernate/pom.xml 2010-09-24 09:48:33 UTC (rev 420) +++ idm/branches/1.1.0/picketlink-idm-hibernate/pom.xml 2010-09-24 09:49:09 UTC (rev 421) @@ -2,7 +2,7 @@ <parent> <groupId>org.picketlink.idm</groupId> <artifactId>picketlink-idm-parent</artifactId> - <version>1.1.6.CR01</version> + <version>1.1.6.CR02-SNAPSHOT</version> <relativePath>../parent</relativePath> </parent> <modelVersion>4.0.0</modelVersion> Modified: idm/branches/1.1.0/picketlink-idm-ldap/pom.xml =================================================================== --- idm/branches/1.1.0/picketlink-idm-ldap/pom.xml 2010-09-24 09:48:33 UTC (rev 420) +++ idm/branches/1.1.0/picketlink-idm-ldap/pom.xml 2010-09-24 09:49:09 UTC (rev 421) @@ -2,7 +2,7 @@ <parent> <groupId>org.picketlink.idm</groupId> <artifactId>picketlink-idm-parent</artifactId> - <version>1.1.6.CR01</version> + <version>1.1.6.CR02-SNAPSHOT</version> <relativePath>../parent</relativePath> </parent> <modelVersion>4.0.0</modelVersion> Modified: idm/branches/1.1.0/picketlink-idm-spi/pom.xml =================================================================== --- idm/branches/1.1.0/picketlink-idm-spi/pom.xml 2010-09-24 09:48:33 UTC (rev 420) +++ idm/branches/1.1.0/picketlink-idm-spi/pom.xml 2010-09-24 09:49:09 UTC (rev 421) @@ -2,7 +2,7 @@ <parent> <groupId>org.picketlink.idm</groupId> <artifactId>picketlink-idm-parent</artifactId> - <version>1.1.6.CR01</version> + <version>1.1.6.CR02-SNAPSHOT</version> <relativePath>../parent</relativePath> </parent> <modelVersion>4.0.0</modelVersion> Modified: idm/branches/1.1.0/picketlink-idm-testsuite/pom.xml =================================================================== --- idm/branches/1.1.0/picketlink-idm-testsuite/pom.xml 2010-09-24 09:48:33 UTC (rev 420) +++ idm/branches/1.1.0/picketlink-idm-testsuite/pom.xml 2010-09-24 09:49:09 UTC (rev 421) @@ -2,7 +2,7 @@ <parent> <groupId>org.picketlink.idm</groupId> <artifactId>picketlink-idm-parent</artifactId> - <version>1.1.6.CR01</version> + <version>1.1.6.CR02-SNAPSHOT</version> <relativePath>../parent</relativePath> </parent> <modelVersion>4.0.0</modelVersion> Modified: idm/branches/1.1.0/pom.xml =================================================================== --- idm/branches/1.1.0/pom.xml 2010-09-24 09:48:33 UTC (rev 420) +++ idm/branches/1.1.0/pom.xml 2010-09-24 09:49:09 UTC (rev 421) @@ -2,7 +2,7 @@ <parent> <groupId>org.picketlink.idm</groupId> <artifactId>picketlink-idm-parent</artifactId> - <version>1.1.6.CR01</version> + <version>1.1.6.CR02-SNAPSHOT</version> <relativePath>parent</relativePath> </parent> <modelVersion>4.0.0</modelVersion> @@ -14,9 +14,9 @@ <description /> <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/picketlink/idm/tags/1.1.6.CR01</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/picketlink/idm/tags/1.1.6.CR01</developerConnection> - <url>http://anonsvn.jboss.org/repos/maven/poms/jboss-parent-pom/tags/1.1.6.CR01</url> + <connection>scm:svn:http://anonsvn.jboss.org/repos/picketlink/idm/branches/1.1.0</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/picketlink/idm/branches/1.1.0</developerConnection> + <url>http://anonsvn.jboss.org/repos/maven/poms/jboss-parent-pom/tags/jboss-par...</url> </scm> <profiles>

14 years, 3 months

1
0
0 / 0

Picketlink SVN: r420 - idm/tags.

by picketlink-commits＠lists.jboss.org

Author: bdaw Date: 2010-09-24 05:48:33 -0400 (Fri, 24 Sep 2010) New Revision: 420 Added: idm/tags/1.1.6.CR01/ Log: [maven-scm] copy for tag 1.1.6.CR01 Copied: idm/tags/1.1.6.CR01 (from rev 419, idm/branches/1.1.0)

14 years, 3 months

1
0
0 / 0

Picketlink SVN: r419 - in idm/branches/1.1.0: assembly and 18 other directories.

by picketlink-commits＠lists.jboss.org

Author: bdaw Date: 2010-09-24 05:48:08 -0400 (Fri, 24 Sep 2010) New Revision: 419 Modified: idm/branches/1.1.0/assembly/pom.xml idm/branches/1.1.0/example/auth-simple/pom.xml idm/branches/1.1.0/example/auth/pom.xml idm/branches/1.1.0/example/simple/pom.xml idm/branches/1.1.0/integration/deployer/pom.xml idm/branches/1.1.0/integration/jboss5/pom.xml idm/branches/1.1.0/integration/pom.xml idm/branches/1.1.0/parent/pom.xml idm/branches/1.1.0/picketlink-idm-api/pom.xml idm/branches/1.1.0/picketlink-idm-auth/pom.xml idm/branches/1.1.0/picketlink-idm-cache/pom.xml idm/branches/1.1.0/picketlink-idm-common/pom.xml idm/branches/1.1.0/picketlink-idm-core/pom.xml idm/branches/1.1.0/picketlink-idm-docs/ReferenceGuide/pom.xml idm/branches/1.1.0/picketlink-idm-docs/pom.xml idm/branches/1.1.0/picketlink-idm-hibernate/pom.xml idm/branches/1.1.0/picketlink-idm-ldap/pom.xml idm/branches/1.1.0/picketlink-idm-spi/pom.xml idm/branches/1.1.0/picketlink-idm-testsuite/pom.xml idm/branches/1.1.0/pom.xml Log: [maven-release-plugin] prepare release 1.1.6.CR01 Modified: idm/branches/1.1.0/assembly/pom.xml =================================================================== --- idm/branches/1.1.0/assembly/pom.xml 2010-09-24 09:27:41 UTC (rev 418) +++ idm/branches/1.1.0/assembly/pom.xml 2010-09-24 09:48:08 UTC (rev 419) @@ -8,7 +8,7 @@ <parent> <groupId>org.picketlink.idm</groupId> <artifactId>picketlink-idm-parent</artifactId> - <version>1.1.6.CR01-SNAPSHOT</version> + <version>1.1.6.CR01</version> <relativePath>../parent</relativePath> </parent> Modified: idm/branches/1.1.0/example/auth/pom.xml =================================================================== --- idm/branches/1.1.0/example/auth/pom.xml 2010-09-24 09:27:41 UTC (rev 418) +++ idm/branches/1.1.0/example/auth/pom.xml 2010-09-24 09:48:08 UTC (rev 419) @@ -1,7 +1,7 @@ <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <groupId>org.picketlink.idm.example</groupId> - <version>1.1.6.CR01-SNAPSHOT</version> + <version>1.1.6.CR01</version> <artifactId>example-auth</artifactId> <packaging>jar</packaging> <name>Example - JEE authentication</name> Modified: idm/branches/1.1.0/example/auth-simple/pom.xml =================================================================== --- idm/branches/1.1.0/example/auth-simple/pom.xml 2010-09-24 09:27:41 UTC (rev 418) +++ idm/branches/1.1.0/example/auth-simple/pom.xml 2010-09-24 09:48:08 UTC (rev 419) @@ -1,7 +1,7 @@ <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <groupId>org.picketlink.idm.example</groupId> - <version>1.1.6.CR01-SNAPSHOT</version> + <version>1.1.6.CR01</version> <artifactId>example-auth-simple</artifactId> <packaging>jar</packaging> <name>Example - JEE authentication (using deployer)</name> Modified: idm/branches/1.1.0/example/simple/pom.xml =================================================================== --- idm/branches/1.1.0/example/simple/pom.xml 2010-09-24 09:27:41 UTC (rev 418) +++ idm/branches/1.1.0/example/simple/pom.xml 2010-09-24 09:48:08 UTC (rev 419) @@ -1,7 +1,7 @@ <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <groupId>org.picketlink.idm.example</groupId> - <version>1.1.6.CR01-SNAPSHOT</version> + <version>1.1.6.CR01</version> <artifactId>example-simple</artifactId> <packaging>jar</packaging> <name>Example - Simple PicketLink IDM Maven2 project</name> Modified: idm/branches/1.1.0/integration/deployer/pom.xml =================================================================== --- idm/branches/1.1.0/integration/deployer/pom.xml 2010-09-24 09:27:41 UTC (rev 418) +++ idm/branches/1.1.0/integration/deployer/pom.xml 2010-09-24 09:48:08 UTC (rev 419) @@ -10,7 +10,7 @@ <parent> <groupId>org.picketlink.idm</groupId> <artifactId>picketlink-idm-integration</artifactId> - <version>1.1.6.CR01-SNAPSHOT</version> + <version>1.1.6.CR01</version> </parent> <properties> Modified: idm/branches/1.1.0/integration/jboss5/pom.xml =================================================================== --- idm/branches/1.1.0/integration/jboss5/pom.xml 2010-09-24 09:27:41 UTC (rev 418) +++ idm/branches/1.1.0/integration/jboss5/pom.xml 2010-09-24 09:48:08 UTC (rev 419) @@ -10,7 +10,7 @@ <parent> <groupId>org.picketlink.idm</groupId> <artifactId>picketlink-idm-integration</artifactId> - <version>1.1.6.CR01-SNAPSHOT</version> + <version>1.1.6.CR01</version> </parent> <dependencies> Modified: idm/branches/1.1.0/integration/pom.xml =================================================================== --- idm/branches/1.1.0/integration/pom.xml 2010-09-24 09:27:41 UTC (rev 418) +++ idm/branches/1.1.0/integration/pom.xml 2010-09-24 09:48:08 UTC (rev 419) @@ -12,7 +12,7 @@ <parent> <groupId>org.picketlink.idm</groupId> <artifactId>picketlink-idm-parent</artifactId> - <version>1.1.6.CR01-SNAPSHOT</version> + <version>1.1.6.CR01</version> <relativePath>../parent/pom.xml</relativePath> </parent> Modified: idm/branches/1.1.0/parent/pom.xml =================================================================== --- idm/branches/1.1.0/parent/pom.xml 2010-09-24 09:27:41 UTC (rev 418) +++ idm/branches/1.1.0/parent/pom.xml 2010-09-24 09:48:08 UTC (rev 419) @@ -8,7 +8,7 @@ <groupId>org.picketlink.idm</groupId> <artifactId>picketlink-idm-parent</artifactId> <packaging>pom</packaging> - <version>1.1.6.CR01-SNAPSHOT</version> + <version>1.1.6.CR01</version> <name>PicketLink IDM- Parent</name> <url>http://labs.jboss.org/portal/jbosssecurity/</url> <description>PicketLink is a cross-cutting project that handles identity needs for the JEMS projects</description> @@ -520,4 +520,10 @@ </dependency> </dependencies> </dependencyManagement> + + <scm> + <connection>scm:svn:http://anonsvn.jboss.org/repos/maven/poms/jboss-parent-pom/tags/1...</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/maven/poms/jboss-parent-pom/tags/1.1....</developerConnection> + <url>http://anonsvn.jboss.org/repos/maven/poms/jboss-parent-pom/tags/1.1.6.CR01</url> + </scm> </project> Modified: idm/branches/1.1.0/picketlink-idm-api/pom.xml =================================================================== --- idm/branches/1.1.0/picketlink-idm-api/pom.xml 2010-09-24 09:27:41 UTC (rev 418) +++ idm/branches/1.1.0/picketlink-idm-api/pom.xml 2010-09-24 09:48:08 UTC (rev 419) @@ -2,7 +2,7 @@ <parent> <groupId>org.picketlink.idm</groupId> <artifactId>picketlink-idm-parent</artifactId> - <version>1.1.6.CR01-SNAPSHOT</version> + <version>1.1.6.CR01</version> <relativePath>../parent</relativePath> </parent> <modelVersion>4.0.0</modelVersion> Modified: idm/branches/1.1.0/picketlink-idm-auth/pom.xml =================================================================== --- idm/branches/1.1.0/picketlink-idm-auth/pom.xml 2010-09-24 09:27:41 UTC (rev 418) +++ idm/branches/1.1.0/picketlink-idm-auth/pom.xml 2010-09-24 09:48:08 UTC (rev 419) @@ -2,7 +2,7 @@ <parent> <groupId>org.picketlink.idm</groupId> <artifactId>picketlink-idm-parent</artifactId> - <version>1.1.6.CR01-SNAPSHOT</version> + <version>1.1.6.CR01</version> <relativePath>../parent</relativePath> </parent> <modelVersion>4.0.0</modelVersion> Modified: idm/branches/1.1.0/picketlink-idm-cache/pom.xml =================================================================== --- idm/branches/1.1.0/picketlink-idm-cache/pom.xml 2010-09-24 09:27:41 UTC (rev 418) +++ idm/branches/1.1.0/picketlink-idm-cache/pom.xml 2010-09-24 09:48:08 UTC (rev 419) @@ -2,7 +2,7 @@ <parent> <groupId>org.picketlink.idm</groupId> <artifactId>picketlink-idm-parent</artifactId> - <version>1.1.6.CR01-SNAPSHOT</version> + <version>1.1.6.CR01</version> <relativePath>../parent</relativePath> </parent> <modelVersion>4.0.0</modelVersion> Modified: idm/branches/1.1.0/picketlink-idm-common/pom.xml =================================================================== --- idm/branches/1.1.0/picketlink-idm-common/pom.xml 2010-09-24 09:27:41 UTC (rev 418) +++ idm/branches/1.1.0/picketlink-idm-common/pom.xml 2010-09-24 09:48:08 UTC (rev 419) @@ -2,7 +2,7 @@ <parent> <groupId>org.picketlink.idm</groupId> <artifactId>picketlink-idm-parent</artifactId> - <version>1.1.6.CR01-SNAPSHOT</version> + <version>1.1.6.CR01</version> <relativePath>../parent</relativePath> </parent> <modelVersion>4.0.0</modelVersion> Modified: idm/branches/1.1.0/picketlink-idm-core/pom.xml =================================================================== --- idm/branches/1.1.0/picketlink-idm-core/pom.xml 2010-09-24 09:27:41 UTC (rev 418) +++ idm/branches/1.1.0/picketlink-idm-core/pom.xml 2010-09-24 09:48:08 UTC (rev 419) @@ -2,7 +2,7 @@ <parent> <groupId>org.picketlink.idm</groupId> <artifactId>picketlink-idm-parent</artifactId> - <version>1.1.6.CR01-SNAPSHOT</version> + <version>1.1.6.CR01</version> <relativePath>../parent</relativePath> </parent> <modelVersion>4.0.0</modelVersion> Modified: idm/branches/1.1.0/picketlink-idm-docs/ReferenceGuide/pom.xml =================================================================== --- idm/branches/1.1.0/picketlink-idm-docs/ReferenceGuide/pom.xml 2010-09-24 09:27:41 UTC (rev 418) +++ idm/branches/1.1.0/picketlink-idm-docs/ReferenceGuide/pom.xml 2010-09-24 09:48:08 UTC (rev 419) @@ -2,7 +2,7 @@ <parent> <groupId>org.picketlink.idm</groupId> <artifactId>picketlink-idm-parent</artifactId> - <version>1.1.6.CR01-SNAPSHOT</version> + <version>1.1.6.CR01</version> <relativePath>../../parent</relativePath> </parent> Modified: idm/branches/1.1.0/picketlink-idm-docs/pom.xml =================================================================== --- idm/branches/1.1.0/picketlink-idm-docs/pom.xml 2010-09-24 09:27:41 UTC (rev 418) +++ idm/branches/1.1.0/picketlink-idm-docs/pom.xml 2010-09-24 09:48:08 UTC (rev 419) @@ -2,7 +2,7 @@ <parent> <groupId>org.picketlink.idm</groupId> <artifactId>picketlink-idm-parent</artifactId> - <version>1.1.6.CR01-SNAPSHOT</version> + <version>1.1.6.CR01</version> <relativePath>../parent</relativePath> </parent> <modelVersion>4.0.0</modelVersion> Modified: idm/branches/1.1.0/picketlink-idm-hibernate/pom.xml =================================================================== --- idm/branches/1.1.0/picketlink-idm-hibernate/pom.xml 2010-09-24 09:27:41 UTC (rev 418) +++ idm/branches/1.1.0/picketlink-idm-hibernate/pom.xml 2010-09-24 09:48:08 UTC (rev 419) @@ -2,7 +2,7 @@ <parent> <groupId>org.picketlink.idm</groupId> <artifactId>picketlink-idm-parent</artifactId> - <version>1.1.6.CR01-SNAPSHOT</version> + <version>1.1.6.CR01</version> <relativePath>../parent</relativePath> </parent> <modelVersion>4.0.0</modelVersion> Modified: idm/branches/1.1.0/picketlink-idm-ldap/pom.xml =================================================================== --- idm/branches/1.1.0/picketlink-idm-ldap/pom.xml 2010-09-24 09:27:41 UTC (rev 418) +++ idm/branches/1.1.0/picketlink-idm-ldap/pom.xml 2010-09-24 09:48:08 UTC (rev 419) @@ -2,7 +2,7 @@ <parent> <groupId>org.picketlink.idm</groupId> <artifactId>picketlink-idm-parent</artifactId> - <version>1.1.6.CR01-SNAPSHOT</version> + <version>1.1.6.CR01</version> <relativePath>../parent</relativePath> </parent> <modelVersion>4.0.0</modelVersion> Modified: idm/branches/1.1.0/picketlink-idm-spi/pom.xml =================================================================== --- idm/branches/1.1.0/picketlink-idm-spi/pom.xml 2010-09-24 09:27:41 UTC (rev 418) +++ idm/branches/1.1.0/picketlink-idm-spi/pom.xml 2010-09-24 09:48:08 UTC (rev 419) @@ -2,7 +2,7 @@ <parent> <groupId>org.picketlink.idm</groupId> <artifactId>picketlink-idm-parent</artifactId> - <version>1.1.6.CR01-SNAPSHOT</version> + <version>1.1.6.CR01</version> <relativePath>../parent</relativePath> </parent> <modelVersion>4.0.0</modelVersion> Modified: idm/branches/1.1.0/picketlink-idm-testsuite/pom.xml =================================================================== --- idm/branches/1.1.0/picketlink-idm-testsuite/pom.xml 2010-09-24 09:27:41 UTC (rev 418) +++ idm/branches/1.1.0/picketlink-idm-testsuite/pom.xml 2010-09-24 09:48:08 UTC (rev 419) @@ -2,7 +2,7 @@ <parent> <groupId>org.picketlink.idm</groupId> <artifactId>picketlink-idm-parent</artifactId> - <version>1.1.6.CR01-SNAPSHOT</version> + <version>1.1.6.CR01</version> <relativePath>../parent</relativePath> </parent> <modelVersion>4.0.0</modelVersion> Modified: idm/branches/1.1.0/pom.xml =================================================================== --- idm/branches/1.1.0/pom.xml 2010-09-24 09:27:41 UTC (rev 418) +++ idm/branches/1.1.0/pom.xml 2010-09-24 09:48:08 UTC (rev 419) @@ -2,7 +2,7 @@ <parent> <groupId>org.picketlink.idm</groupId> <artifactId>picketlink-idm-parent</artifactId> - <version>1.1.6.CR01-SNAPSHOT</version> + <version>1.1.6.CR01</version> <relativePath>parent</relativePath> </parent> <modelVersion>4.0.0</modelVersion> @@ -14,9 +14,9 @@ <description /> <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/picketlink/idm/branches/1.1.0</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/picketlink/idm/branches/1.1.0</developerConnection> - <url>http://anonsvn.jboss.org/repos/maven/poms/jboss-parent-pom/tags/jboss-par...</url> + <connection>scm:svn:http://anonsvn.jboss.org/repos/picketlink/idm/tags/1.1.6.CR01</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/picketlink/idm/tags/1.1.6.CR01</developerConnection> + <url>http://anonsvn.jboss.org/repos/maven/poms/jboss-parent-pom/tags/1.1.6.CR01</url> </scm> <profiles>

14 years, 3 months

1
0
0 / 0

Picketlink SVN: r418 - in idm/branches/1.1.0: example/auth and 2 other directories.

by picketlink-commits＠lists.jboss.org

Author: bdaw Date: 2010-09-24 05:27:41 -0400 (Fri, 24 Sep 2010) New Revision: 418 Modified: idm/branches/1.1.0/example/auth-simple/pom.xml idm/branches/1.1.0/example/auth/pom.xml idm/branches/1.1.0/example/simple/pom.xml idm/branches/1.1.0/pom.xml Log: some cleanup in the build Modified: idm/branches/1.1.0/example/auth/pom.xml =================================================================== --- idm/branches/1.1.0/example/auth/pom.xml 2010-09-23 20:15:55 UTC (rev 417) +++ idm/branches/1.1.0/example/auth/pom.xml 2010-09-24 09:27:41 UTC (rev 418) @@ -1,7 +1,7 @@ <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <groupId>org.picketlink.idm.example</groupId> - <version>1.1.5.CR03-SNAPSHOT</version> + <version>1.1.6.CR01-SNAPSHOT</version> <artifactId>example-auth</artifactId> <packaging>jar</packaging> <name>Example - JEE authentication</name> Modified: idm/branches/1.1.0/example/auth-simple/pom.xml =================================================================== --- idm/branches/1.1.0/example/auth-simple/pom.xml 2010-09-23 20:15:55 UTC (rev 417) +++ idm/branches/1.1.0/example/auth-simple/pom.xml 2010-09-24 09:27:41 UTC (rev 418) @@ -1,7 +1,7 @@ <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <groupId>org.picketlink.idm.example</groupId> - <version>1.1.5.CR03-SNAPSHOT</version> + <version>1.1.6.CR01-SNAPSHOT</version> <artifactId>example-auth-simple</artifactId> <packaging>jar</packaging> <name>Example - JEE authentication (using deployer)</name> Modified: idm/branches/1.1.0/example/simple/pom.xml =================================================================== --- idm/branches/1.1.0/example/simple/pom.xml 2010-09-23 20:15:55 UTC (rev 417) +++ idm/branches/1.1.0/example/simple/pom.xml 2010-09-24 09:27:41 UTC (rev 418) @@ -1,7 +1,7 @@ <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <groupId>org.picketlink.idm.example</groupId> - <version>1.1.5.CR03-SNAPSHOT</version> + <version>1.1.6.CR01-SNAPSHOT</version> <artifactId>example-simple</artifactId> <packaging>jar</packaging> <name>Example - Simple PicketLink IDM Maven2 project</name> Modified: idm/branches/1.1.0/pom.xml =================================================================== --- idm/branches/1.1.0/pom.xml 2010-09-23 20:15:55 UTC (rev 417) +++ idm/branches/1.1.0/pom.xml 2010-09-24 09:27:41 UTC (rev 418) @@ -43,10 +43,10 @@ <profile> <id>all</id> <modules> + <module>assembly</module> <module>example/simple</module> <module>example/auth</module> <module>example/auth-simple</module> - <module>assembly</module> </modules> </profile> <profile>

14 years, 3 months

1
0
0 / 0

Picketlink SVN: r417 - idm/branches/1.1.0/picketlink-idm-testsuite/src/test/resources.

by picketlink-commits＠lists.jboss.org

Author: bdaw Date: 2010-09-23 16:15:55 -0400 (Thu, 23 Sep 2010) New Revision: 417 Modified: idm/branches/1.1.0/picketlink-idm-testsuite/src/test/resources/test-identity-config-redhatds.xml idm/branches/1.1.0/picketlink-idm-testsuite/src/test/resources/test-identity-config-sunds.xml Log: fix testsuite Modified: idm/branches/1.1.0/picketlink-idm-testsuite/src/test/resources/test-identity-config-redhatds.xml =================================================================== --- idm/branches/1.1.0/picketlink-idm-testsuite/src/test/resources/test-identity-config-redhatds.xml 2010-09-23 15:40:25 UTC (rev 416) +++ idm/branches/1.1.0/picketlink-idm-testsuite/src/test/resources/test-identity-config-redhatds.xml 2010-09-23 20:15:55 UTC (rev 417) @@ -888,14 +888,6 @@ <name>cache.configFile</name> <value>jboss-cache.xml</value> </option> - <option> - <name>pagedResultsExtensionSupported</name> - <value>true</value> - </option> - <option> - <name>pagedResultsExtensionSize</name> - <value>1</value> - </option> </options> </identity-store> </identity-stores> Modified: idm/branches/1.1.0/picketlink-idm-testsuite/src/test/resources/test-identity-config-sunds.xml =================================================================== --- idm/branches/1.1.0/picketlink-idm-testsuite/src/test/resources/test-identity-config-sunds.xml 2010-09-23 15:40:25 UTC (rev 416) +++ idm/branches/1.1.0/picketlink-idm-testsuite/src/test/resources/test-identity-config-sunds.xml 2010-09-23 20:15:55 UTC (rev 417) @@ -888,14 +888,6 @@ <name>cache.configFile</name> <value>jboss-cache.xml</value> </option> - <option> - <name>pagedResultsExtensionSupported</name> - <value>true</value> - </option> - <option> - <name>pagedResultsExtensionSize</name> - <value>1</value> - </option> </options> </identity-store> </identity-stores>

14 years, 3 months

1
0
0 / 0

Picketlink SVN: r416 - idm/branches/1.1.0/picketlink-idm-ldap/src/main/java/org/picketlink/idm/impl/store/ldap.

by picketlink-commits＠lists.jboss.org

Author: bdaw Date: 2010-09-23 11:40:25 -0400 (Thu, 23 Sep 2010) New Revision: 416 Added: idm/branches/1.1.0/picketlink-idm-ldap/src/main/java/org/picketlink/idm/impl/store/ldap/SerializableSearchResult.java Modified: idm/branches/1.1.0/picketlink-idm-ldap/src/main/java/org/picketlink/idm/impl/store/ldap/LDAPIdentityStoreImpl.java Log: JBEPP-479 - NotSerializableException when using LDAPIdentityStore cache in replication mode Modified: idm/branches/1.1.0/picketlink-idm-ldap/src/main/java/org/picketlink/idm/impl/store/ldap/LDAPIdentityStoreImpl.java =================================================================== --- idm/branches/1.1.0/picketlink-idm-ldap/src/main/java/org/picketlink/idm/impl/store/ldap/LDAPIdentityStoreImpl.java 2010-09-22 17:42:03 UTC (rev 415) +++ idm/branches/1.1.0/picketlink-idm-ldap/src/main/java/org/picketlink/idm/impl/store/ldap/LDAPIdentityStoreImpl.java 2010-09-23 15:40:25 UTC (rev 416) @@ -535,7 +535,7 @@ String scope = getTypeConfiguration(ctx, identityType).getEntrySearchScope(); //log.debug("Search filter: " + filter); - List sr = searchIdentityObjects(ctx, + List<SerializableSearchResult> sr = searchIdentityObjects(ctx, entryCtxs, filter, null, @@ -581,7 +581,7 @@ } String filter = getTypeConfiguration(invocationCtx, type).getEntrySearchFilter(); - List sr = null; + List<SerializableSearchResult> sr = null; String[] entryCtxs = getTypeConfiguration(invocationCtx, type).getCtxDNs(); @@ -619,12 +619,10 @@ throw new IdentityException("Found more than one identity object with name: " + name + "; Posible data inconsistency"); } - SearchResult res = (SearchResult)sr.iterator().next(); - ctx = (Context)res.getObject(); - String dn = ctx.getNameInNamespace(); + SerializableSearchResult res = sr.iterator().next(); + String dn = res.getNameInNamespace(); IdentityObject io = createIdentityObjectInstance(invocationCtx, type, res.getAttributes(), dn); - ctx.close(); - + // Check for case insensitive name results if (!io.getName().equals(name)) { @@ -853,7 +851,7 @@ } String filter = getTypeConfiguration(invocationCtx, type).getEntrySearchFilter(); - List<SearchResult> sr = null; + List<SerializableSearchResult> sr = null; String[] entryCtxs = getTypeConfiguration(invocationCtx, type).getCtxDNs(); String scope = getTypeConfiguration(invocationCtx, type).getEntrySearchScope(); @@ -885,10 +883,9 @@ } - for (SearchResult res : sr) + for (SerializableSearchResult res : sr) { - ctx = (LdapContext)res.getObject(); - String dn = ctx.getNameInNamespace(); + String dn = res.getNameInNamespace(); if (criteria != null && criteria.isSorted() && configuration.isSortExtensionSupported()) { // It seams that the sort order is not configurable and @@ -1275,7 +1272,7 @@ String filter = checkedTypeConfiguration.getEntrySearchFilter(); - List<SearchResult> sr = null; + List<SerializableSearchResult> sr = null; String[] entryCtxs = checkedTypeConfiguration.getCtxDNs(); String scope = checkedTypeConfiguration.getEntrySearchScope(); @@ -1304,10 +1301,9 @@ requestControls); } - for (SearchResult res : sr) + for (SerializableSearchResult res : sr) { - LdapContext ldapCtx = (LdapContext)res.getObject(); - String dn = ldapCtx.getNameInNamespace(); + String dn = res.getNameInNamespace(); if (parents) { @@ -1576,7 +1572,7 @@ } String filter = checkedTypeConfiguration.getEntrySearchFilter(); - List<SearchResult> sr = null; + List<SerializableSearchResult> sr = null; String[] entryCtxs = checkedTypeConfiguration.getCtxDNs(); String scope = checkedTypeConfiguration.getEntrySearchScope(); @@ -1605,10 +1601,9 @@ requestControls); } - for (SearchResult res : sr) + for (SerializableSearchResult res : sr) { - LdapContext ldapCtx = (LdapContext)res.getObject(); - String dn = ldapCtx.getNameInNamespace(); + String dn = res.getNameInNamespace(); @@ -2110,7 +2105,9 @@ log.finer(toString() + ".removeRelationshipName with name: " + name); } + LdapContext ldapCtx = getLDAPContext(invocationCtx); Context ctx = null; + try { @@ -2120,7 +2117,7 @@ } String filter = getConfiguration(invocationCtx).getRelationshipNameSearchFilter(); - List sr = null; + List<SerializableSearchResult> sr = null; String[] entryCtxs = getConfiguration(invocationCtx).getRelationshipNamesCtxDNs(); @@ -2157,13 +2154,14 @@ throw new IdentityException("Found more than one relationship name entry: " + name + "; Posible data inconsistency"); } - SearchResult res = (SearchResult)sr.iterator().next(); - ctx = (Context)res.getObject(); - String dn = ctx.getNameInNamespace(); + SerializableSearchResult res = sr.iterator().next(); + String dn = res.getNameInNamespace(); + + // Escape JNDI special characters Name jndiName = new CompositeName().add(dn); - ctx.unbind(jndiName); + ldapCtx.unbind(jndiName); invalidateCache(); @@ -2202,6 +2200,23 @@ throw new IdentityException("Failed to close LDAP connection", e); } + try + { + if (ldapCtx != null) + { + ldapCtx.close(); + } + } + catch (NamingException e) + { + if (log.isLoggable(Level.FINER)) + { + log.log(Level.FINER, "Exception occurred: ", e); + } + + throw new IdentityException("Failed to close LDAP connection", e); + } + } return null; @@ -2235,7 +2250,7 @@ StringBuilder af = new StringBuilder(); String filter = config.getRelationshipNameSearchFilter(); - List<SearchResult> sr = null; + List<SerializableSearchResult> sr = null; String[] entryCtxs = config.getRelationshipNamesCtxDNs(); String scope = config.getRelationshipNameSearchScope(); @@ -2265,10 +2280,9 @@ } - for (SearchResult res : sr) + for (SerializableSearchResult res : sr) { - ctx = (LdapContext)res.getObject(); - String dn = ctx.getNameInNamespace(); + String dn = res.getNameInNamespace(); String[] parts = dn.split("="); names.add(parts[1]); @@ -3138,7 +3152,7 @@ .append(")"); String filter = getTypeConfiguration(invocationCtx, type).getEntrySearchFilter(); - List<SearchResult> sr = null; + List<SerializableSearchResult> sr = null; String[] entryCtxs = getTypeConfiguration(invocationCtx, type).getCtxDNs(); String scope = getTypeConfiguration(invocationCtx, type).getEntrySearchScope(); @@ -3168,10 +3182,9 @@ } - for (SearchResult res : sr) + for (SerializableSearchResult res : sr) { - ctx = (LdapContext)res.getObject(); - String dn = ctx.getNameInNamespace(); + String dn = res.getNameInNamespace(); objects.add(createIdentityObjectInstance(invocationCtx, type, res.getAttributes(), dn)); } @@ -3258,7 +3271,7 @@ return ldapio; } - public List<SearchResult> searchIdentityObjects(IdentityStoreInvocationContext ctx, + public List<SerializableSearchResult> searchIdentityObjects(IdentityStoreInvocationContext ctx, String[] entryCtxs, String filter, Object[] filterArgs, @@ -3312,7 +3325,7 @@ log.finer("LDAP search results found in cache. size=" + ((List)results).size()); } - return (List<SearchResult>)results; + return (List<SerializableSearchResult>)results; } } @@ -3323,9 +3336,9 @@ //Reset request controls ldapContext.setRequestControls(null); - List<SearchResult> results = null; + List<SerializableSearchResult> results = null; - List<SearchResult> finalResults; + List<SerializableSearchResult> finalResults; try { @@ -3379,7 +3392,7 @@ } else { - List<SearchResult> merged = new LinkedList(); + List<SerializableSearchResult> merged = new LinkedList(); for (String entryCtx : entryCtxs) { @@ -3431,7 +3444,18 @@ return finalResults; } - protected List<SearchResult> searchLDAP(LdapContext ldapContext, + /** + * Separate search method in which additional stuff like Simple Paged Results extension are applied + * @param ldapContext + * @param jndiName + * @param filter + * @param filterArgs + * @param searchControls + * @param requestControls + * @return + * @throws NamingException + */ + protected List<SerializableSearchResult> searchLDAP(LdapContext ldapContext, Name jndiName, String filter, Object[] filterArgs, @@ -3486,7 +3510,7 @@ byte[] cookie = null; int total = -1; - List<SearchResult> results = new LinkedList<SearchResult>(); + List<SerializableSearchResult> results = new LinkedList<SerializableSearchResult>(); while(true) @@ -3510,7 +3534,14 @@ if (resultsEnumeration != null) { - results.addAll(Tools.toList(resultsEnumeration)); + //results.addAll(Tools.toList(resultsEnumeration)); + + while (resultsEnumeration.hasMoreElements()) + { + SearchResult sr = (SearchResult)resultsEnumeration.nextElement(); + results.add(new SerializableSearchResult(sr)); + } + resultsEnumeration.close(); } Added: idm/branches/1.1.0/picketlink-idm-ldap/src/main/java/org/picketlink/idm/impl/store/ldap/SerializableSearchResult.java =================================================================== --- idm/branches/1.1.0/picketlink-idm-ldap/src/main/java/org/picketlink/idm/impl/store/ldap/SerializableSearchResult.java (rev 0) +++ idm/branches/1.1.0/picketlink-idm-ldap/src/main/java/org/picketlink/idm/impl/store/ldap/SerializableSearchResult.java 2010-09-23 15:40:25 UTC (rev 416) @@ -0,0 +1,58 @@ + +/* +* JBoss, a division of Red Hat +* Copyright 2006, Red Hat Middleware, LLC, and individual contributors as indicated +* by the @authors tag. See the copyright.txt in the distribution for a +* full listing of individual contributors. +* +* This is free software; you can redistribute it and/or modify it +* under the terms of the GNU Lesser General Public License as +* published by the Free Software Foundation; either version 2.1 of +* the License, or (at your option) any later version. +* +* This software is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +* Lesser General Public License for more details. +* +* You should have received a copy of the GNU Lesser General Public +* License along with this software; if not, write to the Free +* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA +* 02110-1301 USA, or see the FSF site: http://www.fsf.org. +*/ + +package org.picketlink.idm.impl.store.ldap; + +import java.io.Serializable; + +import javax.naming.directory.Attributes; +import javax.naming.directory.SearchResult; + + +/** + * Class that helps to repackage needed content from JNDI SearchResult into serializable object + * + */ +public class SerializableSearchResult implements Serializable +{ + + private final Attributes attributes; + + private final String nameInNamespace; + + public SerializableSearchResult(SearchResult result) + { + nameInNamespace = result.getNameInNamespace(); + attributes = result.getAttributes(); + } + + public Attributes getAttributes() + { + return attributes; + } + + public String getNameInNamespace() + { + return nameInNamespace; + } +}

14 years, 3 months

1
0
0 / 0

Picketlink SVN: r415 - in idm/branches/1.1.0: picketlink-idm-ldap/src/main/java/org/picketlink/idm/impl/store/ldap and 1 other directories.

by picketlink-commits＠lists.jboss.org

Author: bdaw Date: 2010-09-22 13:42:03 -0400 (Wed, 22 Sep 2010) New Revision: 415 Modified: idm/branches/1.1.0/parent/logging.properties idm/branches/1.1.0/picketlink-idm-ldap/src/main/java/org/picketlink/idm/impl/store/ldap/LDAPIdentityStoreConfiguration.java idm/branches/1.1.0/picketlink-idm-ldap/src/main/java/org/picketlink/idm/impl/store/ldap/LDAPIdentityStoreImpl.java idm/branches/1.1.0/picketlink-idm-ldap/src/main/java/org/picketlink/idm/impl/store/ldap/SimpleLDAPIdentityStoreConfiguration.java idm/branches/1.1.0/picketlink-idm-testsuite/src/test/resources/test-identity-config-msad-2k3.xml idm/branches/1.1.0/picketlink-idm-testsuite/src/test/resources/test-identity-config-msad-2k8.xml idm/branches/1.1.0/picketlink-idm-testsuite/src/test/resources/test-identity-config-opends12.xml idm/branches/1.1.0/picketlink-idm-testsuite/src/test/resources/test-identity-config-opends20.xml idm/branches/1.1.0/picketlink-idm-testsuite/src/test/resources/test-identity-config-redhatds.xml idm/branches/1.1.0/picketlink-idm-testsuite/src/test/resources/test-identity-config-sunds.xml idm/branches/1.1.0/picketlink-idm-testsuite/src/test/resources/test-identity-config.xml Log: - Support for "Simple Paged Results" LDAP extension to split big searches Modified: idm/branches/1.1.0/parent/logging.properties =================================================================== --- idm/branches/1.1.0/parent/logging.properties 2010-09-20 21:08:57 UTC (rev 414) +++ idm/branches/1.1.0/parent/logging.properties 2010-09-22 17:42:03 UTC (rev 415) @@ -51,14 +51,14 @@ # Naming style for the output file: # (The output file is placed in the directory # defined by the "user.home" System property.) -java.util.logging.FileHandler.pattern=%h/java%u.log +java.util.logging.FileHandler.pattern=%h/jul-logs/java%u.log # Limiting size of output file in bytes: -java.util.logging.FileHandler.limit=50000 +java.util.logging.FileHandler.limit=5000000 # Number of output files to cycle through, by appending an # integer to the base file name: -java.util.logging.FileHandler.count=1 +java.util.logging.FileHandler.count=10000 # Style of output (Simple or XML): java.util.logging.FileHandler.formatter=java.util.logging.SimpleFormatter \ No newline at end of file Modified: idm/branches/1.1.0/picketlink-idm-ldap/src/main/java/org/picketlink/idm/impl/store/ldap/LDAPIdentityStoreConfiguration.java =================================================================== --- idm/branches/1.1.0/picketlink-idm-ldap/src/main/java/org/picketlink/idm/impl/store/ldap/LDAPIdentityStoreConfiguration.java 2010-09-20 21:08:57 UTC (rev 414) +++ idm/branches/1.1.0/picketlink-idm-ldap/src/main/java/org/picketlink/idm/impl/store/ldap/LDAPIdentityStoreConfiguration.java 2010-09-22 17:42:03 UTC (rev 415) @@ -86,4 +86,8 @@ boolean isCreateMissingContexts(); + boolean isPagedExtensionSupported(); + + int getPagedExtensionSize(); + } Modified: idm/branches/1.1.0/picketlink-idm-ldap/src/main/java/org/picketlink/idm/impl/store/ldap/LDAPIdentityStoreImpl.java =================================================================== --- idm/branches/1.1.0/picketlink-idm-ldap/src/main/java/org/picketlink/idm/impl/store/ldap/LDAPIdentityStoreImpl.java 2010-09-20 21:08:57 UTC (rev 414) +++ idm/branches/1.1.0/picketlink-idm-ldap/src/main/java/org/picketlink/idm/impl/store/ldap/LDAPIdentityStoreImpl.java 2010-09-22 17:42:03 UTC (rev 415) @@ -50,9 +50,11 @@ import org.picketlink.idm.spi.store.IdentityStoreInvocationContext; import org.picketlink.idm.spi.store.IdentityStoreSession; +import java.io.IOException; import java.io.UnsupportedEncodingException; import java.lang.reflect.Constructor; import java.lang.reflect.InvocationTargetException; +import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; import java.util.Collections; @@ -87,6 +89,8 @@ import javax.naming.ldap.InitialLdapContext; import javax.naming.ldap.LdapContext; import javax.naming.ldap.LdapName; +import javax.naming.ldap.PagedResultsControl; +import javax.naming.ldap.PagedResultsResponseControl; import javax.naming.ldap.SortControl; /** @@ -3316,13 +3320,11 @@ LdapContext ldapContext = getLDAPContext(ctx); - if (ldapContext != null) - { - ldapContext.setRequestControls(requestControls); - } + //Reset request controls + ldapContext.setRequestControls(null); + + List<SearchResult> results = null; - NamingEnumeration results = null; - List<SearchResult> finalResults; try @@ -3357,14 +3359,14 @@ if (filterArgs == null) { - results = ldapContext.search(jndiName, filter, searchControls); + results = searchLDAP(ldapContext, jndiName, filter, null, searchControls, requestControls); } else { - results = ldapContext.search(jndiName, filter, filterArgs, searchControls); + results = searchLDAP(ldapContext, jndiName, filter, filterArgs, searchControls, requestControls); } - List toReturn = Tools.toList(results); + List toReturn = results; if (log.isLoggable(Level.FINER) && toReturn != null) { @@ -3387,13 +3389,13 @@ if (filterArgs == null) { - results = ldapContext.search(jndiName, filter, searchControls); + results = searchLDAP(ldapContext, jndiName, filter, null, searchControls, requestControls); } else { - results = ldapContext.search(jndiName, filter, filterArgs, searchControls); + results = searchLDAP(ldapContext, jndiName, filter, filterArgs, searchControls, requestControls); } - List singleResult = Tools.toList(results); + List singleResult = results; if (log.isLoggable(Level.FINER) && merged != null) { @@ -3401,7 +3403,6 @@ } merged.addAll(singleResult); - results.close(); } @@ -3411,10 +3412,6 @@ } finally { - if (results != null) - { - results.close(); - } ldapContext.close(); } @@ -3434,6 +3431,162 @@ return finalResults; } + protected List<SearchResult> searchLDAP(LdapContext ldapContext, + Name jndiName, + String filter, + Object[] filterArgs, + SearchControls searchControls, + Control[] requestControls) throws NamingException + { + + // Add paged controls if needed + + int pageSize = configuration.getPagedExtensionSize(); + + if (configuration.isPagedExtensionSupported()) + { + if (log.isLoggable(Level.FINER)) + { + log.finer("Adding 'Simple Paged Results' extension to LDAP search with page size: " + pageSize); + } + + try + { + // Merge existing controls with PageResultscontrol + if (requestControls != null) + { + + List<Control> controls = new ArrayList<Control>(); + controls.addAll(Arrays.asList(requestControls)); + controls.add(new PagedResultsControl(pageSize, Control.CRITICAL)); + + ldapContext.setRequestControls(controls.toArray(new Control[controls.size()])); + } + else + { + ldapContext.setRequestControls(new Control[]{ + new PagedResultsControl(pageSize, Control.CRITICAL) + }); + } + } + catch (IOException e) + { + if (log.isLoggable(Level.INFO)) + { + log.log(Level.INFO, "Could not add 'Simple Paged Results' extension: ", e); + } + } + } + else + { + ldapContext.setRequestControls(requestControls); + } + + int count = 0; + byte[] cookie = null; + int total = -1; + + List<SearchResult> results = new LinkedList<SearchResult>(); + + + while(true) + { + count++; + + //System.err.println("Search loop count = " + count); + + // Perform the search + + NamingEnumeration resultsEnumeration = null; + + if (filterArgs == null) + { + resultsEnumeration = ldapContext.search(jndiName, filter, searchControls); + } + else + { + resultsEnumeration = ldapContext.search(jndiName, filter, filterArgs, searchControls); + } + + if (resultsEnumeration != null) + { + results.addAll(Tools.toList(resultsEnumeration)); + resultsEnumeration.close(); + } + + if (configuration.isPagedExtensionSupported()) + { + + + // Examine the paged results control response + Control[] controls = ldapContext.getResponseControls(); + if(controls!=null) + { + for(int k = 0; k<controls.length; k++) + { + if(controls[k] instanceof PagedResultsResponseControl) + { + PagedResultsResponseControl prrc = + (PagedResultsResponseControl)controls[k]; + total = prrc.getResultSize(); + cookie = prrc.getCookie(); + } + } + } + + if (log.isLoggable(Level.FINER)) + { + log.finer("'Simple Paged Results' extension search pass: " + count + + "; pageSize: " + pageSize + + "; total: " + total); + } + } + + if(cookie == null) + { + break; + } + + if (configuration.isPagedExtensionSupported()) + { + // Re-activate paged results + try + { + if (requestControls != null) + { + List<Control> controls = new LinkedList<Control>(); + controls.addAll(Arrays.asList(requestControls)); + controls.add(new PagedResultsControl(pageSize, cookie, Control.CRITICAL)); + + ldapContext.setRequestControls(controls.toArray(new Control[controls.size()])); + + } + else + { + ldapContext.setRequestControls(new Control[]{ + new PagedResultsControl(pageSize, cookie, Control.CRITICAL)}); + } + } + catch (IOException e) + { + if (log.isLoggable(Level.INFO)) + { + log.log(Level.INFO, "Could not add 'Simple Paged Results' extension: ", e); + } + } + } + } + + if (log.isLoggable(Level.FINER) && results != null) + { + log.log(Level.FINER, "LDAP Search returned ", + results.size() + " results"); + } + + + return results; + + } + // HELPER private LDAPIdentityObjectImpl getSafeLDAPIO(IdentityStoreInvocationContext ctx, IdentityObject io) throws IdentityException Modified: idm/branches/1.1.0/picketlink-idm-ldap/src/main/java/org/picketlink/idm/impl/store/ldap/SimpleLDAPIdentityStoreConfiguration.java =================================================================== --- idm/branches/1.1.0/picketlink-idm-ldap/src/main/java/org/picketlink/idm/impl/store/ldap/SimpleLDAPIdentityStoreConfiguration.java 2010-09-20 21:08:57 UTC (rev 414) +++ idm/branches/1.1.0/picketlink-idm-ldap/src/main/java/org/picketlink/idm/impl/store/ldap/SimpleLDAPIdentityStoreConfiguration.java 2010-09-22 17:42:03 UTC (rev 415) @@ -85,6 +85,10 @@ private final boolean sortExtensionSupported; + private final boolean pagedExtensionSupported; + + private final int pagedExtensionSize; + private final boolean createMissingContexts; @@ -132,6 +136,12 @@ public static final String SORT_EXTENSION_SUPPORTED = "sortExtensionSupported"; + public static final String PAGE_EXTENSION_SUPPORTED = "pagedResultsExtensionSupported"; + + public static final String PAGE_EXTENSION_SIZE = "pagedResultsExtensionSize"; + + public static final int PAGE_EXTENSION_SIZE_DEFAULT = 1000; + public static final String CREATE_MISSING_CONTEXTS = "createMissingContexts"; public SimpleLDAPIdentityStoreConfiguration(IdentityStoreConfigurationMetaData storeMD) @@ -186,6 +196,27 @@ this.sortExtensionSupported = true; } + String pagedExtension = storeMD.getOptionSingleValue(PAGE_EXTENSION_SUPPORTED); + if (pagedExtension != null && pagedExtension.equalsIgnoreCase("true")) + { + this.pagedExtensionSupported = true; + } + else + { + this.pagedExtensionSupported = false; + } + + String pageSize = storeMD.getOptionSingleValue(PAGE_EXTENSION_SIZE); + + if (pageSize != null) + { + this.pagedExtensionSize = Integer.valueOf(pageSize); + } + else + { + this.pagedExtensionSize = PAGE_EXTENSION_SIZE_DEFAULT; + } + String createMissingContexts = storeMD.getOptionSingleValue(CREATE_MISSING_CONTEXTS); if (createMissingContexts != null && createMissingContexts.equalsIgnoreCase("true")) { @@ -498,4 +529,14 @@ { return createMissingContexts; } + + public boolean isPagedExtensionSupported() + { + return pagedExtensionSupported; + } + + public int getPagedExtensionSize() + { + return pagedExtensionSize; + } } Modified: idm/branches/1.1.0/picketlink-idm-testsuite/src/test/resources/test-identity-config-msad-2k3.xml =================================================================== --- idm/branches/1.1.0/picketlink-idm-testsuite/src/test/resources/test-identity-config-msad-2k3.xml 2010-09-20 21:08:57 UTC (rev 414) +++ idm/branches/1.1.0/picketlink-idm-testsuite/src/test/resources/test-identity-config-msad-2k3.xml 2010-09-22 17:42:03 UTC (rev 415) @@ -889,6 +889,14 @@ <name>cache.configFile</name> <value>jboss-cache.xml</value> </option> + <option> + <name>pagedResultsExtensionSupported</name> + <value>true</value> + </option> + <option> + <name>pagedResultsExtensionSize</name> + <value>1</value> + </option> </options> </identity-store> </identity-stores> Modified: idm/branches/1.1.0/picketlink-idm-testsuite/src/test/resources/test-identity-config-msad-2k8.xml =================================================================== --- idm/branches/1.1.0/picketlink-idm-testsuite/src/test/resources/test-identity-config-msad-2k8.xml 2010-09-20 21:08:57 UTC (rev 414) +++ idm/branches/1.1.0/picketlink-idm-testsuite/src/test/resources/test-identity-config-msad-2k8.xml 2010-09-22 17:42:03 UTC (rev 415) @@ -889,6 +889,14 @@ <name>cache.configFile</name> <value>jboss-cache.xml</value> </option> + <option> + <name>pagedResultsExtensionSupported</name> + <value>true</value> + </option> + <option> + <name>pagedResultsExtensionSize</name> + <value>1</value> + </option> </options> </identity-store> </identity-stores> Modified: idm/branches/1.1.0/picketlink-idm-testsuite/src/test/resources/test-identity-config-opends12.xml =================================================================== --- idm/branches/1.1.0/picketlink-idm-testsuite/src/test/resources/test-identity-config-opends12.xml 2010-09-20 21:08:57 UTC (rev 414) +++ idm/branches/1.1.0/picketlink-idm-testsuite/src/test/resources/test-identity-config-opends12.xml 2010-09-22 17:42:03 UTC (rev 415) @@ -899,6 +899,14 @@ <name>cache.configFile</name> <value>jboss-cache.xml</value> </option> + <option> + <name>pagedResultsExtensionSupported</name> + <value>true</value> + </option> + <option> + <name>pagedResultsExtensionSize</name> + <value>1</value> + </option> </options> </identity-store> </identity-stores> Modified: idm/branches/1.1.0/picketlink-idm-testsuite/src/test/resources/test-identity-config-opends20.xml =================================================================== --- idm/branches/1.1.0/picketlink-idm-testsuite/src/test/resources/test-identity-config-opends20.xml 2010-09-20 21:08:57 UTC (rev 414) +++ idm/branches/1.1.0/picketlink-idm-testsuite/src/test/resources/test-identity-config-opends20.xml 2010-09-22 17:42:03 UTC (rev 415) @@ -899,6 +899,14 @@ <name>cache.configFile</name> <value>jboss-cache.xml</value> </option> + <option> + <name>pagedResultsExtensionSupported</name> + <value>true</value> + </option> + <option> + <name>pagedResultsExtensionSize</name> + <value>1</value> + </option> </options> </identity-store> </identity-stores> Modified: idm/branches/1.1.0/picketlink-idm-testsuite/src/test/resources/test-identity-config-redhatds.xml =================================================================== --- idm/branches/1.1.0/picketlink-idm-testsuite/src/test/resources/test-identity-config-redhatds.xml 2010-09-20 21:08:57 UTC (rev 414) +++ idm/branches/1.1.0/picketlink-idm-testsuite/src/test/resources/test-identity-config-redhatds.xml 2010-09-22 17:42:03 UTC (rev 415) @@ -888,6 +888,14 @@ <name>cache.configFile</name> <value>jboss-cache.xml</value> </option> + <option> + <name>pagedResultsExtensionSupported</name> + <value>true</value> + </option> + <option> + <name>pagedResultsExtensionSize</name> + <value>1</value> + </option> </options> </identity-store> </identity-stores> Modified: idm/branches/1.1.0/picketlink-idm-testsuite/src/test/resources/test-identity-config-sunds.xml =================================================================== --- idm/branches/1.1.0/picketlink-idm-testsuite/src/test/resources/test-identity-config-sunds.xml 2010-09-20 21:08:57 UTC (rev 414) +++ idm/branches/1.1.0/picketlink-idm-testsuite/src/test/resources/test-identity-config-sunds.xml 2010-09-22 17:42:03 UTC (rev 415) @@ -888,6 +888,14 @@ <name>cache.configFile</name> <value>jboss-cache.xml</value> </option> + <option> + <name>pagedResultsExtensionSupported</name> + <value>true</value> + </option> + <option> + <name>pagedResultsExtensionSize</name> + <value>1</value> + </option> </options> </identity-store> </identity-stores> Modified: idm/branches/1.1.0/picketlink-idm-testsuite/src/test/resources/test-identity-config.xml =================================================================== --- idm/branches/1.1.0/picketlink-idm-testsuite/src/test/resources/test-identity-config.xml 2010-09-20 21:08:57 UTC (rev 414) +++ idm/branches/1.1.0/picketlink-idm-testsuite/src/test/resources/test-identity-config.xml 2010-09-22 17:42:03 UTC (rev 415) @@ -937,6 +937,14 @@ <name>cache.configFile</name> <value>jboss-cache.xml</value> </option> + <option> + <name>pagedResultsExtensionSupported</name> + <value>true</value> + </option> + <option> + <name>pagedResultsExtensionSize</name> + <value>1</value> + </option> </options> </identity-store> </identity-stores>

14 years, 3 months

1
0
0 / 0

Picketlink SVN: r413 - in integration-tests/branches/Branch_1_x: parent and 2 other directories.

by picketlink-commits＠lists.jboss.org

Author: anil.saldhana(a)jboss.com Date: 2010-09-17 13:46:08 -0400 (Fri, 17 Sep 2010) New Revision: 413 Modified: integration-tests/branches/Branch_1_x/parent/pom.xml integration-tests/branches/Branch_1_x/picketlink-saml-tests/pom.xml integration-tests/branches/Branch_1_x/picketlink-sts-tests/pom.xml integration-tests/branches/Branch_1_x/pom.xml Log: PLFED-104: next 1.0.5 for PL FED Modified: integration-tests/branches/Branch_1_x/parent/pom.xml =================================================================== --- integration-tests/branches/Branch_1_x/parent/pom.xml 2010-09-17 17:45:25 UTC (rev 412) +++ integration-tests/branches/Branch_1_x/parent/pom.xml 2010-09-17 17:46:08 UTC (rev 413) @@ -8,7 +8,7 @@ <groupId>org.picketlink</groupId> <artifactId>picketlink-integration-tests-parent</artifactId> <packaging>pom</packaging> - <version>1.0.4.final</version> + <version>1.0.5-SNAPSHOT</version> <name>PicketLink Integration Tests- Parent</name> <url>http://labs.jboss.org/portal/picketlink/</url> <description>PicketLink is a cross-cutting project that handles identity needs for the JEMS projects</description> Modified: integration-tests/branches/Branch_1_x/picketlink-saml-tests/pom.xml =================================================================== --- integration-tests/branches/Branch_1_x/picketlink-saml-tests/pom.xml 2010-09-17 17:45:25 UTC (rev 412) +++ integration-tests/branches/Branch_1_x/picketlink-saml-tests/pom.xml 2010-09-17 17:46:08 UTC (rev 413) @@ -2,7 +2,7 @@ <parent> <groupId>org.picketlink</groupId> <artifactId>picketlink-integration-tests-parent</artifactId> - <version>1.0.4.final</version> + <version>1.0.5-SNAPSHOT</version> <relativePath>../parent</relativePath> </parent> <modelVersion>4.0.0</modelVersion> Modified: integration-tests/branches/Branch_1_x/picketlink-sts-tests/pom.xml =================================================================== --- integration-tests/branches/Branch_1_x/picketlink-sts-tests/pom.xml 2010-09-17 17:45:25 UTC (rev 412) +++ integration-tests/branches/Branch_1_x/picketlink-sts-tests/pom.xml 2010-09-17 17:46:08 UTC (rev 413) @@ -2,7 +2,7 @@ <parent> <groupId>org.picketlink</groupId> <artifactId>picketlink-integration-tests-parent</artifactId> - <version>1.0.4.final</version> + <version>1.0.5-SNAPSHOT</version> <relativePath>../parent</relativePath> </parent> <modelVersion>4.0.0</modelVersion> Modified: integration-tests/branches/Branch_1_x/pom.xml =================================================================== --- integration-tests/branches/Branch_1_x/pom.xml 2010-09-17 17:45:25 UTC (rev 412) +++ integration-tests/branches/Branch_1_x/pom.xml 2010-09-17 17:46:08 UTC (rev 413) @@ -2,7 +2,7 @@ <parent> <groupId>org.picketlink</groupId> <artifactId>picketlink-integration-tests-parent</artifactId> - <version>1.0.4.final</version> + <version>1.0.5-SNAPSHOT</version> <relativePath>parent</relativePath> </parent> <modelVersion>4.0.0</modelVersion>

14 years, 3 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

picketlink-commits September 2010