From f6bcb1676e8e65cfbba8bff08f279f4758673a7c Mon Sep 17 00:00:00 2001 From: Emir Date: Thu, 13 Aug 2026 23:18:50 +0300 Subject: [PATCH] Fix page number validation in log commands (#4296) --- .../common/commands/log/LogGroupHistory.java | 12 ++++++++---- .../luckperms/common/commands/log/LogRecent.java | 7 ++++++- .../luckperms/common/commands/log/LogSearch.java | 8 +++++++- .../common/commands/log/LogTrackHistory.java | 12 ++++++++---- .../common/commands/log/LogUserHistory.java | 12 ++++++++---- 5 files changed, 37 insertions(+), 14 deletions(-) diff --git a/common/src/main/java/me/lucko/luckperms/common/commands/log/LogGroupHistory.java b/common/src/main/java/me/lucko/luckperms/common/commands/log/LogGroupHistory.java index 9d8d56e14..a44ef10e6 100644 --- a/common/src/main/java/me/lucko/luckperms/common/commands/log/LogGroupHistory.java +++ b/common/src/main/java/me/lucko/luckperms/common/commands/log/LogGroupHistory.java @@ -59,10 +59,14 @@ public class LogGroupHistory extends ChildCommand { return; } - PageParameters pageParams = new PageParameters(ENTRIES_PER_PAGE, args.getIntOrDefault(1, 1)); - LogPage log = plugin.getStorage().getLogPage(ActionFilters.group(group), pageParams).join(); + int page = args.getIntOrDefault(1, 1); + if (page < 1) { + Message.LOG_INVALID_PAGE_RANGE.send(sender, 1); + return; + } - int page = pageParams.pageNumber(); + PageParameters pageParams = new PageParameters(ENTRIES_PER_PAGE, page); + LogPage log = plugin.getStorage().getLogPage(ActionFilters.group(group), pageParams).join(); int maxPage = pageParams.getMaxPage(log.getTotalEntries()); if (log.getTotalEntries() == 0) { @@ -70,7 +74,7 @@ public class LogGroupHistory extends ChildCommand { return; } - if (page < 1 || page > maxPage) { + if (page > maxPage) { Message.LOG_INVALID_PAGE_RANGE.send(sender, maxPage); return; } diff --git a/common/src/main/java/me/lucko/luckperms/common/commands/log/LogRecent.java b/common/src/main/java/me/lucko/luckperms/common/commands/log/LogRecent.java index 248c7acc1..39a795349 100644 --- a/common/src/main/java/me/lucko/luckperms/common/commands/log/LogRecent.java +++ b/common/src/main/java/me/lucko/luckperms/common/commands/log/LogRecent.java @@ -70,6 +70,11 @@ public class LogRecent extends ChildCommand { } } + if (page < 1) { + Message.LOG_INVALID_PAGE_RANGE.send(sender, 1); + return; + } + PageParameters pageParams = new PageParameters(ENTRIES_PER_PAGE, page); LogPage log = plugin.getStorage().getLogPage(uuid == null ? ActionFilters.all() : ActionFilters.source(uuid), pageParams).join(); @@ -79,7 +84,7 @@ public class LogRecent extends ChildCommand { return; } - if (page < 1 || page > maxPage) { + if (page > maxPage) { Message.LOG_INVALID_PAGE_RANGE.send(sender, maxPage); return; } diff --git a/common/src/main/java/me/lucko/luckperms/common/commands/log/LogSearch.java b/common/src/main/java/me/lucko/luckperms/common/commands/log/LogSearch.java index 5af98e275..0266bad48 100644 --- a/common/src/main/java/me/lucko/luckperms/common/commands/log/LogSearch.java +++ b/common/src/main/java/me/lucko/luckperms/common/commands/log/LogSearch.java @@ -60,6 +60,12 @@ public class LogSearch extends ChildCommand { } final String query = String.join(" ", args); + + if (page < 1) { + Message.LOG_INVALID_PAGE_RANGE.send(sender, 1); + return; + } + PageParameters pageParams = new PageParameters(ENTRIES_PER_PAGE, page); LogPage log = plugin.getStorage().getLogPage(ActionFilters.search(query), pageParams).join(); @@ -69,7 +75,7 @@ public class LogSearch extends ChildCommand { return; } - if (page < 1 || page > maxPage) { + if (page > maxPage) { Message.LOG_INVALID_PAGE_RANGE.send(sender, maxPage); return; } diff --git a/common/src/main/java/me/lucko/luckperms/common/commands/log/LogTrackHistory.java b/common/src/main/java/me/lucko/luckperms/common/commands/log/LogTrackHistory.java index f88b2a94f..954289408 100644 --- a/common/src/main/java/me/lucko/luckperms/common/commands/log/LogTrackHistory.java +++ b/common/src/main/java/me/lucko/luckperms/common/commands/log/LogTrackHistory.java @@ -58,10 +58,14 @@ public class LogTrackHistory extends ChildCommand { Message.TRACK_INVALID_ENTRY.send(sender, track); return; } - PageParameters pageParams = new PageParameters(ENTRIES_PER_PAGE, args.getIntOrDefault(1, 1)); - LogPage log = plugin.getStorage().getLogPage(ActionFilters.track(track), pageParams).join(); + int page = args.getIntOrDefault(1, 1); + if (page < 1) { + Message.LOG_INVALID_PAGE_RANGE.send(sender, 1); + return; + } - int page = pageParams.pageNumber(); + PageParameters pageParams = new PageParameters(ENTRIES_PER_PAGE, page); + LogPage log = plugin.getStorage().getLogPage(ActionFilters.track(track), pageParams).join(); int maxPage = pageParams.getMaxPage(log.getTotalEntries()); if (log.getTotalEntries() == 0) { @@ -69,7 +73,7 @@ public class LogTrackHistory extends ChildCommand { return; } - if (page < 1 || page > maxPage) { + if (page > maxPage) { Message.LOG_INVALID_PAGE_RANGE.send(sender, maxPage); return; } diff --git a/common/src/main/java/me/lucko/luckperms/common/commands/log/LogUserHistory.java b/common/src/main/java/me/lucko/luckperms/common/commands/log/LogUserHistory.java index f12fbe560..3f5c9d960 100644 --- a/common/src/main/java/me/lucko/luckperms/common/commands/log/LogUserHistory.java +++ b/common/src/main/java/me/lucko/luckperms/common/commands/log/LogUserHistory.java @@ -55,10 +55,14 @@ public class LogUserHistory extends ChildCommand { return; } - PageParameters pageParams = new PageParameters(ENTRIES_PER_PAGE, args.getIntOrDefault(1, 1)); - LogPage log = plugin.getStorage().getLogPage(ActionFilters.user(uuid), pageParams).join(); + int page = args.getIntOrDefault(1, 1); + if (page < 1) { + Message.LOG_INVALID_PAGE_RANGE.send(sender, 1); + return; + } - int page = pageParams.pageNumber(); + PageParameters pageParams = new PageParameters(ENTRIES_PER_PAGE, page); + LogPage log = plugin.getStorage().getLogPage(ActionFilters.user(uuid), pageParams).join(); int maxPage = pageParams.getMaxPage(log.getTotalEntries()); if (log.getTotalEntries() == 0) { @@ -66,7 +70,7 @@ public class LogUserHistory extends ChildCommand { return; } - if (page < 1 || page > maxPage) { + if (page > maxPage) { Message.LOG_INVALID_PAGE_RANGE.send(sender, maxPage); return; }