[java-idp-oidc] branch main updated: JOIDC-58 - Make default audit extractors accessible in audit.xml
Scott Cantor
cantor.2 at osu.edu
Thu Mar 17 17:02:10 UTC 2022
This is an automated email from the git hooks/post-receive script.
scantor pushed a commit to branch main
in repository java-idp-oidc.
View the commit online:
http://git.shibboleth.net/view/?p=java-idp-oidc.git;a=commit;h=ebdbd3a7257d02547368feecdec322de498cb01a
The following commit(s) were added to refs/heads/main by this push:
new ebdbd3a7 JOIDC-58 - Make default audit extractors accessible in audit.xml
ebdbd3a7 is described below
commit ebdbd3a7257d02547368feecdec322de498cb01a
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Thu Mar 17 13:02:06 2022 -0400
JOIDC-58 - Make default audit extractors accessible in audit.xml
https://shibboleth.atlassian.net/browse/JOIDC-58
---
.../META-INF/net.shibboleth.idp/postconfig.xml | 217 +++++++++++++++++++++
.../issue-registration-access-token-beans.xml | 25 ---
.../oidc-abstract-api-info-beans.xml | 15 --
.../flows/oidc/abstract/oidc-abstract-beans.xml | 185 +-----------------
.../oidc/configuration/configuration-beans.xml | 3 -
.../idp/flows/oidc/keyset/keyset-beans.xml | 3 -
.../idp/flows/oidc/register/register-beans.xml | 15 --
.../idp/flows/oidc/token/token-beans.xml | 19 +-
8 files changed, 220 insertions(+), 262 deletions(-)
diff --git a/idp-oidc-extension-impl/src/main/resources/META-INF/net.shibboleth.idp/postconfig.xml b/idp-oidc-extension-impl/src/main/resources/META-INF/net.shibboleth.idp/postconfig.xml
index 9056c24f..6ee54d32 100644
--- a/idp-oidc-extension-impl/src/main/resources/META-INF/net.shibboleth.idp/postconfig.xml
+++ b/idp-oidc-extension-impl/src/main/resources/META-INF/net.shibboleth.idp/postconfig.xml
@@ -296,4 +296,221 @@
<bean id="shibboleth.oidc.CacheBuilder" factory-bean="cacheFactory" factory-method="build"
abstract="true"/>
+ <!-- Default audit extractors. -->
+
+ <bean id="shibboleth.MessageLookup.oidc.AuthenticationRequest"
+ class="org.opensaml.messaging.context.navigate.MessageLookup"
+ c:type="#{ T(com.nimbusds.openid.connect.sdk.AuthenticationRequest) }" />
+
+ <bean id="shibboleth.MessageLookup.oidc.TokenRevocationRequest"
+ class="org.opensaml.messaging.context.navigate.MessageLookup"
+ c:type="#{ T(com.nimbusds.oauth2.sdk.TokenRevocationRequest) }" />
+
+ <bean id="shibboleth.oidc.DefaultPostDecodeAuditExtractors"
+ class="org.springframework.beans.factory.config.MapFactoryBean">
+ <property name="sourceMap">
+ <map>
+ <entry>
+ <key>
+ <util:constant
+ static-field="net.shibboleth.idp.plugin.oidc.op.audit.AuditFields.INBOUND_MESSAGE_CLASS" />
+ </key>
+ <bean class="net.shibboleth.idp.plugin.oidc.op.audit.impl.InboundMessageClassLookupFunction" />
+ </entry>
+ <entry>
+ <key>
+ <util:constant static-field="net.shibboleth.idp.plugin.oidc.op.audit.AuditFields.IS_PASSIVE"/>
+ </key>
+ <bean class="net.shibboleth.idp.plugin.oidc.op.audit.impl.IsPassiveAuditExtractor">
+ <constructor-arg>
+ <bean parent="shibboleth.Functions.Compose"
+ c:g-ref="shibboleth.MessageLookup.oidc.AuthenticationRequest"
+ c:f-ref="shibboleth.MessageContextLookup.Inbound" />
+ </constructor-arg>
+ </bean>
+ </entry>
+ <entry>
+ <key>
+ <util:constant static-field="net.shibboleth.idp.plugin.oidc.op.audit.AuditFields.FORCE_AUTHN"/>
+ </key>
+ <bean class="net.shibboleth.idp.plugin.oidc.op.audit.impl.ForceAuthnAuditExtractor">
+ <constructor-arg>
+ <bean parent="shibboleth.Functions.Compose"
+ c:g-ref="shibboleth.MessageLookup.oidc.AuthenticationRequest"
+ c:f-ref="shibboleth.MessageContextLookup.Inbound" />
+ </constructor-arg>
+ </bean>
+ </entry>
+ <entry>
+ <key>
+ <util:constant
+ static-field="net.shibboleth.idp.plugin.oidc.op.audit.AuditFields.REVOKED_TOKEN"/>
+ </key>
+ <bean class="net.shibboleth.idp.plugin.oidc.op.audit.impl.RevokedTokenAuditExtractor">
+ <constructor-arg>
+ <bean parent="shibboleth.Functions.Compose"
+ c:g-ref="shibboleth.MessageLookup.oidc.TokenRevocationRequest"
+ c:f-ref="shibboleth.MessageContextLookup.Inbound" />
+ </constructor-arg>
+ </bean>
+ </entry>
+ <entry>
+ <key>
+ <util:constant
+ static-field="net.shibboleth.idp.plugin.oidc.op.audit.AuditFields.NONCE"/>
+ </key>
+ <bean class="net.shibboleth.idp.plugin.oidc.op.audit.impl.AuthenticationRequestClaimsAuditExtractor"
+ c:claim="nonce" />
+ </entry>
+ </map>
+ </property>
+ </bean>
+
+
+ <bean id="shibboleth.oidc.DefaultPostResponseAuditExtractors"
+ class="org.springframework.beans.factory.config.MapFactoryBean">
+ <property name="sourceMap">
+ <map>
+ <entry>
+ <key>
+ <util:constant static-field="net.shibboleth.idp.authn.AuthnAuditFields.AUTHN_FLOW_ID"/>
+ </key>
+ <bean class="net.shibboleth.idp.authn.audit.impl.AuthenticationFlowAuditExtractor" />
+ </entry>
+ <entry>
+ <key>
+ <util:constant static-field="net.shibboleth.idp.authn.AuthnAuditFields.SSO"/>
+ </key>
+ <bean parent="shibboleth.Functions.Compose">
+ <constructor-arg name="g">
+ <bean class="net.shibboleth.idp.authn.context.navigate.PreviousResultLookupFunction" />
+ </constructor-arg>
+ <constructor-arg name="f">
+ <ref bean="shibboleth.ChildLookup.AuthenticationContext" />
+ </constructor-arg>
+ </bean>
+ </entry>
+ <entry>
+ <key>
+ <util:constant
+ static-field="net.shibboleth.idp.plugin.oidc.op.audit.AuditFields.AUTHN_INSTANT"/>
+ </key>
+ <bean class="net.shibboleth.idp.plugin.oidc.op.profile.context.navigate.DefaultAuthTimeLookupFunction" />
+ </entry>
+ <entry>
+ <key>
+ <util:constant
+ static-field="net.shibboleth.idp.plugin.oidc.op.audit.AuditFields.ID_TOKEN_ISSUE_INSTANT"/>
+ </key>
+ <bean class="net.shibboleth.idp.plugin.oidc.op.audit.impl.IdTokenClaimsAuditExtractor"
+ c:claim="iat" />
+ </entry>
+ <entry>
+ <key>
+ <util:constant static-field="net.shibboleth.idp.profile.IdPAuditFields.USERNAME"/>
+ </key>
+ <bean parent="shibboleth.Functions.Compose"
+ c:g-ref="shibboleth.PrincipalNameLookup.Subject"
+ c:f-ref="shibboleth.ChildLookup.SubjectContext" />
+ </entry>
+ <entry>
+ <key>
+ <util:constant static-field="net.shibboleth.idp.profile.IdPAuditFields.HASHED_USERNAME"/>
+ </key>
+ <ref bean="shibboleth.UsernameHasher" />
+ </entry>
+ <entry>
+ <key>
+ <util:constant static-field="net.shibboleth.idp.profile.IdPAuditFields.SESSION_ID"/>
+ </key>
+ <bean parent="shibboleth.Functions.Compose">
+ <constructor-arg name="g">
+ <bean class="net.shibboleth.idp.session.context.navigate.SessionContextIDLookupFunction" />
+ </constructor-arg>
+ <constructor-arg name="f">
+ <ref bean="shibboleth.ChildLookup.SessionContext" />
+ </constructor-arg>
+ </bean>
+ </entry>
+ <entry>
+ <key>
+ <util:constant static-field="net.shibboleth.idp.profile.IdPAuditFields.ATTRIBUTES"/>
+ </key>
+ <bean class="net.shibboleth.idp.plugin.oidc.op.audit.impl.ClaimsAuditExtractor">
+ </bean>
+ </entry>
+ <entry>
+ <key>
+ <util:constant static-field="net.shibboleth.idp.plugin.oidc.op.audit.AuditFields.SUB_VALUE"/>
+ </key>
+ <bean class="net.shibboleth.idp.plugin.oidc.op.audit.impl.SubjectValueAuditExtractor">
+ </bean>
+ </entry>
+ <entry>
+ <key>
+ <util:constant static-field="net.shibboleth.idp.plugin.oidc.op.audit.AuditFields.SUB_FORMAT"/>
+ </key>
+ <bean class="net.shibboleth.idp.plugin.oidc.op.audit.impl.SubjectTypeAuditExtractor">
+ </bean>
+ </entry>
+ <entry>
+ <key>
+ <util:constant static-field="net.shibboleth.idp.plugin.oidc.op.audit.AuditFields.AUDIENCE"/>
+ </key>
+ <bean class="net.shibboleth.idp.plugin.oidc.op.profile.context.navigate.ValidatedAudienceLookupFunction" />
+ </entry>
+ <entry>
+ <key>
+ <util:constant static-field="net.shibboleth.idp.plugin.oidc.op.audit.AuditFields.SCOPE"/>
+ </key>
+ <bean class="net.shibboleth.idp.plugin.oidc.op.profile.context.navigate.ValidatedAudienceLookupFunction" />
+ </entry>
+ <entry>
+ <key>
+ <util:constant static-field="net.shibboleth.idp.plugin.oidc.op.audit.AuditFields.ACR"/>
+ </key>
+ <bean class="net.shibboleth.idp.plugin.oidc.op.audit.impl.AuthenticationContextReferenceAuditExtractor" />
+ </entry>
+ <entry>
+ <key>
+ <util:constant
+ static-field="net.shibboleth.idp.plugin.oidc.op.audit.AuditFields.OUTBOUND_MESSAGE_CLASS" />
+ </key>
+ <bean class="net.shibboleth.idp.plugin.oidc.op.audit.impl.OutboundMessageClassLookupFunction" />
+ </entry>
+ </map>
+ </property>
+ </bean>
+
+ <bean id="shibboleth.oidc.DefaultTokenPostResponseAuditExtractors"
+ parent="shibboleth.oidc.DefaultPostResponseAuditExtractors"
+ class="org.springframework.beans.factory.config.MapFactoryBean">
+ <property name="sourceMap">
+ <map merge="true">
+ <entry>
+ <key>
+ <util:constant static-field="net.shibboleth.idp.plugin.oidc.op.audit.AuditFields.NONCE"/>
+ </key>
+ <bean class="net.shibboleth.idp.plugin.oidc.op.audit.impl.IdTokenClaimsAuditExtractor"
+ c:claim="nonce" />
+ </entry>
+ </map>
+ </property>
+ </bean>
+
+ <bean id="shibboleth.oidc.DefaultRegistrationPostResponseAuditExtractors"
+ class="org.springframework.beans.factory.config.MapFactoryBean">
+ <property name="sourceMap">
+ <map>
+ <entry>
+ <key>
+ <util:constant static-field="net.shibboleth.idp.plugin.oidc.op.audit.AuditFields.CLIENT_ID"/>
+ </key>
+ <bean class="net.shibboleth.idp.plugin.oidc.op.audit.impl.ClientIdRegistrationAuditExtractor">
+ </bean>
+ </entry>
+ </map>
+ </property>
+ </bean>
+
</beans>
diff --git a/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/admin/oidc/issue-registration-access-token/issue-registration-access-token-beans.xml b/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/admin/oidc/issue-registration-access-token/issue-registration-access-token-beans.xml
index 66f19a28..c3f93499 100644
--- a/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/admin/oidc/issue-registration-access-token/issue-registration-access-token-beans.xml
+++ b/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/admin/oidc/issue-registration-access-token/issue-registration-access-token-beans.xml
@@ -110,29 +110,4 @@
p:messageEncoderFactory-ref="oidc.messageEncoderFactory"
p:httpServletResponse-ref="shibboleth.HttpServletResponse" />
- <bean id="RecordResponseComplete" class="net.shibboleth.idp.profile.impl.RecordResponseComplete"
- scope="prototype" />
-
- <bean id="LogEvent" class="org.opensaml.profile.action.impl.LogEvent" scope="prototype"
- p:suppressedEvents="#{getObject('shibboleth.SuppressedEvents') ?: getObject('shibboleth.DefaultSuppressedEvents')}">
- <property name="eventContextLookupStrategy">
- <bean class="net.shibboleth.idp.profile.context.navigate.WebFlowCurrentEventLookupFunction" />
- </property>
- </bean>
-
- <bean id="PostDecodePopulateAuditContext" parent="shibboleth.AbstractPopulateAuditContext"
- p:fieldExtractors="#{getObject('shibboleth.oidc.PostDecodeAuditExtractors') ?: getObject('shibboleth.oidc.DefaultPostDecodeAuditExtractors')}" />
-
- <bean id="PostLookupPopulateAuditContext" parent="shibboleth.AbstractPopulateAuditContext"
- p:fieldExtractors="#{getObject('shibboleth.oidc.PostLookupAuditExtractors') ?: getObject('shibboleth.DefaultPostLookupAuditExtractors')}" />
-
- <bean id="PostResponsePopulateAuditContext" parent="shibboleth.AbstractPopulateAuditContext"
- p:fieldExtractors="#{getObject('shibboleth.oidc.PostResponseAuditExtractors') ?: getObject('shibboleth.oidc.DefaultPostResponseAuditExtractorsForFlow') ?: getObject('shibboleth.oidc.DefaultPostResponseAuditExtractors')}" />
-
- <bean id="WriteAuditLog" class="net.shibboleth.idp.profile.audit.impl.WriteAuditLog" scope="prototype"
- p:formattingMap-ref="shibboleth.AuditFormattingMap"
- p:dateTimeFormat="#{getObject('shibboleth.AuditDateTimeFormat')}"
- p:useDefaultTimeZone="#{getObject('shibboleth.AuditDefaultTimeZone') ?: false}"
- p:httpServletRequest-ref="shibboleth.HttpServletRequest" />
-
</beans>
diff --git a/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/oidc/abstract-api-info/oidc-abstract-api-info-beans.xml b/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/oidc/abstract-api-info/oidc-abstract-api-info-beans.xml
index 78d542c6..c19b8331 100644
--- a/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/oidc/abstract-api-info/oidc-abstract-api-info-beans.xml
+++ b/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/oidc/abstract-api-info/oidc-abstract-api-info-beans.xml
@@ -24,19 +24,4 @@
<bean id="CredentialResolver" class="net.shibboleth.idp.plugin.oidc.op.metadata.impl.CredentialMetadataValueResolver" />
- <bean id="shibboleth.oidc.PostResponseAuditExtractors"
- class="org.springframework.beans.factory.config.MapFactoryBean">
- <property name="sourceMap">
- <map>
- <entry>
- <key>
- <util:constant
- static-field="net.shibboleth.idp.plugin.oidc.op.audit.AuditFields.INBOUND_MESSAGE_CLASS" />
- </key>
- <bean parent="shibboleth.Functions.Constant" c:_0="#{getObject('OidcApiInfoFlowAuditName')}" />
- </entry>
- </map>
- </property>
- </bean>
-
</beans>
diff --git a/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/oidc/abstract/oidc-abstract-beans.xml b/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/oidc/abstract/oidc-abstract-beans.xml
index 0219c006..61d72229 100644
--- a/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/oidc/abstract/oidc-abstract-beans.xml
+++ b/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/oidc/abstract/oidc-abstract-beans.xml
@@ -68,197 +68,14 @@
p:fieldExtractors="#{getObject('shibboleth.oidc.PostLookupAuditExtractors') ?: getObject('shibboleth.DefaultPostLookupAuditExtractors')}" />
<bean id="PostResponsePopulateAuditContext" parent="shibboleth.AbstractPopulateAuditContext"
- p:fieldExtractors="#{getObject('shibboleth.oidc.PostResponseAuditExtractors') ?: getObject('shibboleth.oidc.DefaultPostResponseAuditExtractorsForFlow') ?: getObject('shibboleth.oidc.DefaultPostResponseAuditExtractors')}" />
+ p:fieldExtractors="#{getObject('shibboleth.oidc.PostResponseAuditExtractors') ?: getObject('shibboleth.oidc.DefaultPostResponseAuditExtractors')}" />
<bean id="WriteAuditLog" class="net.shibboleth.idp.profile.audit.impl.WriteAuditLog" scope="prototype"
p:formattingMap-ref="shibboleth.AuditFormattingMap"
p:dateTimeFormat="#{getObject('shibboleth.AuditDateTimeFormat')}"
p:useDefaultTimeZone="#{getObject('shibboleth.AuditDefaultTimeZone') ?: false}"
p:httpServletRequest-ref="shibboleth.HttpServletRequest" />
-
- <bean id="shibboleth.oidc.DefaultPostDecodeAuditExtractors"
- class="org.springframework.beans.factory.config.MapFactoryBean">
- <property name="sourceMap">
- <map>
- <entry>
- <key>
- <util:constant
- static-field="net.shibboleth.idp.plugin.oidc.op.audit.AuditFields.INBOUND_MESSAGE_CLASS" />
- </key>
- <bean class="net.shibboleth.idp.plugin.oidc.op.audit.impl.InboundMessageClassLookupFunction" />
- </entry>
- <entry>
- <key>
- <util:constant static-field="net.shibboleth.idp.plugin.oidc.op.audit.AuditFields.IS_PASSIVE"/>
- </key>
- <bean class="net.shibboleth.idp.plugin.oidc.op.audit.impl.IsPassiveAuditExtractor">
- <constructor-arg>
- <bean parent="shibboleth.Functions.Compose"
- c:g-ref="shibboleth.MessageLookup.oidc.AuthenticationRequest"
- c:f-ref="shibboleth.MessageContextLookup.Inbound" />
- </constructor-arg>
- </bean>
- </entry>
- <entry>
- <key>
- <util:constant static-field="net.shibboleth.idp.plugin.oidc.op.audit.AuditFields.FORCE_AUTHN"/>
- </key>
- <bean class="net.shibboleth.idp.plugin.oidc.op.audit.impl.ForceAuthnAuditExtractor">
- <constructor-arg>
- <bean parent="shibboleth.Functions.Compose"
- c:g-ref="shibboleth.MessageLookup.oidc.AuthenticationRequest"
- c:f-ref="shibboleth.MessageContextLookup.Inbound" />
- </constructor-arg>
- </bean>
- </entry>
- <entry>
- <key>
- <util:constant
- static-field="net.shibboleth.idp.plugin.oidc.op.audit.AuditFields.REVOKED_TOKEN"/>
- </key>
- <bean class="net.shibboleth.idp.plugin.oidc.op.audit.impl.RevokedTokenAuditExtractor">
- <constructor-arg>
- <bean parent="shibboleth.Functions.Compose"
- c:g-ref="shibboleth.MessageLookup.oidc.TokenRevocationRequest"
- c:f-ref="shibboleth.MessageContextLookup.Inbound" />
- </constructor-arg>
- </bean>
- </entry>
- <entry>
- <key>
- <util:constant
- static-field="net.shibboleth.idp.plugin.oidc.op.audit.AuditFields.NONCE"/>
- </key>
- <bean class="net.shibboleth.idp.plugin.oidc.op.audit.impl.AuthenticationRequestClaimsAuditExtractor"
- c:claim="nonce" />
- </entry>
- </map>
- </property>
- </bean>
- <bean id="shibboleth.MessageLookup.oidc.AuthenticationRequest"
- class="org.opensaml.messaging.context.navigate.MessageLookup"
- c:type="#{ T(com.nimbusds.openid.connect.sdk.AuthenticationRequest) }" />
-
- <bean id="shibboleth.MessageLookup.oidc.TokenRevocationRequest"
- class="org.opensaml.messaging.context.navigate.MessageLookup"
- c:type="#{ T(com.nimbusds.oauth2.sdk.TokenRevocationRequest) }" />
-
- <bean id="shibboleth.oidc.DefaultPostResponseAuditExtractors"
- class="org.springframework.beans.factory.config.MapFactoryBean">
- <property name="sourceMap">
- <map>
- <entry>
- <key>
- <util:constant static-field="net.shibboleth.idp.authn.AuthnAuditFields.AUTHN_FLOW_ID"/>
- </key>
- <bean class="net.shibboleth.idp.authn.audit.impl.AuthenticationFlowAuditExtractor" />
- </entry>
- <entry>
- <key>
- <util:constant static-field="net.shibboleth.idp.authn.AuthnAuditFields.SSO"/>
- </key>
- <bean parent="shibboleth.Functions.Compose">
- <constructor-arg name="g">
- <bean class="net.shibboleth.idp.authn.context.navigate.PreviousResultLookupFunction" />
- </constructor-arg>
- <constructor-arg name="f">
- <ref bean="shibboleth.ChildLookup.AuthenticationContext" />
- </constructor-arg>
- </bean>
- </entry>
- <entry>
- <key>
- <util:constant
- static-field="net.shibboleth.idp.plugin.oidc.op.audit.AuditFields.AUTHN_INSTANT"/>
- </key>
- <bean class="net.shibboleth.idp.plugin.oidc.op.profile.context.navigate.DefaultAuthTimeLookupFunction" />
- </entry>
- <entry>
- <key>
- <util:constant
- static-field="net.shibboleth.idp.plugin.oidc.op.audit.AuditFields.ID_TOKEN_ISSUE_INSTANT"/>
- </key>
- <bean class="net.shibboleth.idp.plugin.oidc.op.audit.impl.IdTokenClaimsAuditExtractor"
- c:claim="iat" />
- </entry>
- <entry>
- <key>
- <util:constant static-field="net.shibboleth.idp.profile.IdPAuditFields.USERNAME"/>
- </key>
- <bean parent="shibboleth.Functions.Compose"
- c:g-ref="shibboleth.PrincipalNameLookup.Subject"
- c:f-ref="shibboleth.ChildLookup.SubjectContext" />
- </entry>
- <entry>
- <key>
- <util:constant static-field="net.shibboleth.idp.profile.IdPAuditFields.HASHED_USERNAME"/>
- </key>
- <ref bean="shibboleth.UsernameHasher" />
- </entry>
- <entry>
- <key>
- <util:constant static-field="net.shibboleth.idp.profile.IdPAuditFields.SESSION_ID"/>
- </key>
- <bean parent="shibboleth.Functions.Compose">
- <constructor-arg name="g">
- <bean class="net.shibboleth.idp.session.context.navigate.SessionContextIDLookupFunction" />
- </constructor-arg>
- <constructor-arg name="f">
- <ref bean="shibboleth.ChildLookup.SessionContext" />
- </constructor-arg>
- </bean>
- </entry>
- <entry>
- <key>
- <util:constant static-field="net.shibboleth.idp.profile.IdPAuditFields.ATTRIBUTES"/>
- </key>
- <bean class="net.shibboleth.idp.plugin.oidc.op.audit.impl.ClaimsAuditExtractor">
- </bean>
- </entry>
- <entry>
- <key>
- <util:constant static-field="net.shibboleth.idp.plugin.oidc.op.audit.AuditFields.SUB_VALUE"/>
- </key>
- <bean class="net.shibboleth.idp.plugin.oidc.op.audit.impl.SubjectValueAuditExtractor">
- </bean>
- </entry>
- <entry>
- <key>
- <util:constant static-field="net.shibboleth.idp.plugin.oidc.op.audit.AuditFields.SUB_FORMAT"/>
- </key>
- <bean class="net.shibboleth.idp.plugin.oidc.op.audit.impl.SubjectTypeAuditExtractor">
- </bean>
- </entry>
- <entry>
- <key>
- <util:constant static-field="net.shibboleth.idp.plugin.oidc.op.audit.AuditFields.AUDIENCE"/>
- </key>
- <bean class="net.shibboleth.idp.plugin.oidc.op.profile.context.navigate.ValidatedAudienceLookupFunction" />
- </entry>
- <entry>
- <key>
- <util:constant static-field="net.shibboleth.idp.plugin.oidc.op.audit.AuditFields.SCOPE"/>
- </key>
- <bean class="net.shibboleth.idp.plugin.oidc.op.profile.context.navigate.ValidatedAudienceLookupFunction" />
- </entry>
- <entry>
- <key>
- <util:constant static-field="net.shibboleth.idp.plugin.oidc.op.audit.AuditFields.ACR"/>
- </key>
- <bean class="net.shibboleth.idp.plugin.oidc.op.audit.impl.AuthenticationContextReferenceAuditExtractor" />
- </entry>
- <entry>
- <key>
- <util:constant
- static-field="net.shibboleth.idp.plugin.oidc.op.audit.AuditFields.OUTBOUND_MESSAGE_CLASS" />
- </key>
- <bean class="net.shibboleth.idp.plugin.oidc.op.audit.impl.OutboundMessageClassLookupFunction" />
- </entry>
- </map>
- </property>
- </bean>
-
<bean id="PopulateMetricContext"
class="org.opensaml.profile.action.impl.PopulateMetricContext" scope="prototype"
p:metricStrategy="#{getObject('shibboleth.metrics.MetricStrategy')}" />
diff --git a/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/oidc/configuration/configuration-beans.xml b/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/oidc/configuration/configuration-beans.xml
index 2dfa925b..d3025f0c 100644
--- a/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/oidc/configuration/configuration-beans.xml
+++ b/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/oidc/configuration/configuration-beans.xml
@@ -8,9 +8,6 @@
default-init-method="initialize" default-destroy-method="destroy">
- <!-- Name of the publish flow for audit -->
- <bean id="OidcApiInfoFlowAuditName" class="java.lang.String" c:_0="Discovery" />
-
<bean id="shibboleth.oidc.profileId" class="java.lang.String"
c:_0="#{T(net.shibboleth.oidc.profile.config.OIDCProviderInformationConfiguration).PROFILE_ID}" />
diff --git a/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/oidc/keyset/keyset-beans.xml b/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/oidc/keyset/keyset-beans.xml
index 6b7fbee6..f65e20e6 100644
--- a/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/oidc/keyset/keyset-beans.xml
+++ b/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/oidc/keyset/keyset-beans.xml
@@ -7,9 +7,6 @@
http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd"
default-init-method="initialize" default-destroy-method="destroy">
- <!-- Name of the publish flow for audit -->
- <bean id="OidcApiInfoFlowAuditName" class="java.lang.String" c:_0="KeySet" />
-
<bean id="shibboleth.oidc.profileId" class="java.lang.String"
c:_0="#{T(net.shibboleth.oidc.profile.config.OIDCPublishKeySetConfiguration).PROFILE_ID}" />
diff --git a/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/oidc/register/register-beans.xml b/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/oidc/register/register-beans.xml
index b9c52bf8..e2ca1965 100644
--- a/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/oidc/register/register-beans.xml
+++ b/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/oidc/register/register-beans.xml
@@ -216,20 +216,5 @@
<bean id="PostResponsePopulateAuditContext" parent="shibboleth.AbstractPopulateAuditContext"
p:fieldExtractors="#{getObject('shibboleth.oidc.RegistrationPostResponseAuditExtractors') ?: getObject('shibboleth.oidc.DefaultRegistrationPostResponseAuditExtractors')}" />
-
- <bean id="shibboleth.oidc.DefaultRegistrationPostResponseAuditExtractors"
- class="org.springframework.beans.factory.config.MapFactoryBean">
- <property name="sourceMap">
- <map>
- <entry>
- <key>
- <util:constant static-field="net.shibboleth.idp.plugin.oidc.op.audit.AuditFields.CLIENT_ID"/>
- </key>
- <bean class="net.shibboleth.idp.plugin.oidc.op.audit.impl.ClientIdRegistrationAuditExtractor">
- </bean>
- </entry>
- </map>
- </property>
- </bean>
</beans>
diff --git a/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/oidc/token/token-beans.xml b/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/oidc/token/token-beans.xml
index 29852f48..2ce9c598 100644
--- a/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/oidc/token/token-beans.xml
+++ b/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/oidc/token/token-beans.xml
@@ -494,22 +494,7 @@
class="net.shibboleth.idp.plugin.oidc.op.oauth2.profile.impl.SetAccessTokenToResponseContext"
scope="prototype" />
- <!-- Audit extractors. -->
-
- <bean id="shibboleth.oidc.DefaultPostResponseAuditExtractorsForFlow"
- parent="shibboleth.oidc.DefaultPostResponseAuditExtractors"
- class="org.springframework.beans.factory.config.MapFactoryBean">
- <property name="sourceMap">
- <map merge="true">
- <entry>
- <key>
- <util:constant static-field="net.shibboleth.idp.plugin.oidc.op.audit.AuditFields.NONCE"/>
- </key>
- <bean class="net.shibboleth.idp.plugin.oidc.op.audit.impl.IdTokenClaimsAuditExtractor"
- c:claim="nonce" />
- </entry>
- </map>
- </property>
- </bean>
+ <bean id="PostResponsePopulateAuditContext" parent="shibboleth.AbstractPopulateAuditContext"
+ p:fieldExtractors="#{getObject('shibboleth.oidc.TokenPostResponseAuditExtractors') ?: getObject('shibboleth.oidc.DefaultTokenPostResponseAuditExtractors')}" />
</beans>
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list