X-Git-Url: http://www.project-moonshot.org/gitweb/?a=blobdiff_plain;f=saml%2FSAMLConfig.cpp;h=a842faf1a663d962aac9e9f1fb4683052094b38d;hb=2bca43f62a6859ce908174d90153b327341214d7;hp=1f84e920f46e0603ccc392014ecfa81775391fce;hpb=31bc751c4d57cbefbcda84e5a6afc7dffee22dcf;p=shibboleth%2Fcpp-opensaml.git

diff --git a/saml/SAMLConfig.cpp b/saml/SAMLConfig.cpp
index 1f84e92..a842faf 100644
--- a/saml/SAMLConfig.cpp
+++ b/saml/SAMLConfig.cpp
@@ -1,3 +1,4 @@
+
 /*
  *  Copyright 2001-2006 Internet2
  * 
@@ -20,15 +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>
@@ -37,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;
@@ -45,7 +49,22 @@ using namespace xmltooling;
 using namespace log4cpp;
 using namespace std;
 
-//DECL_EXCEPTION_FACTORY(XMLParserException,xmltooling);
+// Expose entry points when used as an extension library
+
+extern "C" int SAML_API xmltooling_extension_init(void*)
+{
+    if (SAMLConfig::getConfig().init(false))
+        return 0;
+    return -1;
+}
+
+extern "C" void SAML_API xmltooling_extension_term()
+{
+    SAMLConfig::getConfig().term(false);
+}
+
+DECL_EXCEPTION_FACTORY(ArtifactException,opensaml);
+DECL_EXCEPTION_FACTORY(MetadataFilterException,opensaml::saml2md);
 
 namespace opensaml {
    SAMLInternalConfig g_config;
@@ -61,7 +80,7 @@ SAMLInternalConfig& SAMLInternalConfig::getInternalConfig()
     return g_config;
 }
 
-bool SAMLInternalConfig::init()
+bool SAMLInternalConfig::init(bool initXMLTooling)
 {
 #ifdef _DEBUG
     xmltooling::NDC ndc("init");
@@ -69,32 +88,50 @@ bool SAMLInternalConfig::init()
     Category& log=Category::getInstance(SAML_LOGCAT".SAMLConfig");
     log.debug("library initialization started");
 
-    XMLToolingConfig::getConfig().init();
-    log.debug("XMLTooling library initialized");
+    if (initXMLTooling) {
+        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();
     saml2p::registerProtocolClasses();
     saml2md::registerMetadataClasses();
+    saml2md::registerMetadataProviders();
+    saml2md::registerMetadataFilters();
+    registerTrustEngines();
 
     log.info("library initialization complete");
     return true;
 }
 
-void SAMLInternalConfig::term()
+void SAMLInternalConfig::term(bool termXMLTooling)
 {
 #ifdef _DEBUG
     xmltooling::NDC ndc("term");
 #endif
+    Category& log=Category::getInstance(SAML_LOGCAT".SAMLConfig");
 
     saml1::AssertionSchemaValidators.destroyValidators();
     saml1p::ProtocolSchemaValidators.destroyValidators();
     saml2::AssertionSchemaValidators.destroyValidators();
     saml2md::MetadataSchemaValidators.destroyValidators();
-
-    XMLToolingConfig::getConfig().term();
-    Category::getInstance(SAML_LOGCAT".SAMLConfig").info("library shutdown complete");
+    
+    SAMLArtifactManager.deregisterFactories();
+    MetadataFilterManager.deregisterFactories();
+    MetadataProviderManager.deregisterFactories();
+    TrustEngineManager.deregisterFactories();
+
+    if (termXMLTooling) {
+        XMLToolingConfig::getConfig().term();
+        log.debug("XMLTooling library shut down");
+    }
+    log.info("library shutdown complete");
 }
 
 void SAMLInternalConfig::generateRandomBytes(void* buf, unsigned int len)
@@ -129,3 +166,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);
+    }
+}