aljaz/btcpayserver
1
0
Fork 0
mirror of https://github.com/aljazceru/btcpayserver.git synced 2026-01-06 07:34:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2180 from btcpayserver/attempt-onion-modal-fix

Browse Source 
Do not tell tor browser to redirect if invoice is loaded as a modal
This commit is contained in:
Nicolas Dorier
2021-01-05 14:04:14 +09:00
committed by GitHub
parent c0549d872c 0a6ea59254
commit a38a4d6f69
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
BTCPayServer/Hosting/BTCpayMiddleware.cs
View File

@@ -58,7 +58,14 @@ namespace BTCPayServer.Hosting
return;
}
if (!httpContext.Request.IsOnion() && (httpContext.Request.Headers["Accept"].ToString().StartsWith("text/html", StringComparison.InvariantCulture)))
var isHtml = httpContext.Request.Headers.TryGetValue("Accept", out var accept)
&& accept.ToString().StartsWith("text/html", StringComparison.OrdinalIgnoreCase);
var isModal = httpContext.Request.Query.TryGetValue("view", out var view)
&& view.ToString().Equals("modal", StringComparison.OrdinalIgnoreCase);
if (!string.IsNullOrEmpty(_Env.OnionUrl) &&
!httpContext.Request.IsOnion() &&
isHtml &&
!isModal)
{
var onionLocation = _Env.OnionUrl + httpContext.Request.GetEncodedPathAndQuery();
httpContext.Response.SetHeader("Onion-Location", onionLocation);