github-mirrors/logstash
1
0
Fork 0
mirror of https://github.com/elastic/logstash.git synced 2025-04-19 12:25:10 -04:00
Code Issues Projects Releases Packages Wiki Activity

update jackson and jackson-databind to 2.13.3 (#13945)

Browse source 
In jackson-databind 2.10, enabling Default Typing requires having a type validator, and while there's an "allow all" validator called LaissezFaireSubTypeValidator, this commit also tightens the validation a bit by narrowing down the allowed classes.

The default typing validator is only applied to the ObjectMapper for CBOR, which is used in the DLQ, leaving the one for JSON as-is.

Other changes:
* make ingest-converter use versions.yml for jackson-databind
* update jrjackson
This commit is contained in:
João Duarte 2022-06-06 09:47:44 +01:00 • committed by GitHub
parent 886f1caed1
commit 4d6942c240
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 18 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
logstash-core/src/main/java/org/logstash/ObjectMappers.java
View file

@ -29,12 +29,14 @@ import com.fasterxml.jackson.databind.JavaType;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.SerializerProvider;
import com.fasterxml.jackson.databind.deser.std.StdDeserializer;
import com.fasterxml.jackson.databind.jsontype.PolymorphicTypeValidator;
import com.fasterxml.jackson.databind.jsontype.TypeSerializer;
import com.fasterxml.jackson.databind.module.SimpleModule;
import com.fasterxml.jackson.databind.ser.std.StdScalarSerializer;
import com.fasterxml.jackson.databind.ser.std.StdSerializer;
import com.fasterxml.jackson.dataformat.cbor.CBORFactory;
import com.fasterxml.jackson.dataformat.cbor.CBORGenerator;
import com.fasterxml.jackson.databind.jsontype.BasicPolymorphicTypeValidator;
import java.io.IOException;
import java.math.BigDecimal;
import java.math.BigInteger;
@ -70,10 +72,20 @@ public final class ObjectMappers {
public static final ObjectMapper JSON_MAPPER =
new ObjectMapper().registerModule(RUBY_SERIALIZERS);
public static final PolymorphicTypeValidator TYPE_VALIDATOR = BasicPolymorphicTypeValidator.builder()
.allowIfBaseType(java.util.HashMap.class)
.allowIfSubType(org.jruby.RubyNil.class)
.allowIfSubType(org.jruby.RubyString.class)
.allowIfSubType(org.logstash.ConvertedMap.class)
.allowIfSubType(org.logstash.ConvertedList.class)
.allowIfSubType(org.logstash.Timestamp.class)
.build();
public static final ObjectMapper CBOR_MAPPER = new ObjectMapper(
new CBORFactory().configure(CBORGenerator.Feature.WRITE_MINIMAL_INTS, false)
).registerModules(RUBY_SERIALIZERS, CBOR_DESERIALIZERS)
.enableDefaultTyping(ObjectMapper.DefaultTyping.NON_FINAL);
.activateDefaultTyping(TYPE_VALIDATOR, ObjectMapper.DefaultTyping.NON_FINAL);
/**
* {@link JavaType} for the {@link HashMap} that {@link Event} is serialized as.

3
tools/ingest-converter/build.gradle
View file

@ -24,6 +24,7 @@ def versionMap = (Map) (new Yaml()).load(new File("$projectDir/../../versions.ym
description = """Ingest JSON to Logstash Grok Config Converter"""
version = versionMap['logstash-core']
String jacksonDatabindVersion = versionMap['jackson-databind']
repositories {
mavenCentral()
@ -42,7 +43,7 @@ buildscript {
dependencies {
implementation 'net.sf.jopt-simple:jopt-simple:4.6'
implementation 'com.fasterxml.jackson.core:jackson-databind:2.13.2'
implementation "com.fasterxml.jackson.core:jackson-databind:${jacksonDatabindVersion}"
testImplementation "junit:junit:4.12"
testImplementation 'commons-io:commons-io:2.5'
}

6
versions.yml
View file

@ -24,6 +24,6 @@ jruby:
# Note: this file is copied to the root of logstash-core because its gemspec needs it when
# bundler evaluates the gemspec via bin/logstash
# Ensure Jackson version here is kept in sync with version used by jrjackson gem
jrjackson: 0.4.14
jackson: 2.9.10
jackson-databind: 2.9.10.8
jrjackson: 0.4.15
jackson: 2.13.3
jackson-databind: 2.13.3