Cap oversized page size values

Author: $gitUsername

internal/handlers/general/pagination.go

@@ -78,10 +78,14 @@ func pageSizeFromQuery(ctx *fiber.Ctx) (int, error) {
 		return 0, errInvalidPageSize
 	}
 
-	if size < 1 || size > MaxLimitCount {
+	if size < 1 {
 		return 0, errPageSizeOutOfRange
 	}
 
+	if size > MaxLimitCount {
+		return MaxLimitCount, nil
+	}
+
 	return size, nil
 }
 

internal/handlers/general/pagination_test.go

@@ -28,3 +28,14 @@ func TestNewPaginatorWithConfig_DoesNotMutateDefaultConfig(t *testing.T) {
 	assert.Equal(t, paginator.ASC, DefaultConfig.Order,
 		"DefaultConfig.Order must not be mutated by NewPaginatorWithConfig")
 }
+
+func TestPageSizeFromQueryCapsValuesAboveMax(t *testing.T) {
+	app, ctx := newTestCtx()
+	defer app.ReleaseCtx(ctx)
+
+	ctx.Request().URI().SetQueryString("page[size]=200")
+
+	size, err := pageSizeFromQuery(ctx)
+	assert.NoError(t, err)
+	assert.Equal(t, MaxLimitCount, size)
+}

logs_test.go

@@ -86,13 +86,13 @@ func TestLogsEndpoints(t *testing.T) {
 			},
 		},
 		{
-			description:         "GET with page[size] bigger than the max of 100",
+			description:         "GET with page[size] bigger than the max of 100 caps the size",
 			query:               "GET /v1/logs?page[size]=200",
-			expectedCode:        422,
-			expectedContentType: "application/problem+json",
+			expectedCode:        200,
+			expectedContentType: "application/json",
 			validateFunc: func(t *testing.T, response map[string]interface{}) {
-				assert.Equal(t, `can't get Logs`, response["title"])
-				assert.Equal(t, "page[size] must be between 1 and 100", response["detail"])
+				items := assertListResponse(t, response)
+				assert.LessOrEqual(t, len(items), 100)
 			},
 		},
 		{

publishers_test.go

@@ -109,14 +109,14 @@ func TestPublishersEndpoints(t *testing.T) {
 			},
 		},
 		{
-			description: "GET with page[size] bigger than the max of 100",
+			description: "GET with page[size] bigger than the max of 100 caps the size",
 			query:       "GET /v1/publishers?page[size]=200",
 
-			expectedCode:        422,
-			expectedContentType: "application/problem+json",
+			expectedCode:        200,
+			expectedContentType: "application/json",
 			validateFunc: func(t *testing.T, response map[string]interface{}) {
-				assert.Equal(t, `can't get Publishers`, response["title"])
-				assert.Equal(t, "page[size] must be between 1 and 100", response["detail"])
+				items := assertListResponse(t, response)
+				assert.LessOrEqual(t, len(items), 100)
 			},
 		},
 		{

software_test.go

@@ -195,14 +195,14 @@ func TestSoftwareEndpoints(t *testing.T) {
 			},
 		},
 		{
-			description: "GET with page[size] bigger than the max of 100",
+			description: "GET with page[size] bigger than the max of 100 caps the size",
 			query:       "GET /v1/software?page[size]=200",
 
-			expectedCode:        422,
-			expectedContentType: "application/problem+json",
+			expectedCode:        200,
+			expectedContentType: "application/json",
 			validateFunc: func(t *testing.T, response map[string]interface{}) {
-				assert.Equal(t, `can't get Software`, response["title"])
-				assert.Equal(t, "page[size] must be between 1 and 100", response["detail"])
+				items := assertListResponse(t, response)
+				assert.LessOrEqual(t, len(items), 100)
 			},
 		},
 		{