Revised exception modeling.

POST profile more exception-based when errors occur.

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

diff --git a/shib/ShibPOSTProfile.cpp b/shib/ShibPOSTProfile.cpp
index 87dcf60..efab89a 100644 (file)
--- a/shib/ShibPOSTProfile.cpp
+++ b/shib/ShibPOSTProfile.cpp
@@ -96,12 +96,12 @@ ShibPOSTProfile::~ShibPOSTProfile()
         delete[] const_cast<XMLCh*>(*i);
 }
 
-SAMLAssertion* ShibPOSTProfile::getSSOAssertion(const SAMLResponse& r)
+SAMLAssertion& ShibPOSTProfile::getSSOAssertion(const SAMLResponse& r)
 {
     return SAMLPOSTProfile::getSSOAssertion(r,Iterator<const XMLCh*>(m_policies));
 }
 
-SAMLAuthenticationStatement* ShibPOSTProfile::getSSOStatement(const SAMLAssertion& a)
+SAMLAuthenticationStatement& ShibPOSTProfile::getSSOStatement(const SAMLAssertion& a)
 {
     return SAMLPOSTProfile::getSSOStatement(a);
 }
@@ -111,26 +111,20 @@ SAMLResponse* ShibPOSTProfile::accept(const XMLByte* buf)
     // The built-in SAML functionality will do most of the basic non-crypto checks.
     // Note that if the response only contains a status error, it gets tossed out
     // as an exception.
-    SAMLResponse* r = SAMLPOSTProfile::accept(buf, m_receiver, m_ttlSeconds);
+    auto_ptr<SAMLResponse> r(SAMLPOSTProfile::accept(buf, m_receiver, m_ttlSeconds));
 
     // Now we do some more non-crypto (ie. cheap) work to match up the origin site
-    // with its associated data. If we can't even find a SSO statement in the response
-    // we just return the response to the caller, who will presumably notice this.
-    const SAMLAssertion* assertion = getSSOAssertion(*r);
-    if (!assertion)
-        return r;
-
-    const SAMLAuthenticationStatement* sso = getSSOStatement(*assertion);
-    if (!sso)
-        return r;
+    // with its associated data.
+    const SAMLAssertion& assertion = getSSOAssertion(*r);
+    const SAMLAuthenticationStatement& sso = getSSOStatement(assertion);
 
     // Examine the subject information.
-    const SAMLSubject* subject = sso->getSubject();
+    const SAMLSubject* subject = sso.getSubject();
     if (!subject->getNameQualifier())
-        throw SAMLException(SAMLException::RESPONDER, "ShibPOSTProfile::accept() requires subject name qualifier");
+        throw InvalidAssertionException(SAMLException::RESPONDER, "ShibPOSTProfile::accept() requires subject name qualifier");
 
     const XMLCh* originSite = subject->getNameQualifier();
-    const XMLCh* handleService = assertion->getIssuer();
+    const XMLCh* handleService = assertion.getIssuer();
 
     // Is this a trusted HS?
     Iterator<xstring> hsNames=ShibConfig::getConfig().origin_mapper->getHandleServiceNames(originSite);
@@ -139,17 +133,17 @@ SAMLResponse* ShibPOSTProfile::accept(const XMLByte* buf)
         if (!XMLString::compareString(hsNames.next().c_str(),handleService))
             bFound = true;
     if (!bFound)
-        throw SAMLException(SAMLException::RESPONDER, "ShibPOSTProfile::accept() detected an untrusted HS for the origin site");
+        throw TrustException(SAMLException::RESPONDER, "ShibPOSTProfile::accept() detected an untrusted HS for the origin site");
 
     const Key* hsKey=ShibConfig::getConfig().origin_mapper->getHandleServiceKey(handleService);
 
     // Signature verification now takes place. We check the assertion and the response.
     // Assertion signing is optional, response signing is mandatory.
-    if (assertion->isSigned())
-        verifySignature(*assertion, handleService, hsKey);
+    if (assertion.isSigned())
+        verifySignature(assertion, handleService, hsKey);
     verifySignature(*r, handleService, hsKey);
 
-    return r;
+    return r.release();
 }
 
 SAMLResponse* ShibPOSTProfile::prepare(const XMLCh* recipient,

diff --git a/shib/shib.h b/shib/shib.h
index 5ad7341..573b5e5 100644 (file)
--- a/shib/shib.h
+++ b/shib/shib.h
@@ -129,8 +129,8 @@ namespace shibboleth
         ShibPOSTProfile(const saml::Iterator<const XMLCh*>& policies, const XMLCh* issuer);
         virtual ~ShibPOSTProfile();
 
-        virtual saml::SAMLAssertion* getSSOAssertion(const saml::SAMLResponse& r);
-        virtual saml::SAMLAuthenticationStatement* getSSOStatement(const saml::SAMLAssertion& a);
+        virtual saml::SAMLAssertion& getSSOAssertion(const saml::SAMLResponse& r);
+        virtual saml::SAMLAuthenticationStatement& getSSOStatement(const saml::SAMLAssertion& a);
         virtual saml::SAMLResponse* accept(const XMLByte* buf);
         virtual saml::SAMLResponse* prepare(const XMLCh* recipient,
                                             const XMLCh* name,