Merge branch '1.x' of ssh://authdev.it.ohio-state.edu/~scantor/git/cpp-xmltooling...

[shibboleth/cpp-xmltooling.git] / xmltooling / signature / impl / SignatureValidator.cpp

diff --git a/xmltooling/signature/impl/SignatureValidator.cpp b/xmltooling/signature/impl/SignatureValidator.cpp
index ac65a40..f69d299 100644 (file)
--- a/xmltooling/signature/impl/SignatureValidator.cpp
+++ b/xmltooling/signature/impl/SignatureValidator.cpp
@@ -1,64 +1,95 @@
-/*\r
- *  Copyright 2001-2006 Internet2\r
- * \r
- * Licensed under the Apache License, Version 2.0 (the "License");\r
- * you may not use this file except in compliance with the License.\r
- * You may obtain a copy of the License at\r
- *\r
- *     http://www.apache.org/licenses/LICENSE-2.0\r
- *\r
- * Unless required by applicable law or agreed to in writing, software\r
- * distributed under the License is distributed on an "AS IS" BASIS,\r
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
- * See the License for the specific language governing permissions and\r
- * limitations under the License.\r
- */\r
-\r
-/**\r
- * SignatureValidator.cpp\r
- * \r
- * Validator for signatures based on an externally-supplied key \r
- */\r
- \r
-#include "internal.h"\r
-#include "signature/SignatureValidator.h"\r
-\r
-#include <xsec/enc/XSECCryptoException.hpp>\r
-#include <xsec/framework/XSECException.hpp>\r
-\r
-using namespace xmlsignature;\r
-using namespace xmltooling;\r
-using namespace std;\r
-\r
-void SignatureValidator::validate(const XMLObject* xmlObject) const\r
-{\r
-    const Signature* sigObj=dynamic_cast<const Signature*>(xmlObject);\r
-    if (!sigObj)\r
-        throw ValidationException("Validator only applies to Signature objects.");\r
-    validate(sigObj);\r
-}\r
-\r
-void SignatureValidator::validate(const Signature* sigObj) const\r
-{\r
-    DSIGSignature* sig=sigObj->getXMLSignature();\r
-    if (!sig)\r
-        throw ValidationException("Signature does not exist yet.");\r
-    else if (!m_key && !m_resolver)\r
-        throw ValidationException("No KeyResolver or signing key set on Validator.");\r
-\r
-    try {\r
-        XSECCryptoKey* key = m_key ? m_key->clone() : m_resolver->resolveKey(sig->getKeyInfoList());\r
-        if (!key)\r
-            throw ValidationException("Unable to resolve signing key.");\r
-        sig->setSigningKey(key);\r
-        if (!sig->verify())\r
-            throw ValidationException("Digital signature does not validate with the given key.");\r
-    }\r
-    catch(XSECException& e) {\r
-        auto_ptr_char temp(e.getMsg());\r
-        throw ValidationException(string("Caught an XMLSecurity exception verifying signature: ") + temp.get());\r
-    }\r
-    catch(XSECCryptoException& e) {\r
-        throw ValidationException(string("Caught an XMLSecurity exception verifying signature: ") + e.getMsg());\r
-    }\r
-}\r
+/**
+ * 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.
+ *
+ * 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
+ *
+ * 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.
+ */
+
+/**
+ * SignatureValidator.cpp
+ * 
+ * Validator for signatures based on an externally-supplied key 
+ */
+ 
+#include "internal.h"
+#include "security/Credential.h"
+#include "signature/Signature.h"
+#include "signature/SignatureValidator.h"
+
+#include <xsec/enc/XSECCryptoException.hpp>
+#include <xsec/framework/XSECException.hpp>
+
+using namespace xmlsignature;
+using namespace xmltooling;
+using namespace std;
+
+SignatureValidator::SignatureValidator(XSECCryptoKey* key) : m_key(key), m_credential(nullptr)
+{
+}
+
+SignatureValidator::SignatureValidator(const Credential* credential) : m_key(nullptr), m_credential(credential)
+{
+}
+
+SignatureValidator::~SignatureValidator()
+{
+}
+
+void SignatureValidator::setKey(XSECCryptoKey* key)
+{
+    m_key = key;
+    m_credential = nullptr;
+}
+
+void SignatureValidator::setCredential(const Credential* credential)
+{
+    m_key = nullptr;
+    m_credential = credential;
+}
+
+void SignatureValidator::validate(const XMLObject* xmlObject) const
+{
+    const Signature* sigObj=dynamic_cast<const Signature*>(xmlObject);
+    if (!sigObj)
+        throw ValidationException("Validator only applies to Signature objects.");
+    validate(sigObj);
+}
+
+void SignatureValidator::validate(const Signature* sigObj) const
+{
+    DSIGSignature* sig=sigObj->getXMLSignature();
+    if (!sig)
+        throw ValidationException("Signature does not exist yet.");
+    else if (!m_key && !m_credential)
+        throw ValidationException("No Credential or key set on Validator.");
+
+    XSECCryptoKey* key = m_key ? m_key : (m_credential ? m_credential->getPublicKey() : nullptr);
+    if (!key)
+        throw ValidationException("Credential did not contain a verification key.");
+
+    try {
+        sig->setSigningKey(key->clone());
+        if (!sig->verify())
+            throw ValidationException("Digital signature does not validate with the supplied key.");
+    }
+    catch(XSECException& e) {
+        auto_ptr_char temp(e.getMsg());
+        throw ValidationException(string("Caught an XMLSecurity exception verifying signature: ") + temp.get());
+    }
+    catch(XSECCryptoException& e) {
+        throw ValidationException(string("Caught an XMLSecurity exception verifying signature: ") + e.getMsg());
+    }
+}