Change license header, remove stale pkg files.

[shibboleth/cpp-opensaml.git] / samltest / signature / SAML1ResponseTest.h

diff --git a/samltest/signature/SAML1ResponseTest.h b/samltest/signature/SAML1ResponseTest.h
index a27bbe3..6a6e495 100644 (file)
--- a/samltest/signature/SAML1ResponseTest.h
+++ b/samltest/signature/SAML1ResponseTest.h
@@ -1,17 +1,21 @@
-/*
- *  Copyright 2001-2005 Internet2
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+/**
+ * Licensed to the University Corporation for Advanced Internet
+ * Development, Inc. (UCAID) under one or more contributor license
+ * agreements. See the NOTICE file distributed with this work for
+ * additional information regarding copyright ownership.
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ * UCAID licenses this file to you under the Apache License,
+ * Version 2.0 (the "License"); you may not use this file except
+ * in compliance with the License. You may obtain a copy of the
+ * License at
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific
+ * language governing permissions and limitations under the License.
  */
 
 #include "signature/SAMLSignatureTestBase.h"
@@ -61,21 +65,18 @@ public:
 
         // Append a Signature.
         assertion->setSignature(SignatureBuilder::buildSignature());
-        Locker locker(m_resolver);
-        assertion->getSignature()->setSigningKey(m_resolver->getKey());
-
-        // Build KeyInfo.
-        KeyInfo* keyInfo=KeyInfoBuilder::buildKeyInfo();
-        X509Data* x509Data=X509DataBuilder::buildX509Data();
-        keyInfo->getX509Datas().push_back(x509Data);
-        for_each(m_resolver->getCertificates().begin(),m_resolver->getCertificates().end(),bind1st(_addcert(),x509Data));
-        assertion->getSignature()->setKeyInfo(keyInfo);
 
         // Sign assertion while marshalling.
         vector<Signature*> sigs(1,assertion->getSignature());
-        DOMElement* rootElement = NULL;
+        CredentialCriteria cc;
+        cc.setUsage(Credential::SIGNING_CREDENTIAL);
+        Locker locker(m_resolver);
+        const Credential* cred = m_resolver->resolve(&cc);
+        TSM_ASSERT("Retrieved credential was null", cred!=nullptr);
+
+        DOMElement* rootElement = nullptr;
         try {
-            rootElement=assertion->marshall((DOMDocument*)NULL,&sigs);
+            rootElement=assertion->marshall((DOMDocument*)nullptr,&sigs,cred);
         }
         catch (XMLToolingException& e) {
             TS_TRACE(e.what());
@@ -87,6 +88,10 @@ public:
         sc->setValue(&StatusCode::SUCCESS);
         Status* status=StatusBuilder::buildStatus();
         status->setStatusCode(sc);
+        sc = StatusCodeBuilder::buildStatusCode();
+        xmltooling::QName subcode("urn:mace:shibboleth", "NoReally", "shib");
+        sc->setValue(&subcode);
+        status->getStatusCode()->setStatusCode(sc);
 
         auto_ptr<Response> response(ResponseBuilder::buildResponse());
         response->setResponseID(rid.get());
@@ -94,15 +99,13 @@ public:
         response->setStatus(status);
         response->getAssertions().push_back(assertion);
         response->setSignature(SignatureBuilder::buildSignature());
-        response->getSignature()->setSigningKey(m_resolver->getKey());
-        response->getSignature()->setKeyInfo(keyInfo->cloneKeyInfo());
 
         // Sign response while marshalling.
         sigs.clear();
         sigs.push_back(response->getSignature());
-        rootElement = NULL;
+        rootElement = nullptr;
         try {
-            rootElement=response->marshall((DOMDocument*)NULL,&sigs);
+            rootElement=response->marshall((DOMDocument*)nullptr,&sigs,cred);
         }
         catch (XMLToolingException& e) {
             TS_TRACE(e.what());
@@ -117,15 +120,17 @@ public:
         
         auto_ptr<XMLObject> response2(b->buildFromDocument(doc));
         assertEquals("Unmarshalled response does not match", expectedChildElementsDOM, response2.get(), false);
+
+        auto_ptr<Response> response3(dynamic_cast<Response*>(response2.get())->cloneResponse());
         
         try {
-            SignatureProfileValidator spv;
-            spv.validate(dynamic_cast<Response*>(response2.get())->getAssertions().front()->getSignature());
-            spv.validate(dynamic_cast<Response*>(response2.get())->getSignature());
+            opensaml::SignatureProfileValidator spv;
+            spv.validate(dynamic_cast<Response*>(response3.get())->getAssertions().front()->getSignature());
+            spv.validate(dynamic_cast<Response*>(response3.get())->getSignature());
 
-            SignatureValidator sv(new KeyResolver(m_resolver->getKey()));
-            sv.validate(dynamic_cast<Response*>(response2.get())->getAssertions().front()->getSignature());
-            sv.validate(dynamic_cast<Response*>(response2.get())->getSignature());
+            SignatureValidator sv(cred);
+            sv.validate(dynamic_cast<Response*>(response3.get())->getAssertions().front()->getSignature());
+            sv.validate(dynamic_cast<Response*>(response3.get())->getSignature());
         }
         catch (XMLToolingException& e) {
             TS_TRACE(e.what());