chore(oxauth): renamed requestUriBlackList -> requestUriBlockList (4.5)

JanssenProject/jans#1503 (cherry picked from commit bcbabc1)
GluuFederation · Jun 10, 2022 · f500010 · f500010
1 parent 2116ac5
commit f500010
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 11 deletions.
diff --git a/Model/src/main/java/org/gluu/oxauth/model/configuration/AppConfiguration.java b/Model/src/main/java/org/gluu/oxauth/model/configuration/AppConfiguration.java
@@ -101,7 +101,7 @@ public class AppConfiguration implements Configuration {
     private Boolean requestUriParameterSupported;
     private Boolean requestUriHashVerificationEnabled;
     private Boolean requireRequestUriRegistration;
-    private List<String> requestUriBlackList;
+    private List<String> requestUriBlockList;
     private String opPolicyUri;
     private String opTosUri;
     private int authorizationCodeLifetime;
@@ -2090,13 +2090,13 @@ public void setCibaEnabled(Boolean cibaEnabled) {
         this.cibaEnabled = cibaEnabled;
     }
 
-    public List<String> getRequestUriBlackList() {
-        if (requestUriBlackList == null) requestUriBlackList = Lists.newArrayList();
-        return requestUriBlackList;
+    public List<String> getRequestUriBlockList() {
+        if (requestUriBlockList == null) requestUriBlockList = Lists.newArrayList();
+        return requestUriBlockList;
     }
 
-    public void setRequestUriBlackList(List<String> requestUriBlackList) {
-        this.requestUriBlackList = requestUriBlackList;
+    public void setRequestUriBlockList(List<String> requestUriBlockList) {
+        this.requestUriBlockList = requestUriBlockList;
     }
 
     public Boolean getRequestUriHashVerificationEnabled() {

diff --git a/Server/src/main/java/org/gluu/oxauth/model/authorize/JwtAuthorizationRequest.java b/Server/src/main/java/org/gluu/oxauth/model/authorize/JwtAuthorizationRequest.java
@@ -502,7 +502,7 @@ public static void validateRequestUri(String requestUri, Client client, AppConfi
         }
 
         // check black list
-        final List<String> blackList = appConfiguration.getRequestUriBlackList();
+        final List<String> blackList = appConfiguration.getRequestUriBlockList();
         if (!blackList.isEmpty()) {
             URLPatternList urlPatternList = new URLPatternList(blackList);
             if (urlPatternList.isUrlListed(requestUri)) {

diff --git a/Server/src/test/java/org/gluu/oxauth/model/authorize/JwtAuthorizationRequestTest.java b/Server/src/test/java/org/gluu/oxauth/model/authorize/JwtAuthorizationRequestTest.java
@@ -44,7 +44,7 @@ public void validateRequestUri_whichIsBlackListed_shouldRaiseException() {
         String requestUri = "https://myrp.com/request_uri";
 
         final AppConfiguration appConfiguration = new AppConfiguration();
-        appConfiguration.setRequestUriBlackList(Arrays.asList("myrp.com", "evil.com"));
+        appConfiguration.setRequestUriBlockList(Arrays.asList("myrp.com", "evil.com"));
         JwtAuthorizationRequest.validateRequestUri(requestUri, new Client(), appConfiguration, "", new ErrorResponseFactory());
     }
 
@@ -53,7 +53,7 @@ public void validateRequestUri_forLocalhost_shouldRaiseException() {
         String requestUri = "https://localhost/request_uri";
 
         final AppConfiguration appConfiguration = new AppConfiguration();
-        appConfiguration.setRequestUriBlackList(Collections.singletonList("localhost"));
+        appConfiguration.setRequestUriBlockList(Collections.singletonList("localhost"));
         JwtAuthorizationRequest.validateRequestUri(requestUri, new Client(), appConfiguration, "", new ErrorResponseFactory());
     }
 
@@ -62,7 +62,7 @@ public void validateRequestUri_forLocalhostIp_shouldRaiseException() {
         String requestUri = "https://127.0.0.1/request_uri";
 
         final AppConfiguration appConfiguration = new AppConfiguration();
-        appConfiguration.setRequestUriBlackList(Collections.singletonList("127.0.0.1"));
+        appConfiguration.setRequestUriBlockList(Collections.singletonList("127.0.0.1"));
         JwtAuthorizationRequest.validateRequestUri(requestUri, new Client(), appConfiguration, "", new ErrorResponseFactory());
     }
 
@@ -71,7 +71,7 @@ public void validateRequestUri_whichIsNotBlackListed_shouldBeOk() {
         String requestUri = "https://myrp.com/request_uri";
 
         final AppConfiguration appConfiguration = new AppConfiguration();
-        appConfiguration.setRequestUriBlackList(Arrays.asList("evil.com", "second.com"));
+        appConfiguration.setRequestUriBlockList(Arrays.asList("evil.com", "second.com"));
         JwtAuthorizationRequest.validateRequestUri(requestUri, new Client(), appConfiguration, "", new ErrorResponseFactory());
     }
 }