Clean up error handling during cache insertion

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

diff --git a/shib-target/shibrpc-server.cpp b/shib-target/shibrpc-server.cpp
index b240055..268bcc7 100644 (file)
--- a/shib-target/shibrpc-server.cpp
+++ b/shib-target/shibrpc-server.cpp
@@ -395,19 +395,30 @@ shibrpc_new_session_2_svc(
     }
     catch (ReplayedAssertionException& e) {
       // Specific case where we have an error code.
+      if (!role) {
+          // Try and map to metadata for support purposes.
+          const IEntityDescriptor* provider=m.lookup(origin);
+          if (provider) {
+              const IIDPSSODescriptor* IDP=provider->getIDPSSODescriptor(saml::XML::SAML11_PROTOCOL_ENUM);
+              role=IDP;
+          }
+      }
       throw ShibTargetException(SHIBRPC_ASSERTION_REPLAYED, e.what(), role);
     }
     catch (SAMLException& e) {
       log.error ("caught SAML exception: %s", e.what());
       ostringstream os;
       os << e;
+      if (!role) {
+          // Try and map to metadata for support purposes.
+          const IEntityDescriptor* provider=m.lookup(origin);
+          if (provider) {
+              const IIDPSSODescriptor* IDP=provider->getIDPSSODescriptor(saml::XML::SAML11_PROTOCOL_ENUM);
+              role=IDP;
+          }
+      }
       throw ShibTargetException (SHIBRPC_SAML_EXCEPTION, os.str().c_str(), role);
     }
-    catch (XMLException& e) {
-      log.error ("caught XML exception");
-      auto_ptr_char msg(e.getMessage());
-      throw ShibTargetException (SHIBRPC_XML_EXCEPTION, msg.get(), role);
-    }
   }
   catch (ShibTargetException& e) {
     log.error ("FAILED: %s", e.what());
@@ -429,15 +440,10 @@ shibrpc_new_session_2_svc(
   // It passes all our tests -- create a new session.
   log.info ("Creating new session");
 
-  // Clone the statement so we can store it.
-  // TODO: we need to extract the Issuer and propagate that around as the origin site along
-  // with the statement and attribute assertions.
-  SAMLAuthenticationStatement* as=static_cast<SAMLAuthenticationStatement*>(bpr.authnStatement->clone());
-
   // Create a new session key.
   string cookie = conf->getSessionCache()->generateKey();
 
-  // Cache this session, possibly including response if attributes appear present.
+  // Are attributes present?
   bool attributesPushed=false;
   Iterator<SAMLAssertion*> assertions=bpr.response->getAssertions();
   while (!attributesPushed && assertions.hasNext()) {
@@ -447,8 +453,44 @@ shibrpc_new_session_2_svc(
             attributesPushed=true;
       }
   }
-  conf->getSessionCache()->insert(cookie.c_str(), app, as, argp->client_addr, (attributesPushed ? bpr.response : NULL), role);
   
+  // Insertion into cache might fail.
+  SAMLAuthenticationStatement* as=NULL;
+  try {
+      as=static_cast<SAMLAuthenticationStatement*>(bpr.authnStatement->clone());
+      // TODO: we need to extract the Issuer and propagate that around as the origin site along
+      // with the statement and attribute assertions.
+      conf->getSessionCache()->insert(
+        cookie.c_str(),
+        app,
+        as,
+        argp->client_addr,
+        (attributesPushed ? bpr.response : NULL),
+        role
+        );
+  }
+  catch (SAMLException& e) {
+      log.error ("caught SAML exception during cache insertion: %s", e.what());
+      delete as;
+      ostringstream os;
+      os << e;
+      bpr.clear();
+      if (origin) XMLString::release(&origin);
+      ShibTargetException ex(SHIBRPC_SAML_EXCEPTION, os.str().c_str(), role);
+      set_rpc_status(&result->status, ex);
+      return TRUE;
+  }
+#ifndef _DEBUG
+  catch (...) {
+      log.error ("caught unknown exception during cache insertion");
+      delete as;
+      bpr.clear();
+      if (origin) XMLString::release(&origin);
+      set_rpc_status(&result->status, SHIBRPC_UNKNOWN_ERROR, "An unknown exception occurred");
+      return TRUE;
+  }
+#endif
+    
   // And let the user know.
   if (result->cookie) free(result->cookie);
   if (result->target) free(result->target);