fix #947 add support for compressed responses and basic auth on the alternative http connection

Author: Mpdreamz

src/Connections/Elasticsearch.Net.Connection.HttpClient/HttpClientConnection.cs

@@ -3,6 +3,7 @@
 using System.Net;
 using System.Net.Http;
 using System.Net.Http.Headers;
+using System.Text;
 using System.Threading.Tasks;
 using Elasticsearch.Net.Connection.Configuration;
 
@@ -37,10 +38,14 @@ public HttpClientConnection(IConnectionConfigurationValues settings, HttpClientH
 
 			var innerHandler = handler ?? new WebRequestHandler();
 
+			if (settings.EnableCompressedResponses)
+				innerHandler.AutomaticDecompression = DecompressionMethods.GZip | DecompressionMethods.Deflate;
+
 			if (innerHandler.SupportsProxy && !string.IsNullOrWhiteSpace(_settings.ProxyAddress))
 			{
 				innerHandler.Proxy = new WebProxy(_settings.ProxyAddress)
 				{
+
 					Credentials = new NetworkCredential(_settings.ProxyUsername, _settings.ProxyPassword),
 				};
 
@@ -51,6 +56,7 @@ public HttpClientConnection(IConnectionConfigurationValues settings, HttpClientH
 			{
 				Timeout = TimeSpan.FromMilliseconds(_settings.Timeout)
 			};
+
 		}
 
 		/// <summary>
@@ -115,24 +121,22 @@ public async Task<ElasticsearchResponse<Stream>> DoRequest(HttpMethod method, Ur
 			try
 			{
 				var request = new HttpRequestMessage(method, uri);
+				if (requestSpecificConfig != null && !string.IsNullOrWhiteSpace(requestSpecificConfig.ContentType))
+					request.Headers.Accept.Add(new MediaTypeWithQualityHeaderValue(requestSpecificConfig.ContentType));
+				else if (!string.IsNullOrWhiteSpace(DefaultContentType))
+					request.Headers.Accept.Add(new MediaTypeWithQualityHeaderValue(DefaultContentType));
+
+				if (!string.IsNullOrWhiteSpace(DefaultContentType))
+					request.Content.Headers.ContentType = new MediaTypeHeaderValue(DefaultContentType);
+
+				if (!string.IsNullOrEmpty(uri.UserInfo))
+				{
+					request.Headers.Authorization = new AuthenticationHeaderValue("Basic", Convert.ToBase64String(Encoding.UTF8.GetBytes(uri.UserInfo)));
+				}
 
 				if (method != HttpMethod.Get && method != HttpMethod.Head && data != null && data.Length > 0)
 				{
 					request.Content = new ByteArrayContent(data);
-
-					if (requestSpecificConfig != null && !string.IsNullOrWhiteSpace(requestSpecificConfig.ContentType))
-					{
-						request.Headers.Accept.Add(new MediaTypeWithQualityHeaderValue(requestSpecificConfig.ContentType));
-					}
-					else if (!string.IsNullOrWhiteSpace(DefaultContentType))
-					{
-						request.Headers.Accept.Add(new MediaTypeWithQualityHeaderValue(DefaultContentType));
-					}
-
-					if (!string.IsNullOrWhiteSpace(DefaultContentType))
-					{
-						request.Content.Headers.ContentType = new MediaTypeHeaderValue(DefaultContentType);
-					}
 				}
 
 				var response = await Client.SendAsync(request, HttpCompletionOption.ResponseHeadersRead);

src/Elasticsearch.Net/Connection/HttpConnection.cs

@@ -141,7 +141,7 @@ private static void ThreadTimeoutCallback(object state, bool timedOut)
 		protected virtual HttpWebRequest CreateHttpWebRequest(Uri uri, string method, byte[] data, IRequestConfiguration requestSpecificConfig)
 		{
 			var myReq = this.CreateWebRequest(uri, method, data, requestSpecificConfig);
-			this.SetBasicAuthorizationIfNeeded(myReq);
+			this.SetBasicAuthorizationIfNeeded(uri, myReq);
 			this.SetProxyIfNeeded(myReq);
 			return myReq;
 		}
@@ -164,15 +164,12 @@ private void SetProxyIfNeeded(HttpWebRequest myReq)
             }
 		}
 
-		private void SetBasicAuthorizationIfNeeded(HttpWebRequest myReq)
+		private void SetBasicAuthorizationIfNeeded(Uri uri, HttpWebRequest myReq)
 		{
-			//TODO figure out a way to cache this;
-
-			//if (this._ConnectionSettings.UriSpecifiedBasicAuth)
-			//{
-			myReq.Headers["Authorization"] =
-				"Basic " + Convert.ToBase64String(Encoding.UTF8.GetBytes(myReq.RequestUri.UserInfo));
-			//}
+			if (!uri.UserInfo.IsNullOrEmpty())
+			{
+				myReq.Headers["Authorization"] = "Basic " + Convert.ToBase64String(Encoding.UTF8.GetBytes(myReq.RequestUri.UserInfo));
+			}
 		}
 
 		protected virtual HttpWebRequest CreateWebRequest(Uri uri, string method, byte[] data, IRequestConfiguration requestSpecificConfig)

src/Tests/Elasticsearch.Net.Tests.Unit/Elasticsearch.Net.Tests.Unit.csproj

@@ -64,6 +64,7 @@
     <Compile Include="Connection\NoRetryOnServerExceptionTests.cs" />
     <Compile Include="Connection\ElasticsearchServerExceptions.cs" />
     <Compile Include="Connection\NoRetryTests.cs" />
+    <Compile Include="Connection\SingleNodeConnectionPoolTests.cs" />
     <Compile Include="Stubs\FakeCalls.cs" />
     <Compile Include="Stubs\FakeResponse.cs" />
     <Compile Include="Connection\SkipDeadNodesTests.cs" />