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

these should be empty json arrays, not just "[]".

Browse source 
Actually these *should* be structs, not filling out json.  Adding this to the tech debt backlog
This commit is contained in:
Grant Limberg 2025-10-09 15:39:40 -07:00
parent 19ccc98f91
commit bf0fe2c09a
No known key found for this signature in database
GPG key ID: 8F2F97D3BE8D7735
1 changed files with 71 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

110
nonfree/controller/PubSubListener.cpp
View file

@ -312,15 +312,21 @@ nlohmann::json toJson(const pbmessages::NetworkChange_Network& nc, pbmessages::N
out["id"] = nc.network_id();
out["name"] = nc.name();
std::string caps = nc.capabilities();
if (caps.length() == 0) {
out["capabilities"] = "[]";
try {
std::string caps = nc.capabilities();
if (caps.length() == 0) {
out["capabilities"] = nlohmann::json::array();
}
else if (caps == "null") {
out["capabilities"] = nlohmann::json::array();
}
else {
out["capabilities"] = OSUtils::jsonParse(caps);
}
}
else if (caps == "null") {
out["capabilities"] = "[]";
}
else {
out["capabilities"] = OSUtils::jsonParse(caps);
catch (const nlohmann::json::parse_error& e) {
fprintf(stderr, "toJson Network capabilities JSON parse error: %s\n", e.what());
out["capabilities"] = nlohmann::json::array();
}
out["mtu"] = nc.mtu();
@ -334,29 +340,41 @@ nlohmann::json toJson(const pbmessages::NetworkChange_Network& nc, pbmessages::N
out["remoteTraceTarget"] = "";
}
std::string rules = nc.rules();
if (rules.length() == 0) {
out["rules"] = "[]";
try {
std::string rules = nc.rules();
if (rules.length() == 0) {
out["rules"] = nlohmann::json::array();
}
else if (rules == "null") {
out["rules"] = nlohmann::json::array();
}
else {
out["rules"] = OSUtils::jsonParse(rules);
}
}
else if (rules == "null") {
out["rules"] = "[]";
}
else {
out["rules"] = OSUtils::jsonParse(rules);
catch (const nlohmann::json::parse_error& e) {
fprintf(stderr, "toJson Network rules JSON parse error: %s\n", e.what());
out["rules"] = nlohmann::json::array();
}
out["rulesSource"] = nc.rules_source();
std::string tags = nc.tags();
if (tags.length() == 0) {
out["tags"] = "[]";
try {
std::string tags = nc.tags();
if (tags.length() == 0) {
out["tags"] = nlohmann::json::array();
}
else if (tags == "[]") {
out["tags"] = nlohmann::json::array();
}
else {
out["tags"] = OSUtils::jsonParse(tags);
}
}
else if (tags == "[]") {
catch (const nlohmann::json::parse_error& e) {
fprintf(stderr, "toJson Network tags JSON parse error: %s\n", e.what());
out["tags"] = "[]";
}
else {
out["tags"] = OSUtils::jsonParse(tags);
}
if (nc.has_ipv4_assign_mode()) {
nlohmann::json ipv4mode;
@ -501,15 +519,22 @@ nlohmann::json toJson(const pbmessages::MemberChange_Member& mc, pbmessages::Mem
out["ssoExempt"] = mc.sso_exempt();
out["authenticationExpiryTime"] = mc.auth_expiry_time();
std::string caps = mc.capabilities();
if (caps.length() == 0) {
out["capabilities"] = "[]";
try {
std::string caps = mc.capabilities();
if (caps.length() == 0) {
out["capabilities"] = nlohmann::json::array();
}
else if (caps == "null") {
out["capabilities"] = nlohmann::json::array();
}
else {
out["capabilities"] = OSUtils::jsonParse(caps);
}
}
else if (caps == "null") {
out["capabilities"] = "[]";
}
else {
out["capabilities"] = OSUtils::jsonParse(caps);
catch (const nlohmann::json::parse_error& e) {
fprintf(stderr, "MemberChange member capabilities JSON parse error: %s\n", e.what());
fprintf(stderr, "capabilities: %s\n", mc.capabilities().c_str());
out["capabilities"] = nlohmann::json::array();
}
out["creationTime"] = mc.creation_time();
@ -519,15 +544,22 @@ nlohmann::json toJson(const pbmessages::MemberChange_Member& mc, pbmessages::Mem
out["remoteTraceLevel"] = mc.remote_trace_level();
out["revision"] = mc.revision();
std::string tags = mc.tags();
if (tags.length() == 0) {
out["tags"] = "[]";
try {
std::string tags = mc.tags();
if (tags.length() == 0) {
out["tags"] = nlohmann::json::array();
}
else if (tags == "null") {
out["tags"] = nlohmann::json::array();
}
else {
out["tags"] = OSUtils::jsonParse(tags);
}
}
else if (tags == "null") {
out["tags"] = "[]";
}
else {
out["tags"] = OSUtils::jsonParse(tags);
catch (const nlohmann::json::parse_error& e) {
fprintf(stderr, "MemberChange member tags JSON parse error: %s\n", e.what());
fprintf(stderr, "tags: %s\n", mc.tags().c_str());
out["tags"] = nlohmann::json::array();
}
out["versionMajor"] = mc.version_major();