Major revamp of credential and trust handling code, PKIX engine still needs work.

[shibboleth/cpp-opensaml.git] / samltest / saml1 / binding / SAML1ArtifactTest.h

diff --git a/samltest/saml1/binding/SAML1ArtifactTest.h b/samltest/saml1/binding/SAML1ArtifactTest.h
index 9c39c47..5ae1dc8 100644 (file)
--- a/samltest/saml1/binding/SAML1ArtifactTest.h
+++ b/samltest/saml1/binding/SAML1ArtifactTest.h
@@ -25,18 +25,6 @@
 using namespace opensaml::saml1p;\r
 using namespace opensaml::saml1;\r
 \r
-namespace {\r
-    class SAML_DLLLOCAL _addcert : public binary_function<X509Data*,XSECCryptoX509*,void> {\r
-    public:\r
-        void operator()(X509Data* bag, XSECCryptoX509* cert) const {\r
-            safeBuffer& buf=cert->getDEREncodingSB();\r
-            X509Certificate* x=X509CertificateBuilder::buildX509Certificate();\r
-            x->setValue(buf.sbStrToXMLCh());\r
-            bag->getX509Certificates().push_back(x);\r
-        }\r
-    };\r
-};\r
-\r
 class SAML1ArtifactTest : public CxxTest::TestSuite,\r
         public SAMLBindingBaseTestCase, public MessageEncoder::ArtifactGenerator, public MessageDecoder::ArtifactResolver {\r
 public:\r
@@ -63,12 +51,18 @@ public:
                 );\r
             janitor.release();\r
 \r
+            CredentialCriteria cc;\r
+            cc.setUsage(CredentialCriteria::SIGNING_CREDENTIAL);\r
+            Locker clocker(m_creds);\r
+            const Credential* cred = m_creds->resolve(&cc);\r
+            TSM_ASSERT("Retrieved credential was null", cred!=NULL);\r
+\r
             // Encode message.\r
             auto_ptr<MessageEncoder> encoder(\r
                 SAMLConfig::getConfig().MessageEncoderManager.newPlugin(samlconstants::SAML1_PROFILE_BROWSER_ARTIFACT, NULL)\r
                 );\r
             encoder->setArtifactGenerator(this);\r
-            encoder->encode(*this,toSend.get(),"https://sp.example.org/SAML/SSO","https://sp.example.org/","state",m_creds);\r
+            encoder->encode(*this,toSend.get(),"https://sp.example.org/SAML/SSO","https://sp.example.org/","state",cred);\r
             toSend.release();\r
             \r
             // Decode message.\r
@@ -106,25 +100,6 @@ public:
         throw BindingException("Not implemented.");\r
     }\r
     \r
-    Signature* buildSignature(const CredentialResolver* credResolver) const\r
-    {\r
-        // Build a Signature.\r
-        Signature* sig = SignatureBuilder::buildSignature();\r
-        sig->setSigningKey(credResolver->getKey());\r
-\r
-        // Build KeyInfo.\r
-        const vector<XSECCryptoX509*>& certs = credResolver->getCertificates();\r
-        if (!certs.empty()) {\r
-            KeyInfo* keyInfo=KeyInfoBuilder::buildKeyInfo();\r
-            X509Data* x509Data=X509DataBuilder::buildX509Data();\r
-            keyInfo->getX509Datas().push_back(x509Data);\r
-            for_each(certs.begin(),certs.end(),bind1st(_addcert(),x509Data));\r
-            sig->setKeyInfo(keyInfo);\r
-        }\r
-        \r
-        return sig;\r
-    }\r
-\r
     Response* resolve(\r
         const vector<SAMLArtifact*>& artifacts,\r
         const IDPSSODescriptor& idpDescriptor,\r
@@ -142,9 +117,14 @@ public:
         StatusCode* sc = StatusCodeBuilder::buildStatusCode();\r
         status->setStatusCode(sc);\r
         sc->setValue(&StatusCode::SUCCESS);\r
-        response->setSignature(buildSignature(m_creds));\r
+        response->setSignature(SignatureBuilder::buildSignature());\r
         vector<Signature*> sigs(1,response->getSignature());\r
-        response->marshall((DOMDocument*)NULL,&sigs);\r
+        CredentialCriteria cc;\r
+        cc.setUsage(CredentialCriteria::SIGNING_CREDENTIAL);\r
+        Locker clocker(m_creds);\r
+        const Credential* cred = m_creds->resolve(&cc);\r
+        TSM_ASSERT("Retrieved credential was null", cred!=NULL);\r
+        response->marshall((DOMDocument*)NULL,&sigs,cred);\r
         SchemaValidators.validate(response.get());\r
         policy.evaluate(*(response.get()), this);\r
         return response.release();\r