projects
/
shibboleth
/
cpp-sp.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
de97bb2
)
https://issues.shibboleth.net/jira/browse/SSPCPP-458
author
Scott Cantor
<cantor.2@osu.edu>
Thu, 31 May 2012 17:52:06 +0000
(17:52 +0000)
committer
Scott Cantor
<cantor.2@osu.edu>
Thu, 31 May 2012 17:52:06 +0000
(17:52 +0000)
shibsp/attribute/resolver/impl/QueryAttributeResolver.cpp
patch
|
blob
|
history
shibsp/attribute/resolver/impl/SimpleAggregationAttributeResolver.cpp
patch
|
blob
|
history
shibsp/attribute/resolver/impl/XMLAttributeExtractor.cpp
patch
|
blob
|
history
shibsp/handler/impl/SAML2Consumer.cpp
patch
|
blob
|
history
diff --git
a/shibsp/attribute/resolver/impl/QueryAttributeResolver.cpp
b/shibsp/attribute/resolver/impl/QueryAttributeResolver.cpp
index
60536eb
..
402dfba
100644
(file)
--- a/
shibsp/attribute/resolver/impl/QueryAttributeResolver.cpp
+++ b/
shibsp/attribute/resolver/impl/QueryAttributeResolver.cpp
@@
-578,11
+578,11
@@
void QueryResolver::SAML2Query(QueryContext& ctx) const
tokenwrapper.release();
newtokenwrapper.reset(newtoken);
if (m_log.isDebugEnabled())
tokenwrapper.release();
newtokenwrapper.reset(newtoken);
if (m_log.isDebugEnabled())
- m_log.debugStream() << "decrypted
A
ssertion: " << *newtoken << logging::eol;
+ m_log.debugStream() << "decrypted
a
ssertion: " << *newtoken << logging::eol;
}
}
catch (exception& ex) {
}
}
catch (exception& ex) {
- m_log.error(ex.what());
+ m_log.error(
"failed to decrypt assertion: %s",
ex.what());
throw;
}
}
throw;
}
}
diff --git
a/shibsp/attribute/resolver/impl/SimpleAggregationAttributeResolver.cpp
b/shibsp/attribute/resolver/impl/SimpleAggregationAttributeResolver.cpp
index
7639ea3
..
f21e75f
100644
(file)
--- a/
shibsp/attribute/resolver/impl/SimpleAggregationAttributeResolver.cpp
+++ b/
shibsp/attribute/resolver/impl/SimpleAggregationAttributeResolver.cpp
@@
-482,11
+482,11
@@
void SimpleAggregationResolver::doQuery(SimpleAggregationContext& ctx, const cha
tokenwrapper.release();
newtokenwrapper.reset(newtoken);
if (m_log.isDebugEnabled())
tokenwrapper.release();
newtokenwrapper.reset(newtoken);
if (m_log.isDebugEnabled())
- m_log.debugStream() << "decrypted
A
ssertion: " << *newtoken << logging::eol;
+ m_log.debugStream() << "decrypted
a
ssertion: " << *newtoken << logging::eol;
}
}
catch (std::exception& ex) {
}
}
catch (std::exception& ex) {
- m_log.error(ex.what());
+ m_log.error(
"failed to decrypt assertion: %s",
ex.what());
throw;
}
}
throw;
}
}
diff --git
a/shibsp/attribute/resolver/impl/XMLAttributeExtractor.cpp
b/shibsp/attribute/resolver/impl/XMLAttributeExtractor.cpp
index
54e0591
..
1fc2555
100644
(file)
--- a/
shibsp/attribute/resolver/impl/XMLAttributeExtractor.cpp
+++ b/
shibsp/attribute/resolver/impl/XMLAttributeExtractor.cpp
@@
-990,7
+990,7
@@
void XMLExtractor::extractAttributes(
}
}
catch (std::exception& ex) {
}
}
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;
}
}
return;
}
}
diff --git
a/shibsp/handler/impl/SAML2Consumer.cpp
b/shibsp/handler/impl/SAML2Consumer.cpp
index
be11ccd
..
f90f7ca
100644
(file)
--- a/
shibsp/handler/impl/SAML2Consumer.cpp
+++ b/
shibsp/handler/impl/SAML2Consumer.cpp
@@
-302,7
+302,7
@@
void SAML2Consumer::implementProtocol(
}
}
catch (std::exception& ex) {
}
}
catch (std::exception& ex) {
- m_log.error(ex.what());
+ m_log.error(
"failed to decrypt assertion: %s",
ex.what());
}
if (!decrypted)
continue;
}
if (!decrypted)
continue;
@@
-401,7
+401,7
@@
void SAML2Consumer::implementProtocol(
}
}
catch (std::exception& ex) {
}
}
catch (std::exception& ex) {
- m_log.error(ex.what());
+ m_log.error(
"failed to decrypt NameID: %s",
ex.what());
}
}
}
}
}
}