honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #15910 from talevy/ingest-fix-grok-nocaptures 

[Ingest] fix NPE when Grok matches expression, but no captures defined.
This commit is contained in:
Tal Levy 2016-01-12 12:02:55 -08:00
parent f8019926b3 b39a64e49f
commit 4bf12a7dca
3 changed files with 23 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
modules/ingest-grok/src/main/java/org/elasticsearch/ingest/grok/Grok.java
View File

@ -134,7 +134,7 @@ final class Grok {
Map<String, Object> fields = new HashMap<>(); Map<String, Object> fields = new HashMap<>();
Matcher matcher = compiledExpression.matcher(textAsBytes); Matcher matcher = compiledExpression.matcher(textAsBytes);
int result = matcher.search(0, textAsBytes.length, Option.DEFAULT); int result = matcher.search(0, textAsBytes.length, Option.DEFAULT);
if (result != -1) { if (result != -1 && compiledExpression.numberOfNames() > 0) {
Region region = matcher.getEagerRegion(); Region region = matcher.getEagerRegion();
for (Iterator<NameEntry> entry = compiledExpression.namedBackrefIterator(); entry.hasNext();) { for (Iterator<NameEntry> entry = compiledExpression.namedBackrefIterator(); entry.hasNext();) {
NameEntry e = entry.next(); NameEntry e = entry.next();
@ -148,11 +148,11 @@ final class Grok {
GrokMatchGroup match = new GrokMatchGroup(groupName, matchValue); GrokMatchGroup match = new GrokMatchGroup(groupName, matchValue);
fields.put(match.getName(), match.getValue()); fields.put(match.getName(), match.getValue());
} }
} else { return fields;
return null; } else if (result != -1) {
return fields;
} }
return null;
return fields;
} }
} }

11
modules/ingest-grok/src/test/java/org/elasticsearch/ingest/grok/GrokProcessorTests.java
View File

@ -57,6 +57,17 @@ public class GrokProcessorTests extends ESTestCase {
} }
} }
public void testMatchWithoutCaptures() throws Exception {
String fieldName = "value";
IngestDocument originalDoc = new IngestDocument(new HashMap<>(), new HashMap<>());
originalDoc.setFieldValue(fieldName, fieldName);
IngestDocument doc = new IngestDocument(originalDoc);
Grok grok = new Grok(Collections.emptyMap(), fieldName);
GrokProcessor processor = new GrokProcessor(grok, fieldName);
processor.execute(doc);
assertThat(doc, equalTo(originalDoc));
}
public void testNotStringField() { public void testNotStringField() {
String fieldName = RandomDocumentPicks.randomFieldName(random()); String fieldName = RandomDocumentPicks.randomFieldName(random());
IngestDocument doc = RandomDocumentPicks.randomIngestDocument(random(), new HashMap<>()); IngestDocument doc = RandomDocumentPicks.randomIngestDocument(random(), new HashMap<>());

7
modules/ingest-grok/src/test/java/org/elasticsearch/ingest/grok/GrokTests.java
View File

@ -57,6 +57,13 @@ public class GrokTests extends ESTestCase {
); );
} }
public void testMatchWithoutCaptures() {
String line = "value";
Grok grok = new Grok(basePatterns, "value");
Map<String, Object> matches = grok.captures(line);
assertEquals(0, matches.size());
}
public void testSimpleSyslogLine() { public void testSimpleSyslogLine() {
String line = "Mar 16 00:01:25 evita postfix/smtpd[1713]: connect from camomile.cloud9.net[168.100.1.3]"; String line = "Mar 16 00:01:25 evita postfix/smtpd[1713]: connect from camomile.cloud9.net[168.100.1.3]";
Grok grok = new Grok(basePatterns, "%{SYSLOGLINE}"); Grok grok = new Grok(basePatterns, "%{SYSLOGLINE}");