mirrors/ZeroTierOne
1
Fork 0
mirror of https://github.com/zerotier/ZeroTierOne.git synced 2026-01-30 04:11:21 -08:00
Code Issues Projects Releases Wiki Activity

robustify the handling of tags/capabilities/rules which are strings of encoded json

Browse source
This commit is contained in:
Grant Limberg 2025-10-09 14:39:46 -07:00
parent 946d96f482
commit 46a8cd7b67
No known key found for this signature in database
GPG key ID: 8F2F97D3BE8D7735
1 changed files with 33 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

36
nonfree/controller/PubSubListener.cpp
View file

@ -311,7 +311,17 @@ nlohmann::json toJson(const pbmessages::NetworkChange_Network& nc, pbmessages::N
out["objtype"] = "network";
out["id"] = nc.network_id();
out["name"] = nc.name();
out["capabilities"] = OSUtils::jsonParse(nc.capabilities());
if (nc.has_capabilities()) {
std::string caps = nc.capabilities();
if (caps == "null") {
out["capabilities"] = "null";
}
else {
out["capabilities"] = OSUtils::jsonParse(caps);
}
out["capabilities"] = OSUtils::jsonParse(caps);
}
out["mtu"] = nc.mtu();
out["multicastLimit"] = nc.multicast_limit();
out["private"] = nc.is_private();
@ -322,9 +332,29 @@ nlohmann::json toJson(const pbmessages::NetworkChange_Network& nc, pbmessages::N
else {
out["remoteTraceTarget"] = "";
}
out["rules"] = OSUtils::jsonParse(nc.rules());
if (nc.has_rules()) {
std::string rules = nc.rules();
if (rules == "null") {
out["rules"] = "[]";
}
else {
out["rules"] = OSUtils::jsonParse(rules);
}
}
out["rulesSource"] = nc.rules_source();
out["tags"] = OSUtils::jsonParse(nc.tags());
if (nc.has_tags()) {
std::string tags = nc.tags();
if (tags == "[]") {
out["tags"] = "[]";
}
else {
out["tags"] = OSUtils::jsonParse(tags);
}
}
else {
out["tags"] = "[]";
}
if (nc.has_ipv4_assign_mode()) {
nlohmann::json ipv4mode;