Merge remote-tracking branch 'upstream/master'

2026-02-21 06:04:26 +01:00 · 2019-04-04 20:57:16 +02:00
parent 449066449b eb5e32a07f
commit cf27fe5a53
9 changed files with 89 additions and 21 deletions
--- a/BTCPayServer/Controllers/ServerController.cs
+++ b/BTCPayServer/Controllers/ServerController.cs
@@ -680,7 +680,7 @@ namespace BTCPayServer.Controllers
                return File(System.IO.File.ReadAllBytes(settings.KeyFile), "application/octet-stream", "id_rsa");
            }

-            var server = IsLocalNetwork(settings.Server) ? this.Request.Host.Host: settings.Server;
+            var server = Extensions.IsLocalNetwork(settings.Server) ? this.Request.Host.Host: settings.Server;
            SSHServiceViewModel vm = new SSHServiceViewModel();
            string port = settings.Port == 22 ? "" : $" -p {settings.Port}";
            vm.CommandLine = $"ssh {settings.Username}@{server}{port}";
@@ -690,14 +690,6 @@ namespace BTCPayServer.Controllers
            return View(vm);
        }

-        private static bool IsLocalNetwork(string server)
-        {
-            return server.EndsWith(".internal", StringComparison.OrdinalIgnoreCase) ||
-                   server.EndsWith(".local", StringComparison.OrdinalIgnoreCase) ||
-                   server.Equals("127.0.0.1", StringComparison.OrdinalIgnoreCase) ||
-                   server.Equals("localhost", StringComparison.OrdinalIgnoreCase);
-        }
-
        [Route("server/theme")]
        public async Task<IActionResult> Theme()
        {
--- a/BTCPayServer/Extensions.cs
+++ b/BTCPayServer/Extensions.cs
@@ -166,6 +166,24 @@ namespace BTCPayServer
                            (derivationStrategyBase is DirectDerivationStrategy direct) && direct.Segwit;
        }

+        public static bool IsLocalNetwork(string server)
+        {
+            if (server == null)
+                throw new ArgumentNullException(nameof(server));
+            if (Uri.CheckHostName(server) == UriHostNameType.Dns)
+            {
+                return server.EndsWith(".internal", StringComparison.OrdinalIgnoreCase) ||
+                   server.EndsWith(".local", StringComparison.OrdinalIgnoreCase) ||
+                   server.EndsWith(".lan", StringComparison.OrdinalIgnoreCase) ||
+                   server.IndexOf('.', StringComparison.OrdinalIgnoreCase) == -1;
+            }
+            if(IPAddress.TryParse(server, out var ip))
+            {
+                return ip.IsLocal();
+            }
+            return false;
+        }
+
        public static bool IsOnion(this HttpRequest request)
        {
            if (request?.Host.Host == null)
--- a/BTCPayServer/Services/BTCPayServerEnvironment.cs
+++ b/BTCPayServer/Services/BTCPayServerEnvironment.cs
@@ -56,6 +56,18 @@ namespace BTCPayServer.Services
                return NetworkType == NetworkType.Regtest && Environment.IsDevelopment();
            }
        }
+
+        public bool IsSecure
+        {
+            get
+            {
+                return NetworkType != NetworkType.Mainnet ||
+                       httpContext.HttpContext.Request.Scheme == "https" ||
+                       httpContext.HttpContext.Request.Host.Host.EndsWith(".onion", StringComparison.OrdinalIgnoreCase) ||
+                       Extensions.IsLocalNetwork(httpContext.HttpContext.Request.Host.Host);
+            }
+        }
+
        public override string ToString()
        {
            StringBuilder txt = new StringBuilder();
--- a/BTCPayServer/Services/Rates/ExchangeSharpRateProvider.cs
+++ b/BTCPayServer/Services/Rates/ExchangeSharpRateProvider.cs
@@ -39,7 +39,9 @@ namespace BTCPayServer.Services.Rates
            lock (notFoundSymbols)
            {
                var exchangeRates =
-                    rates.Select(t => CreateExchangeRate(t))
+                    rates
+                    .Where(t => t.Value.Ask != 0m && t.Value.Bid != 0m)
+                    .Select(t => CreateExchangeRate(t))
                    .Where(t => t != null)
                    .ToArray();
                return new ExchangeRates(exchangeRates);
--- a/BTCPayServer/Services/Rates/KrakenExchangeRateProvider.cs
+++ b/BTCPayServer/Services/Rates/KrakenExchangeRateProvider.cs
@@ -39,7 +39,37 @@ namespace BTCPayServer.Services.Rates
        static HttpClient _Client = new HttpClient();

        // ExchangeSymbolToGlobalSymbol throws exception which would kill perf
-        ConcurrentDictionary<string, string> notFoundSymbols = new ConcurrentDictionary<string, string>();
+        ConcurrentDictionary<string, string> notFoundSymbols = new ConcurrentDictionary<string, string>(new Dictionary<string, string>()
+        {
+            {"ADAXBT","ADAXBT"},
+            { "BSVUSD","BSVUSD"},
+            { "QTUMEUR","QTUMEUR"},
+            { "QTUMXBT","QTUMXBT"},
+            { "EOSUSD","EOSUSD"},
+            { "XTZUSD","XTZUSD"},
+            { "XREPZUSD","XREPZUSD"},
+            { "ADAEUR","ADAEUR"},
+            { "ADAUSD","ADAUSD"},
+            { "GNOEUR","GNOEUR"},
+            { "XTZETH","XTZETH"},
+            { "XXRPZJPY","XXRPZJPY"},
+            { "XXRPZCAD","XXRPZCAD"},
+            { "XTZEUR","XTZEUR"},
+            { "QTUMETH","QTUMETH"},
+            { "XXLMZUSD","XXLMZUSD"},
+            { "QTUMCAD","QTUMCAD"},
+            { "QTUMUSD","QTUMUSD"},
+            { "XTZXBT","XTZXBT"},
+            { "GNOUSD","GNOUSD"},
+            { "ADAETH","ADAETH"},
+            { "ADACAD","ADACAD"},
+            { "XTZCAD","XTZCAD"},
+            { "BSVEUR","BSVEUR"},
+            { "XZECZJPY","XZECZJPY"},
+            { "XXLMZEUR","XXLMZEUR"},
+            {"EOSEUR","EOSEUR"},
+            {"BSVXBT","BSVXBT"}
+        });
        string[] _Symbols = Array.Empty<string>();
        DateTimeOffset? _LastSymbolUpdate = null;

--- a/BTCPayServer/Views/AppsPublic/ViewPointOfSale.cshtml
+++ b/BTCPayServer/Views/AppsPublic/ViewPointOfSale.cshtml
@@ -1,4 +1,4 @@
-@addTagHelper *, BundlerMinifier.TagHelpers
+@addTagHelper *, BundlerMinifier.TagHelpers
@inject BTCPayServer.HostedServices.CssThemeManager themeManager

@model BTCPayServer.Models.AppViewModels.ViewPointOfSaleViewModel
@@ -251,7 +251,7 @@
                            var image = item.Image;
                            var description = item.Description;

-                            <div class="js-add-cart card my-2" data-id="@index">
+                            <div class="js-add-cart card my-2 card-wrapper" data-id="@index">
                                @if (!String.IsNullOrWhiteSpace(image))
                                {
                                    @:<img class="card-img-top" src="@image" alt="Card image cap">
--- a/BTCPayServer/Views/Shared/SyncModal.cshtml
+++ b/BTCPayServer/Views/Shared/SyncModal.cshtml
@@ -10,8 +10,7 @@
        </div>
        <div class="modal-body">
            <p>
-                Some of your nodes are still synchronizing...<br />
-                BTCPay Server will not create invoices with those cryptocurrencies.
+                Your node is synching the entire blockchain and validating the consensus rules...
            </p>
            @foreach (var line in dashboard.GetAll())
            {
@@ -49,8 +48,8 @@
                        {
                            <li>The node is synchronized (Height: @line.Status.BitcoinStatus.Headers)</li>
                            @if (line.Status.BitcoinStatus.IsSynched &&
-                                line.Status.SyncHeight.HasValue &&
-                                line.Status.SyncHeight.Value < line.Status.BitcoinStatus.Headers)
+                              line.Status.SyncHeight.HasValue &&
+                              line.Status.SyncHeight.Value < line.Status.BitcoinStatus.Headers)
                            {
                                <li>NBXplorer is synchronizing... (Height: @line.Status.SyncHeight.Value)</li>
                            }
@@ -72,7 +71,13 @@
                    }
                }
            }
+            <p>
+                <a href="https://www.youtube.com/watch?v=OrYDehC-8TU" target="_blank">Watch this video</a> to understand the importance of blockchain synchronization.
+            </p>
+
+            <p>If you really don't want to synch and that you are familiar with command line, check <a href="https://github.com/btcpayserver/btcpayserver-docker/blob/master/contrib/FastSync/README.md" target="_blank">FastSync</a>.</p>
        </div>
+
    </div>

 </div>
--- a/BTCPayServer/Views/Shared/_Layout.cshtml
+++ b/BTCPayServer/Views/Shared/_Layout.cshtml
@@ -85,13 +85,14 @@
                        <li class="nav-item">
                            <a asp-area="" asp-controller="Account" asp- asp-action="Logout" title="Manage" class="nav-link js-scroll-trigger">Log out</a>
                        </li>}
-                    else
+                    else if (env.IsSecure)
                    {
                        if (themeManager.ShowRegister)
                        {
                            <li class="nav-item"><a asp-area="" asp-controller="Account" asp-action="Register" class="nav-link js-scroll-trigger">Register</a></li>
                        }
-                        <li class="nav-item"><a asp-area="" asp-controller="Account" asp-action="Login" class="nav-link js-scroll-trigger">Log in</a></li>}
+                        <li class="nav-item"><a asp-area="" asp-controller="Account" asp-action="Login" class="nav-link js-scroll-trigger">Log in</a></li>
+                    }

                </ul>
            </div>
@@ -99,6 +100,14 @@
                <button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">&times;</span></button>
                <span>BTCPay is expecting you to access this website from <b>@(env.ExpectedProtocol)://@(env.ExpectedHost)/</b>. If you use a reverse proxy, please set the <b>X-Forwarded-Proto</b> header to <b id="browserScheme">@(env.ExpectedProtocol)</b> (<a href="https://docs.btcpayserver.org/faq-and-common-issues/faq-deployment#btcpay-is-expecting-you-to-access-this-website-from" target="_blank">More information</a>)</span>
            </div>
+            @if (!env.IsSecure)
+            {
+                <div class="alert alert-danger alert-dismissible" style="position:absolute; top:75px;" role="alert">
+                    <button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">&times;</span></button>
+                    <span>You access BTCPay Server over an unsecured network. If you are using docker deployment with NGINX and HTTPS is not available, you probably did not configured your DNS settings right. <br /> 
+                          We disabled the register and login link so you don't leak your credentials.</span>
+                </div>
+            }
        </div>
    </nav>

--- a/BTCPayServer/wwwroot/cart/js/cart.jquery.js
+++ b/BTCPayServer/wwwroot/cart/js/cart.jquery.js
@@ -94,7 +94,7 @@ $(document).ready(function(){
        $('#js-pos-list').find(".card-wrapper").show();

        if (str.length > 1) {
-            var $list = $('#js-pos-list').find(".card-title:not(:icontains('" + str + "'))");
+            var $list = $('#js-pos-list').find(".card-title:not(:icontains('" + $.escapeSelector(str) + "'))");
            $list.parents('.card-wrapper').hide();
            $('.js-search-reset').show();
        }
@@ -133,4 +133,4 @@ $(document).ready(function(){
            $tip.trigger('input');
        });
    });
-});
+});