ARTEMIS-4315 incorrect validation for page-limit settings

apache · Jun 21, 2023 · 3db540c · 3db540c
1 parent 2de12d2
commit 3db540c
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/...rc/main/java/org/apache/activemq/artemis/core/deployers/impl/FileConfigurationParser.java b/...rc/main/java/org/apache/activemq/artemis/core/deployers/impl/FileConfigurationParser.java
@@ -1301,11 +1301,11 @@ protected Pair<String, AddressSettings> parseAddressSettings(final Node node) {
             addressSettings.setPageCacheMaxSize(XMLUtil.parseInt(child));
          } else if (PAGE_LIMIT_BYTES_NODE_NAME.equalsIgnoreCase(name)) {
             long pageLimitBytes = ByteUtil.convertTextBytes(getTrimmedTextContent(child));
-            Validators.MINUS_ONE_OR_POSITIVE_INT.validate(PAGE_LIMIT_BYTES_NODE_NAME, pageLimitBytes);
+            Validators.MINUS_ONE_OR_GT_ZERO.validate(PAGE_LIMIT_BYTES_NODE_NAME, pageLimitBytes);
             addressSettings.setPageLimitBytes(pageLimitBytes);
          } else if (PAGE_LIMIT_MESSAGES_NODE_NAME.equalsIgnoreCase(name)) {
-            long pageLimitMessages = ByteUtil.convertTextBytes(getTrimmedTextContent(child));
-            Validators.MINUS_ONE_OR_POSITIVE_INT.validate(PAGE_LIMIT_MESSAGES_NODE_NAME, pageLimitMessages);
+            long pageLimitMessages = XMLUtil.parseLong(child);
+            Validators.MINUS_ONE_OR_GT_ZERO.validate(PAGE_LIMIT_MESSAGES_NODE_NAME, pageLimitMessages);
             addressSettings.setPageLimitMessages(pageLimitMessages);
          } else if (MESSAGE_COUNTER_HISTORY_DAY_LIMIT_NODE_NAME.equalsIgnoreCase(name)) {
             addressSettings.setMessageCounterHistoryDayLimit(XMLUtil.parseInt(child));

diff --git a/...c/test/java/org/apache/activemq/artemis/core/config/impl/FileConfigurationParserTest.java b/...c/test/java/org/apache/activemq/artemis/core/config/impl/FileConfigurationParserTest.java
@@ -414,7 +414,7 @@ public void testParseMaxReadAddressSettings() throws Exception {
 
    @Test
    public void testParsePageLimitSettings() throws Exception {
-      String configStr = "<configuration><address-settings>" + "\n" + "<address-setting match=\"foo\">" + "\n" + "<max-read-page-bytes>1k</max-read-page-bytes><page-limit-bytes>2k</page-limit-bytes><page-limit-messages>337</page-limit-messages><page-full-policy>FAIL</page-full-policy><max-read-page-messages>33</max-read-page-messages>.\n" + "</address-setting>" + "\n" + "</address-settings></configuration>" + "\n";
+      String configStr = "<configuration><address-settings>" + "\n" + "<address-setting match=\"foo\">" + "\n" + "<max-read-page-bytes>1k</max-read-page-bytes><page-limit-bytes>10G</page-limit-bytes><page-limit-messages>3221225472</page-limit-messages><page-full-policy>FAIL</page-full-policy><max-read-page-messages>33</max-read-page-messages>.\n" + "</address-setting>" + "\n" + "</address-settings></configuration>" + "\n";
 
       FileConfigurationParser parser = new FileConfigurationParser();
       ByteArrayInputStream input = new ByteArrayInputStream(configStr.getBytes(StandardCharsets.UTF_8));
@@ -423,8 +423,8 @@ public void testParsePageLimitSettings() throws Exception {
       AddressSettings settings = configuration.getAddressSettings().get("foo");
       Assert.assertEquals(1024, settings.getMaxReadPageBytes());
       Assert.assertEquals(33, settings.getMaxReadPageMessages());
-      Assert.assertEquals(2048L, settings.getPageLimitBytes().longValue());
-      Assert.assertEquals(337L, settings.getPageLimitMessages().longValue());
+      Assert.assertEquals(10L * 1024 * 1024 * 1024, settings.getPageLimitBytes().longValue());
+      Assert.assertEquals(3L * 1024 * 1024 * 1024, settings.getPageLimitMessages().longValue());
       Assert.assertEquals("FAIL", settings.getPageFullMessagePolicy().toString());
    }