Move credential usage enum to Credential class.

git-svn-id: https://svn.middleware.georgetown.edu/cpp-sp/trunk@2537 cb58f699-b61c-0410-a6fe-9272a202ed29

diff --git a/shibsp/binding/impl/SOAPClient.cpp b/shibsp/binding/impl/SOAPClient.cpp
index 607bd74..711153a 100644 (file)
--- a/shibsp/binding/impl/SOAPClient.cpp
+++ b/shibsp/binding/impl/SOAPClient.cpp
@@ -56,7 +56,7 @@ void SOAPClient::send(const soap11::Envelope& env, const char* from, MetadataCre
         if (m_credResolver) {
             m_credResolver->lock();
             // Fill in criteria to use.
-            to.setUsage(CredentialCriteria::SIGNING_CREDENTIAL);
+            to.setUsage(Credential::SIGNING_CREDENTIAL);
             pair<bool,const char*> keyName = m_relyingParty->getString("keyName");
             if (keyName.first)
                 to.getKeyNames().insert(keyName.second);
@@ -128,7 +128,7 @@ void SOAPClient::prepareTransport(SOAPTransport& transport)
                 m_credResolver->lock();
         }
         if (m_credResolver) {
-            m_criteria->setUsage(CredentialCriteria::TLS_CREDENTIAL);
+            m_criteria->setUsage(Credential::TLS_CREDENTIAL);
             authType = m_relyingParty->getString("keyName");
             if (authType.first)
                 m_criteria->getKeyNames().insert(authType.second);

diff --git a/shibsp/handler/impl/AbstractHandler.cpp b/shibsp/handler/impl/AbstractHandler.cpp
index c2a1ef9..d23f17a 100644 (file)
--- a/shibsp/handler/impl/AbstractHandler.cpp
+++ b/shibsp/handler/impl/AbstractHandler.cpp
@@ -192,7 +192,7 @@ long AbstractHandler::sendMessage(
             Locker credLocker(credResolver);
             // Fill in criteria to use.
             MetadataCredentialCriteria mcc(*role);
-            mcc.setUsage(CredentialCriteria::SIGNING_CREDENTIAL);
+            mcc.setUsage(Credential::SIGNING_CREDENTIAL);
             pair<bool,const char*> keyName = relyingParty->getString("keyName");
             if (keyName.first)
                 mcc.getKeyNames().insert(keyName.second);

diff --git a/shibsp/handler/impl/MetadataGenerator.cpp b/shibsp/handler/impl/MetadataGenerator.cpp
index 092d77b..21717c5 100644 (file)
--- a/shibsp/handler/impl/MetadataGenerator.cpp
+++ b/shibsp/handler/impl/MetadataGenerator.cpp
@@ -244,7 +244,7 @@ pair<bool,long> MetadataGenerator::processMessage(const Application& application
     if (credResolver) {
         Locker credLocker(credResolver);
         CredentialCriteria cc;
-        cc.setUsage(CredentialCriteria::SIGNING_CREDENTIAL);
+        cc.setUsage(Credential::SIGNING_CREDENTIAL);
         vector<const Credential*> creds;
         credResolver->resolve(creds,&cc);
         for (vector<const Credential*>::const_iterator c = creds.begin(); c != creds.end(); ++c) {
@@ -257,7 +257,7 @@ pair<bool,long> MetadataGenerator::processMessage(const Application& application
             }
         }
 
-        cc.setUsage(CredentialCriteria::ENCRYPTION_CREDENTIAL);
+        cc.setUsage(Credential::ENCRYPTION_CREDENTIAL);
         creds.clear();
         credResolver->resolve(creds,&cc);
         for (vector<const Credential*>::const_iterator c = creds.begin(); c != creds.end(); ++c) {
@@ -278,7 +278,7 @@ pair<bool,long> MetadataGenerator::processMessage(const Application& application
             Locker credLocker(credResolver);
             // Fill in criteria to use.
             CredentialCriteria cc;
-            cc.setUsage(CredentialCriteria::SIGNING_CREDENTIAL);
+            cc.setUsage(Credential::SIGNING_CREDENTIAL);
             prop = getString("keyName");
             if (prop.first)
                 cc.getKeyNames().insert(prop.second);

diff --git a/shibsp/handler/impl/SAML2LogoutInitiator.cpp b/shibsp/handler/impl/SAML2LogoutInitiator.cpp
index 36141f5..9a13bea 100644 (file)
--- a/shibsp/handler/impl/SAML2LogoutInitiator.cpp
+++ b/shibsp/handler/impl/SAML2LogoutInitiator.cpp
@@ -436,7 +436,7 @@ LogoutRequest* SAML2LogoutInitiator::buildRequest(
                 Locker credLocker(credResolver);
                 // Fill in criteria to use.
                 MetadataCredentialCriteria mcc(role);
-                mcc.setUsage(CredentialCriteria::SIGNING_CREDENTIAL);
+                mcc.setUsage(Credential::SIGNING_CREDENTIAL);
                 pair<bool,const char*> keyName = relyingParty->getString("keyName");
                 if (keyName.first)
                     mcc.getKeyNames().insert(keyName.second);

diff --git a/shibsp/handler/impl/StatusHandler.cpp b/shibsp/handler/impl/StatusHandler.cpp
index f95ffe1..cfb06c7 100644 (file)
--- a/shibsp/handler/impl/StatusHandler.cpp
+++ b/shibsp/handler/impl/StatusHandler.cpp
@@ -222,6 +222,19 @@ pair<bool,long> StatusHandler::processMessage(
         }
     }
 
+    s << "<Application id='" << application.getId() << "' entityID='" << application.getString("entityID").second << "'/>";
+
+    s << "<Handlers>";
+    vector<const Handler*> handlers;
+    application.getHandlers(handlers);
+    for (vector<const Handler*>::const_iterator h = handlers.begin(); h != handlers.end(); ++h) {
+        s << "<Handler type='" << (*h)->getType() << "' Location='" << (*h)->getString("Location").second << "'";
+        if ((*h)->getString("Binding").first)
+            s << " Binding='" << (*h)->getString("Binding").second << "'";
+        s << "/>";
+    }
+    s << "</Handlers>";
+
     s << "<Status>" << status << "</Status></StatusHandler>";
 
     httpResponse.setContentType("text/xml");