[java-identity-provider COMMIT] in /trunk: idp-conf/src/main/resources/system/conf/audit-system.xml idp-conf/src/main...

[noreply at shibboleth.net]

Author: scantor
Date: Tue Sep 23 19:20:39 2014
New Revision: 6562

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6562&view=rev
Log:
IDP-400 -  Log if an authn request is forced or passive

Added:
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/audit/impl/ForceAuthnAuditExtractor.java   (with props)
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/audit/impl/IsPassiveAuditExtractor.java   (with props)
Modified:
    trunk/idp-conf/src/main/resources/system/conf/audit-system.xml
    trunk/idp-conf/src/main/resources/system/conf/utilities.xml
    trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/profile/SAMLAuditFields.java

Modified: trunk/idp-conf/src/main/resources/system/conf/audit-system.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/conf/audit-system.xml?rev=6562&r1=6561&r2=6562&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/conf/audit-system.xml (original)
+++ trunk/idp-conf/src/main/resources/system/conf/audit-system.xml Tue Sep 23 19:20:39 2014
@@ -71,6 +71,30 @@
                         </constructor-arg>
                     </bean>
                 </entry>
+                <entry>
+                    <key>
+                        <util:constant static-field="net.shibboleth.idp.saml.profile.SAMLAuditFields.IS_PASSIVE"/>
+                    </key>
+                    <bean class="net.shibboleth.idp.saml.audit.impl.IsPassiveAuditExtractor">
+                        <constructor-arg>
+                            <bean class="com.google.common.base.Functions" factory-method="compose"
+                                c:g-ref="shibboleth.MessageLookup.AuthnRequest"
+                                c:f-ref="shibboleth.MessageContextLookup.Inbound" />
+                        </constructor-arg>
+                    </bean>
+                </entry>
+                <entry>
+                    <key>
+                        <util:constant static-field="net.shibboleth.idp.saml.profile.SAMLAuditFields.FORCE_AUTHN"/>
+                    </key>
+                    <bean class="net.shibboleth.idp.saml.audit.impl.ForceAuthnAuditExtractor">
+                        <constructor-arg>
+                            <bean class="com.google.common.base.Functions" factory-method="compose"
+                                c:g-ref="shibboleth.MessageLookup.AuthnRequest"
+                                c:f-ref="shibboleth.MessageContextLookup.Inbound" />
+                        </constructor-arg>
+                    </bean>
+                </entry>
             </map>
         </property>
     </bean>

Modified: trunk/idp-conf/src/main/resources/system/conf/utilities.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/conf/utilities.xml?rev=6562&r1=6561&r2=6562&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/conf/utilities.xml (original)
+++ trunk/idp-conf/src/main/resources/system/conf/utilities.xml Tue Sep 23 19:20:39 2014
@@ -27,6 +27,9 @@
     <bean id="shibboleth.MessageLookup.SAMLObject"
         class="org.opensaml.messaging.context.navigate.MessageLookup"
         c:type="#{ T(org.opensaml.saml.common.SAMLObject) }" />
+    <bean id="shibboleth.MessageLookup.AuthnRequest"
+        class="org.opensaml.messaging.context.navigate.MessageLookup"
+        c:type="#{ T(org.opensaml.saml.saml2.core.AuthnRequest) }" />
 
     <bean id="shibboleth.ChildLookup.RelyingParty"
         class="org.opensaml.messaging.context.navigate.ChildContextLookup"

Modified: trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/profile/SAMLAuditFields.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/profile/SAMLAuditFields.java?rev=6562&r1=6561&r2=6562&view=diff
==============================================================================
--- trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/profile/SAMLAuditFields.java (original)
+++ trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/profile/SAMLAuditFields.java Tue Sep 23 19:20:39 2014
@@ -86,6 +86,12 @@
     /** Status message field. */
     @Nonnull @NotEmpty public static final String STATUS_MESSAGE = "SM";
 
+    /** IsPassive requested field. */
+    @Nonnull @NotEmpty public static final String IS_PASSIVE = "pasv";
+
+    /** ForceAuthn requested field. */
+    @Nonnull @NotEmpty public static final String FORCE_AUTHN = "fauth";
+    
     /** Constructor. */
     private SAMLAuditFields() {