[cpp-sp COMMIT] in /branches/REL_2/shibsp: attribute/resolver/impl/QueryAttributeResolver.cpp attribute/resolver/impl...

[noreply at shibboleth.net]

Author: scantor
Date: Thu May 31 18:52:06 2012
New Revision: 3686

URL: http://svn.shibboleth.net/view/cpp-sp?rev=3686&view=rev
Log:
https://issues.shibboleth.net/jira/browse/SSPCPP-458

Modified:
    branches/REL_2/shibsp/attribute/resolver/impl/QueryAttributeResolver.cpp
    branches/REL_2/shibsp/attribute/resolver/impl/SimpleAggregationAttributeResolver.cpp
    branches/REL_2/shibsp/attribute/resolver/impl/XMLAttributeExtractor.cpp
    branches/REL_2/shibsp/handler/impl/SAML2Consumer.cpp

Modified: branches/REL_2/shibsp/attribute/resolver/impl/QueryAttributeResolver.cpp
URL: http://svn.shibboleth.net/view/cpp-sp/branches/REL_2/shibsp/attribute/resolver/impl/QueryAttributeResolver.cpp?rev=3686&r1=3685&r2=3686&view=diff
==============================================================================
--- branches/REL_2/shibsp/attribute/resolver/impl/QueryAttributeResolver.cpp (original)
+++ branches/REL_2/shibsp/attribute/resolver/impl/QueryAttributeResolver.cpp Thu May 31 18:52:06 2012
@@ -578,11 +578,11 @@
                 tokenwrapper.release();
                 newtokenwrapper.reset(newtoken);
                 if (m_log.isDebugEnabled())
-                    m_log.debugStream() << "decrypted Assertion: " << *newtoken << logging::eol;
+                    m_log.debugStream() << "decrypted assertion: " << *newtoken << logging::eol;
             }
         }
         catch (exception& ex) {
-            m_log.error(ex.what());
+            m_log.error("failed to decrypt assertion: %s", ex.what());
             throw;
         }
     }

Modified: branches/REL_2/shibsp/attribute/resolver/impl/SimpleAggregationAttributeResolver.cpp
URL: http://svn.shibboleth.net/view/cpp-sp/branches/REL_2/shibsp/attribute/resolver/impl/SimpleAggregationAttributeResolver.cpp?rev=3686&r1=3685&r2=3686&view=diff
==============================================================================
--- branches/REL_2/shibsp/attribute/resolver/impl/SimpleAggregationAttributeResolver.cpp (original)
+++ branches/REL_2/shibsp/attribute/resolver/impl/SimpleAggregationAttributeResolver.cpp Thu May 31 18:52:06 2012
@@ -482,11 +482,11 @@
                 tokenwrapper.release();
                 newtokenwrapper.reset(newtoken);
                 if (m_log.isDebugEnabled())
-                    m_log.debugStream() << "decrypted Assertion: " << *newtoken << logging::eol;
+                    m_log.debugStream() << "decrypted assertion: " << *newtoken << logging::eol;
             }
         }
         catch (std::exception& ex) {
-            m_log.error(ex.what());
+            m_log.error("failed to decrypt assertion: %s", ex.what());
             throw;
         }
     }

Modified: branches/REL_2/shibsp/attribute/resolver/impl/XMLAttributeExtractor.cpp
URL: http://svn.shibboleth.net/view/cpp-sp/branches/REL_2/shibsp/attribute/resolver/impl/XMLAttributeExtractor.cpp?rev=3686&r1=3685&r2=3686&view=diff
==============================================================================
--- branches/REL_2/shibsp/attribute/resolver/impl/XMLAttributeExtractor.cpp (original)
+++ branches/REL_2/shibsp/attribute/resolver/impl/XMLAttributeExtractor.cpp Thu May 31 18:52:06 2012
@@ -990,7 +990,7 @@
                 }
             }
             catch (std::exception& ex) {
-                m_log.error("caught exception decrypting Attribute: %s", ex.what());
+                m_log.error("failed to decrypt Attribute: %s", ex.what());
                 return;
             }
         }

Modified: branches/REL_2/shibsp/handler/impl/SAML2Consumer.cpp
URL: http://svn.shibboleth.net/view/cpp-sp/branches/REL_2/shibsp/handler/impl/SAML2Consumer.cpp?rev=3686&r1=3685&r2=3686&view=diff
==============================================================================
--- branches/REL_2/shibsp/handler/impl/SAML2Consumer.cpp (original)
+++ branches/REL_2/shibsp/handler/impl/SAML2Consumer.cpp Thu May 31 18:52:06 2012
@@ -302,7 +302,7 @@
             }
         }
         catch (std::exception& ex) {
-            m_log.error(ex.what());
+            m_log.error("failed to decrypt assertion: %s", ex.what());
         }
         if (!decrypted)
             continue;
@@ -401,7 +401,7 @@
                     }
                 }
                 catch (std::exception& ex) {
-                    m_log.error(ex.what());
+                    m_log.error("failed to decrypt NameID: %s", ex.what());
                 }
             }
         }