github/darkfi
1
1
Fork 0
mirror of https://github.com/darkrenaissance/darkfi.git synced 2026-01-09 14:48:08 -05:00
Code Issues Packages Projects Releases Wiki Activity

rpc/server: Implement stop-gap hack for handling some XMRig requests.

Browse Source
This commit is contained in:
parazyd
2023-11-19 16:13:44 +01:00
parent ca2ebcf9fa
commit 6933f333cc
2 changed files with 47 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Makefile
View File

@@ -18,6 +18,7 @@ BINS = \
darkfid2 \
faucetd \
darkirc \
darkfi-mmproxy \
genev/genev-cli \
genev/genevd \
lilith \

53
src/rpc/server.rs
View File

@@ -105,8 +105,46 @@ pub async fn accept(
let _ = read_from_stream(&mut reader_lock, &mut buf, false).await?;
drop(reader_lock);
let val: JsonValue = String::from_utf8(buf)?.trim().parse()?;
let req = JsonRequest::try_from(&val)?;
let read_string = match String::from_utf8(buf) {
Ok(v) => v,
Err(e) => {
error!(
target: "rpc::server::accept()",
"[RPC SERVER] Failed parsing string from read buffer: {}", e,
);
return Err(e.into())
}
};
// Implementation note:
// When using this JSON-RPC server with XMRig, an issue arises.
// XMRig tends to send something we do not parse as a line in
// read_from_stream(), so as a stop-gap hack we do this:
let line = read_string.trim().lines().take(1).next().unwrap();
// Parse the line as JSON
let val: JsonValue = match line.parse() {
Ok(v) => v,
Err(e) => {
error!(
target: "rpc::server::accept()",
"[RPC SERVER] Failed parsing JSON string: {}", e,
);
return Err(e.into())
}
};
// Cast to JsonRequest
let req = match JsonRequest::try_from(&val) {
Ok(v) => v,
Err(e) => {
error!(
target: "rpc::server::accept()",
"[RPC SERVER] Failed casting JSON to a JsonRequest: {}", e,
);
return Err(e.into())
}
};
debug!(target: "rpc::server", "{} --> {}", addr, val.stringify()?);
@@ -115,8 +153,6 @@ pub async fn accept(
match rep {
JsonResult::Subscriber(subscriber) => {
let task = StoppableTask::new();
debug!(target: "rpc::server", "Adding background task {} to map", task.task_id);
tasks.lock().await.insert(task.clone());
// Clone what needs to go in the background
let task_ = task.clone();
@@ -155,6 +191,9 @@ pub async fn accept(
Error::DetachedTaskStopped,
ex.clone(),
);
debug!(target: "rpc::server", "Adding background task {} to map", task.task_id);
tasks.lock().await.insert(task.clone());
}
JsonResult::SubscriberWithReply(subscriber, reply) => {
@@ -165,9 +204,6 @@ pub async fn accept(
drop(writer_lock);
let task = StoppableTask::new();
debug!(target: "rpc::server", "Adding background task {} to map", task.task_id);
tasks.lock().await.insert(task.clone());
// Clone what needs to go in the background
let task_ = task.clone();
let addr_ = addr.clone();
@@ -206,6 +242,9 @@ pub async fn accept(
Error::DetachedTaskStopped,
ex.clone(),
);
debug!(target: "rpc::server", "Adding background task {} to map", task.task_id);
tasks.lock().await.insert(task.clone());
}
JsonResult::Request(_) | JsonResult::Notification(_) => {