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

When parsing a http request port is a required field. 

The parser for http request had a bug and was accepting requests that did not specify a port.
This changes this.

Fixes elastic/elasticsearch#299

Original commit: elastic/x-pack-elasticsearch@e0eafe3787
This commit is contained in:
Brian Murphy 2015-04-30 12:23:03 -04:00
parent 67d2a39f2c
commit ba3037f5fe
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/org/elasticsearch/watcher/support/http/HttpRequestTemplate.java
View File

@ -255,7 +255,7 @@ public class HttpRequestTemplate implements ToXContent {
if (builder.host == null) {
throw new ParseException("could not parse http request template. missing required [host] string field");
}
if (builder.port < 0) {
if (builder.port <= 0) {
throw new ParseException("could not parse http request template. missing required [port] numeric field");
}

13
src/test/java/org/elasticsearch/watcher/actions/webhook/WebhookActionTests.java
View File

@ -18,7 +18,6 @@ import org.elasticsearch.common.xcontent.XContentParser;
import org.elasticsearch.common.xcontent.json.JsonXContent;
import org.elasticsearch.test.ElasticsearchTestCase;
import org.elasticsearch.threadpool.ThreadPool;
import org.elasticsearch.watcher.actions.ActionException;
import org.elasticsearch.watcher.actions.email.service.*;
import org.elasticsearch.watcher.execution.TriggeredExecutionContext;
import org.elasticsearch.watcher.execution.WatchExecutionContext;
@ -206,16 +205,24 @@ public class WebhookActionTests extends ElasticsearchTestCase {
assertThat(parsedAction.action(), is(action));
}
@Test(expected = ActionException.class)
@Test(expected = WebhookActionException.class)
@Repeat(iterations = 5)
public void testParser_Failure() throws Exception {
XContentBuilder builder = jsonBuilder().startObject();
if (randomBoolean()) {
builder.field(HttpRequestTemplate.Parser.HOST_FIELD.getPreferredName(), TEST_HOST);
} else {
builder.field(HttpRequestTemplate.Parser.PORT_FIELD.getPreferredName(), TEST_PORT);
}
builder.endObject();
XContentBuilder builder = jsonBuilder().startObject().endObject();
XContentParser parser = JsonXContent.jsonXContent.createParser(builder.bytes());
parser.nextToken();
WebhookActionFactory actionParser = getParser(ExecuteScenario.Success.client());
//This should fail since we are not supplying a url
actionParser.parseExecutable("_watch", randomAsciiOfLength(5), parser);
fail("expected a WebhookActionException since we only provided either a host or a port but not both");
}
@Test @Repeat(iterations = 30)