Support Cookie Authentication.

Signed-off-by: Pttn <28868425+Pttn@users.noreply.github.com>

Author: Pttn

Client.hpp

@@ -72,7 +72,8 @@ class NetworkedClient : public Client {
 class GBTClient : public NetworkedClient {
 	// Options
 	const std::vector<std::string> _rules;
-	const std::string _host, _url, _credentials;
+	const std::string _host, _url, _cookie;
+	std::string _credentials;
 	const std::vector<uint8_t> _scriptPubKey;
 	// Client State Variables
 	CURL *_curl;
@@ -103,6 +104,7 @@ class GBTClient : public NetworkedClient {
 		_rules(options.rules),
 		_host(options.host),
 		_url("http://" + options.host + ":" + std::to_string(options.port) + "/"),
+		_cookie(options.cookie),
 		_credentials(options.username + ":" + options.password),
 		_scriptPubKey(bech32ToScriptPubKey(options.payoutAddress)),
 		_curl(curl_easy_init()) {}

GBTClient.cpp

@@ -204,6 +204,15 @@ bool GBTClient::_fetchJob() {
 
 void GBTClient::connect() {
 	if (!_connected) {
+		if (_cookie != "") {
+			std::ifstream file(_cookie, std::ios::in);
+			if (!file) {
+				logger.log("Could not open Cookie '"s + _cookie + "'!\n"s
+				"Check that the Server is running, that the Cookie does exist at this path, and that this instance of rieMiner can read it.\n"s, MessageType::ERROR);
+				return;
+			}
+			std::getline(file, _credentials);
+		}
 		_currentJobTemplate = JobTemplate();
 		_pendingBlocks = {};
 		process();

README.md

@@ -203,6 +203,7 @@ rieMiner proposes the following Modes depending on what you want to do. Use the
 * `Port`: port of the Riecoin server (same as rpcport in riecoin.conf for solo mining). Default: 28332 (default RPC port for Riecoin Core);
 * `Username`: username used to connect to the server (same as rpcuser in riecoin.conf for solo mining). Default: empty;
 * `Password`: password used to connect to the server (same as rpcpassword in riecoin.conf for solo mining). Default: empty;
+* `Cookie`: for solo mining, cookie file containing the credentials, overriding `Username` and `Password`. Default: empty/none;
 * `PayoutAddress`: payout address for solo mining. You can use Bech32 "ric1" addresses (only lowercase). Default: a donation address;
 * `Rules`: for solo mining, add consensus rules in the GetBlockTemplate RPC call, each separated by a comma. `segwit` must be present. You should not touch this unless a major Riecoin upgrade is upcoming and it is said to use this option. Default: segwit.
 

main.cpp

@@ -107,6 +107,7 @@ bool Configuration::parse(const int argc, char** argv, std::string &parsingMessa
 		}
 		else if (key == "Username") _options.username = value;
 		else if (key == "Password") _options.password = value;
+		else if (key == "Cookie") _options.cookie = value;
 		else if (key == "PayoutAddress") _options.payoutAddress = value;
 		else if (key == "Threads") {
 			try {_options.stellaConfig.threads = std::stoi(value);}
@@ -342,8 +343,12 @@ int main(int argc, char** argv) {
 		else
 			logger.log("Pooled mining"s);
 		logger.log(" via host "s + configuration.options().host + ", port "s + std::to_string(configuration.options().port) + "\n"s);
-		logger.log("Username: "s + configuration.options().username + "\n"s);
-		logger.log("Password: <"s + std::to_string(configuration.options().password.size()) + " character(s)>\n"s);
+		if (configuration.options().mode == "Solo" && configuration.options().cookie != "")
+			logger.log("Cookie: "s + configuration.options().cookie + "\n"s);
+		else {
+			logger.log("Username: "s + configuration.options().username + "\n"s);
+			logger.log("Password: <"s + std::to_string(configuration.options().password.size()) + " character(s)>\n"s);
+		}
 		if (configuration.options().mode == "Solo") {
 			std::vector<uint8_t> scriptPubKey(bech32ToScriptPubKey(configuration.options().payoutAddress));
 			logger.log("Payout address: "s + configuration.options().payoutAddress + "\n"s);

main.hpp

@@ -38,7 +38,7 @@ extern std::string confPath;
 struct Options {
 	Stella::Configuration stellaConfig;
 	uint16_t tupleLengthMin{0U};
-	std::string host{"127.0.0.1"}, username{""}, password{""}, mode{"Benchmark"}, payoutAddress{"ric1pstellap55ue6keg3ta2qwlxr0h58g66fd7y4ea78hzkj3r4lstrsk4clvn"}, tuplesFile{"Tuples.txt"};
+	std::string host{"127.0.0.1"}, username{""}, password{""}, cookie{""}, mode{"Benchmark"}, payoutAddress{"ric1pstellap55ue6keg3ta2qwlxr0h58g66fd7y4ea78hzkj3r4lstrsk4clvn"}, tuplesFile{"Tuples.txt"};
 	uint64_t filePrimeTableLimit{0ULL};
 	uint16_t port{28332U};
 	double refreshInterval{30.}, difficulty{1024.}, benchmarkBlockInterval{150.}, benchmarkTimeLimit{960.};