Skip to content

fix(sql): clamp pageNo/pageSize to prevent paging offset int overflow #2433

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openai0229 merged 4 commits into from
Aug 3, 2026
Merged

fix(sql): clamp pageNo/pageSize to prevent paging offset int overflow #2433

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5188f4e
fix(sql): clamp pageNo/pageSize to prevent paging offset int overflow…
Aias00 Aug 3, 2026
1809aca
Merge remote-tracking branch 'origin/main' into review-2433
openai0229 Aug 3, 2026
ffee9cf
refactor(sql): centralize safe page bounds
openai0229 Aug 3, 2026
541a915
Merge remote-tracking branch 'origin/main' into review-2433
openai0229 Aug 3, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 29 additions & 6 deletions ...mmunity-server/chat2db-community-spi/src/main/java/ai/chat2db/spi/DefaultSQLExecutor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -833,9 +833,10 @@ private List<ExecuteResponse> executeSQL(SimpleSqlStatement simpleSqlStatement,
String originalSql = simpleSqlStatement.getSql();
long startedAtEpochMs = System.currentTimeMillis();
long startedAtNanos = System.nanoTime();
int pageNo = Optional.ofNullable(param.getPageNo()).orElse(1);
int pageSize = Optional.ofNullable(param.getPageSize()).orElse(IEasyToolsConstant.MAX_PAGE_SIZE);
Integer offset = (pageNo - 1) * pageSize;
PageBounds pageBounds = normalizePageBounds(param.getPageNo(), param.getPageSize());
int pageNo = pageBounds.pageNo();
int pageSize = pageBounds.pageSize();
Integer offset = pageBounds.offset();
Integer count = pageSize;
SqlTypeEnum sqlType = getSqlType(dbType, originalSql);
List<ExecuteResponse> executeResults = new ArrayList<>();
Expand Down Expand Up @@ -910,9 +911,10 @@ private List<ExecuteResponse> executeSQLStreaming(SimpleSqlStatement simpleSqlSt
String originalSql = simpleSqlStatement.getSql();
long startedAtEpochMs = System.currentTimeMillis();
long startedAtNanos = System.nanoTime();
int pageNo = Optional.ofNullable(param.getPageNo()).orElse(1);
int pageSize = Optional.ofNullable(param.getPageSize()).orElse(IEasyToolsConstant.MAX_PAGE_SIZE);
Integer offset = (pageNo - 1) * pageSize;
PageBounds pageBounds = normalizePageBounds(param.getPageNo(), param.getPageSize());
int pageNo = pageBounds.pageNo();
int pageSize = pageBounds.pageSize();
Integer offset = pageBounds.offset();
Integer count = pageSize;
SqlTypeEnum sqlType = getSqlType(dbType, originalSql);
List<ExecuteResponse> executeResults = new ArrayList<>();
Expand Down Expand Up @@ -979,6 +981,27 @@ private List<ExecuteResponse> executeSQLStreaming(SimpleSqlStatement simpleSqlSt
return executeResults;
}

static PageBounds normalizePageBounds(Integer requestedPageNo, Integer requestedPageSize) {
int pageNo = Optional.ofNullable(requestedPageNo).orElse(1);
int pageSize = Optional.ofNullable(requestedPageSize).orElse(IEasyToolsConstant.MAX_PAGE_SIZE);
if (pageNo < 1) {
pageNo = 1;
}
if (pageSize < 1 || pageSize > IEasyToolsConstant.MAX_PAGE_SIZE) {
pageSize = IEasyToolsConstant.MAX_PAGE_SIZE;
}

long maxPageNo = (long) Integer.MAX_VALUE / pageSize + 1L;
if ((long) pageNo > maxPageNo) {
pageNo = (int) maxPageNo;
}
int offset = (int) ((long) (pageNo - 1) * pageSize);
return new PageBounds(pageNo, pageSize, offset);
}

record PageBounds(int pageNo, int pageSize, int offset) {
}

protected List<ExecuteResponse> executeMulti(SimpleSqlStatement simpleSqlStatement, Connection connection,
boolean limitRowSize, Integer offset, Integer count,
Integer resultSetId) throws SQLException {
Expand Down
36 changes: 36 additions & 0 deletions .../chat2db-community-spi/src/test/java/ai/chat2db/spi/DefaultSQLExecutorPageBoundsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
package ai.chat2db.spi;

import ai.chat2db.community.tools.constant.IEasyToolsConstant;
import org.junit.jupiter.api.Test;

import static org.junit.jupiter.api.Assertions.assertEquals;

class DefaultSQLExecutorPageBoundsTest {

@Test
void defaultsAndInvalidValuesUseFirstPageAndMaximumPageSize() {
assertBounds(null, null, 1, IEasyToolsConstant.MAX_PAGE_SIZE, 0);
assertBounds(0, 0, 1, IEasyToolsConstant.MAX_PAGE_SIZE, 0);
assertBounds(-1, IEasyToolsConstant.MAX_PAGE_SIZE + 1,
1, IEasyToolsConstant.MAX_PAGE_SIZE, 0);
}

@Test
void clampsPageNumberWithoutOverflowingOffset() {
int pageSize = 1000;
int maxPageNo = Integer.MAX_VALUE / pageSize + 1;
int maxOffset = (maxPageNo - 1) * pageSize;

assertBounds(Integer.MAX_VALUE, pageSize, maxPageNo, pageSize, maxOffset);
assertBounds(Integer.MAX_VALUE, 1, Integer.MAX_VALUE, 1, Integer.MAX_VALUE - 1);
}

private static void assertBounds(Integer requestedPageNo, Integer requestedPageSize,
int pageNo, int pageSize, int offset) {
DefaultSQLExecutor.PageBounds bounds =
DefaultSQLExecutor.normalizePageBounds(requestedPageNo, requestedPageSize);
assertEquals(pageNo, bounds.pageNo());
assertEquals(pageSize, bounds.pageSize());
assertEquals(offset, bounds.offset());
}
}
Loading