fzorb/REDACTED-rig
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Added API endpoint "GET /1/config".

Browse source
This commit is contained in:
XMRig 2018-03-31 19:00:31 +07:00
parent 341557c34e
commit 8d4d1a3285
3 changed files with 74 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/api/ApiRouter.cpp
View file

@ -89,6 +89,17 @@ void ApiRouter::ApiRouter::get(const xmrig::HttpRequest &req, xmrig::HttpReply &
rapidjson::Document doc; rapidjson::Document doc;
doc.SetObject(); doc.SetObject();
if (req.match("/1/config")) {
if (req.isRestricted()) {
reply.status = 403;
return;
}
m_controller->config()->getJSON(doc);
return finalize(reply, doc);
}
getIdentify(doc); getIdentify(doc);
getMiner(doc); getMiner(doc);
getHashrate(doc); getHashrate(doc);

110
src/core/Config.cpp
View file

@ -23,18 +23,23 @@
#include <string.h> #include <string.h>
#include <uv.h> #include <uv.h>
#include <inttypes.h>
#include "core/Config.h" #include "core/Config.h"
#include "core/ConfigCreator.h" #include "core/ConfigCreator.h"
#include "core/ConfigLoader.h" #include "core/ConfigLoader.h"
#include "Cpu.h" #include "Cpu.h"
#include "net/Url.h"
#include "rapidjson/document.h" #include "rapidjson/document.h"
#include "rapidjson/filewritestream.h" #include "rapidjson/filewritestream.h"
#include "rapidjson/prettywriter.h" #include "rapidjson/prettywriter.h"
#include "xmrig.h" #include "xmrig.h"
static char affinity_tmp[20] = { 0 };
xmrig::Config::Config() : xmrig::CommonConfig(), xmrig::Config::Config() : xmrig::CommonConfig(),
m_doubleHash(false), m_doubleHash(false),
m_dryRun(false), m_dryRun(false),
@ -66,69 +71,78 @@ void xmrig::Config::getJSON(rapidjson::Document &doc) const
{ {
doc.SetObject(); doc.SetObject();
// auto &allocator = doc.GetAllocator(); auto &allocator = doc.GetAllocator();
// doc.AddMember("access-log-file", accessLog() ? rapidjson::Value(rapidjson::StringRef(accessLog())).Move() : rapidjson::Value(rapidjson::kNullType).Move(), allocator); doc.AddMember("algo", rapidjson::StringRef(algoName()), allocator);
// doc.AddMember("algo", rapidjson::StringRef(algoName()), allocator);
// rapidjson::Value api(rapidjson::kObjectType); rapidjson::Value api(rapidjson::kObjectType);
// api.AddMember("port", apiPort(), allocator); api.AddMember("port", apiPort(), allocator);
// api.AddMember("access-token", apiToken() ? rapidjson::Value(rapidjson::StringRef(apiToken())).Move() : rapidjson::Value(rapidjson::kNullType).Move(), allocator); api.AddMember("access-token", apiToken() ? rapidjson::Value(rapidjson::StringRef(apiToken())).Move() : rapidjson::Value(rapidjson::kNullType).Move(), allocator);
// api.AddMember("worker-id", apiWorkerId() ? rapidjson::Value(rapidjson::StringRef(apiWorkerId())).Move() : rapidjson::Value(rapidjson::kNullType).Move(), allocator); api.AddMember("worker-id", apiWorkerId() ? rapidjson::Value(rapidjson::StringRef(apiWorkerId())).Move() : rapidjson::Value(rapidjson::kNullType).Move(), allocator);
// api.AddMember("ipv6", isApiIPv6(), allocator); api.AddMember("ipv6", isApiIPv6(), allocator);
// api.AddMember("restricted", isApiRestricted(), allocator); api.AddMember("restricted", isApiRestricted(), allocator);
// doc.AddMember("api", api, allocator); doc.AddMember("api", api, allocator);
// doc.AddMember("background", isBackground(), allocator); doc.AddMember("av", algoVariant(), allocator);
doc.AddMember("background", isBackground(), allocator);
// rapidjson::Value bind(rapidjson::kArrayType); doc.AddMember("colors", isColors(), allocator);
// for (const Addr *addr : m_addrs) {
// bind.PushBack(rapidjson::StringRef(addr->addr()), allocator);
// }
// doc.AddMember("bind", bind, allocator); if (affinity() != -1L) {
// doc.AddMember("colors", isColors(), allocator); snprintf(affinity_tmp, sizeof(affinity_tmp) - 1, "0x%" PRIX64, affinity());
// doc.AddMember("custom-diff", diff(), allocator); doc.AddMember("cpu-affinity", rapidjson::StringRef(affinity_tmp), allocator);
// doc.AddMember("donate-level", donateLevel(), allocator); }
// doc.AddMember("log-file", logFile() ? rapidjson::Value(rapidjson::StringRef(logFile())).Move() : rapidjson::Value(rapidjson::kNullType).Move(), allocator); else {
// doc.AddMember("mode", rapidjson::StringRef(modeName()), allocator); doc.AddMember("cpu-affinity", rapidjson::kNullType, allocator);
}
// rapidjson::Value pools(rapidjson::kArrayType); if (priority() != -1) {
doc.AddMember("cpu-priority", priority(), allocator);
}
else {
doc.AddMember("cpu-priority", rapidjson::kNullType, allocator);
}
// for (const Url *url : m_pools) { doc.AddMember("donate-level", donateLevel(), allocator);
// rapidjson::Value obj(rapidjson::kObjectType); doc.AddMember("huge-pages", isHugePages(), allocator);
doc.AddMember("log-file", logFile() ? rapidjson::Value(rapidjson::StringRef(logFile())).Move() : rapidjson::Value(rapidjson::kNullType).Move(), allocator);
doc.AddMember("max-cpu-usage", m_maxCpuUsage, allocator);
// obj.AddMember("url", rapidjson::StringRef(url->url()), allocator); rapidjson::Value pools(rapidjson::kArrayType);
// obj.AddMember("user", rapidjson::StringRef(url->user()), allocator);
// obj.AddMember("pass", rapidjson::StringRef(url->password()), allocator);
// obj.AddMember("coin", rapidjson::StringRef(url->coin()), allocator);
// if (url->keepAlive() == 0 || url->keepAlive() == Url::kKeepAliveTimeout) { for (const Url *url : m_pools) {
// obj.AddMember("keepalive", url->keepAlive() > 0, allocator); rapidjson::Value obj(rapidjson::kObjectType);
// }
// else {
// obj.AddMember("keepalive", url->keepAlive(), allocator);
// }
// obj.AddMember("variant", url->variant(), allocator); obj.AddMember("url", rapidjson::StringRef(url->url()), allocator);
obj.AddMember("user", rapidjson::StringRef(url->user()), allocator);
obj.AddMember("pass", rapidjson::StringRef(url->password()), allocator);
// pools.PushBack(obj, allocator); if (url->keepAlive() == 0 || url->keepAlive() == Url::kKeepAliveTimeout) {
// } obj.AddMember("keepalive", url->keepAlive() > 0, allocator);
}
else {
obj.AddMember("keepalive", url->keepAlive(), allocator);
}
// doc.AddMember("pools", pools, allocator); obj.AddMember("nicehash", url->isNicehash(), allocator);
obj.AddMember("variant", url->variant(), allocator);
// doc.AddMember("retries", retries(), allocator); pools.PushBack(obj, allocator);
// doc.AddMember("retry-pause", retryPause(), allocator); }
// doc.AddMember("reuse-timeout", reuseTimeout(), allocator);
// doc.AddMember("user-agent", userAgent() ? rapidjson::Value(rapidjson::StringRef(userAgent())).Move() : rapidjson::Value(rapidjson::kNullType).Move(), allocator);
//# ifdef HAVE_SYSLOG_H doc.AddMember("pools", pools, allocator);
// doc.AddMember("syslog", syslog(), allocator); doc.AddMember("print-time", printTime(), allocator);
//# endif doc.AddMember("retries", retries(), allocator);
doc.AddMember("retry-pause", retryPause(), allocator);
doc.AddMember("safe", m_safe, allocator);
doc.AddMember("threads", threads(), allocator);
doc.AddMember("user-agent", userAgent() ? rapidjson::Value(rapidjson::StringRef(userAgent())).Move() : rapidjson::Value(rapidjson::kNullType).Move(), allocator);
// doc.AddMember("verbose", isVerbose(), allocator); # ifdef HAVE_SYSLOG_H
// doc.AddMember("watch", m_watch, allocator); doc.AddMember("syslog", syslog(), allocator);
// doc.AddMember("workers", isWorkers(), allocator); # endif
doc.AddMember("watch", m_watch, allocator);
} }

2
src/core/ConfigLoader_platform.h
View file

@ -138,7 +138,7 @@ static struct option const config_options[] = {
{ "retry-pause", 1, nullptr, xmrig::IConfig::RetryPauseKey }, { "retry-pause", 1, nullptr, xmrig::IConfig::RetryPauseKey },
{ "safe", 0, nullptr, xmrig::IConfig::SafeKey }, { "safe", 0, nullptr, xmrig::IConfig::SafeKey },
{ "syslog", 0, nullptr, xmrig::IConfig::SyslogKey }, { "syslog", 0, nullptr, xmrig::IConfig::SyslogKey },
{ "threads", 1, nullptr, xmrig::IConfig::SafeKey }, { "threads", 1, nullptr, xmrig::IConfig::ThreadsKey },
{ "user-agent", 1, nullptr, xmrig::IConfig::UserAgentKey }, { "user-agent", 1, nullptr, xmrig::IConfig::UserAgentKey },
{ 0, 0, 0, 0 } { 0, 0, 0, 0 }
}; };