api: Configuration modification support (if enabled in conf file)

Author: luke-jr

CMakeLists.txt

@@ -27,6 +27,9 @@ set(WEB_RESOURCES
 	www/home.html
 	www/clients_top.html
 	www/coinbaser_top.html
+	www/config.html
+	www/config_errors.html
+	www/config_restart.html
 	www/threads_top.html
 	www/foot.html
 	www/assets/style.css

src/datum_api.c

@@ -404,8 +404,15 @@ void *datum_gateway_template_thread(void *args) {
 	{
 		unsigned char dummy[64];
 		if (!addr_2_output_script(datum_config.mining_pool_address, &dummy[0], 64)) {
-			DLOG_FATAL("Could not generate output script for pool addr! Perhaps invalid? This is bad.");
-			panic_from_thread(__LINE__);
+			if (datum_config.api_modify_conf) {
+				DLOG_ERROR("Could not generate output script for pool addr! Perhaps invalid? Configure via API/dashboard.");
+			} else {
+				DLOG_FATAL("Could not generate output script for pool addr! Perhaps invalid? This is bad.");
+				panic_from_thread(__LINE__);
+			}
+		}
+		while (!addr_2_output_script(datum_config.mining_pool_address, &dummy[0], 64)) {
+			usleep(50000);
 		}
 	}
 

src/datum_blocktemplates.c

@@ -111,6 +111,8 @@ const T_DATUM_CONFIG_ITEM datum_config_options[] = {
 		.required = false, .ptr = datum_config.api_admin_password,						.default_string[0] = "", .max_string_len = sizeof(datum_config.api_admin_password) },
 	{ .var_type = DATUM_CONF_INT, 		.category = "api",	 		.name = "listen_port",				.description = "Port to listen for API/dashboard requests (0=disabled)",
 		.required = false, .ptr = &datum_config.api_listen_port, 						.default_int = 0 },
+	{ .var_type = DATUM_CONF_BOOL, 		.category = "api",	 		.name = "modify_conf",				.description = "Enable modifying the config file from API/dashboard",
+		.required = false, .ptr = &datum_config.api_modify_conf, 						.default_int = 0 },
 
 	// extra block submissions list
 	{ .var_type = DATUM_CONF_STRING_ARRAY, 	.category = "extra_block_submissions", 	.name = "urls",		.description = "Array of bitcoind RPC URLs to submit our blocks to directly.  Include auth info: http://user:pass@IP",
@@ -322,7 +324,9 @@ int datum_read_config(const char *conffile) {
 		}
 	}
 
-	if (config) {
+	if (datum_config.api_modify_conf) {
+		datum_config.config_json = config;
+	} else {
 		json_decref(config);
 	}
 

src/datum_conf.c

@@ -43,6 +43,8 @@
 #include <stdbool.h>
 #include <stdint.h>
 
+#include <jansson.h>
+
 #define DATUM_CONF_BOOL 1
 #define DATUM_CONF_INT 2
 #define DATUM_CONF_STRING 3
@@ -107,6 +109,8 @@ typedef struct {
 	size_t api_admin_password_len;
 	char api_csrf_token[65];
 	int api_listen_port;
+	bool api_modify_conf;
+	json_t *config_json;
 
 	int extra_block_submissions_count;
 	char extra_block_submissions_urls[DATUM_MAX_BLOCK_SUBMITS][DATUM_MAX_SUBMIT_URL_LEN];

src/datum_conf.h

@@ -250,6 +250,14 @@ bool update_rpc_cookie(global_config_t * const cfg) {
 	return true;
 }
 
+void update_rpc_auth(global_config_t * const cfg) {
+	if (datum_config.bitcoind_rpccookiefile[0] && !cfg->bitcoind_rpcuser[0]) {
+		update_rpc_cookie(cfg);
+	} else {
+		snprintf(datum_config.bitcoind_rpcuserpass, sizeof(datum_config.bitcoind_rpcuserpass), "%s:%s", datum_config.bitcoind_rpcuser, datum_config.bitcoind_rpcpassword);
+	}
+}
+
 json_t *bitcoind_json_rpc_call(CURL * const curl, global_config_t * const cfg, const char * const rpc_req) {
 	long http_resp_code = -1;
 	json_t *j = json_rpc_call_full(curl, cfg->bitcoind_rpcurl, cfg->bitcoind_rpcuserpass, rpc_req, NULL, &http_resp_code);

src/datum_jsonrpc.c

@@ -66,6 +66,7 @@ struct upload_buffer {
 json_t *json_rpc_call(CURL *curl, const char *url, const char *userpass, const char *rpc_req);
 char *basic_http_call(CURL *curl, const char *url);
 bool update_rpc_cookie(global_config_t *cfg);
+void update_rpc_auth(global_config_t *cfg);
 json_t *bitcoind_json_rpc_call(CURL *curl, global_config_t *cfg, const char *rpc_req);
 
 #endif

src/datum_jsonrpc.h

@@ -51,6 +51,7 @@
 #include <stdint.h>
 #include <sys/time.h>
 #include <inttypes.h>
+#include <unistd.h>
 
 #include "datum_gateway.h"
 #include "datum_logger.h"

src/datum_utils.c

@@ -14,6 +14,7 @@ <h1><img src="/assets/icons/datum_logo.svg" alt="(DATUM Logo)" style="vertical-a
 		</div>
 		<div class="menu-container">
 			<a href="/">Status</a>
+			<a href="/config">Config</a>
 			<a href="/clients" style="background-color: darkslategrey;">Clients</a>
 			<a href="/threads">Threads</a>
 			<a href="/coinbaser">Coinbaser</a>

www/clients_top.html

@@ -31,6 +31,7 @@ <h1><img src="/assets/icons/datum_logo.svg" alt="(DATUM Logo)" style="vertical-a
 		</div>
 		<div class="menu-container">
 			<a href="/">Status</a>
+			<a href="/config">Config</a>
 			<a href="/clients">Clients</a>
 			<a href="/threads">Threads</a>
 			<a href="/coinbaser" style="background-color: darkslategrey;">Coinbaser</a>