fix: route all config of stream read constraints through ObjectMappers

elastic · Dec 4, 2024 · 37bf0a4 · 37bf0a4
1 parent 4f09282
commit 37bf0a4
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 4 deletions.
diff --git a/logstash-core/lib/logstash/util/jackson.rb b/logstash-core/lib/logstash/util/jackson.rb
@@ -20,9 +20,9 @@ module Util
     module Jackson
 
       def self.verify_jackson_overrides
-        java_import org.logstash.jackson.StreamReadConstraintsUtil
+        java_import org.logstash.ObjectMappers
 
-        StreamReadConstraintsUtil.fromSystemProperties().validateIsGlobalDefault()
+        ObjectMappers.getConfiguredStreamReadConstraints().validateIsGlobalDefault()
       end
 
     end

diff --git a/logstash-core/src/main/java/org/logstash/ObjectMappers.java b/logstash-core/src/main/java/org/logstash/ObjectMappers.java
@@ -58,11 +58,21 @@
 
 public final class ObjectMappers {
 
+    static final String RUBY_SERIALIZERS_MODULE_ID = "RubySerializers";
+
+    static final StreamReadConstraintsUtil CONFIGURED_STREAM_READ_CONSTRAINTS;
+
     static {
-        StreamReadConstraintsUtil.fromSystemProperties().applyAsGlobalDefault();
+        // The StreamReadConstraintsUtil needs to load the configured constraints from system
+        // properties and apply them _statically_, before any object mappers are initialized.
+        CONFIGURED_STREAM_READ_CONSTRAINTS = StreamReadConstraintsUtil.fromSystemProperties();
+        CONFIGURED_STREAM_READ_CONSTRAINTS.applyAsGlobalDefault();
+    }
+
+    static StreamReadConstraintsUtil getConfiguredStreamReadConstraints() {
+        return CONFIGURED_STREAM_READ_CONSTRAINTS;
     }
 
-    static final String RUBY_SERIALIZERS_MODULE_ID = "RubySerializers";
 
     private static final SimpleModule RUBY_SERIALIZERS =
         new SimpleModule(RUBY_SERIALIZERS_MODULE_ID)