diff --git a/common/config.py b/common/config.py index 3f221a6bc..b0c1af2dd 100644 --- a/common/config.py +++ b/common/config.py @@ -146,7 +146,7 @@ def __init__(self): self.grouper_messages_timeout_sec = int(os.getenv("GROUPER_MESSAGES_TIMEOUT_SECS", "10")) # Manager - self.maximum_page_size = int(os.getenv("MAXIMUM_PAGE_SIZE", "100")) + self.maximum_page_size = int(os.getenv("MAXIMUM_PAGE_SIZE", "0")) # Reporters self.allowed_reporters = os.getenv("ALLOWED_REPORTERS", "puptoo,rhsm-system-profile-bridge").split(",") diff --git a/conf/manager.env b/conf/manager.env index 2d8b0b38c..9541e51cb 100644 --- a/conf/manager.env +++ b/conf/manager.env @@ -1,7 +1,7 @@ DISABLE_RBAC=FALSE GRANULAR_RBAC=FALSE MAX_REQUEST_SIZE_MB=2 -MAXIMUM_PAGE_SIZE=1000 +MAXIMUM_PAGE_SIZE=0 API_MAX_RPS=100 KESSEL_URL=host.containers.internal:9091 KESSEL_AUTH_ENABLED=TRUE diff --git a/deploy/clowdapp.yaml b/deploy/clowdapp.yaml index b7856a18b..c2d10248d 100644 --- a/deploy/clowdapp.yaml +++ b/deploy/clowdapp.yaml @@ -1036,6 +1036,7 @@ parameters: - name: UNLEASH_BOOTSTRAP_FILE value: '' - name: MAXIMUM_PAGE_SIZE + description: Maximum number of items in a response, if set to 0 it's not limited value: "100" - name: GUNICORN_WORKERS_MANAGER value: "4" diff --git a/manager/base.py b/manager/base.py index aed2696f4..3ae65c24a 100644 --- a/manager/base.py +++ b/manager/base.py @@ -313,7 +313,7 @@ def _parse_list_arguments(cls, kwargs): data_format = cls._get_data_format(kwargs) - if limit > CFG.maximum_page_size and not UI_REFERER.search(context.request.headers.get("referer", "")): + if CFG.maximum_page_size > 0 and limit > CFG.maximum_page_size and not UI_REFERER.search(context.request.headers.get("referer", "")): raise InvalidArgumentException(f"Page limit of size: {limit} is too high, maximum is {CFG.maximum_page_size}") return {