Merge remote-tracking branch 'origin/release/3.1' into validate_set_w…

…hitelist_blacklist_input_main
AntelopeIO · Sep 7, 2022 · fa6a9e1 · fa6a9e1
2 parents 9a6bb11 + fc96431
commit fa6a9e1
Showing 1 changed file with 9 additions and 0 deletions.
diff --git a/plugins/producer_plugin/producer_plugin.cpp b/plugins/producer_plugin/producer_plugin.cpp
@@ -1129,13 +1129,17 @@ producer_plugin::runtime_options producer_plugin::get_runtime_options() const {
 }
 
 void producer_plugin::add_greylist_accounts(const greylist_params& params) {
+   EOS_ASSERT(params.accounts.size() > 0, chain::invalid_http_request, "At least one account is required");
+
    chain::controller& chain = my->chain_plug->chain();
    for (auto &acc : params.accounts) {
       chain.add_resource_greylist(acc);
    }
 }
 
 void producer_plugin::remove_greylist_accounts(const greylist_params& params) {
+   EOS_ASSERT(params.accounts.size() > 0, chain::invalid_http_request, "At least one account is required");
+
    chain::controller& chain = my->chain_plug->chain();
    for (auto &acc : params.accounts) {
       chain.remove_resource_greylist(acc);
@@ -1166,6 +1170,11 @@ producer_plugin::whitelist_blacklist producer_plugin::get_whitelist_blacklist()
 }
 
 void producer_plugin::set_whitelist_blacklist(const producer_plugin::whitelist_blacklist& params) {
+   EOS_ASSERT(params.actor_whitelist || params.actor_blacklist || params.contract_whitelist || params.contract_blacklist || params.action_blacklist || params.key_blacklist,
+              chain::invalid_http_request,
+              "At least one of actor_whitelist, actor_blacklist, contract_whitelist, contract_blacklist, action_blacklist, and key_blacklist is required"
+             );
+
    chain::controller& chain = my->chain_plug->chain();
    if(params.actor_whitelist) chain.set_actor_whitelist(*params.actor_whitelist);
    if(params.actor_blacklist) chain.set_actor_blacklist(*params.actor_blacklist);