You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by ji...@apache.org on 2026/09/03 22:03:18 UTC
(geode) branch support/1.15 updated: Refine MBean query expression handling (#8052)
This is an automated email from the ASF dual-hosted git repository.
JinwooHwang pushed a commit to branch support/1.15
in repository https://gitbox.apache.org/repos/asf/geode.git
The following commit(s) were added to refs/heads/support/1.15 by this push:
new 683dba7ac5 Refine MBean query expression handling (#8052)
683dba7ac5 is described below
commit 683dba7ac58adace3fa3d048d903b06007a0fe40
Author: Jinwoo Hwang <92...@users.noreply.github.com>
AuthorDate: Thu Sep 3 18:03:12 2026 -0400
Refine MBean query expression handling (#8052)
---
.../internal/web/controllers/ShellCommandsController.java | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/geode-web/src/main/java/org/apache/geode/management/internal/web/controllers/ShellCommandsController.java b/geode-web/src/main/java/org/apache/geode/management/internal/web/controllers/ShellCommandsController.java
index 8bb6cd8a2e..a8ba623d01 100644
--- a/geode-web/src/main/java/org/apache/geode/management/internal/web/controllers/ShellCommandsController.java
+++ b/geode-web/src/main/java/org/apache/geode/management/internal/web/controllers/ShellCommandsController.java
@@ -34,6 +34,7 @@ import javax.management.QueryExp;
import javax.management.ReflectionException;
import org.apache.commons.io.FileUtils;
+import org.apache.commons.io.serialization.ValidatingObjectInputStream;
import org.apache.commons.lang3.ArrayUtils;
import org.springframework.core.io.InputStreamResource;
import org.springframework.http.HttpHeaders;
@@ -169,8 +170,12 @@ public class ShellCommandsController extends AbstractCommandsController {
ObjectName name = ObjectName.getInstance(decode(objectName));
QueryExp query = null;
if (queryExpressionBase64 != null) {
- query =
- (QueryExp) IOUtils.deserializeObject(Base64.getDecoder().decode(queryExpressionBase64));
+ try (ValidatingObjectInputStream ois = ValidatingObjectInputStream.builder()
+ .setByteArray(Base64.getDecoder().decode(queryExpressionBase64))
+ .accept("javax.management.*", "java.lang.*", "java.util.*")
+ .get()) {
+ query = (QueryExp) ois.readObject();
+ }
}
final Set<ObjectName> objectNames = getMBeanServer().queryNames(name, query);
return new ResponseEntity<>(IOUtils.serializeObject(objectNames), HttpStatus.OK);