X-Git-Url: http://www.project-moonshot.org/gitweb/?a=blobdiff_plain;f=saml%2FSAMLConfig.cpp;h=6f4bf768c40e86ef095767036881b2462ade9228;hb=cec17382f1fd55105c849e5967d39d5d25eb2c1f;hp=ad8a6df7106e10474854b0085f03660f4665b62f;hpb=e55d708c3afe86d26819d5f6c141a67bf6f7ee61;p=shibboleth%2Fcpp-opensaml.git

diff --git a/saml/SAMLConfig.cpp b/saml/SAMLConfig.cpp
index ad8a6df..6f4bf76 100644
--- a/saml/SAMLConfig.cpp
+++ b/saml/SAMLConfig.cpp
@@ -1,3 +1,4 @@
+
 /*
  *  Copyright 2001-2006 Internet2
  * 
@@ -20,16 +21,16 @@
  * Library configuration 
  */
 
-#define SAML_DECLARE_VALIDATORS
-
 #include "internal.h"
 #include "exceptions.h"
+#include "SAMLArtifact.h"
 #include "SAMLConfig.h"
 #include "saml1/core/Assertions.h"
 #include "saml1/core/Protocols.h"
 #include "saml2/core/Protocols.h"
 #include "saml2/metadata/Metadata.h"
 #include "saml2/metadata/MetadataProvider.h"
+#include "security/TrustEngine.h"
 #include "util/SAMLConstants.h"
 
 #include <xmltooling/XMLToolingConfig.h>
@@ -38,7 +39,9 @@
 
 #include <log4cpp/Category.hh>
 #include <xsec/enc/XSECCryptoException.hpp>
+#include <xsec/enc/XSECCryptoProvider.hpp>
 #include <xsec/utils/XSECPlatformUtils.hpp>
+#include <openssl/err.h>
 
 using namespace opensaml;
 using namespace xmlsignature;
@@ -46,7 +49,8 @@ using namespace xmltooling;
 using namespace log4cpp;
 using namespace std;
 
-//DECL_EXCEPTION_FACTORY(XMLParserException,xmltooling);
+DECL_EXCEPTION_FACTORY(ArtifactException,opensaml);
+DECL_EXCEPTION_FACTORY(MetadataFilterException,opensaml::saml2md);
 
 namespace opensaml {
    SAMLInternalConfig g_config;
@@ -73,6 +77,10 @@ bool SAMLInternalConfig::init()
     XMLToolingConfig::getConfig().init();
     log.debug("XMLTooling library initialized");
 
+    REGISTER_EXCEPTION_FACTORY(ArtifactException,opensaml);
+    REGISTER_EXCEPTION_FACTORY(MetadataFilterException,opensaml::saml2md);
+
+    registerSAMLArtifacts();
     saml1::registerAssertionClasses();
     saml1p::registerProtocolClasses();
     saml2::registerAssertionClasses();
@@ -80,6 +88,7 @@ bool SAMLInternalConfig::init()
     saml2md::registerMetadataClasses();
     saml2md::registerMetadataProviders();
     saml2md::registerMetadataFilters();
+    registerTrustEngines();
 
     log.info("library initialization complete");
     return true;
@@ -96,8 +105,10 @@ void SAMLInternalConfig::term()
     saml2::AssertionSchemaValidators.destroyValidators();
     saml2md::MetadataSchemaValidators.destroyValidators();
     
+    SAMLArtifactManager.deregisterFactories();
     MetadataFilterManager.deregisterFactories();
     MetadataProviderManager.deregisterFactories();
+    TrustEngineManager.deregisterFactories();
 
     XMLToolingConfig::getConfig().term();
     Category::getInstance(SAML_LOGCAT".SAMLConfig").info("library shutdown complete");
@@ -135,3 +146,47 @@ XMLCh* SAMLInternalConfig::generateIdentifier()
     hexform[33]=0;
     return XMLString::transcode(hexform);
 }
+
+string SAMLInternalConfig::hashSHA1(const char* s, bool toHex)
+{
+    static char DIGITS[] = {'0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f'};
+
+    auto_ptr<XSECCryptoHash> hasher(XSECPlatformUtils::g_cryptoProvider->hashSHA1());
+    if (hasher.get()) {
+        auto_ptr<char> dup(strdup(s));
+        unsigned char buf[21];
+        hasher->hash(reinterpret_cast<unsigned char*>(dup.get()),strlen(dup.get()));
+        if (hasher->finish(buf,20)==20) {
+            string ret;
+            if (toHex) {
+                for (unsigned int i=0; i<20; i++) {
+                    ret+=(DIGITS[((unsigned char)(0xF0 & buf[i])) >> 4 ]);
+                    ret+=(DIGITS[0x0F & buf[i]]);
+                }
+            }
+            else {
+                for (unsigned int i=0; i<20; i++) {
+                    ret+=buf[i];
+                }
+            }
+            return ret;
+        }
+    }
+    throw XMLSecurityException("Unable to generate SHA-1 hash.");
+}
+
+void opensaml::log_openssl()
+{
+    const char* file;
+    const char* data;
+    int flags,line;
+
+    unsigned long code=ERR_get_error_line_data(&file,&line,&data,&flags);
+    while (code) {
+        Category& log=Category::getInstance("OpenSSL");
+        log.errorStream() << "error code: " << code << " in " << file << ", line " << line << CategoryStream::ENDLINE;
+        if (data && (flags & ERR_TXT_STRING))
+            log.errorStream() << "error data: " << data << CategoryStream::ENDLINE;
+        code=ERR_get_error_line_data(&file,&line,&data,&flags);
+    }
+}