[java-oidc-common] 35/35: Fix OIDC authz config issues after rebase
Phil Smart
philip.smart at jisc.ac.uk
Tue Sep 20 14:19:35 UTC 2022
This is an automated email from the git hooks/post-receive script.
philsmart pushed a commit to branch dev/JCOMOIDC-41
in repository java-oidc-common.
View the commit online:
http://git.shibboleth.net/view/?p=java-oidc-common.git;a=commit;h=ecb99fb03f266e90908973bee5382fc8c9dbdcaf
commit ecb99fb03f266e90908973bee5382fc8c9dbdcaf
Author: Phil Smart <philip.smart at jisc.ac.uk>
AuthorDate: Tue Sep 20 15:12:34 2022 +0100
Fix OIDC authz config issues after rebase
---
.../config/OIDCAuthorizationConfiguration.java | 234 +++++----------------
1 file changed, 55 insertions(+), 179 deletions(-)
diff --git a/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/OIDCAuthorizationConfiguration.java b/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/OIDCAuthorizationConfiguration.java
index 040c63d..291b864 100644
--- a/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/OIDCAuthorizationConfiguration.java
+++ b/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/OIDCAuthorizationConfiguration.java
@@ -114,7 +114,6 @@ public class OIDCAuthorizationConfiguration extends AbstractOIDCSSOConfiguration
@Nonnull private Function<ProfileRequestContext, Credential> clientCredentialLookupStrategy;
/** Lookup function to determine the client_authentication method. */
- // @Nonnull private Function<ProfileRequestContext, ClientAuthentication> clientAuthenticationLookupStrategy;
//TODO same as tokenEndpointAuthMethodsLookupStrategy?
@Nonnull private Function<ProfileRequestContext, String> clientAuthenticationMethodLookupStrategy;
@@ -386,31 +385,6 @@ public class OIDCAuthorizationConfiguration extends AbstractOIDCSSOConfiguration
clientIdLookupStrategy = FunctionSupport.constant(StringSupport.trimOrNull(clientId));
}
- /**
- * Set the client authentication lookup strategy which will locate the client_authentication method
- * for a given client.
- *
- * @param strategy the strategy to use
- */
- public void setClientAuthenticationLookupStrategy(
- @Nonnull final Function<ProfileRequestContext, ClientAuthentication> strategy) {
- clientAuthenticationLookupStrategy =
- Constraint.isNotNull(strategy, "Client authentication strategy can not be null");
- }
-
- /**
- * Get the client_authentication for the given context. Typically that associated with the
- * current client_id.
- *
- * @param profileRequestContext the profile request context
- *
- * @return the client_authentication method
- */
- public ClientAuthentication getClientAuthentication(
- @Nullable final ProfileRequestContext profileRequestContext) {
- return clientAuthenticationLookupStrategy.apply(profileRequestContext);
- }
-
/**
* Get the client_id appropriate for the given context. Typically that associated
* with the chosen downstream OpenID Connect Provider.
@@ -725,6 +699,41 @@ public class OIDCAuthorizationConfiguration extends AbstractOIDCSSOConfiguration
public void setResponseMode(@Nonnull final String responseMode) {
responseModeLookupStrategy = FunctionSupport.constant(responseMode);
}
+
+ /**
+ * Get whether to include iss parameter in the authentication response.
+ *
+ * @param profileRequestContext profile request context
+ *
+ * @return whether to include iss parameter in the authentication response
+ *
+ * @since 2.1.0
+ */
+ public boolean isIncludeIssuerInResponse(@Nullable final ProfileRequestContext profileRequestContext) {
+ return includeIssuerInResponsePredicate.test(profileRequestContext);
+ }
+
+ /**
+ * Set whether to include iss parameter in the authentication response.
+ *
+ * @param flag flag to set
+ *
+ * @since 2.1.0
+ */
+ public void setIncludeIssuerInResponse(final boolean flag) {
+ includeIssuerInResponsePredicate = flag ? Predicates.alwaysTrue() : Predicates.alwaysFalse();
+ }
+
+ /**
+ * Set condition for whether to include iss parameter in the authentication response.
+ *
+ * @param condition condition to set
+ *
+ * @since 2.1.0
+ */
+ public void setIncludeIssuerInResponsePredicate(@Nonnull final Predicate<ProfileRequestContext> condition) {
+ includeIssuerInResponsePredicate = Constraint.isNotNull(condition, "Condition cannot be null");
+ }
/**
* Set the lookup strategy to determine the response_type for authentication requests.
@@ -754,6 +763,25 @@ public class OIDCAuthorizationConfiguration extends AbstractOIDCSSOConfiguration
public String getResponseType(@Nullable final ProfileRequestContext profileRequestContext) {
return responseTypeLookupStrategy.apply(profileRequestContext);
}
+
+ @Nonnull
+ public BiFunction<ProfileRequestContext,Map<String,Object>,Map<String,Object>>
+ getAuthorizationCodeClaimsSetManipulationStrategy(
+ @Nullable final ProfileRequestContext profileRequestContext) {
+ return authorizationCodeClaimsSetManipulationStrategyLookupStrategy.apply(profileRequestContext);
+ }
+
+ /**
+ * Set the bi-function for manipulating authorization code claims set.
+ *
+ * @param strategy bi-function for manipulating authorization code claims set
+ *
+ * @since 2.1.0
+ */
+ public void setAuthorizationCodeClaimsSetManipulationStrategy(
+ @Nullable final BiFunction<ProfileRequestContext,Map<String,Object>,Map<String,Object>> strategy) {
+ authorizationCodeClaimsSetManipulationStrategyLookupStrategy = FunctionSupport.constant(strategy);
+ }
/**
* Set the lookup strategy to determine the scopes to use for authentication requests.
@@ -863,158 +891,6 @@ public class OIDCAuthorizationConfiguration extends AbstractOIDCSSOConfiguration
public void setProxiedAuthnInstant(final boolean flag) {
proxiedAuthnInstantPredicate = flag ? Predicates.alwaysTrue() : Predicates.alwaysFalse();
}
- /**
- * Get whether to include iss parameter in the authentication response.
- *
- * @param profileRequestContext profile request context
- *
- * @return whether to include iss parameter in the authentication response
- *
- * @since 2.1.0
- */
- public boolean isIncludeIssuerInResponse(@Nullable final ProfileRequestContext profileRequestContext) {
- return includeIssuerInResponsePredicate.test(profileRequestContext);
- }
-
- /**
- * Set whether to include iss parameter in the authentication response.
- *
- * @param flag flag to set
- *
- * @since 2.1.0
- */
- public void setIncludeIssuerInResponse(final boolean flag) {
- includeIssuerInResponsePredicate = flag ? Predicates.alwaysTrue() : Predicates.alwaysFalse();
- }
-
- /**
- * Set condition for whether to include iss parameter in the authentication response.
- *
- * @param condition condition to set
- *
- * @since 2.1.0
- */
- public void setIncludeIssuerInResponsePredicate(@Nonnull final Predicate<ProfileRequestContext> condition) {
- includeIssuerInResponsePredicate = Constraint.isNotNull(condition, "Condition cannot be null");
- }
-
- /**
- * Get the bi-function for manipulating authorization code claims set.
- *
- * @param profileRequestContext profile request context
- *
- * @return the bi-function for manipulating authorization code claims set
- *
- * @since 2.1.0
- */
- @Nonnull
- public BiFunction<ProfileRequestContext,Map<String,Object>,Map<String,Object>>
- getAuthorizationCodeClaimsSetManipulationStrategy(
- @Nullable final ProfileRequestContext profileRequestContext) {
- return authorizationCodeClaimsSetManipulationStrategyLookupStrategy.apply(profileRequestContext);
- }
-
- /**
- * Set the bi-function for manipulating authorization code claims set.
- *
- * @param strategy bi-function for manipulating authorization code claims set
- *
- * @since 2.1.0
- */
- public void setAuthorizationCodeClaimsSetManipulationStrategy(
- @Nullable final BiFunction<ProfileRequestContext,Map<String,Object>,Map<String,Object>> strategy) {
- authorizationCodeClaimsSetManipulationStrategyLookupStrategy = FunctionSupport.constant(strategy);
- }
-
- /**
- * Set a lookup strategy for the bi-function for manipulating authorization code claims set.
- *
- * @param strategy lookup strategy
- *
- * @since 2.1.0
- */
- public void setAuthorizationCodeClaimsSetManipulationStrategyLookupStrategy(@Nonnull final
- Function<ProfileRequestContext,BiFunction<ProfileRequestContext,Map<String,Object>,Map<String,Object>>>
- strategy) {
- authorizationCodeClaimsSetManipulationStrategyLookupStrategy = Constraint.isNotNull(strategy,
- "Lookup strategy cannot be null");
- }
-
- /**
- * Get whether to include iss parameter in the authentication response.
- *
- * @param profileRequestContext profile request context
- *
- * @return whether to include iss parameter in the authentication response
- *
- * @since 2.1.0
- */
- public boolean isIncludeIssuerInResponse(@Nullable final ProfileRequestContext profileRequestContext) {
- return includeIssuerInResponsePredicate.test(profileRequestContext);
- }
-
- /**
- * Set whether to include iss parameter in the authentication response.
- *
- * @param flag flag to set
- *
- * @since 2.1.0
- */
- public void setIncludeIssuerInResponse(final boolean flag) {
- includeIssuerInResponsePredicate = flag ? Predicates.alwaysTrue() : Predicates.alwaysFalse();
- }
-
- /**
- * Set condition for whether to include iss parameter in the authentication response.
- *
- * @param condition condition to set
- *
- * @since 2.1.0
- */
- public void setIncludeIssuerInResponsePredicate(@Nonnull final Predicate<ProfileRequestContext> condition) {
- includeIssuerInResponsePredicate = Constraint.isNotNull(condition, "Condition cannot be null");
- }
-
- /**
- * Get the bi-function for manipulating authorization code claims set.
- *
- * @param profileRequestContext profile request context
- *
- * @return the bi-function for manipulating authorization code claims set
- *
- * @since 2.1.0
- */
- @Nonnull
- public BiFunction<ProfileRequestContext,Map<String,Object>,Map<String,Object>>
- getAuthorizationCodeClaimsSetManipulationStrategy(
- @Nullable final ProfileRequestContext profileRequestContext) {
- return authorizationCodeClaimsSetManipulationStrategyLookupStrategy.apply(profileRequestContext);
- }
-
- /**
- * Set the bi-function for manipulating authorization code claims set.
- *
- * @param strategy bi-function for manipulating authorization code claims set
- *
- * @since 2.1.0
- */
- public void setAuthorizationCodeClaimsSetManipulationStrategy(
- @Nullable final BiFunction<ProfileRequestContext,Map<String,Object>,Map<String,Object>> strategy) {
- authorizationCodeClaimsSetManipulationStrategyLookupStrategy = FunctionSupport.constant(strategy);
- }
-
- /**
- * Set a lookup strategy for the bi-function for manipulating authorization code claims set.
- *
- * @param strategy lookup strategy
- *
- * @since 2.1.0
- */
- public void setAuthorizationCodeClaimsSetManipulationStrategyLookupStrategy(@Nonnull final
- Function<ProfileRequestContext,BiFunction<ProfileRequestContext,Map<String,Object>,Map<String,Object>>>
- strategy) {
- authorizationCodeClaimsSetManipulationStrategyLookupStrategy = Constraint.isNotNull(strategy,
- "Lookup strategy cannot be null");
- }
+
}
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list