aljaz/btcpayserver
1
0
Fork 0
mirror of https://github.com/aljazceru/btcpayserver.git synced 2025-12-17 14:04:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

Rewrite the CanUseHotWallet, check if the derivationscheme is actually a hotwallet, before retrieving the seed

Browse Source
This commit is contained in:
nicolas.dorier
2021-03-11 21:46:32 +09:00
parent cdfdad3e3d
commit c2b85779c3
2 changed files with 17 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
BTCPayServer/Controllers/GreenField/StoreOnChainWalletsController.cs
View File

@@ -388,7 +388,7 @@ namespace BTCPayServer.Controllers.GreenField
var signingKeyStr = await explorerClient var signingKeyStr = await explorerClient
.GetMetadataAsync<string>(derivationScheme.AccountDerivation, .GetMetadataAsync<string>(derivationScheme.AccountDerivation,
WellknownMetadataKeys.MasterHDKey); WellknownMetadataKeys.MasterHDKey);
if (signingKeyStr is null) if (!derivationScheme.IsHotWallet || signingKeyStr is null)
{ {
return this.CreateAPIError("not-available", return this.CreateAPIError("not-available",
$"{cryptoCode} sending services are not currently available"); $"{cryptoCode} sending services are not currently available");
@@ -403,7 +403,7 @@ namespace BTCPayServer.Controllers.GreenField
var accountKey = signingKey.Derive(rootedKeyPath.KeyPath); var accountKey = signingKey.Derive(rootedKeyPath.KeyPath);
var changed = psbt.PSBT.PSBTChanged(() => psbt.PSBT.SignAll(derivationScheme.AccountDerivation, accountKey, var changed = psbt.PSBT.PSBTChanged(() => psbt.PSBT.SignAll(derivationScheme.AccountDerivation, accountKey,
rootedKeyPath, new SigningOptions() {EnforceLowR = !(signingContext?.EnforceLowR is false)})); rootedKeyPath, new SigningOptions() {EnforceLowR = signingContext?.EnforceLowR is bool v ? v : psbt.Suggestions.ShouldEnforceLowR }));
if (!changed) if (!changed)
{ {
@@ -465,17 +465,6 @@ namespace BTCPayServer.Controllers.GreenField
return await _authorizationService.CanUseHotWallet(_cssThemeManager.Policies, User); return await _authorizationService.CanUseHotWallet(_cssThemeManager.Policies, User);
} }
private async Task<ExtKey> GetWallet(DerivationSchemeSettings derivationScheme)
{
if (!derivationScheme.IsHotWallet)
return null;
var result = await _explorerClientProvider.GetExplorerClient(derivationScheme.Network.CryptoCode)
.GetMetadataAsync<string>(derivationScheme.AccountDerivation,
WellknownMetadataKeys.MasterHDKey);
return string.IsNullOrEmpty(result) ? null : ExtKey.Parse(result, derivationScheme.Network.NBitcoinNetwork);
}
private bool IsInvalidWalletRequest(string cryptoCode, out BTCPayNetwork network, private bool IsInvalidWalletRequest(string cryptoCode, out BTCPayNetwork network,
out DerivationSchemeSettings derivationScheme, out IActionResult actionResult) out DerivationSchemeSettings derivationScheme, out IActionResult actionResult)
{ {

17
BTCPayServer/Extensions/AuthorizationExtensions.cs
View File

@@ -1,9 +1,11 @@
using System.Security.Claims; using System.Security.Claims;
using System.Threading.Tasks; using System.Threading.Tasks;
using BTCPayServer.Abstractions.Constants;
using BTCPayServer.Client; using BTCPayServer.Client;
using BTCPayServer.Security.Bitpay; using BTCPayServer.Security.Bitpay;
using BTCPayServer.Security.GreenField; using BTCPayServer.Security.GreenField;
using BTCPayServer.Services; using BTCPayServer.Services;
using CsvHelper.Configuration.Attributes;
using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Authorization;
namespace BTCPayServer namespace BTCPayServer
@@ -15,8 +17,19 @@ namespace BTCPayServer
PoliciesSettings policiesSettings, PoliciesSettings policiesSettings,
ClaimsPrincipal user) ClaimsPrincipal user)
{ {
return (await authorizationService.AuthorizeAsync(user, Policies.CanModifyServerSettings)) if (!user.Identity.IsAuthenticated)
.Succeeded ? (true, true) : (policiesSettings?.AllowHotWalletForAll is true, policiesSettings?.AllowHotWalletRPCImportForAll is true); return (false, false);
var claimUser = user.Identity as ClaimsIdentity;
if (claimUser is null)
return (false, false);
bool isAdmin = false;
if (claimUser.AuthenticationType == AuthenticationSchemes.Cookie)
isAdmin = user.IsInRole(Roles.ServerAdmin);
else if (claimUser.AuthenticationType == GreenFieldConstants.AuthenticationType)
isAdmin = (await authorizationService.AuthorizeAsync(user, Policies.CanModifyServerSettings)).Succeeded;
return isAdmin ? (true, true) :
(policiesSettings?.AllowHotWalletForAll is true, policiesSettings?.AllowHotWalletRPCImportForAll is true);
} }
} }
} }