[java-opensaml COMMIT] in /trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/profile/impl: EncryptAssert...

[noreply at shibboleth.net]

Author: scantor
Date: Tue May 27 11:51:25 2014
New Revision: 3896

URL: http://svn.shibboleth.net/view/java-opensaml?rev=3896&view=rev
Log:
Add pre-encrypt logging of objects.

Modified:
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/profile/impl/EncryptAssertions.java
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/profile/impl/EncryptAttributes.java
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/profile/impl/EncryptNameIDs.java

Modified: trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/profile/impl/EncryptAssertions.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/profile/impl/EncryptAssertions.java?rev=3896&r1=3895&r2=3896&view=diff
==============================================================================
--- trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/profile/impl/EncryptAssertions.java (original)
+++ trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/profile/impl/EncryptAssertions.java Tue May 27 11:51:25 2014
@@ -24,7 +24,10 @@
 
 import net.shibboleth.utilities.java.support.component.ComponentSupport;
 import net.shibboleth.utilities.java.support.logic.Constraint;
+import net.shibboleth.utilities.java.support.xml.SerializeSupport;
 
+import org.opensaml.core.xml.io.MarshallingException;
+import org.opensaml.core.xml.util.XMLObjectSupport;
 import org.opensaml.messaging.context.navigate.MessageLookup;
 import org.opensaml.profile.action.ActionSupport;
 import org.opensaml.profile.action.EventIds;
@@ -38,6 +41,7 @@
 import org.opensaml.xmlsec.encryption.support.EncryptionException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.w3c.dom.Element;
 
 import com.google.common.base.Function;
 import com.google.common.base.Functions;
@@ -112,6 +116,15 @@
         
         for (final Assertion assertion : response.getAssertions()) {
             try {
+                if (log.isDebugEnabled()) {
+                    try {
+                        final Element dom = XMLObjectSupport.marshall(assertion);
+                        log.debug("{} Assertion before encryption:\n{}", getLogPrefix(),
+                                SerializeSupport.prettyPrintXML(dom));
+                    } catch (final MarshallingException e) {
+                        log.error(getLogPrefix() + " Unable to marshall message for logging purposes", e);
+                    }
+                }
                 accumulator.add(getEncrypter().encrypt(assertion));
             } catch (final EncryptionException e) {
                 log.warn(getLogPrefix() + " Error encrypting assertion", e);

Modified: trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/profile/impl/EncryptAttributes.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/profile/impl/EncryptAttributes.java?rev=3896&r1=3895&r2=3896&view=diff
==============================================================================
--- trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/profile/impl/EncryptAttributes.java (original)
+++ trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/profile/impl/EncryptAttributes.java Tue May 27 11:51:25 2014
@@ -24,7 +24,10 @@
 
 import net.shibboleth.utilities.java.support.component.ComponentSupport;
 import net.shibboleth.utilities.java.support.logic.Constraint;
+import net.shibboleth.utilities.java.support.xml.SerializeSupport;
 
+import org.opensaml.core.xml.io.MarshallingException;
+import org.opensaml.core.xml.util.XMLObjectSupport;
 import org.opensaml.messaging.context.navigate.MessageLookup;
 import org.opensaml.profile.action.ActionSupport;
 import org.opensaml.profile.action.EventIds;
@@ -40,6 +43,7 @@
 import org.opensaml.xmlsec.encryption.support.EncryptionException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.w3c.dom.Element;
 
 import com.google.common.base.Function;
 import com.google.common.base.Functions;
@@ -118,6 +122,15 @@
                 
                 for (final Attribute attribute : statement.getAttributes()) {
                     try {
+                        if (log.isDebugEnabled()) {
+                            try {
+                                final Element dom = XMLObjectSupport.marshall(attribute);
+                                log.debug("{} Attribute before encryption:\n{}", getLogPrefix(),
+                                        SerializeSupport.prettyPrintXML(dom));
+                            } catch (final MarshallingException e) {
+                                log.error(getLogPrefix() + " Unable to marshall Attribute for logging purposes", e);
+                            }
+                        }
                         accumulator.add(getEncrypter().encrypt(attribute));
                     } catch (final EncryptionException e) {
                         log.warn(getLogPrefix() + " Error encrypting attribute", e);


[... 46 lines stripped ...]