You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openwebbeans.apache.org by st...@apache.org on 2026/08/05 10:36:28 UTC

(openwebbeans-meecrowave) 01/02: MEECROWAVE-350 remove partialMatchScopeValidation

This is an automated email from the ASF dual-hosted git repository.

asf-gitbox-commits pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/openwebbeans-meecrowave.git

commit 854428d146a8b883277a0bbb9d817c5cc0657699
Author: Mark Struberg <st...@apache.org>
AuthorDate: Wed Aug 5 12:32:19 2026 +0200

    MEECROWAVE-350 remove partialMatchScopeValidation
    
    See CXF-9222 for more information
---
 .../meecrowave/oauth2/configuration/OAuth2Configurer.java     |  4 ----
 .../apache/meecrowave/oauth2/configuration/OAuth2Options.java | 11 -----------
 2 files changed, 15 deletions(-)

diff --git a/meecrowave-oauth2-minimal/src/main/java/org/apache/meecrowave/oauth2/configuration/OAuth2Configurer.java b/meecrowave-oauth2-minimal/src/main/java/org/apache/meecrowave/oauth2/configuration/OAuth2Configurer.java
index b3712af..57f0bcb 100644
--- a/meecrowave-oauth2-minimal/src/main/java/org/apache/meecrowave/oauth2/configuration/OAuth2Configurer.java
+++ b/meecrowave-oauth2-minimal/src/main/java/org/apache/meecrowave/oauth2/configuration/OAuth2Configurer.java
@@ -37,7 +37,6 @@ import org.apache.cxf.rs.security.oauth2.grants.code.AuthorizationCodeGrantHandl
 import org.apache.cxf.rs.security.oauth2.grants.code.DefaultEncryptingCodeDataProvider;
 import org.apache.cxf.rs.security.oauth2.grants.code.DigestCodeVerifier;
 import org.apache.cxf.rs.security.oauth2.grants.code.JPACodeDataProvider;
-import org.apache.cxf.rs.security.oauth2.grants.code.PlainCodeVerifier;
 import org.apache.cxf.rs.security.oauth2.grants.jwt.JwtBearerGrantHandler;
 import org.apache.cxf.rs.security.oauth2.grants.owner.JAASResourceOwnerLoginHandler;
 import org.apache.cxf.rs.security.oauth2.grants.owner.ResourceOwnerGrantHandler;
@@ -250,7 +249,6 @@ public class OAuth2Configurer {
         };
         refreshTokenGrantHandler.setDataProvider(provider);
         refreshTokenGrantHandler.setUseAllClientScopes(configuration.isUseAllClientScopes());
-        refreshTokenGrantHandler.setPartialMatchScopeValidation(configuration.isPartialMatchScopeValidation());
 
         final ResourceOwnerLoginHandler loginHandler = configuration.isJaas() ? new JAASResourceOwnerLoginHandler() {
             @Override
@@ -369,7 +367,6 @@ public class OAuth2Configurer {
                     final AbstractGrantHandler handler = AbstractGrantHandler.class.cast(h);
                     handler.setDataProvider(dataProvider);
                     handler.setCanSupportPublicClients(configuration.isCanSupportPublicClients());
-                    handler.setPartialMatchScopeValidation(configuration.isPartialMatchScopeValidation());
                 });
 
         abstractTokenServiceConsumer = s -> { // this is used @RequestScoped so ensure it is not slow for no reason
@@ -409,7 +406,6 @@ public class OAuth2Configurer {
             s.setBlockUnsecureRequests(configuration.isBlockUnsecureRequests());
             s.setWriteOptionalParameters(configuration.isWriteOptionalParameters());
             s.setUseAllClientScopes(configuration.isUseAllClientScopes());
-            s.setPartialMatchScopeValidation(configuration.isPartialMatchScopeValidation());
             s.setUseRegisteredRedirectUriIfPossible(configuration.isUseRegisteredRedirectUriIfPossible());
             s.setMaxDefaultSessionInterval(configuration.getMaxDefaultSessionInterval());
             s.setMatchRedirectUriWithApplicationUri(configuration.isMatchRedirectUriWithApplicationUri());
diff --git a/meecrowave-oauth2-minimal/src/main/java/org/apache/meecrowave/oauth2/configuration/OAuth2Options.java b/meecrowave-oauth2-minimal/src/main/java/org/apache/meecrowave/oauth2/configuration/OAuth2Options.java
index 97844a0..5cdda96 100644
--- a/meecrowave-oauth2-minimal/src/main/java/org/apache/meecrowave/oauth2/configuration/OAuth2Options.java
+++ b/meecrowave-oauth2-minimal/src/main/java/org/apache/meecrowave/oauth2/configuration/OAuth2Options.java
@@ -49,9 +49,6 @@ public class OAuth2Options implements Cli.Options {
     @CliOption(name = "oauth2-write-optional-parameters", description = "Should optional parameters be written")
     private boolean writeOptionalParameters = true;
 
-    @CliOption(name = "oauth2-partial-match-scope-validation", description = "Is partial match for scope validation activated")
-    private boolean partialMatchScopeValidation;
-
     @CliOption(name = "oauth2-use-jaas", description = "Should jaas be used - alternative (default) is to delegate to meecrowave/tomcat realms")
     private boolean jaas;
 
@@ -381,14 +378,6 @@ public class OAuth2Options implements Cli.Options {
         this.forceClient = forceClient;
     }
 
-    public boolean isPartialMatchScopeValidation() {
-        return partialMatchScopeValidation;
-    }
-
-    public void setPartialMatchScopeValidation(final boolean partialMatchScopeValidation) {
-        this.partialMatchScopeValidation = partialMatchScopeValidation;
-    }
-
     public boolean isJaas() {
         return jaas;
     }