aboutsummaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
authorosensei <admin@monerohash.com>2016-05-14 03:06:04 -0300
committerosensei <admin@monerohash.com>2016-05-14 03:06:04 -0300
commit9f8bc4946b3993ad4437936dcae705d2c8f1116a (patch)
tree0fbe7a39375b5b430a95232a0870ce2c6efa7eb2 /contrib
parentMerge pull request #826 (diff)
downloadmonero-9f8bc4946b3993ad4437936dcae705d2c8f1116a.tar.xz
Don't allow 'flush_txpool' and 'setbans' JSON_RPC methods when running in restricted mode.
Diffstat (limited to 'contrib')
-rw-r--r--contrib/epee/include/net/http_server_handlers_map2.h6
1 files changed, 4 insertions, 2 deletions
diff --git a/contrib/epee/include/net/http_server_handlers_map2.h b/contrib/epee/include/net/http_server_handlers_map2.h
index a822cce3e..3a7d5333b 100644
--- a/contrib/epee/include/net/http_server_handlers_map2.h
+++ b/contrib/epee/include/net/http_server_handlers_map2.h
@@ -168,8 +168,8 @@
response_info.m_header_info.m_content_type = " application/json"; \
LOG_PRINT( query_info.m_URI << "[" << method_name << "] processed with " << ticks1-ticks << "/"<< ticks2-ticks1 << "/" << ticks3-ticks2 << "ms", LOG_LEVEL_2);
-#define MAP_JON_RPC_WE(method_name, callback_f, command_type) \
- else if(callback_name == method_name) \
+#define MAP_JON_RPC_WE_IF(method_name, callback_f, command_type, cond) \
+ else if((callback_name == method_name) && (cond)) \
{ \
PREPARE_OBJECTS_FROM_JSON(command_type) \
epee::json_rpc::error_response fail_resp = AUTO_VAL_INIT(fail_resp); \
@@ -184,6 +184,8 @@
return true;\
}
+#define MAP_JON_RPC_WE(method_name, callback_f, command_type) MAP_JON_RPC_WE_IF(method_name, callback_f, command_type, true)
+
#define MAP_JON_RPC_WERI(method_name, callback_f, command_type) \
else if(callback_name == method_name) \
{ \