Shield on CoreFX broken

- BasicAuthentication only listened to the authentication set on the
  request, not connectionsettings.
- HttpConnection-CoreFX did not take RunAs into account
- Maximum runtime for integration tests is now 30minutes, we are well
  under that luckily though :)

Conflicts:
	paket.lock

Author: Mpdreamz

build/scripts/Paths.fsx

@@ -288,16 +288,16 @@ module Tooling =
             match (runtime, hasClr, hasCoreClr) with
             | (Core, _, Some c) ->
                 let proc = c.Process exe
-                execProcess proc arguments
+                execProcessWithTimeout proc arguments (TimeSpan.FromMinutes 30.)
             | (Desktop, Some d, _) ->
                 let proc = d.Process exe
-                execProcess proc arguments
+                execProcessWithTimeout proc arguments (TimeSpan.FromMinutes 30.)
             | (Both, Some d, Some c) ->
                 let proc = d.Process exe
                 let result = execProcess proc arguments 
                 if result <> 0 then failwith (sprintf "Failed to run dnx tooling for %s args: %A" proc arguments)
                 let proc = c.Process exe
-                execProcess proc arguments 
+                execProcessWithTimeout proc arguments (TimeSpan.FromMinutes 30.)
             | _ -> failwith "Tried to run dnx tooling in unknown state"
             |> ignore
 

src/Elasticsearch.Net/Connection/HttpConnection-CoreFx.cs

@@ -30,46 +30,46 @@ public class HttpConnection : IConnection
 		private readonly object _lock = new object();
 		private readonly ConcurrentDictionary<int, HttpClient> _clients = new ConcurrentDictionary<int, HttpClient>();
 
-	    private string DefaultContentType => "application/json";
+		private string DefaultContentType => "application/json";
 
 		public HttpConnection() { }
-		
+
 		private HttpClient GetClient(RequestData requestData)
 		{
 			var hashCode = requestData.GetHashCode();
 			HttpClient client;
 			if (this._clients.TryGetValue(hashCode, out client)) return client;
-			lock(_lock)
+			lock (_lock)
 			{
 				if (this._clients.TryGetValue(hashCode, out client)) return client;
 
-			    var handler = new HttpClientHandler
-			    {
-			        AutomaticDecompression = requestData.HttpCompression ? GZip | Deflate : None
-			    };
-
-                if (!requestData.ProxyAddress.IsNullOrEmpty())
-                {
-                    var uri = new Uri(requestData.ProxyAddress);
-                    var proxy = new WebProxy(uri);
-                    var credentials = new NetworkCredential(requestData.ProxyUsername, requestData.ProxyPassword);
-                    proxy.Credentials = credentials;
-                    handler.Proxy = proxy;
-                }
-
-                if (requestData.DisableAutomaticProxyDetection)
-                    handler.Proxy = null;
-
-                client = new HttpClient(handler, false)
-			    {
-			        Timeout = requestData.RequestTimeout
-			    };
-
-			    client.DefaultRequestHeaders.ExpectContinue = false;
-
-                //TODO add headers
-                //client.DefaultRequestHeaders = 
-                this._clients.TryAdd(hashCode, client);
+				var handler = new HttpClientHandler
+				{
+					AutomaticDecompression = requestData.HttpCompression ? GZip | Deflate : None
+				};
+
+				if (!requestData.ProxyAddress.IsNullOrEmpty())
+				{
+					var uri = new Uri(requestData.ProxyAddress);
+					var proxy = new WebProxy(uri);
+					var credentials = new NetworkCredential(requestData.ProxyUsername, requestData.ProxyPassword);
+					proxy.Credentials = credentials;
+					handler.Proxy = proxy;
+				}
+
+				if (requestData.DisableAutomaticProxyDetection)
+					handler.Proxy = null;
+
+				client = new HttpClient(handler, false)
+				{
+					Timeout = requestData.RequestTimeout
+				};
+
+				client.DefaultRequestHeaders.ExpectContinue = false;
+
+				//TODO add headers
+				//client.DefaultRequestHeaders =
+				this._clients.TryAdd(hashCode, client);
 				return client;
 			}
 
@@ -122,13 +122,27 @@ private static HttpRequestMessage CreateHttpRequestMessage(RequestData requestDa
 			var method = ConvertHttpMethod(requestData.Method);
 			var requestMessage = new HttpRequestMessage(method, requestData.Uri);
 
-			foreach(string key in requestData.Headers)
+			foreach (string key in requestData.Headers)
 			{
 				requestMessage.Headers.TryAddWithoutValidation(key, requestData.Headers.GetValues(key));
 			}
 
 			requestMessage.Headers.Accept.Add(new MediaTypeWithQualityHeaderValue(requestData.ContentType));
 
+			if (!requestData.RunAs.IsNullOrEmpty())
+				requestMessage.Headers.Add("es-shield-runas-user", requestData.RunAs);
+
+			string userInfo = null;
+			if (!requestData.Uri.UserInfo.IsNullOrEmpty())
+				userInfo = Uri.UnescapeDataString(requestData.Uri.UserInfo);
+			else if (requestData.BasicAuthorizationCredentials != null)
+				userInfo = requestData.BasicAuthorizationCredentials.ToString();
+			if (!userInfo.IsNullOrEmpty())
+			{
+				var credentials = Convert.ToBase64String(Encoding.UTF8.GetBytes(userInfo));
+				requestMessage.Headers.Authorization = new AuthenticationHeaderValue("Basic", credentials);
+			}
+
 			var data = requestData.PostData;
 
 			if (data != null)
@@ -153,18 +167,10 @@ private static HttpRequestMessage CreateHttpRequestMessage(RequestData requestDa
 			else
 			{
 				// Set content in order to set a Content-Type header.
-                // Content gets diposed so can't be shared instance
+				// Content gets diposed so can't be shared instance
 				requestMessage.Content = new ByteArrayContent(new byte[0]);
 			}
-
 			requestMessage.Content.Headers.ContentType = new MediaTypeHeaderValue(requestData.ContentType);
-
-			if (!string.IsNullOrWhiteSpace(requestData.Uri.UserInfo))
-			{
-				var credentials = Convert.ToBase64String(Encoding.UTF8.GetBytes(requestMessage.RequestUri.UserInfo));
-				requestMessage.Headers.Authorization = new AuthenticationHeaderValue("Basic", credentials);
-			}
-
 			return requestMessage;
 		}
 
@@ -186,7 +192,7 @@ private static System.Net.Http.HttpMethod ConvertHttpMethod(HttpMethod httpMetho
 
 		protected virtual void DisposeManagedResources()
 		{
-			foreach(var c in _clients)
+			foreach (var c in _clients)
 				c.Value.Dispose();
 		}
 	}