Fix setting up DNS name

BTCPayServer/BTCPayServer.csproj

@@ -2,7 +2,7 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <TargetFramework>netcoreapp2.1</TargetFramework>
-		<Version>1.0.2.90</Version>
+		<Version>1.0.2.92</Version>
     <NoWarn>NU1701,CA1816,CA1308,CA1810,CA2208</NoWarn>
   </PropertyGroup>
   <ItemGroup>

BTCPayServer/Controllers/ServerController.cs

@@ -180,6 +180,8 @@ namespace BTCPayServer.Controllers
                     return View(vm);
                 }
                 vm.DNSDomain = vm.DNSDomain.Trim().ToLowerInvariant();
+                if (vm.DNSDomain.Equals(this.Request.Host.Host, StringComparison.OrdinalIgnoreCase))
+                    return View(vm);
                 if (IPAddress.TryParse(vm.DNSDomain, out var unused))
                 {
                     ModelState.AddModelError(nameof(vm.DNSDomain), $"This should be a domain name");
@@ -198,14 +200,13 @@ namespace BTCPayServer.Controllers
                 {
                     try
                     {
-                        builder.Scheme = this.Request.Scheme;
-                        builder.Host = vm.DNSDomain;
-                        if (this.Request.Host.Port != null)
-                            builder.Port = this.Request.Host.Port.Value;
-                        builder.Path = "runid";
-                        builder.Query = $"expected={RunId}";
-                        var response = await client.GetAsync(builder.Uri);
-                        if (!response.IsSuccessStatusCode)
+                        var addresses1 = Dns.GetHostAddressesAsync(this.Request.Host.Host);
+                        var addresses2 = Dns.GetHostAddressesAsync(vm.DNSDomain);
+                        await Task.WhenAll(addresses1, addresses2);
+
+                        var addressesSet = addresses1.GetAwaiter().GetResult().Select(c => c.ToString()).ToHashSet();
+                        var hasCommonAddress = addresses2.GetAwaiter().GetResult().Select(c => c.ToString()).Any(s => addressesSet.Contains(s));
+                        if (!hasCommonAddress)
                         {
                             ModelState.AddModelError(nameof(vm.DNSDomain), $"Invalid host ({vm.DNSDomain} is not pointing to this BTCPay instance)");
                             return View(vm);

BTCPayServer/Views/Server/Services.cshtml

@@ -13,49 +13,46 @@
 </div>
 
 <div class="row">
-    @if(Model.LNDServices.Count != 0)
-    {
-        <div class="col-md-8">
-            <div class="form-group">
-                <h5>LND nodes</h5>
-                <span>You can get access to internal LND services here. For gRPC, only BTC is supported.</span>
-            </div>
 
-            <div class="form-group">
-                <table class="table table-sm table-responsive-md">
-                    <thead>
-                        <tr>
-                            <th>Crypto</th>
-                            <th>Access Type</th>
-                            <th style="text-align:right">Actions</th>
-                        </tr>
-                    </thead>
-                    <tbody>
-                        @foreach(var lnd in Model.LNDServices)
-                        {
-                            <tr>
-                                <td>@lnd.Crypto</td>
-                                <td>@lnd.Type</td>
-                                <td style="text-align:right">
-                                    <a asp-action="LNDGRPCServices" asp-route-cryptoCode="@lnd.Crypto" asp-route-index="@lnd.Index">See information</a>
-                                </td>
-                            </tr>
-                        }
-                        @if(Model.HasSSH)
-                        {
-                            <tr>
-                                <td>None</td>
-                                <td>SSH</td>
-                                <td style="text-align:right">
-                                    <a asp-action="SSHService">See information</a>
-                                </td>
-                            </tr>
-                        }
-                    </tbody>
-                </table>
-            </div>
+    <div class="col-md-8">
+        <div class="form-group">
+            <span>You can get access here to LND-gRPC or SSH services exposed by your server</span>
         </div>
-    }
+
+        <div class="form-group">
+            <table class="table table-sm table-responsive-md">
+                <thead>
+                    <tr>
+                        <th>Crypto</th>
+                        <th>Access Type</th>
+                        <th style="text-align:right">Actions</th>
+                    </tr>
+                </thead>
+                <tbody>
+                    @foreach(var lnd in Model.LNDServices)
+                    {
+                        <tr>
+                            <td>@lnd.Crypto</td>
+                            <td>@lnd.Type</td>
+                            <td style="text-align:right">
+                                <a asp-action="LNDGRPCServices" asp-route-cryptoCode="@lnd.Crypto" asp-route-index="@lnd.Index">See information</a>
+                            </td>
+                        </tr>
+                    }
+                    @if(Model.HasSSH)
+                    {
+                        <tr>
+                            <td>None</td>
+                            <td>SSH</td>
+                            <td style="text-align:right">
+                                <a asp-action="SSHService">See information</a>
+                            </td>
+                        </tr>
+                    }
+                </tbody>
+            </table>
+        </div>
+    </div>
 </div>
 
 @section Scripts {