Mirrors/VILLASnode
1
0
Fork 0
mirror of https://git.rwth-aachen.de/acs/public/villas/node/ synced 2025-03-09 00:00:00 +01:00
Code Issues Releases Wiki Activity

Fix buffer overflow in UUID handling

Browse source 
Signed-off-by: Steffen Vogel <steffen.vogel@opal-rt.com>
This commit is contained in:
Steffen Vogel 2023-06-30 13:00:01 +02:00
parent 7c32617ead
commit 352c5996db
11 changed files with 25 additions and 59 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
common

@ -1 +1 @@
Subproject commit d9d4ac76a5403e14f7899dae480781e9cdcf0572
Subproject commit 120312e938dc298b4dc13792e1acf7510190bbf4

6
include/villas/path.hpp
View file

@ -188,6 +188,12 @@ public:
return state;
}
/** Get the UUID of this path. */
const uuid_t & getUuid() const
{
return uuid;
}
json_t * toJson() const;
};

4
include/villas/super_node.hpp
View file

@ -146,9 +146,9 @@ public:
return state;
}
void getUUID(uuid_t out) const
const uuid_t & getUuid() const
{
uuid_copy(out, uuid);
return uuid;
}
struct timespec getStartTime() const

11
lib/api/requests/status.cpp
View file

@ -6,16 +6,14 @@
*********************************************************************************/
#include <time.h>
#include <uuid/uuid.h>
#include <sys/utsname.h>
#include <sys/sysinfo.h>
#include <villas/uuid.hpp>
#include <villas/timing.hpp>
#include <villas/api/request.hpp>
#include <villas/api/response.hpp>
typedef char uuid_string_t[37];
namespace villas {
namespace node {
namespace api {
@ -37,15 +35,10 @@ public:
auto *sn = session->getSuperNode();
uuid_t uuid;
uuid_string_t uuid_str;
struct utsname uts;
struct sysinfo sinfo;
char hname[128];
sn->getUUID(uuid);
uuid_unparse_lower(uuid, uuid_str);
auto now = time_now();
auto started = sn->getStartTime();
@ -73,7 +66,7 @@ public:
"build_id", PROJECT_BUILD_ID,
"build_date", PROJECT_BUILD_DATE,
"hostname", hname,
"uuid", uuid_str,
"uuid", uuid::toString(sn->getUuid()).c_str(),
"time_now", time_to_double(&now),
"time_started", time_to_double(&started),
"timezone",

10
lib/api/requests/universal/info.cpp
View file

@ -5,8 +5,7 @@
* @license Apache 2.0
*********************************************************************************/
#include <uuid.h>
#include <villas/uuid.hpp>
#include <villas/api/requests/universal.hpp>
#include <villas/api/response.hpp>
#include <villas/node.hpp>
@ -28,14 +27,9 @@ public:
if (body != nullptr)
throw BadRequest("This endpoint does not accept any body data");
auto uid = node->getUuid();
char uid_str[UUID_STR_LEN];
uuid_unparse(uid, uid_str);
auto *info = json_pack("{ s: s, s: s, s: { s: s, s: s, s: s } }",
"id", node->getNameShort().c_str(),
"uuid", uid_str,
"uuid", uuid::toString(node->getUuid()).c_str(),
"transport",
"type", "villas",

10
lib/node.cpp
View file

@ -364,11 +364,8 @@ int Node::write(struct Sample * smps[], unsigned cnt)
const std::string & Node::getNameFull()
{
if (name_full.empty()) {
char uuid_str[37];
uuid_unparse(uuid, uuid_str);
name_full = fmt::format("{}: uuid={}, #in.signals={}/{}, #in.hooks={}, #out.hooks={}, in.vectorize={}, out.vectorize={}",
getName(), uuid_str,
getName(), uuid::toString(uuid).c_str(),
getInputSignals(false)->size(),
getInputSignals(true)->size(),
in.hooks.size(), out.hooks.size(),
@ -438,9 +435,6 @@ json_t * Node::toJson() const
json_t *json_signals_in = nullptr;
json_t *json_signals_out = nullptr;
char uuid_str[37];
uuid_unparse(uuid, uuid_str);
json_signals_in = getInputSignals()->toJson();
auto output_signals = getOutputSignals();
@ -449,7 +443,7 @@ json_t * Node::toJson() const
json_node = json_pack("{ s: s, s: s, s: s, s: i, s: { s: i, s: o? }, s: { s: i, s: o? } }",
"name", getNameShort().c_str(),
"uuid", uuid_str,
"uuid", uuid::toString(uuid).c_str(),
"state", stateToString(state).c_str(),
"affinity", affinity,
"in",

7
lib/nodes/webrtc.cpp
View file

@ -11,6 +11,7 @@
#include <villas/node_compat.hpp>
#include <villas/nodes/webrtc.hpp>
#include <villas/uuid.hpp>
#include <villas/utils.hpp>
#include <villas/sample.hpp>
#include <villas/exceptions.hpp>
@ -35,9 +36,7 @@ WebRTCNode::WebRTCNode(const uuid_t &id, const std::string &name) :
dci.reliability.type = rtc::Reliability::Type::Rexmit;
// Initialize signaling peer with node UUID
char uuid_str[36+1];
uuid_unparse(id, uuid_str);
peer = uuid_str;
peer = uuid::toString(id);
}
WebRTCNode::~WebRTCNode()
@ -234,7 +233,7 @@ int WebRTCNode::_write(struct Sample *smps[], unsigned cnt)
return ret;
}
json_t * WebRTCNode::_readStatus()
json_t * WebRTCNode::_readStatus() const
{
if (!conn)
return nullptr;

2
lib/nodes/webrtc/peer_connection.cpp
View file

@ -81,7 +81,7 @@ bool PeerConnection::waitForDataChannel(std::chrono::seconds timeout)
return startupCondition.wait_until(lock, deadline, [this](){ return this->stopStartup; });
}
json_t * PeerConnection::readStatus()
json_t * PeerConnection::readStatus() const
{
auto *json = json_pack("{ s: I, s: I }",
"bytes_received", conn->bytesReceived(),

5
lib/path.cpp
View file

@ -696,9 +696,6 @@ unsigned Path::getOutputSignalsMaxCount()
json_t * Path::toJson() const
{
char uuid_str[37];
uuid_unparse(uuid, uuid_str);
json_t *json_signals = signals->toJson();
#ifdef WITH_HOOKS
json_t *json_hooks = hooks.toJson();
@ -715,7 +712,7 @@ json_t * Path::toJson() const
json_array_append_new(json_destinations, json_string(pd->node->getNameShort().c_str()));
json_t *json_path = json_pack("{ s: s, s: s, s: s, s: b, s: b s: b, s: b, s: b, s: b s: i, s: o, s: o, s: o, s: o }",
"uuid", uuid_str,
"uuid", uuid::toString(uuid).c_str(),
"state", stateToString(state).c_str(),
"mode", mode == Mode::ANY ? "any" : "all",
"enabled", enabled,

15
lib/super_node.cpp
View file

@ -29,8 +29,6 @@
using namespace villas;
using namespace villas::node;
typedef char uuid_string_t[37];
SuperNode::SuperNode() :
state(State::INITIALIZED),
idleStop(-1),
@ -153,7 +151,7 @@ void SuperNode::parse(json_t *root)
}
else
// Generate UUID from node name and super-node UUID
uuid::generateFromString(node_uuid, node_name, uuid);
uuid::generateFromString(node_uuid, node_name, uuid::toString(uuid));
auto *n = NodeFactory::make(node_type, node_uuid, node_name);
if (!n)
@ -162,7 +160,6 @@ void SuperNode::parse(json_t *root)
ret = n->parse(json_node);
if (ret) {
auto config_id = fmt::format("node-config-node-{}", node_type);
throw ConfigError(json_node, config_id, "Failed to parse configuration of node '{}'", node_name);
}
@ -514,15 +511,11 @@ graph_t * SuperNode::getGraph()
std::map<Node *, Agnode_t *> nodeMap;
uuid_string_t uuid_str;
for (auto *n : nodes) {
nodeMap[n] = agnode(g, (char *) n->getNameShort().c_str(), 1);
uuid_unparse(n->getUuid(), uuid_str);
set_attr(nodeMap[n], "shape", "ellipse");
set_attr(nodeMap[n], "tooltip", fmt::format("type={}, uuid={}", n->getFactory()->getName(), uuid_str));
set_attr(nodeMap[n], "tooltip", fmt::format("type={}, uuid={}", n->getFactory()->getName(), uuid::toString(n->getUuid()).c_str()));
// set_attr(nodeMap[n], "fixedsize", "true");
// set_attr(nodeMap[n], "width", "0.15");
// set_attr(nodeMap[n], "height", "0.15");
@ -534,10 +527,8 @@ graph_t * SuperNode::getGraph()
m = agnode(g, (char *) name.c_str(), 1);
uuid_unparse(p->uuid, uuid_str);
set_attr(m, "shape", "box");
set_attr(m, "tooltip", fmt::format("uuid={}", uuid_str));
set_attr(m, "tooltip", fmt::format("uuid={}", uuid::toString(p->getUuid()).c_str()));
for (auto ps : p->sources)
agedge(g, nodeMap[ps->getNode()], m, nullptr, 1);

12
src/villas-relay.cpp
View file

@ -26,8 +26,6 @@
#include "villas-relay.hpp"
typedef char uuid_string_t[37];
using namespace villas;
using namespace villas::node;
@ -100,12 +98,9 @@ json_t * RelaySession::toJson() const
json_array_append(json_connections, conn->toJson());
}
uuid_string_t uuid_str;
uuid_unparse_lower(uuid, uuid_str);
return json_pack("{ s: s, s: s, s: o, s: I, s: i }",
"identifier", identifier.c_str(),
"uuid", uuid_str,
"uuid", uuid::toString(uuid).c_str(),
"connections", json_connections,
"created", created,
"connects", connects
@ -296,14 +291,11 @@ int Relay::httpProtocolCallback(lws *wsi, enum lws_callback_reasons reason, void
json_array_append(json_sessions, session->toJson());
}
uuid_string_t uuid_str;
uuid_unparse(r->uuid, uuid_str);
json_body = json_pack("{ s: o, s: s, s: s, s: s, s: { s: b, s: i, s: s } }",
"sessions", json_sessions,
"version", PROJECT_VERSION_STR,
"hostname", r->hostname.c_str(),
"uuid", uuid_str,
"uuid", uuid::toString(r->uuid).c_str(),
"options",
"loopback", r->loopback,
"port", r->port,