Merge pull request #541 from mpmadhavig/validate-count-parameter-value

wso2-extensions · Mar 26, 2024 · ba53d35 · ba53d35
2 parents 6c5b409 + 586af8d
commit ba53d35
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 1 deletion.
diff --git a/...rovider/src/main/java/org/wso2/carbon/identity/scim2/provider/resources/UserResource.java b/...rovider/src/main/java/org/wso2/carbon/identity/scim2/provider/resources/UserResource.java
@@ -197,6 +197,11 @@ public Response getUser(@HeaderParam(SCIMProviderConstants.ACCEPT_HEADER) String
                 throw  new FormatNotSupportedException(error);
             }
 
+            // Validates the count parameter if exists.
+            if (count != null && IdentityUtil.isSCIM2UserMaxItemsPerPageEnabled()) {
+                count = validateCountParameter(count);
+            }
+
             // obtain the user store manager
             UserManager userManager = IdentitySCIMManager.getInstance().getUserManager();
 
@@ -392,4 +397,24 @@ private void removeAskPasswordConfirmationCodeThreadLocal() {
         IdentityUtil.threadLocalProperties.get()
                 .remove(IdentityRecoveryConstants.AP_CONFIRMATION_CODE_THREAD_LOCAL_PROPERTY);
     }
+
+    /**
+     * Validate the count query parameter.
+     *
+     * @param count Requested item count.
+     * @return Validated count parameter.
+     */
+    private int validateCountParameter(Integer count) {
+
+        int maximumItemsPerPage = IdentityUtil.getMaximumItemPerPage();
+        if (count > maximumItemsPerPage) {
+            if (LOG.isDebugEnabled()) {
+                LOG.debug(String.format("Given limit exceeds the maximum limit. Therefore the limit is set to %s.",
+                        maximumItemsPerPage));
+            }
+            return maximumItemsPerPage;
+        }
+
+        return count;
+    }
 }
diff --git a/pom.xml b/pom.xml
@@ -285,7 +285,7 @@
         <inbound.auth.oauth.version>6.5.3</inbound.auth.oauth.version>
         <commons-collections.version>3.2.0.wso2v1</commons-collections.version>
         <carbon.kernel.version>4.10.2</carbon.kernel.version>
-        <identity.framework.version>7.0.105</identity.framework.version>
+        <identity.framework.version>7.0.112</identity.framework.version>
         <junit.version>4.13.1</junit.version>
         <commons.lang.version>20030203.000129</commons.lang.version>
         <identity.governance.version>1.8.12</identity.governance.version>