Allows encoding while consutring HTTP request for sending notification

Author: mihirsoni

notification/src/main/java/com/amazon/opendistroforelasticsearch/alerting/destination/client/DestinationHttpClient.java

@@ -23,6 +23,7 @@
 import org.apache.http.client.methods.CloseableHttpResponse;
 import org.apache.http.client.methods.HttpPost;
 import org.apache.http.client.utils.URIBuilder;
+import org.apache.http.entity.ContentType;
 import org.apache.http.entity.StringEntity;
 import org.apache.http.impl.client.CloseableHttpClient;
 import org.apache.http.impl.client.DefaultHttpRequestRetryHandler;
@@ -34,10 +35,10 @@
 import org.elasticsearch.common.Strings;
 import org.elasticsearch.common.unit.TimeValue;
 import org.elasticsearch.rest.RestStatus;
-
 import java.io.IOException;
 import java.net.URI;
 import java.net.URISyntaxException;
+import java.nio.charset.StandardCharsets;
 import java.util.Map;
 
 
@@ -52,7 +53,8 @@ public class DestinationHttpClient {
     private static final int MAX_CONNECTIONS_PER_ROUTE = 20;
     private static final int TIMEOUT_MILLISECONDS = (int) TimeValue.timeValueSeconds(5).millis();
     private static final int SOCKET_TIMEOUT_MILLISECONDS = (int)TimeValue.timeValueSeconds(50).millis();
-
+    private static final String DEFAULT_CONTENT_TYPE_KEY = "Content-Type";
+    private static final String DEFAULT_CONTENT_TYPE_VALUE = "application/json";
     private static CloseableHttpClient HTTP_CLIENT = createHttpClient();
 
     private static CloseableHttpClient createHttpClient() {
@@ -90,6 +92,7 @@ public String execute(BaseMessage message) throws Exception {
     private CloseableHttpResponse getHttpResponse(BaseMessage message) throws Exception {
         URI uri = null;
         HttpPost httpPostRequest = new HttpPost();
+        String entityContentType = DEFAULT_CONTENT_TYPE_VALUE;
         if (message instanceof CustomWebhookMessage) {
             CustomWebhookMessage customWebhookMessage = (CustomWebhookMessage) message;
             uri = buildUri(customWebhookMessage.getUrl(), customWebhookMessage.getScheme(), customWebhookMessage.getHost(),
@@ -98,20 +101,24 @@ private CloseableHttpResponse getHttpResponse(BaseMessage message) throws Except
             // set headers
             Map<String, String> headerParams = customWebhookMessage.getHeaderParams();
             if(headerParams == null || headerParams.isEmpty()) {
-                // set default header
-                httpPostRequest.setHeader("Content-Type", "application/json");
+                // set default header and content Type
+                httpPostRequest.setHeader(DEFAULT_CONTENT_TYPE_KEY, DEFAULT_CONTENT_TYPE_VALUE);
             } else {
-                for (Map.Entry<String, String> e : customWebhookMessage.getHeaderParams().entrySet())
+                for (Map.Entry<String, String> e : customWebhookMessage.getHeaderParams().entrySet()){
+                    if(e.getKey().equals(DEFAULT_CONTENT_TYPE_KEY)) {
+                        entityContentType = e.getValue();
+                    }
                     httpPostRequest.setHeader(e.getKey(), e.getValue());
+                }
             }
         } else {
             uri = buildUri(message.getUrl().trim(), null, null, -1, null, null);
         }
 
         httpPostRequest.setURI(uri);
-        StringEntity entity = new StringEntity(extractBody(message));
+        StringEntity entity = new StringEntity(extractBody(message),
+                ContentType.create(entityContentType, StandardCharsets.UTF_8));
         httpPostRequest.setEntity(entity);
-
         return HTTP_CLIENT.execute(httpPostRequest);
     }
 

notification/src/test/java/com/amazon/opendistroforelasticsearch/alerting/destination/CustomWebhookMessageTest.java

@@ -24,12 +24,15 @@
 import com.amazon.opendistroforelasticsearch.alerting.destination.response.DestinationHttpResponse;
 import org.apache.http.client.methods.CloseableHttpResponse;
 import org.apache.http.client.methods.HttpPost;
+import org.apache.http.entity.ContentType;
+import org.apache.http.entity.StringEntity;
 import org.apache.http.impl.client.CloseableHttpClient;
 import org.apache.http.message.BasicStatusLine;
 import org.easymock.EasyMock;
 import org.elasticsearch.rest.RestStatus;
 import org.junit.Test;
 
+import java.nio.charset.StandardCharsets;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -79,6 +82,49 @@ public void testCustomWebhookMessage() throws Exception {
         assertEquals(expectedCustomWebhookResponse.getStatusCode(), actualCustomResponse.getStatusCode());
     }
 
+    @Test
+    public void testCustomWebhookMessageWithHeaders() throws Exception {
+
+        CloseableHttpClient mockHttpClient = EasyMock.createMock(CloseableHttpClient.class);
+
+        DestinationHttpResponse expectedCustomWebhookResponse = new DestinationHttpResponse.Builder()
+                .withResponseContent("<response><status>200</status></response>")
+                .withStatusCode(RestStatus.OK.getStatus()).build();
+        CloseableHttpResponse httpResponse = EasyMock.createMock(CloseableHttpResponse.class);
+        EasyMock.expect(mockHttpClient.execute(EasyMock.anyObject(HttpPost.class))).andReturn(httpResponse);
+
+        BasicStatusLine mockStatusLine = EasyMock.createMock(BasicStatusLine.class);
+
+        EasyMock.expect(httpResponse.getStatusLine()).andReturn(mockStatusLine);
+        EasyMock.expect(httpResponse.getEntity()).andReturn(
+                new StringEntity("<response><status>200</status></response>",
+                        ContentType.create("application/xml", StandardCharsets.UTF_8))).anyTimes();
+        EasyMock.expect(mockStatusLine.getStatusCode()).andReturn(RestStatus.OK.getStatus());
+        EasyMock.replay(mockHttpClient);
+        EasyMock.replay(httpResponse);
+        EasyMock.replay(mockStatusLine);
+
+        DestinationHttpClient httpClient = new DestinationHttpClient();
+        httpClient.setHttpClient(mockHttpClient);
+        CustomWebhookDestinationFactory customDestinationFactory = new CustomWebhookDestinationFactory();
+        customDestinationFactory.setClient(httpClient);
+
+        DestinationFactoryProvider.setFactory(DestinationType.CUSTOMWEBHOOK, customDestinationFactory);
+
+        Map<String, String> headerParams = new HashMap<String, String>();
+        headerParams .put("Content-Type", "application/xml");
+
+        String message = "<message>Hello</message>";
+        BaseMessage bm = new CustomWebhookMessage.Builder("abc").withHost("hooks.chime.aws").
+                withPath("incomingwebhooks/383c0e2b-d028-44f4-8d38-696754bc4574").
+                withMessage(message).
+                withHeaderParams(headerParams ).build();
+        DestinationHttpResponse actualCustomResponse = (DestinationHttpResponse) Notification.publish(bm);
+
+        assertEquals(expectedCustomWebhookResponse.getResponseContent(), actualCustomResponse.getResponseContent());
+        assertEquals(expectedCustomWebhookResponse.getStatusCode(), actualCustomResponse.getStatusCode());
+    }
+
     @Test(expected = IllegalArgumentException.class)
     public void testUrlMissingMessage() {
         try {