Reducing header overuse, non-inlining selected methods (CPPOST-35).

diff --git a/shibsp/attribute/resolver/impl/DelegationAttributeExtractor.cpp b/shibsp/attribute/resolver/impl/DelegationAttributeExtractor.cpp
index d44311e..d05fb85 100644 (file)
--- a/shibsp/attribute/resolver/impl/DelegationAttributeExtractor.cpp
+++ b/shibsp/attribute/resolver/impl/DelegationAttributeExtractor.cpp
@@ -29,6 +29,7 @@
 
 #include <saml/saml2/core/Assertions.h>
 #include <saml/saml2/metadata/MetadataCredentialCriteria.h>
+#include <xmltooling/util/DateTime.h>
 #include <xmltooling/util/XMLHelper.h>
 #include <xercesc/util/XMLUniDefs.hpp>
 
@@ -165,29 +166,29 @@ void DelegationExtractor::extractAttributes(
                         val.addmember("DelegationInstant").string(temp.get());
                     }
 
-                    auto_arrayptr<char> name(toUTF8(n->getName()));\r
-                    if (name.get() && *name.get()) {\r
-                        val.addmember("Name").string(name.get());\r
-                        char* str = toUTF8(n->getFormat());\r
-                        if (str && *str)\r
-                            val.addmember("Format").string(str);\r
-                        delete[] str;\r
-\r
-                        str = toUTF8(n->getNameQualifier());\r
-                        if (str && *str)\r
-                            val.addmember("NameQualifier").string(str);\r
-                        delete[] str;\r
-\r
-                        str = toUTF8(n->getSPNameQualifier());\r
-                        if (str && *str)\r
-                            val.addmember("SPNameQualifier").string(str);\r
-                        delete[] str;\r
-\r
-                        str = toUTF8(n->getSPProvidedID());\r
-                        if (str && *str)\r
-                            val.addmember("SPProvidedID").string(str);\r
-                        delete[] str;\r
-                    }\r
+                    auto_arrayptr<char> name(toUTF8(n->getName()));
+                    if (name.get() && *name.get()) {
+                        val.addmember("Name").string(name.get());
+                        char* str = toUTF8(n->getFormat());
+                        if (str && *str)
+                            val.addmember("Format").string(str);
+                        delete[] str;
+
+                        str = toUTF8(n->getNameQualifier());
+                        if (str && *str)
+                            val.addmember("NameQualifier").string(str);
+                        delete[] str;
+
+                        str = toUTF8(n->getSPNameQualifier());
+                        if (str && *str)
+                            val.addmember("SPNameQualifier").string(str);
+                        delete[] str;
+
+                        str = toUTF8(n->getSPProvidedID());
+                        if (str && *str)
+                            val.addmember("SPProvidedID").string(str);
+                        delete[] str;
+                    }
 
                     if (n != (*d)->getNameID())
                         delete n;

diff --git a/shibsp/binding/impl/SOAPClient.cpp b/shibsp/binding/impl/SOAPClient.cpp
index 1ae2d7d..2905a6b 100644 (file)
--- a/shibsp/binding/impl/SOAPClient.cpp
+++ b/shibsp/binding/impl/SOAPClient.cpp
@@ -27,7 +27,9 @@
 #include "binding/SOAPClient.h"
 
 #include <saml/saml2/metadata/Metadata.h>
+#include <saml/signature/ContentReference.h>
 #include <xmltooling/security/Credential.h>
+#include <xmltooling/signature/Signature.h>
 #include <xmltooling/soap/SOAP.h>
 #include <xmltooling/soap/HTTPSOAPTransport.h>
 #include <xmltooling/util/NDC.h>

diff --git a/shibsp/handler/impl/MetadataGenerator.cpp b/shibsp/handler/impl/MetadataGenerator.cpp
index 163c4b9..3444f4a 100644 (file)
--- a/shibsp/handler/impl/MetadataGenerator.cpp
+++ b/shibsp/handler/impl/MetadataGenerator.cpp
@@ -29,8 +29,11 @@
 
 #ifndef SHIBSP_LITE
 # include "metadata/MetadataProviderCriteria.h"
+# include <saml/signature/ContentReference.h>
 # include <xmltooling/XMLToolingConfig.h>
 # include <xmltooling/security/Credential.h>
+# include <xmltooling/security/CredentialCriteria.h>
+# include <xmltooling/signature/Signature.h>
 # include <xmltooling/util/PathResolver.h>
 #endif
 

diff --git a/shibsp/handler/impl/SAML1Consumer.cpp b/shibsp/handler/impl/SAML1Consumer.cpp
index 1f678eb..f2aa0b9 100644 (file)
--- a/shibsp/handler/impl/SAML1Consumer.cpp
+++ b/shibsp/handler/impl/SAML1Consumer.cpp
@@ -34,6 +34,7 @@
 # include <saml/saml1/core/Assertions.h>
 # include <saml/saml1/core/Protocols.h>
 # include <saml/saml2/metadata/Metadata.h>
+# include <xmltooling/util/DateTime.h>
 using namespace opensaml::saml1;
 using namespace opensaml::saml1p;
 using namespace opensaml;

diff --git a/shibsp/handler/impl/SAML2Consumer.cpp b/shibsp/handler/impl/SAML2Consumer.cpp
index 8e676ac..9fce6ef 100644 (file)
--- a/shibsp/handler/impl/SAML2Consumer.cpp
+++ b/shibsp/handler/impl/SAML2Consumer.cpp
@@ -35,6 +35,7 @@
 # include <saml/saml2/metadata/MetadataCredentialCriteria.h>
 # include <saml/saml2/profile/SAML2AssertionPolicy.h>
 # include <xmltooling/XMLToolingConfig.h>
+# include <xmltooling/util/DateTime.h>
 using namespace opensaml::saml2;
 using namespace opensaml::saml2p;
 using namespace opensaml::saml2md;

diff --git a/shibsp/handler/impl/SAML2LogoutInitiator.cpp b/shibsp/handler/impl/SAML2LogoutInitiator.cpp
index 2f25f45..0492d0b 100644 (file)
--- a/shibsp/handler/impl/SAML2LogoutInitiator.cpp
+++ b/shibsp/handler/impl/SAML2LogoutInitiator.cpp
@@ -36,7 +36,9 @@
 # include <saml/saml2/binding/SAML2SOAPClient.h>
 # include <saml/saml2/metadata/EndpointManager.h>
 # include <saml/saml2/metadata/MetadataCredentialCriteria.h>
+# include <saml/signature/ContentReference.h>
 # include <xmltooling/security/Credential.h>
+# include <xmltooling/signature/Signature.h>
 using namespace opensaml::saml2;
 using namespace opensaml::saml2p;
 using namespace opensaml::saml2md;

diff --git a/shibsp/handler/impl/StatusHandler.cpp b/shibsp/handler/impl/StatusHandler.cpp
index c14e420..7bde368 100644 (file)
--- a/shibsp/handler/impl/StatusHandler.cpp
+++ b/shibsp/handler/impl/StatusHandler.cpp
@@ -34,6 +34,7 @@ using namespace shibsp;
 # include "metadata/MetadataProviderCriteria.h"
 # include <saml/version.h>
 # include <xmltooling/security/Credential.h>
+# include <xmltooling/security/CredentialCriteria.h>
 using namespace opensaml::saml2md;
 using namespace opensaml;
 using namespace xmlsignature;

diff --git a/shibsp/impl/StorageServiceSessionCache.cpp b/shibsp/impl/StorageServiceSessionCache.cpp
index 839c6c1..0fd8f6d 100644 (file)
--- a/shibsp/impl/StorageServiceSessionCache.cpp
+++ b/shibsp/impl/StorageServiceSessionCache.cpp
@@ -39,6 +39,7 @@
 #include "util/SPConstants.h"
 
 #include <algorithm>
+#include <xmltooling/util/DateTime.h>
 #include <xmltooling/util/NDC.h>
 #include <xmltooling/util/XMLHelper.h>
 #include <xercesc/util/XMLUniDefs.hpp>