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

ModelBinders should not throw exception, but return error on ModelState

Browse Source
This commit is contained in:
nicolas.dorier
2021-04-26 12:55:03 +09:00
parent dcc4214dcb
commit 8d5c3c5cdd
3 changed files with 18 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
BTCPayServer/ModelBinders/DerivationSchemeModelBinder.cs
View File

@@ -43,11 +43,17 @@ namespace BTCPayServer.ModelBinders
var data = network.NBXplorerNetwork.DerivationStrategyFactory.Parse(key);
if (!bindingContext.ModelType.IsInstanceOfType(data))
{
throw new FormatException("Invalid destination type");
bindingContext.Result = ModelBindingResult.Failed();
bindingContext.ModelState.AddModelError(bindingContext.ModelName, "Invalid derivation scheme");
return Task.CompletedTask;
}
bindingContext.Result = ModelBindingResult.Success(data);
}
catch { throw new FormatException("Invalid derivation scheme"); }
catch
{
bindingContext.Result = ModelBindingResult.Failed();
bindingContext.ModelState.AddModelError(bindingContext.ModelName, "Invalid derivation scheme");
}
return Task.CompletedTask;
}

5
BTCPayServer/ModelBinders/PaymentMethodIdModelBinder.cs
View File

@@ -31,6 +31,11 @@ namespace BTCPayServer.ModelBinders
{
bindingContext.Result = ModelBindingResult.Success(paymentId);
}
else
{
bindingContext.Result = ModelBindingResult.Failed();
bindingContext.ModelState.AddModelError(bindingContext.ModelName, "Invalid payment id");
}
return Task.CompletedTask;
}
}

5
BTCPayServer/ModelBinders/WalletIdModelBinder.cs
View File

@@ -30,6 +30,11 @@ namespace BTCPayServer.ModelBinders
{
bindingContext.Result = ModelBindingResult.Success(walletId);
}
else
{
bindingContext.Result = ModelBindingResult.Failed();
bindingContext.ModelState.AddModelError(bindingContext.ModelName, "Invalid wallet id");
}
return Task.CompletedTask;
}
}