fix #1808 fqdn from http.publish_host should not be parsed correctly and prefered over IP

Author: Mpdreamz

src/Elasticsearch.Net/Transport/Sniff/SniffResponse.cs

@@ -1,24 +1,43 @@
 using System;
 using System.Collections.Generic;
+using System.Text.RegularExpressions;
 
 namespace Elasticsearch.Net
 {
 	internal class SniffResponse
 	{
+		private static Regex AddressRe { get; } = new Regex(@"^(?<fqdn>[^/]+)?/?(?<ip>[^:]+):(?<port>\d+)$");
+
 		public string cluster_name { get; set; }
 		public Dictionary<string, SniffNode> nodes { get; set; }
 
 		public IEnumerable<Node> ToNodes(bool forceHttp = false)
 		{
-			var suffix = forceHttp ? "s" : string.Empty;
-			foreach (var kv in nodes)
-				yield return new Node(new Uri($"http{suffix}://" + kv.Value.http_address))
+			foreach (var kv in nodes)
+			{
+				yield return new Node(this.ParseToUri(kv.Value.http_address, forceHttp))
 				{
 					Name = kv.Value.name,
 					Id = kv.Key,
 					MasterEligible = kv.Value.MasterEligible,
 					HoldsData = kv.Value.HoldsData,
-				};
+				};
+			}
+		}
+
+		private Uri ParseToUri(string httpAdress, bool forceHttp)
+		{
+			var suffix = forceHttp ? "s" : string.Empty;
+			var match = AddressRe.Match(httpAdress);
+			if (!match.Success) throw new Exception($"Can not parse http_address: {httpAdress} to Uri");
+
+			var fqdn = match.Groups["fqdn"].Value?.Trim();
+			var ip = match.Groups["ip"].Value?.Trim();
+			var port = match.Groups["port"].Value?.Trim();
+			var host = !fqdn.IsNullOrEmpty() ? fqdn : ip;
+
+			return new Uri($"http{suffix}://{host}:{port}");
+
 		}
 
 	}

src/Tests/ClientConcepts/ConnectionPooling/Sniffing/RoleDetection.doc.cs

@@ -76,6 +76,36 @@ public async Task DetectsDataNodes()
 				}
 			};
 			await audit.TraceStartup();
+		}
+		[U, SuppressMessage("AsyncUsage", "AsyncFixer001:Unnecessary async/await usage", Justification = "Its a test")]
+		public async Task DetectsFqdn()
+		{
+			var audit = new Auditor(() => Framework.Cluster
+				.Nodes(10)
+				.Sniff(s => s.SucceedAlways()
+					.Succeeds(Always, Framework.Cluster.Nodes(8).StoresNoData(9200, 9201, 9202).SniffShouldReturnFqdn())
+				)
+				.SniffingConnectionPool()
+				.AllDefaults()
+			)
+			{
+				AssertPoolBeforeCall = (pool) =>
+				{
+					pool.Should().NotBeNull();
+					pool.Nodes.Should().HaveCount(10);
+					pool.Nodes.Where(n => n.HoldsData).Should().HaveCount(10);
+					pool.Nodes.Should().OnlyContain(n => n.Uri.Host == "localhost");
+				},
+
+				AssertPoolAfterCall = (pool) =>
+				{
+					pool.Should().NotBeNull();
+					pool.Nodes.Should().HaveCount(8);
+					pool.Nodes.Where(n => n.HoldsData).Should().HaveCount(5);
+					pool.Nodes.Should().OnlyContain(n => n.Uri.Host.StartsWith("fqdn") && !n.Uri.Host.Contains("/"));
+				}
+			};
+			await audit.TraceStartup();
 		}
 	}
 

src/Tests/Framework/MockResponses/SniffingResponse.cs

@@ -10,33 +10,34 @@ public static class SniffResponse
 	{
 		private static string ClusterName => "elasticsearch-test-cluster";
 
-		public static byte[] Create(IEnumerable<Node> nodes)
+		public static byte[] Create(IEnumerable<Node> nodes, bool randomFqdn = false)
 		{
 			var response = new
 			{
 				cluster_name = ClusterName,
-				nodes = SniffResponseNodes(nodes)
+				nodes = SniffResponseNodes(nodes, randomFqdn)
 			};
 			using (var ms = new MemoryStream())
 			{
 				new ElasticsearchDefaultSerializer().Serialize(response, ms);
 				return ms.ToArray();
 			}
 		}
-		private static IDictionary<string, object> SniffResponseNodes(IEnumerable<Node> nodes) =>
+		private static IDictionary<string, object> SniffResponseNodes(IEnumerable<Node> nodes, bool randomFqdn) =>
 			(from node in nodes
 			let id = string.IsNullOrEmpty(node.Id) ? Guid.NewGuid().ToString("N").Substring(0, 8) : node.Id
 			let name = string.IsNullOrEmpty(node.Name) ? Guid.NewGuid().ToString("N").Substring(0, 8) : node.Name
 			select new { id, name, node })
-			.ToDictionary(kv => kv.id, kv => CreateNodeResponse(kv.node, kv.name));
+			.ToDictionary(kv => kv.id, kv => CreateNodeResponse(kv.node, kv.name, randomFqdn));
 
-		private static object CreateNodeResponse(Node node, string name)
+		private static object CreateNodeResponse(Node node, string name, bool randomFqdn)
 		{
+			var fqdn = randomFqdn ? $"fqdn{node.Uri.Port}/" : "";
 			var nodeResponse = new
 			{
 				name = name,
 				transport_address = $"127.0.0.1:{node.Uri.Port + 1000}]",
-				http_address = $"127.0.0.1:{node.Uri.Port}",
+				http_address = $"{fqdn}127.0.0.1:{node.Uri.Port}",
 				host = Guid.NewGuid().ToString("N").Substring(0, 8),
 				ip = "127.0.0.1",
 				version = TestClient.Configuration.ElasticsearchVersion,

src/Tests/Framework/VirtualClustering/VirtualCluster.cs

@@ -14,13 +14,23 @@ public class VirtualCluster
 		public List<IClientCallRule> ClientCallRules { get; } = new List<IClientCallRule>();
 		public TestableDateTimeProvider DateTimeProvider { get; } = new TestableDateTimeProvider();
 
+		private bool _sniffReturnsFqdn = false;
+		public bool SniffShouldReturnFqnd => _sniffReturnsFqdn;
+			
+
 		public IReadOnlyList<Node> Nodes => _nodes;
 
 		public VirtualCluster(IEnumerable<Node> nodes)
 		{
 			this._nodes = nodes.ToList();
 		}
 
+		public VirtualCluster SniffShouldReturnFqdn()
+		{
+			_sniffReturnsFqdn = true;
+			return this;
+		}
+
 		public VirtualCluster MasterEligible(params int[] ports)
 		{
 			foreach (var node in this._nodes.Where(n => !ports.Contains(n.Uri.Port)))

src/Tests/Framework/VirtualClustering/VirtualClusterConnection.cs

@@ -53,7 +53,7 @@ public override ElasticsearchResponse<TReturn> Request<TReturn>(RequestData requ
 						this._cluster.SniffingRules,
 						requestData.RequestTimeout,
 						(r) => this.UpdateCluster(r.NewClusterState),
-						() => SniffResponse.Create(this._cluster.Nodes)
+						() => SniffResponse.Create(this._cluster.Nodes, this._cluster.SniffShouldReturnFqnd)
 					);
 				}
 				if (IsPingRequest(requestData))

src/Tests/tests.yaml

@@ -1,5 +1,5 @@
 # mode either u (unit test), i (integration test) or m (mixed mode)
-mode: m
+mode: u
 # the elasticsearch version that should be started
 elasticsearch_version: 2.0.1
 # whether we want to forcefully reseed on the node, if you are starting the tests with a node already running