Add handlers and keys to status handler.

Fix mockup of AssertionLookup handler.

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

diff --git a/shibsp/handler/impl/AssertionLookup.cpp b/shibsp/handler/impl/AssertionLookup.cpp
index 61cf3b0..4854694 100644 (file)
--- a/shibsp/handler/impl/AssertionLookup.cpp
+++ b/shibsp/handler/impl/AssertionLookup.cpp
@@ -61,6 +61,10 @@ namespace shibsp {
         pair<bool,long> run(SPRequest& request, bool isHandler=true) const;
         void receive(DDF& in, ostream& out);
 
+        const char* getType() const {
+            return "AssertionLookup";
+        }
+
     private:
         pair<bool,long> processMessage(const Application& application, HTTPRequest& httpRequest, HTTPResponse& httpResponse) const;
 

diff --git a/shibsp/handler/impl/StatusHandler.cpp b/shibsp/handler/impl/StatusHandler.cpp
index cfb06c7..b5f3825 100644 (file)
--- a/shibsp/handler/impl/StatusHandler.cpp
+++ b/shibsp/handler/impl/StatusHandler.cpp
@@ -33,6 +33,7 @@ using namespace shibsp;
 # include <saml/version.h>
 using namespace opensaml::saml2md;
 using namespace opensaml;
+using namespace xmlsignature;
 #endif
 using namespace xmltooling;
 using namespace std;
@@ -220,20 +221,64 @@ pair<bool,long> StatusHandler::processMessage(
             s << "<SessionCache><Exception type='std::exception'>" << ex.what() << "</Exception></SessionCache>";
             status = "<Partial/>";
         }
-    }
 
-    s << "<Application id='" << application.getId() << "' entityID='" << application.getString("entityID").second << "'/>";
+        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>";
+
+        const PropertySet* relyingParty=NULL;
+        const char* entityID=httpRequest.getParameter("entityID");
+        if (entityID) {
+            Locker mlock(application.getMetadataProvider());
+            relyingParty = application.getRelyingParty(application.getMetadataProvider()->getEntityDescriptor(entityID));
+        }
+        if (!relyingParty)
+            relyingParty = application.getRelyingParty(NULL);
+        CredentialResolver* credResolver=application.getCredentialResolver();
+        if (credResolver) {
+            Locker credLocker(credResolver);
+            CredentialCriteria cc;
+            cc.setUsage(Credential::SIGNING_CREDENTIAL);
+            pair<bool,const char*> keyName = relyingParty->getString("keyName");
+            if (keyName.first)
+                cc.getKeyNames().insert(keyName.second);
+            vector<const Credential*> creds;
+            credResolver->resolve(creds,&cc);
+            for (vector<const Credential*>::const_iterator c = creds.begin(); c != creds.end(); ++c) {
+                KeyInfo* kinfo = (*c)->getKeyInfo();
+                if (kinfo) {
+                    auto_ptr<KeyDescriptor> kd(KeyDescriptorBuilder::buildKeyDescriptor());
+                    kd->setUse(KeyDescriptor::KEYTYPE_SIGNING);
+                    kd->setKeyInfo(kinfo);
+                    s << *(kd.get());
+                }
+            }
+
+            cc.setUsage(Credential::ENCRYPTION_CREDENTIAL);
+            creds.clear();
+            cc.getKeyNames().clear();
+            credResolver->resolve(creds,&cc);
+            for (vector<const Credential*>::const_iterator c = creds.begin(); c != creds.end(); ++c) {
+                KeyInfo* kinfo = (*c)->getKeyInfo();
+                if (kinfo) {
+                    auto_ptr<KeyDescriptor> kd(KeyDescriptorBuilder::buildKeyDescriptor());
+                    kd->setUse(KeyDescriptor::KEYTYPE_ENCRYPTION);
+                    kd->setKeyInfo(kinfo);
+                    s << *(kd.get());
+                }
+            }
+        }
 
-    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>";
 

diff --git a/shibsp/impl/XMLServiceProvider.cpp b/shibsp/impl/XMLServiceProvider.cpp
index c350e9b..0694abf 100644 (file)
--- a/shibsp/impl/XMLServiceProvider.cpp
+++ b/shibsp/impl/XMLServiceProvider.cpp
@@ -551,7 +551,14 @@ XMLApplication::XMLApplication(
         pair<bool,const char*> location = sessions ? sessions->getString("exportLocation") : pair<bool,const char*>(false,NULL);
         if (location.first) {
             try {
-                handler = conf.HandlerManager.newPlugin(samlconstants::SAML20_BINDING_URI, make_pair(sessions->getElement(), getId()));
+                DOMElement* exportElement = e->getOwnerDocument()->createElementNS(shibspconstants::SHIB2SPCONFIG_NS,_Handler);
+                exportElement->setAttributeNS(NULL,Location,sessions->getXMLString("exportLocation").second);
+                pair<bool,const XMLCh*> exportACL = sessions->getXMLString("exportACL");
+                if (exportACL.first) {
+                    static const XMLCh _acl[] = UNICODE_LITERAL_9(e,x,p,o,r,t,A,C,L);
+                    exportElement->setAttributeNS(NULL,_acl,exportACL.second);
+                }
+                handler = conf.HandlerManager.newPlugin(samlconstants::SAML20_BINDING_URI, make_pair(exportElement, getId()));
                 m_handlers.push_back(handler);
 
                 // Insert into location map. If it contains the handlerURL, we skip past that part.

diff --git a/shibsp/shibsp.vcproj b/shibsp/shibsp.vcproj
index 8ce1a2e..c0c3eb8 100644 (file)
--- a/shibsp/shibsp.vcproj
+++ b/shibsp/shibsp.vcproj
@@ -637,14 +637,14 @@
                                        RelativePath=".\security\SecurityPolicy.h"\r
                                        >\r
                                </File>\r
-                       </Filter>\r
-                       <Filter\r
-                               Name="metadata"\r
-                               >\r
-                               <File\r
-                                       RelativePath=".\metadata\MetadataExt.h"\r
+                               <Filter\r
+                                       Name="metadata"\r
                                        >\r
-                               </File>\r
+                                       <File\r
+                                               RelativePath=".\metadata\MetadataExt.h"\r
+                                               >\r
+                                       </File>\r
+                               </Filter>\r
                        </Filter>\r
                        <Filter\r
                                Name="remoting"\r