[shibboleth-sp2] 42/89: SSPCPP-688 - Error handling should have access to the message type.

[Ferenc Wágner]

This is an automated email from the git hooks/post-receive script.

wferi pushed a commit to branch master
in repository shibboleth-sp2.

commit ff989541a39dedc754eddd2b581ebe1a146d6afa
Author: Scott Cantor <cantor.2 at osu.edu>
Date:   Thu Jun 2 14:05:32 2016 -0400

    SSPCPP-688 - Error handling should have access to the message type.
    
    https://issues.shibboleth.net/jira/browse/SSPCPP-688
---
 shibsp/ServiceProvider.cpp | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/shibsp/ServiceProvider.cpp b/shibsp/ServiceProvider.cpp
index e7f0b0e..e69e3b7 100644
--- a/shibsp/ServiceProvider.cpp
+++ b/shibsp/ServiceProvider.cpp
@@ -348,10 +348,17 @@ pair<bool,long> ServiceProvider::doAuthentication(SPRequest& request, bool handl
 
             // Dispatch to SessionInitiator. This MUST handle the request, or we want to fail here.
             // Used to fall through into doExport, but this is a cleaner exit path.
-            pair<bool,long> ret = initiator->run(request, false);
-            if (ret.first)
-                return ret;
-            throw ConfigurationException("Session initiator did not handle request for a new session, check configuration.");
+            try {
+                pair<bool, long> ret = initiator->run(request, false);
+                if (ret.first)
+                    return ret;
+                throw ConfigurationException("Session initiator did not handle request for a new session, check configuration.");
+            }
+            catch (XMLToolingException& ex) {
+                if (!ex.getProperty("eventType") && initiator->getEventType())
+                    ex.addProperty("eventType", initiator->getEventType());
+                throw;
+            }
         }
 
         request.setAuthType(authType.second);

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-shibboleth/shibboleth-sp2.git