X-Git-Url: http://www.project-moonshot.org/gitweb/?a=blobdiff_plain;f=samltest%2FArtifactMapTest.h;h=3b92c32a6977518a085697a9fcd3623e53c4768c;hb=e9554c255ad3c91c7c4976e7a1a54905903e66a2;hp=8f2aa301d082152fba483e963e56aa76fe5f19ad;hpb=6ab457e2f63d1e0698d0ece6b171043f601b3677;p=shibboleth%2Fcpp-opensaml.git

diff --git a/samltest/ArtifactMapTest.h b/samltest/ArtifactMapTest.h
index 8f2aa30..3b92c32 100644
--- a/samltest/ArtifactMapTest.h
+++ b/samltest/ArtifactMapTest.h
@@ -1,53 +1,56 @@
-/*
- *  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
- *
- *     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 "internal.h"
-#include <saml/SAMLConfig.h>
-#include "saml/binding/ArtifactMap.h"
-#include <saml/saml2/binding/SAML2ArtifactType0004.h>
-#include <saml/saml2/core/Protocols.h>
-
-using namespace opensaml::saml2p;
-using namespace opensaml;
-using namespace std;
-
-class ArtifactMapTest : public CxxTest::TestSuite
-{
-public:
-    string providerIdStr;
-    string handle;
-    void setUp() {
-        if (handle.empty()) {
-            providerIdStr = "https://idp.org/SAML";
-            SAMLConfig::getConfig().generateRandomBytes(handle,SAML2ArtifactType0004::HANDLE_LENGTH);
-        }
-    }
-    void tearDown() {
-    }
-    void testArtifactMap(void) {
-        auto_ptr<Response> response(ResponseBuilder::buildResponse());
-
-        SAML2ArtifactType0004 artifact(SAMLConfig::getConfig().hashSHA1(providerIdStr.c_str()),666,handle);
-        
-        ArtifactMap* artifactMap = SAMLConfig::getConfig().getArtifactMap();
-        artifactMap->storeContent(response.get(), &artifact, providerIdStr.c_str());
-        response.release();
-
-        auto_ptr<XMLObject> xmlObject(artifactMap->retrieveContent(&artifact, providerIdStr.c_str()));
-        TSM_ASSERT_THROWS("Artifact resolution improperly succeeded.", artifactMap->retrieveContent(&artifact), BindingException);
-        TSM_ASSERT("Mapped content was not a Response.", dynamic_cast<Response*>(xmlObject.get())!=NULL);
-    }
-};
+/*
+ *  Copyright 2001-2010 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
+ *
+ *     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 "internal.h"
+#include <saml/SAMLConfig.h>
+#include "saml/binding/ArtifactMap.h"
+#include <saml/saml2/binding/SAML2ArtifactType0004.h>
+#include <saml/saml2/core/Protocols.h>
+#include <xmltooling/security/SecurityHelper.h>
+
+using namespace opensaml::saml2p;
+using namespace opensaml;
+using namespace std;
+
+class ArtifactMapTest : public CxxTest::TestSuite
+{
+public:
+    string providerIdStr;
+    string handle;
+    void setUp() {
+        if (handle.empty()) {
+            providerIdStr = "https://idp.org/SAML";
+            SAMLConfig::getConfig().generateRandomBytes(handle,SAML2ArtifactType0004::HANDLE_LENGTH);
+        }
+    }
+    void tearDown() {
+    }
+    void testArtifactMap(void) {
+        auto_ptr<Response> response(ResponseBuilder::buildResponse());
+
+        SAML2ArtifactType0004 artifact(
+            SecurityHelper::doHash("SHA1", providerIdStr.data(), providerIdStr.length(), false), 666, handle
+            );
+        
+        ArtifactMap* artifactMap = SAMLConfig::getConfig().getArtifactMap();
+        artifactMap->storeContent(response.get(), &artifact, providerIdStr.c_str());
+        response.release();
+
+        auto_ptr<XMLObject> xmlObject(artifactMap->retrieveContent(&artifact, providerIdStr.c_str()));
+        TSM_ASSERT_THROWS("Artifact resolution improperly succeeded.", artifactMap->retrieveContent(&artifact), BindingException);
+        TSM_ASSERT("Mapped content was not a Response.", dynamic_cast<Response*>(xmlObject.get())!=nullptr);
+    }
+};