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

support truthy eval of constants

Browse source 
Fixes #11032
This commit is contained in:
Dan Hermann 2019-08-08 14:08:34 -05:00
parent 4b5dc343ae
commit d64e5a7853
2 changed files with 58 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

18
logstash-core/src/main/java/org/logstash/config/ir/compiler/EventCondition.java
View file

@ -195,6 +195,8 @@ public interface EventCondition {
final Expression inner = truthy.getExpression();
if (inner instanceof EventValueExpression) {
condition = truthy((EventValueExpression) inner);
} else if (inner instanceof ValueExpression) {
condition = constant(valueIsTruthy(((ValueExpression) inner).get()));
} else {
throw new EventCondition.Compiler.UnexpectedTypeException(inner);
}
@ -455,6 +457,15 @@ public interface EventCondition {
return value ? event -> true : event -> false;
}
private static boolean valueIsTruthy(Object object) {
if (object == null) {
return false;
}
final String other = object.toString();
return other != null && !other.isEmpty() &&
!Boolean.toString(false).equals(other);
}
private static final class FieldMatches implements EventCondition {
private final FieldReference field;
@ -611,12 +622,7 @@ public interface EventCondition {
@Override
public boolean fulfilled(final JrubyEventExtLibrary.RubyEvent event) {
final Object object = event.getEvent().getUnconvertedField(field);
if (object == null) {
return false;
}
final String other = object.toString();
return other != null && !other.isEmpty() &&
!Boolean.toString(false).equals(other);
return valueIsTruthy(object);
}
}

52
logstash-core/src/test/java/org/logstash/config/ir/EventConditionTest.java
View file

@ -1,7 +1,5 @@
package org.logstash.config.ir;
import org.hamcrest.CoreMatchers;
import org.hamcrest.MatcherAssert;
import org.jruby.RubyArray;
import org.junit.After;
import org.junit.Before;
@ -22,6 +20,8 @@ import java.util.function.Supplier;
import static org.logstash.config.ir.CompiledPipelineTest.IDENTITY_FILTER;
import static org.logstash.ext.JrubyEventExtLibrary.RubyEvent;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
public final class EventConditionTest extends RubyEnvTestCase {
@ -113,10 +113,50 @@ public final class EventConditionTest extends RubyEnvTestCase {
).buildExecution().compute(inputBatch, false, false);
final RubyEvent[] outputEvents = EVENT_SINKS.get(runId).toArray(new RubyEvent[0]);
MatcherAssert.assertThat(outputEvents.length, CoreMatchers.is(3));
MatcherAssert.assertThat(outputEvents[0], CoreMatchers.is(leftIsString1));
MatcherAssert.assertThat(outputEvents[1], CoreMatchers.is(rightIsList1));
MatcherAssert.assertThat(outputEvents[2], CoreMatchers.is(nonStringValue1));
assertThat(outputEvents.length, is(3));
assertThat(outputEvents[0], is(leftIsString1));
assertThat(outputEvents[1], is(rightIsList1));
assertThat(outputEvents[2], is(nonStringValue1));
}
@Test
public void testConditionWithConstantValue() throws Exception {
testConditionWithConstantValue("\"[abc]\"", 1);
}
@Test
public void testConditionWithConstantFalseLiteralValue() throws Exception {
testConditionWithConstantValue("\"false\"", 0);
}
@Test
public void testConditionWithConstantEmptyStringValue() throws Exception {
testConditionWithConstantValue("\"\"", 0);
}
private void testConditionWithConstantValue(String condition, int expectedMatches) throws Exception {
final PipelineIR pipelineIR = ConfigCompiler.configToPipelineIR(
"input {mockinput{}} filter { " +
"mockfilter {} } " +
"output { " +
" if " + condition + " { " +
" mockoutput{}" +
" } }",
false
);
new CompiledPipeline(
pipelineIR,
new CompiledPipelineTest.MockPluginFactory(
Collections.singletonMap("mockinput", () -> null),
Collections.singletonMap("mockfilter", () -> IDENTITY_FILTER),
Collections.singletonMap("mockoutput", mockOutputSupplier())
))
.buildExecution()
.compute(RubyUtil.RUBY.newArray(RubyEvent.newRubyEvent(RubyUtil.RUBY)), false, false);
final Collection<RubyEvent> outputEvents = EVENT_SINKS.get(runId);
assertThat(outputEvents.size(), is(expectedMatches));
}
private Supplier<Consumer<Collection<RubyEvent>>> mockOutputSupplier() {