From c2754b324d51a8bee3c1231a4e66b8d28f3a3eda Mon Sep 17 00:00:00 2001
From: "nicolas.dorier" <nicolas.dorier@gmail.com>
Date: Mon, 18 Mar 2019 16:45:46 +0900
Subject: [PATCH] Show other tor services

---
 BTCPayServer/Controllers/ServerController.cs  | 10 ++++-
 .../ServerViewModels/ServicesViewModel.cs     |  3 +-
 BTCPayServer/Views/Server/Services.cshtml     | 37 +++++++++++++++++--
 3 files changed, 45 insertions(+), 5 deletions(-)

diff --git a/BTCPayServer/Controllers/ServerController.cs b/BTCPayServer/Controllers/ServerController.cs
index e8a581edd..bbeee6250 100644
--- a/BTCPayServer/Controllers/ServerController.cs
+++ b/BTCPayServer/Controllers/ServerController.cs
@@ -470,12 +470,20 @@ namespace BTCPayServer.Controllers
             {
                 if (torService.VirtualPort == 80)
                 {
-                    result.TorServices.Add(new ServicesViewModel.OtherExternalService()
+                    result.TorHttpServices.Add(new ServicesViewModel.OtherExternalService()
                     {
                         Name = torService.Name,
                         Link = $"http://{torService.OnionHost}"
                     });
                 }
+                else
+                {
+                    result.OtherExternalServices.Add(new ServicesViewModel.OtherExternalService()
+                    {
+                        Name = torService.Name,
+                        Link = $"{torService.OnionHost}:{torService.VirtualPort}"
+                    });
+                }
             }
             return View(result);
         }
diff --git a/BTCPayServer/Models/ServerViewModels/ServicesViewModel.cs b/BTCPayServer/Models/ServerViewModels/ServicesViewModel.cs
index 4da4f5fd3..d29a6ac5a 100644
--- a/BTCPayServer/Models/ServerViewModels/ServicesViewModel.cs
+++ b/BTCPayServer/Models/ServerViewModels/ServicesViewModel.cs
@@ -18,6 +18,7 @@ namespace BTCPayServer.Models.ServerViewModels
 
         public List<ExternalService> ExternalServices { get; set; } = new List<ExternalService>();
         public List<OtherExternalService> OtherExternalServices { get; set; } = new List<OtherExternalService>();
-        public List<OtherExternalService> TorServices { get; set; } = new List<OtherExternalService>();
+        public List<OtherExternalService> TorHttpServices { get; set; } = new List<OtherExternalService>();
+        public List<OtherExternalService> TorOtherServices { get; set; } = new List<OtherExternalService>();
     }
 }
diff --git a/BTCPayServer/Views/Server/Services.cshtml b/BTCPayServer/Views/Server/Services.cshtml
index e5dc9a740..4135906cc 100644
--- a/BTCPayServer/Views/Server/Services.cshtml
+++ b/BTCPayServer/Views/Server/Services.cshtml
@@ -79,11 +79,11 @@
     </div>
 }
 
-@if (Model.TorServices.Count != 0)
+@if (Model.TorHttpServices.Count != 0)
 {
     <div class="row">
         <div class="col-md-8">
-            <h4>TOR hidden services</h4>
+            <h4>HTTP TOR hidden services</h4>
             <div class="form-group">
                 <span>TOR services hosted on this server, only http servers are listed here.</span>
             </div>
@@ -96,7 +96,7 @@
                         </tr>
                     </thead>
                     <tbody>
-                        @foreach (var s in Model.TorServices)
+                        @foreach (var s in Model.TorHttpServices)
                         {
                             <tr>
                                 <td>@s.Name</td>
@@ -112,6 +112,37 @@
     </div>
 }
 
+@if (Model.TorOtherServices.Count != 0)
+{
+    <div class="row">
+        <div class="col-md-8">
+            <h4>Other TOR hidden services</h4>
+            <div class="form-group">
+                <span>TOR services hosted on this server which are not http based.</span>
+            </div>
+            <div class="form-group">
+                <table class="table table-sm table-responsive-md">
+                    <thead>
+                        <tr>
+                            <th>Name</th>
+                            <th style="text-align:right">Actions</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                        @foreach (var s in Model.TorOtherServices)
+                        {
+                            <tr>
+                                <td>@s.Name</td>
+                                <td style="text-align:right">@s.Link</td>
+                            </tr>
+                        }
+                    </tbody>
+                </table>
+            </div>
+        </div>
+    </div>
+}
+
 @section Scripts {
     @await Html.PartialAsync("_ValidationScriptsPartial")
 }