[java-oidc-common] branch main updated: JOIDC-160 - Add profile counter metrics to the OP flows
Henri Mikkonen
henri.mikkonen at iki.fi
Tue Sep 5 10:32:46 UTC 2023
This is an automated email from the git hooks/post-receive script.
hjmikkon pushed a commit to branch main
in repository java-oidc-common.
View the commit online:
http://git.shibboleth.net/view/?p=java-oidc-common.git;a=commit;h=da933e682f954ad6559b73c052833b66364891e8
The following commit(s) were added to refs/heads/main by this push:
new da933e6 JOIDC-160 - Add profile counter metrics to the OP flows
da933e6 is described below
commit da933e682f954ad6559b73c052833b66364891e8
Author: Henri Mikkonen <henri.mikkonen at iki.fi>
AuthorDate: Tue Sep 5 13:31:13 2023 +0300
JOIDC-160 - Add profile counter metrics to the OP flows
https://shibboleth.atlassian.net/browse/JOIDC-160
Added PROFILE_COUNTER constants to the classes to be referenced from the
flow xmls.
---
.../profile/config/impl/DefaultOIDCAuthorizationConfiguration.java | 3 +++
.../config/impl/DefaultOIDCDynamicRegistrationConfiguration.java | 3 +++
.../config/impl/DefaultOIDCProviderInformationConfiguration.java | 3 +++
.../profile/config/impl/DefaultOIDCPublishKeySetConfiguration.java | 3 +++
.../oidc/profile/config/impl/DefaultOIDCUserInfoConfiguration.java | 5 ++++-
.../oauth2/config/impl/DefaultOAuth2TokenAudienceConfiguration.java | 2 --
.../profile/oauth2/config/impl/DefaultOAuth2TokenConfiguration.java | 3 +++
.../config/impl/DefaultOAuth2TokenIntrospectionConfiguration.java | 5 ++++-
.../config/impl/DefaultOAuth2TokenRevocationConfiguration.java | 3 +++
9 files changed, 26 insertions(+), 4 deletions(-)
diff --git a/oidc-common-profile-impl/src/main/java/net/shibboleth/oidc/profile/config/impl/DefaultOIDCAuthorizationConfiguration.java b/oidc-common-profile-impl/src/main/java/net/shibboleth/oidc/profile/config/impl/DefaultOIDCAuthorizationConfiguration.java
index f3efc94..8a85c03 100644
--- a/oidc-common-profile-impl/src/main/java/net/shibboleth/oidc/profile/config/impl/DefaultOIDCAuthorizationConfiguration.java
+++ b/oidc-common-profile-impl/src/main/java/net/shibboleth/oidc/profile/config/impl/DefaultOIDCAuthorizationConfiguration.java
@@ -52,6 +52,9 @@ public class DefaultOIDCAuthorizationConfiguration extends AbstractOIDCSSOConfig
implements OIDCAuthenticationRelyingPartyProfileConfiguration,
OIDCAuthorizationConfiguration {
+ /** OIDC authorization profile counter name. */
+ @Nonnull @NotEmpty public static final String PROFILE_COUNTER = "net.shibboleth.idp.profiles.oidc.authorize";
+
/** Whether all acr claim requests should be treated as Essential. */
@Nonnull private Predicate<ProfileRequestContext> acrRequestAlwaysEssentialPredicate;
diff --git a/oidc-common-profile-impl/src/main/java/net/shibboleth/oidc/profile/config/impl/DefaultOIDCDynamicRegistrationConfiguration.java b/oidc-common-profile-impl/src/main/java/net/shibboleth/oidc/profile/config/impl/DefaultOIDCDynamicRegistrationConfiguration.java
index e836c5c..465f1bf 100644
--- a/oidc-common-profile-impl/src/main/java/net/shibboleth/oidc/profile/config/impl/DefaultOIDCDynamicRegistrationConfiguration.java
+++ b/oidc-common-profile-impl/src/main/java/net/shibboleth/oidc/profile/config/impl/DefaultOIDCDynamicRegistrationConfiguration.java
@@ -37,6 +37,9 @@ import net.shibboleth.shared.logic.FunctionSupport;
public class DefaultOIDCDynamicRegistrationConfiguration extends AbstractOAuth2FlowAwareProfileConfiguration
implements OIDCDynamicRegistrationConfiguration {
+ /** OIDC dynamic registration profile counter name. */
+ @Nonnull @NotEmpty public static final String PROFILE_COUNTER = "net.shibboleth.idp.profiles.oidc.register";
+
/** Lookup function to override issuer value. */
@Nonnull private Function<ProfileRequestContext,String> issuerLookupStrategy;
diff --git a/oidc-common-profile-impl/src/main/java/net/shibboleth/oidc/profile/config/impl/DefaultOIDCProviderInformationConfiguration.java b/oidc-common-profile-impl/src/main/java/net/shibboleth/oidc/profile/config/impl/DefaultOIDCProviderInformationConfiguration.java
index 567e35a..730fbf2 100644
--- a/oidc-common-profile-impl/src/main/java/net/shibboleth/oidc/profile/config/impl/DefaultOIDCProviderInformationConfiguration.java
+++ b/oidc-common-profile-impl/src/main/java/net/shibboleth/oidc/profile/config/impl/DefaultOIDCProviderInformationConfiguration.java
@@ -33,6 +33,9 @@ import net.shibboleth.shared.logic.FunctionSupport;
public class DefaultOIDCProviderInformationConfiguration extends AbstractConditionalProfileConfiguration
implements OIDCProviderInformationConfiguration {
+ /** OIDC provider information profile counter name. */
+ @Nonnull @NotEmpty public static final String PROFILE_COUNTER = "net.shibboleth.idp.profiles.oidc.configuration";
+
/** Lookup function to override issuer value. */
@Nonnull private Function<ProfileRequestContext,String> issuerLookupStrategy;
diff --git a/oidc-common-profile-impl/src/main/java/net/shibboleth/oidc/profile/config/impl/DefaultOIDCPublishKeySetConfiguration.java b/oidc-common-profile-impl/src/main/java/net/shibboleth/oidc/profile/config/impl/DefaultOIDCPublishKeySetConfiguration.java
index 646921a..7e79419 100644
--- a/oidc-common-profile-impl/src/main/java/net/shibboleth/oidc/profile/config/impl/DefaultOIDCPublishKeySetConfiguration.java
+++ b/oidc-common-profile-impl/src/main/java/net/shibboleth/oidc/profile/config/impl/DefaultOIDCPublishKeySetConfiguration.java
@@ -33,6 +33,9 @@ public class DefaultOIDCPublishKeySetConfiguration extends AbstractConditionalPr
/** ID for this profile configuration. */
public static final String PROFILE_ID = "http://shibboleth.net/ns/profiles/oidc/keyset";
+ /** OIDC keyset profile counter name. */
+ @Nonnull @NotEmpty public static final String PROFILE_COUNTER = "net.shibboleth.idp.profiles.oidc.keyset";
+
/**
* Constructor.
*/
diff --git a/oidc-common-profile-impl/src/main/java/net/shibboleth/oidc/profile/config/impl/DefaultOIDCUserInfoConfiguration.java b/oidc-common-profile-impl/src/main/java/net/shibboleth/oidc/profile/config/impl/DefaultOIDCUserInfoConfiguration.java
index 77e3b3a..6099354 100644
--- a/oidc-common-profile-impl/src/main/java/net/shibboleth/oidc/profile/config/impl/DefaultOIDCUserInfoConfiguration.java
+++ b/oidc-common-profile-impl/src/main/java/net/shibboleth/oidc/profile/config/impl/DefaultOIDCUserInfoConfiguration.java
@@ -51,7 +51,10 @@ public class DefaultOIDCUserInfoConfiguration extends AbstractOAuth2TokenValidat
/** Lookup function to supply attribute IDs to omit from UserInfo token. */
@Nonnull private Function<ProfileRequestContext,Set<String>> deniedUserInfoAttributesLookupStrategy;
-
+
+ /** OIDC UserInfo profile counter name. */
+ @Nonnull @NotEmpty public static final String PROFILE_COUNTER = "net.shibboleth.idp.profiles.oidc.userinfo";
+
/**
* Constructor.
*/
diff --git a/oidc-common-profile-impl/src/main/java/net/shibboleth/oidc/profile/oauth2/config/impl/DefaultOAuth2TokenAudienceConfiguration.java b/oidc-common-profile-impl/src/main/java/net/shibboleth/oidc/profile/oauth2/config/impl/DefaultOAuth2TokenAudienceConfiguration.java
index 19ffd46..9a60a39 100644
--- a/oidc-common-profile-impl/src/main/java/net/shibboleth/oidc/profile/oauth2/config/impl/DefaultOAuth2TokenAudienceConfiguration.java
+++ b/oidc-common-profile-impl/src/main/java/net/shibboleth/oidc/profile/oauth2/config/impl/DefaultOAuth2TokenAudienceConfiguration.java
@@ -29,7 +29,6 @@ import com.google.common.base.Predicates;
import net.shibboleth.idp.profile.config.AbstractInterceptorAwareProfileConfiguration;
import net.shibboleth.oidc.profile.oauth2.config.OAuth2TokenAudienceConfiguration;
-import net.shibboleth.profile.config.AbstractConditionalProfileConfiguration;
import net.shibboleth.shared.annotation.constraint.NotEmpty;
import net.shibboleth.shared.annotation.constraint.Positive;
import net.shibboleth.shared.logic.Constraint;
@@ -42,7 +41,6 @@ import net.shibboleth.shared.primitive.StringSupport;
public class DefaultOAuth2TokenAudienceConfiguration extends AbstractInterceptorAwareProfileConfiguration
implements OAuth2TokenAudienceConfiguration {
-
/** Lookup function to override issuer value. */
@Nonnull private Function<ProfileRequestContext,String> issuerLookupStrategy;
diff --git a/oidc-common-profile-impl/src/main/java/net/shibboleth/oidc/profile/oauth2/config/impl/DefaultOAuth2TokenConfiguration.java b/oidc-common-profile-impl/src/main/java/net/shibboleth/oidc/profile/oauth2/config/impl/DefaultOAuth2TokenConfiguration.java
index c7a5bd9..711b6a7 100644
--- a/oidc-common-profile-impl/src/main/java/net/shibboleth/oidc/profile/oauth2/config/impl/DefaultOAuth2TokenConfiguration.java
+++ b/oidc-common-profile-impl/src/main/java/net/shibboleth/oidc/profile/oauth2/config/impl/DefaultOAuth2TokenConfiguration.java
@@ -45,6 +45,9 @@ import net.shibboleth.shared.primitive.StringSupport;
*/
public class DefaultOAuth2TokenConfiguration extends AbstractOIDCSSOConfiguration implements OAuth2TokenConfiguration {
+ /** OAuth2 token profile counter name. */
+ @Nonnull @NotEmpty public static final String PROFILE_COUNTER = "net.shibboleth.idp.profiles.oauth2.token";
+
/** Enabled grant types. */
@Nonnull private Function<ProfileRequestContext,Set<String>> grantTypesLookupStrategy;
diff --git a/oidc-common-profile-impl/src/main/java/net/shibboleth/oidc/profile/oauth2/config/impl/DefaultOAuth2TokenIntrospectionConfiguration.java b/oidc-common-profile-impl/src/main/java/net/shibboleth/oidc/profile/oauth2/config/impl/DefaultOAuth2TokenIntrospectionConfiguration.java
index 00d386b..e562d24 100644
--- a/oidc-common-profile-impl/src/main/java/net/shibboleth/oidc/profile/oauth2/config/impl/DefaultOAuth2TokenIntrospectionConfiguration.java
+++ b/oidc-common-profile-impl/src/main/java/net/shibboleth/oidc/profile/oauth2/config/impl/DefaultOAuth2TokenIntrospectionConfiguration.java
@@ -25,7 +25,10 @@ import net.shibboleth.shared.annotation.constraint.NotEmpty;
*/
public class DefaultOAuth2TokenIntrospectionConfiguration extends AbstractOAuth2TokenValidatingConfiguration implements
OAuth2TokenIntrospectionConfiguration {
-
+
+ /** OAuth2 token introspection profile counter name. */
+ @Nonnull @NotEmpty public static final String PROFILE_COUNTER = "net.shibboleth.idp.profiles.oauth2.introspection";
+
/**
* Constructor.
*/
diff --git a/oidc-common-profile-impl/src/main/java/net/shibboleth/oidc/profile/oauth2/config/impl/DefaultOAuth2TokenRevocationConfiguration.java b/oidc-common-profile-impl/src/main/java/net/shibboleth/oidc/profile/oauth2/config/impl/DefaultOAuth2TokenRevocationConfiguration.java
index 8c7b240..5ea2299 100644
--- a/oidc-common-profile-impl/src/main/java/net/shibboleth/oidc/profile/oauth2/config/impl/DefaultOAuth2TokenRevocationConfiguration.java
+++ b/oidc-common-profile-impl/src/main/java/net/shibboleth/oidc/profile/oauth2/config/impl/DefaultOAuth2TokenRevocationConfiguration.java
@@ -35,6 +35,9 @@ import net.shibboleth.shared.logic.FunctionSupport;
public class DefaultOAuth2TokenRevocationConfiguration extends AbstractOAuth2TokenValidatingConfiguration implements
OAuth2TokenRevocationConfiguration {
+ /** OAuth2 token revocation profile counter name. */
+ @Nonnull @NotEmpty public static final String PROFILE_COUNTER = "net.shibboleth.idp.profiles.oauth2.revocation";
+
/**
* Which revocation method should be used when revoking a token.
* Supported values are CHAIN and TOKEN. The default is CHAIN.
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list