Merge branch '0.2.x'

Author: luke-jr

src/datum_api.c

@@ -478,6 +478,45 @@ void datum_api_cmd_kill_client(int tid, int cid) {
 	}
 }
 
+void datum_api_cmd_kill_client2(const char * const data, const size_t size, const char ** const redirect_p) {
+	const char * const end = &data[size];
+	const char *underscore_pos = memchr(data, '_', size);
+	if (!underscore_pos) return;
+	const size_t tid_size = underscore_pos - data;
+	const int tid = datum_atoi_strict(data, tid_size);
+	const char *p = &underscore_pos[1];
+	underscore_pos = memchr(p, '_', end - p);
+	if (!underscore_pos) underscore_pos = end;
+	const int cid = datum_atoi_strict(p, underscore_pos - p);
+	
+	// Valid input; unconditionally redirect back to clients dashboard
+	*redirect_p = "/clients";
+	
+	if (tid < 0 || tid >= global_stratum_app->max_threads || cid < 0 || cid >= global_stratum_app->max_clients_thread) {
+		return;
+	}
+	
+	if (underscore_pos != end) {
+		// Check it's the same client intended
+		p = &underscore_pos[1];
+		underscore_pos = memchr(p, '_', end - p);
+		if (!underscore_pos) underscore_pos = end;
+		const uint64_t connect_tsms = datum_atoi_strict_u64(p, underscore_pos - p);
+		const T_DATUM_MINER_DATA * const m = global_stratum_app->datum_threads[tid].client_data[cid].app_client_data;
+		if (connect_tsms != m->connect_tsms) {
+			DLOG_WARN("API Request to disconnect FORMER stratum client %d/%d (ignored; connect tsms req=%lu vs cur=%lu)", tid, cid, (unsigned long)connect_tsms, (unsigned long)m->connect_tsms);
+			return;
+		}
+		p = &underscore_pos[1];
+		const uint64_t unique_id = datum_atoi_strict_u64(p, end - p);
+		if (unique_id != m->unique_id) {
+			DLOG_WARN("API Request to disconnect FORMER stratum client %d/%d (ignored; unique id req=%lu vs cur=%lu)", tid, cid, (unsigned long)unique_id, (unsigned long)m->unique_id);
+			return;
+		}
+	}
+	datum_api_cmd_kill_client(tid, cid);
+}
+
 int datum_api_cmd(struct MHD_Connection *connection, char *post, int len) {
 	struct MHD_Response *response;
 	char output[1024];
@@ -561,14 +600,7 @@ int datum_api_cmd(struct MHD_Connection *connection, char *post, int len) {
 			if (param) {
 				const char * const data = json_string_value(param);
 				const size_t size = json_string_length(param);
-				const char * const underscore_pos = memchr(data, '_', size);
-				if (underscore_pos) {
-					const size_t tid_size = underscore_pos - data;
-					const int tid = datum_atoi_strict(data, tid_size);
-					const int cid = datum_atoi_strict(&underscore_pos[1], size - tid_size - 1);
-					datum_api_cmd_kill_client(tid, cid);
-					redirect = "/clients";
-				}
+				datum_api_cmd_kill_client2(data, size, &redirect);
 			}
 
 			response = MHD_create_response_from_buffer(0, "", MHD_RESPMEM_PERSISTENT);
@@ -803,7 +835,7 @@ int datum_api_client_dashboard(struct MHD_Connection *connection) {
 					sz += snprintf(&output[sz], max_sz-1-sz, "<TD COLSPAN=\"8\">Not Subscribed</TD>");
 				}
 
-				sz += snprintf(&output[sz], max_sz-1-sz, "<TD><button name='kill_client' value='%d_%d' onclick=\"sendPostRequest('/cmd', {cmd:'kill_client',tid:%d,cid:%d}); return false;\">Kick</button></TD></TR>", j, ii, j, ii);
+				sz += snprintf(&output[sz], max_sz-1-sz, "<TD><button name='kill_client' value='%d_%d_%lu_%lu' onclick=\"sendPostRequest('/cmd', {cmd:'kill_client',tid:%d,cid:%d,t:%lu,id:%lu}); return false;\">Kick</button></TD></TR>", j, ii, (unsigned long)m->connect_tsms, (unsigned long)m->unique_id, j, ii, (unsigned long)m->connect_tsms, (unsigned long)m->unique_id);
 			}
 		}
 	}

src/datum_stratum.c

@@ -352,6 +352,9 @@ void datum_stratum_v1_socket_thread_client_new(T_DATUM_CLIENT_DATA *c) {
 	m->sdata = (T_DATUM_STRATUM_THREADPOOL_DATA *)c->datum_thread->app_thread_data;
 	m->stats.last_swap_tsms = m->stats.last_share_tsms;
 
+	static uint64_t unique_id_ctr = 0;
+	m->unique_id = unique_id_ctr++;
+	
 	// set initial connection time
 	// if this is the first client on the thread, we won't have a loop_tsms yet
 	if (m->sdata->loop_tsms > 0) {

src/datum_stratum.h

@@ -211,6 +211,7 @@ typedef struct {
 
 typedef struct {
 	uint32_t sid, sid_inv;
+	uint64_t unique_id;
 	uint64_t connect_tsms;
 	char useragent[128];
 	char last_auth_username[192];

src/datum_utils.c

@@ -706,20 +706,27 @@ uint64_t datum_siphash_mod8(const void *src, uint64_t sz, const unsigned char ke
 }
 
 // Uses a fixed-size buffer; positive only; digits only
-// Returns -1 on failure
-int datum_atoi_strict(const char * const s, const size_t size) {
-	if (!size) return -1;
+// Returns UINT64_MAX on failure
+uint64_t datum_atoi_strict_u64(const char * const s, const size_t size) {
+	if (!size) return UINT64_MAX;
 	assert(s);
-	int ret = 0;
+	uint64_t ret = 0;
 	for (size_t i = 0; i < size; ++i) {
-		if (s[i] < '0' || s[i] > '9') return -1;
+		if (s[i] < '0' || s[i] > '9') return UINT64_MAX;
 		int digit = s[i] - '0';
-		if (ret > (INT_MAX - digit) / 10) return -1;
+		if (ret > (UINT64_MAX - digit) / 10) return UINT64_MAX;
 		ret = (ret * 10) + digit;
 	}
 	return ret;
 }
 
+// Uses a fixed-size buffer; positive only; digits only
+// Returns -1 on failure
+int datum_atoi_strict(const char * const s, const size_t size) {
+	const uint64_t ret = datum_atoi_strict_u64(s, size);
+	return (ret == UINT64_MAX || ret > INT_MAX) ? -1 : ret;
+}
+
 bool datum_secure_strequals(const char *secret, const size_t secret_len, const char *guess) {
 	const size_t guess_len = strlen(guess);
 	size_t acc = secret_len ^ guess_len;

src/datum_utils.h

@@ -69,6 +69,7 @@ long double calc_network_difficulty(const char *bits_hex);
 unsigned char floorPoT(uint64_t x);
 uint64_t datum_siphash(const void *src, uint64_t sz, const unsigned char key[16]);
 uint64_t datum_siphash_mod8(const void *src, uint64_t sz, const unsigned char key[16]);
+uint64_t datum_atoi_strict_u64(const char *s, size_t size);
 int datum_atoi_strict(const char *s, size_t size);
 bool datum_secure_strequals(const char *secret, const size_t secret_len, const char *guess);