Merge branch 'rpccookie'

Author: luke-jr

src/datum_blocktemplates.c

@@ -349,7 +349,7 @@ void *datum_gateway_fallback_notifier(void *args) {
 
 	while(1) {
 		snprintf(req, sizeof(req), "{\"jsonrpc\":\"1.0\",\"id\":\"%"PRIu64"\",\"method\":\"getbestblockhash\",\"params\":[]}", current_time_millis());
-		gbbh = json_rpc_call(tcurl, datum_config.bitcoind_rpcurl, datum_config.bitcoind_rpcuserpass, req);
+		gbbh = bitcoind_json_rpc_call(tcurl, &datum_config, req);
 		if (gbbh) {
 			res_val = json_object_get(gbbh, "result");
 			if (!res_val) {
@@ -415,7 +415,7 @@ void *datum_gateway_template_thread(void *args) {
 
 		// fetch latest template
 		snprintf(gbt_req, sizeof(gbt_req), "{\"method\":\"getblocktemplate\",\"params\":[{\"rules\":[\"segwit\"]}],\"id\":%"PRIu64"}",(uint64_t)((uint64_t)time(NULL)<<(uint64_t)8)|(uint64_t)(i&255));
-		gbt = json_rpc_call(tcurl, datum_config.bitcoind_rpcurl, datum_config.bitcoind_rpcuserpass, gbt_req);
+		gbt = bitcoind_json_rpc_call(tcurl, &datum_config, gbt_req);
 
 		if (!gbt) {
 			DLOG_ERROR("Could not fetch new template from %s!", datum_config.bitcoind_rpcurl);

src/datum_conf.c

@@ -43,6 +43,7 @@
 #include <jansson.h>
 
 #include "datum_conf.h"
+#include "datum_jsonrpc.h"
 #include "datum_utils.h"
 #include "datum_sockets.h"
 
@@ -52,10 +53,12 @@ const char *datum_conf_var_type_text[] = { "N/A", "boolean", "integer", "string"
 
 const T_DATUM_CONFIG_ITEM datum_config_options[] = {
 	// Bitcoind configs
+	{ .var_type = DATUM_CONF_STRING, 	.category = "bitcoind", 	.name = "rpccookiefile",			.description = "Path to file to read RPC cookie from, for communication with local bitcoind.",
+		.required = false, .ptr = datum_config.bitcoind_rpccookiefile,			.default_string[0] = "", .max_string_len = sizeof(datum_config.bitcoind_rpccookiefile) },
 	{ .var_type = DATUM_CONF_STRING, 	.category = "bitcoind", 	.name = "rpcuser",					.description = "RPC username for communication with local bitcoind.",
-		.required = true, .ptr = datum_config.bitcoind_rpcuser, .max_string_len = sizeof(datum_config.bitcoind_rpcuser) },
+		.required = false, .ptr = datum_config.bitcoind_rpcuser,			.default_string[0] = "", .max_string_len = sizeof(datum_config.bitcoind_rpcuser) },
 	{ .var_type = DATUM_CONF_STRING, 	.category = "bitcoind", 	.name = "rpcpassword",				.description = "RPC password for communication with local bitcoind.",
-		.required = true, .ptr = datum_config.bitcoind_rpcpassword, .max_string_len = sizeof(datum_config.bitcoind_rpcpassword) },
+		.required = false, .ptr = datum_config.bitcoind_rpcpassword,			.default_string[0] = "", .max_string_len = sizeof(datum_config.bitcoind_rpcpassword) },
 	{ .var_type = DATUM_CONF_STRING, 	.category = "bitcoind", 	.name = "rpcurl",					.description = "RPC URL for communication with local bitcoind. (GBT Template Source)",
 		.required = true, .ptr = datum_config.bitcoind_rpcurl, .max_string_len = sizeof(datum_config.bitcoind_rpcurl) },
 	{ .var_type = DATUM_CONF_INT,	 	.category = "bitcoind", 	.name = "work_update_seconds",		.description = "How many seconds between normal work updates?  (5-120, 40 suggested)",
@@ -150,6 +153,21 @@ const T_DATUM_CONFIG_ITEM datum_config_options[] = {
 
 #define NUM_CONFIG_ITEMS (sizeof(datum_config_options) / sizeof(datum_config_options[0]))
 
+const T_DATUM_CONFIG_ITEM *datum_config_get_option_info(const char * const category, const size_t category_len, const char * const name, const size_t name_len) {
+	for (size_t i = 0; i < NUM_CONFIG_ITEMS; ++i) {
+		if (strncmp(category, datum_config_options[i].category, category_len)) continue;
+		if (datum_config_options[i].category[category_len]) continue;
+		if (strncmp(name, datum_config_options[i].name, name_len)) continue;
+		if (datum_config_options[i].name[name_len]) continue;
+		return &datum_config_options[i];
+	}
+	return NULL;
+}
+
+const T_DATUM_CONFIG_ITEM *datum_config_get_option_info2(const char * const category, const char * const name) {
+	return datum_config_get_option_info(category, strlen(category), name, strlen(name));
+}
+
 json_t *load_json_from_file(const char *file_path) {
 	json_error_t error;
 	json_t *root = json_load_file(file_path, 0, &error);
@@ -254,6 +272,11 @@ int datum_config_parse_value(const T_DATUM_CONFIG_ITEM *c, json_t *item) {
 	return -1;
 }
 
+static void datum_config_opt_missing_error(const T_DATUM_CONFIG_ITEM * const opt) {
+	DLOG_ERROR("Required configuration option (%s.%s) not found in config file:", opt->category, opt->name);
+	DLOG_ERROR("--- Config description: \"%s\"", opt->description);
+}
+
 int datum_read_config(const char *conffile) {
 	json_t *config = NULL;
 	json_t *cat, *item;
@@ -278,8 +301,7 @@ int datum_read_config(const char *conffile) {
 		}
 		if ((!item) || json_is_null(item)) {
 			if (datum_config_options[i].required) {
-				DLOG_ERROR("Required configuration option (%s.%s) not found in config file:", datum_config_options[i].category, datum_config_options[i].name);
-				DLOG_ERROR("--- Config description: \"%s\"", datum_config_options[i].description);
+				datum_config_opt_missing_error(&datum_config_options[i]);
 				return 0;
 			} else {
 				datum_config_set_default(&datum_config_options[i]);
@@ -321,6 +343,24 @@ int datum_read_config(const char *conffile) {
 		datum_config.bitcoind_work_update_seconds = 120;
 	}
 
+	if (datum_config.bitcoind_rpcuser[0]) {
+		if (!datum_config.bitcoind_rpcpassword[0]) {
+			datum_config_opt_missing_error(datum_config_get_option_info2("bitcoind", "rpcpassword"));
+			return 0;
+		}
+		snprintf(datum_config.bitcoind_rpcuserpass, sizeof(datum_config.bitcoind_rpcuserpass), "%s:%s", datum_config.bitcoind_rpcuser, datum_config.bitcoind_rpcpassword);
+	} else if (datum_config.bitcoind_rpccookiefile[0]) {
+		update_rpc_cookie(&datum_config);
+	} else {
+		const T_DATUM_CONFIG_ITEM *opt;
+		DLOG_ERROR("Either bitcoind.rpcuser (and bitcoind.rpcpassword) or bitcoind.rpccookiefile is required.");
+		opt = datum_config_get_option_info2("bitcoind", "rpcuser");
+		DLOG_ERROR("--- Config description for %s.%s: \"%s\"", opt->category, opt->name, opt->description);
+		opt = datum_config_get_option_info2("bitcoind", "rpccookiefile");
+		DLOG_ERROR("--- Config description for %s.%s: \"%s\"", opt->category, opt->name, opt->description);
+		return 0;
+	}
+	
 	if (datum_config.stratum_v1_max_threads > MAX_THREADS) {
 		DLOG_FATAL("Maximum threads must be less than %d.", MAX_THREADS);
 		return 0;

src/datum_conf.h

@@ -65,9 +65,13 @@ typedef struct {
 	bool required;
 } T_DATUM_CONFIG_ITEM;
 
+const T_DATUM_CONFIG_ITEM *datum_config_get_option_info(const char *category, size_t category_len, const char *name, size_t name_len);
+const T_DATUM_CONFIG_ITEM *datum_config_get_option_info2(const char *category, const char *name);
+
 // Globally accessable config options
 typedef struct {
 	char bitcoind_rpcuserpass[256];
+	char bitcoind_rpccookiefile[1024];
 	char bitcoind_rpcuser[128];
 	char bitcoind_rpcpassword[128];
 	char bitcoind_rpcurl[256];

src/datum_jsonrpc.c

@@ -33,6 +33,7 @@
  *
  */
 
+#include <assert.h>
 #include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -41,6 +42,7 @@
 #include <jansson.h>
 #include <stdbool.h>
 
+#include "datum_conf.h"
 #include "datum_jsonrpc.h"
 #include "datum_utils.h"
 
@@ -137,7 +139,7 @@ char *basic_http_call(CURL *curl, const char *url) {
 	return NULL;
 }
 
-json_t *json_rpc_call_full(CURL *curl, const char *url, const char *userpass, const char *rpc_req, const char *extra_header) {
+json_t *json_rpc_call_full(CURL *curl, const char *url, const char *userpass, const char *rpc_req, const char *extra_header, long * const http_resp_code_out) {
 	json_t *val, *err_val, *res_val;
 	CURLcode rc;
 	struct data_buffer all_data = { };
@@ -185,6 +187,7 @@ json_t *json_rpc_call_full(CURL *curl, const char *url, const char *userpass, co
 
 	rc = curl_easy_perform(curl);
 	if (rc) {
+		if (http_resp_code_out) curl_easy_getinfo(curl, CURLINFO_RESPONSE_CODE, http_resp_code_out);
 		DLOG_DEBUG("json_rpc_call: HTTP request failed: %s", curl_err_str);
 		DLOG_DEBUG("json_rpc_call: Request was: %s",rpc_req);
 		goto err_out;
@@ -230,5 +233,31 @@ json_t *json_rpc_call_full(CURL *curl, const char *url, const char *userpass, co
 }
 
 json_t *json_rpc_call(CURL *curl, const char *url, const char *userpass, const char *rpc_req) {
-	return json_rpc_call_full(curl, url, userpass, rpc_req, NULL);
+	return json_rpc_call_full(curl, url, userpass, rpc_req, NULL, NULL);
+}
+
+bool update_rpc_cookie(global_config_t * const cfg) {
+	assert(!cfg->bitcoind_rpcuser[0]);
+	FILE * const F = fopen(cfg->bitcoind_rpccookiefile, "r");
+	if (!F) {
+		DLOG_ERROR("Cannot %s cookie file %s", "open", datum_config.bitcoind_rpccookiefile);
+		return false;
+	}
+	if (!(fgets(cfg->bitcoind_rpcuserpass, sizeof(cfg->bitcoind_rpcuserpass), F) && cfg->bitcoind_rpcuserpass[0])) {
+		DLOG_ERROR("Cannot %s cookie file %s", "read", datum_config.bitcoind_rpccookiefile);
+		return false;
+	}
+	return true;
+}
+
+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);
+	if (j) return j;
+	if (cfg->bitcoind_rpcuser[0]) return NULL;
+	if (http_resp_code != 401) return NULL;
+	
+	// Authentication failure using cookie; reload cookie file and try again
+	if (!update_rpc_cookie(cfg)) return NULL;
+	return json_rpc_call(curl, cfg->bitcoind_rpcurl, cfg->bitcoind_rpcuserpass, rpc_req);
 }

src/datum_jsonrpc.h

@@ -39,6 +39,8 @@
 #include <curl/curl.h>
 #include <jansson.h>
 
+#include "datum_conf.h"
+
 #ifndef JSON_INTEGER_IS_LONG_LONG
 #       error "Jansson 2.0 with long long support required!"
 #endif
@@ -63,5 +65,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);
+json_t *bitcoind_json_rpc_call(CURL *curl, global_config_t *cfg, const char *rpc_req);
 
 #endif

src/datum_stratum.c

@@ -2183,7 +2183,7 @@ int assembleBlockAndSubmit(uint8_t *block_header, uint8_t *coinbase_txn, size_t
 	}
 
 	// make the call!
-	r = json_rpc_call(tcurl, datum_config.bitcoind_rpcurl, datum_config.bitcoind_rpcuserpass, submitblock_req);
+	r = bitcoind_json_rpc_call(tcurl, &datum_config, submitblock_req);
 	curl_easy_cleanup(tcurl);
 	if (!r) {
 		// oddly, this means success here.

src/datum_submitblock.c

@@ -53,9 +53,8 @@ void preciousblock(CURL *curl, char *blockhash) {
 	json_t *json;
 	char rpc_data[384];
 
-	// TODO: Move these types of things to the conf file
 	snprintf(rpc_data, sizeof(rpc_data), "{\"method\":\"preciousblock\",\"params\":[\"%s\"],\"id\":1}", blockhash);
-	json = json_rpc_call(curl, datum_config.bitcoind_rpcurl, datum_config.bitcoind_rpcuserpass, rpc_data);
+	json = bitcoind_json_rpc_call(curl, &datum_config, rpc_data);
 	if (!json) return;
 
 	json_decref(json);
@@ -67,7 +66,7 @@ void datum_submitblock_doit(CURL *tcurl, char *url, const char *submitblock_req,
 	char *s = NULL;
 	// TODO: Move these types of things to the conf file
 	if (!url) {
-		r = json_rpc_call(tcurl, datum_config.bitcoind_rpcurl, datum_config.bitcoind_rpcuserpass, submitblock_req);
+		r = bitcoind_json_rpc_call(tcurl, &datum_config, submitblock_req);
 	} else {
 		r = json_rpc_call(tcurl, url, NULL, submitblock_req);
 	}