Fixing more JSON issues

nonfree/controller/CentralDB.cpp

@@ -1207,6 +1207,30 @@ void CentralDB::commitThread()
 						}
 					}
 
+					std::vector<std::string> ipAssignments;
+					if (config["ipAssignments"].is_array()) {
+						for (auto& ip : config["ipAssignments"]) {
+							if (ip.is_string()) {
+								ipAssignments.push_back(ip.get<std::string>());
+							}
+						}
+					}
+
+					fprintf(stderr, "member json: %s\n", config.dump().c_str());
+
+					int64_t vMajor = OSUtils::jsonUInt(config["vMajor"], 0);
+					int64_t vMinor = OSUtils::jsonUInt(config["vMinor"], 0);
+					int64_t vRev = OSUtils::jsonUInt(config["vRev"], 0);
+					int64_t vProto = OSUtils::jsonUInt(config["vProto"], 0);
+					if (vMajor < 0)
+						vMajor = 0;
+					if (vMinor < 0)
+						vMinor = 0;
+					if (vRev < 0)
+						vRev = 0;
+					if (vProto < 0)
+						vProto = 0;
+
 					pqxx::result res =
 						w.exec(
 							 "INSERT INTO network_memberships_ctl (device_id, network_id, authorized, active_bridge, "
@@ -1235,25 +1259,25 @@ void CentralDB::commitThread()
 							 "version_protocol = EXCLUDED.version_protocol",
 							 pqxx::params { memberId,
 											networkId,
-											(bool)config["authorized"],
-											(bool)config["activeBridge"],
-											config["ipAssignments"].get<std::vector<std::string> >(),
-											(bool)config["noAutoAssignIps"],
-											(bool)config["ssoExempt"],
-											(uint64_t)config["authenticationExpiryTime"],
+											OSUtils::jsonBool(config["authorized"], false),
+											OSUtils::jsonBool(config["activeBridge"], false),
+											ipAssignments,
+											OSUtils::jsonBool(config["noAutoAssignIps"], false),
+											OSUtils::jsonBool(config["ssoExempt"], false),
+											OSUtils::jsonInt(config["authenticationExpiryTime"], 0),
 											OSUtils::jsonDump(config["capabilities"], -1),
-											(uint64_t)config["creationTime"],
+											OSUtils::jsonInt(config["creationTime"], OSUtils::now()),
 											OSUtils::jsonString(config["identity"], ""),
-											(uint64_t)config["lastAuthorizedTime"],
-											(uint64_t)config["lastDeauthorizedTime"],
-											(int)config["remoteTraceLevel"],
+											OSUtils::jsonInt(config["lastAuthorizedTime"], 0),
+											OSUtils::jsonInt(config["lastDeauthorizedTime"], 0),
+											OSUtils::jsonInt(config["remoteTraceLevel"], 0),
 											target,
-											(uint64_t)config["revision"],
+											OSUtils::jsonInt(config["revision"], 0),
 											OSUtils::jsonDump(config["tags"], -1),
-											(int)config["vMajor"],
-											(int)config["vMinor"],
-											(int)config["vRev"],
-											(int)config["vProto"] })
+											vMajor,
+											vMinor,
+											vRev,
+											vProto })
 							.no_rows();
 
 					w.commit();

osdep/OSUtils.cpp

@@ -9,6 +9,7 @@
 #include "../node/Constants.hpp"
 #include "../node/Utils.hpp"
 
+#include <cstddef>
 #include <inttypes.h>
 #include <stdarg.h>
 #include <stdio.h>
@@ -109,7 +110,9 @@ std::vector<std::string> OSUtils::listDirectory(const char* path, bool includeDi
 	WIN32_FIND_DATAA ffd;
 	if ((hFind = FindFirstFileA((std::string(path) + "\\*").c_str(), &ffd)) != INVALID_HANDLE_VALUE) {
 		do {
-			if ((strcmp(ffd.cFileName, ".")) && (strcmp(ffd.cFileName, "..")) && (((ffd.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) == 0) || (((ffd.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) != 0) && (includeDirectories))))
+			if ((strcmp(ffd.cFileName, ".")) && (strcmp(ffd.cFileName, ".."))
+				&& (((ffd.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) == 0)
+					|| (((ffd.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) != 0) && (includeDirectories))))
 				r.push_back(std::string(ffd.cFileName));
 		} while (FindNextFileA(hFind, &ffd));
 		FindClose(hFind);
@@ -125,7 +128,8 @@ std::vector<std::string> OSUtils::listDirectory(const char* path, bool includeDi
 		if (readdir_r(d, &de, &dptr))
 			break;
 		if (dptr) {
-			if ((strcmp(dptr->d_name, ".")) && (strcmp(dptr->d_name, "..")) && ((dptr->d_type != DT_DIR) || (includeDirectories)))
+			if ((strcmp(dptr->d_name, ".")) && (strcmp(dptr->d_name, ".."))
+				&& ((dptr->d_type != DT_DIR) || (includeDirectories)))
 				r.push_back(std::string(dptr->d_name));
 		}
 		else
@@ -149,7 +153,8 @@ long OSUtils::cleanDirectory(const char* path, const int64_t olderThan)
 	char tmp[4096];
 	if ((hFind = FindFirstFileA((std::string(path) + "\\*").c_str(), &ffd)) != INVALID_HANDLE_VALUE) {
 		do {
-			if ((strcmp(ffd.cFileName, ".")) && (strcmp(ffd.cFileName, "..")) && ((ffd.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) == 0)) {
+			if ((strcmp(ffd.cFileName, ".")) && (strcmp(ffd.cFileName, ".."))
+				&& ((ffd.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) == 0)) {
 				date.HighPart = ffd.ftLastWriteTime.dwHighDateTime;
 				date.LowPart = ffd.ftLastWriteTime.dwLowDateTime;
 				if (date.QuadPart > 0) {
@@ -258,7 +263,10 @@ void OSUtils::lockDownFile(const char* path, bool isDir)
 		startupInfo.cb = sizeof(startupInfo);
 		memset(&startupInfo, 0, sizeof(STARTUPINFOA));
 		memset(&processInfo, 0, sizeof(PROCESS_INFORMATION));
-		if (CreateProcessA(NULL, (LPSTR)(std::string("C:\\Windows\\System32\\icacls.exe \"") + path + "\" /inheritance:d /Q").c_str(), NULL, NULL, FALSE, CREATE_NO_WINDOW, NULL, NULL, &startupInfo, &processInfo)) {
+		if (CreateProcessA(
+				NULL,
+				(LPSTR)(std::string("C:\\Windows\\System32\\icacls.exe \"") + path + "\" /inheritance:d /Q").c_str(),
+				NULL, NULL, FALSE, CREATE_NO_WINDOW, NULL, NULL, &startupInfo, &processInfo)) {
 			WaitForSingleObject(processInfo.hProcess, INFINITE);
 			CloseHandle(processInfo.hProcess);
 			CloseHandle(processInfo.hThread);
@@ -267,7 +275,11 @@ void OSUtils::lockDownFile(const char* path, bool isDir)
 		startupInfo.cb = sizeof(startupInfo);
 		memset(&startupInfo, 0, sizeof(STARTUPINFOA));
 		memset(&processInfo, 0, sizeof(PROCESS_INFORMATION));
-		if (CreateProcessA(NULL, (LPSTR)(std::string("C:\\Windows\\System32\\icacls.exe \"") + path + "\" /remove *S-1-5-32-545 /Q").c_str(), NULL, NULL, FALSE, CREATE_NO_WINDOW, NULL, NULL, &startupInfo, &processInfo)) {
+		if (CreateProcessA(
+				NULL,
+				(LPSTR)(std::string("C:\\Windows\\System32\\icacls.exe \"") + path + "\" /remove *S-1-5-32-545 /Q")
+					.c_str(),
+				NULL, NULL, FALSE, CREATE_NO_WINDOW, NULL, NULL, &startupInfo, &processInfo)) {
 			WaitForSingleObject(processInfo.hProcess, INFINITE);
 			CloseHandle(processInfo.hProcess);
 			CloseHandle(processInfo.hThread);
@@ -277,7 +289,11 @@ void OSUtils::lockDownFile(const char* path, bool isDir)
 		startupInfo.cb = sizeof(startupInfo);
 		memset(&startupInfo, 0, sizeof(STARTUPINFOA));
 		memset(&processInfo, 0, sizeof(PROCESS_INFORMATION));
-		if (CreateProcessA(NULL, (LPSTR)(std::string("C:\\Windows\\System32\\icacls.exe \"") + path + "\" /remove:g Everyone /t /c /Q").c_str(), NULL, NULL, FALSE, CREATE_NO_WINDOW, NULL, NULL, &startupInfo, &processInfo)) {
+		if (CreateProcessA(
+				NULL,
+				(LPSTR)(std::string("C:\\Windows\\System32\\icacls.exe \"") + path + "\" /remove:g Everyone /t /c /Q")
+					.c_str(),
+				NULL, NULL, FALSE, CREATE_NO_WINDOW, NULL, NULL, &startupInfo, &processInfo)) {
 			WaitForSingleObject(processInfo.hProcess, INFINITE);
 			CloseHandle(processInfo.hProcess);
 			CloseHandle(processInfo.hThread);
@@ -507,6 +523,25 @@ uint64_t OSUtils::jsonInt(const nlohmann::json& jv, const uint64_t dfl)
 	return dfl;
 }
 
+int64_t OSUtils::jsonUInt(const nlohmann::json& jv, const int64_t dfl)
+{
+	try {
+		if (jv.is_number()) {
+			return (int64_t)jv;
+		}
+		else if (jv.is_string()) {
+			std::string s = jv;
+			return Utils::strTo64(s.c_str());
+		}
+		else if (jv.is_boolean()) {
+			return ((bool)jv ? 1LL : 0LL);
+		}
+	}
+	catch (...) {
+	}
+	return dfl;
+}
+
 double OSUtils::jsonDouble(const nlohmann::json& jv, const double dfl)
 {
 	try {
@@ -614,14 +649,21 @@ std::string OSUtils::jsonBinFromHex(const nlohmann::json& jv)
 #endif	 // OMIT_JSON_SUPPORT
 
 // Used to convert HTTP header names to ASCII lower case
-const unsigned char OSUtils::TOLOWER_TABLE[256] = { 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x18, 0x19, 0x1a, 0x1b, 0x1c,
-													0x1d, 0x1e, 0x1f, ' ',	'!',  '"',	'#',  '$',	'%',  '&',	0x27, '(',	')',  '*',	'+',  ',',	'-',  '.',	'/',  '0',	'1',  '2',	'3',  '4',	'5',  '6',	'7',  '8',	'9',
-													':',  ';',	'<',  '=',	'>',  '?',	'@',  'a',	'b',  'c',	'd',  'e',	'f',  'g',	'h',  'i',	'j',  'k',	'l',  'm',	'n',  'o',	'p',  'q',	'r',  's',	't',  'u',	'v',
-													'w',  'x',	'y',  'z',	'{',  '|',	'}',  '~',	'_',  '`',	'a',  'b',	'c',  'd',	'e',  'f',	'g',  'h',	'i',  'j',	'k',  'l',	'm',  'n',	'o',  'p',	'q',  'r',	's',
-													't',  'u',	'v',  'w',	'x',  'y',	'z',  '{',	'|',  '}',	'~',  0x7f, 0x80, 0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87, 0x88, 0x89, 0x8a, 0x8b, 0x8c, 0x8d, 0x8e, 0x8f, 0x90,
-													0x91, 0x92, 0x93, 0x94, 0x95, 0x96, 0x97, 0x98, 0x99, 0x9a, 0x9b, 0x9c, 0x9d, 0x9e, 0x9f, 0xa0, 0xa1, 0xa2, 0xa3, 0xa4, 0xa5, 0xa6, 0xa7, 0xa8, 0xa9, 0xaa, 0xab, 0xac, 0xad,
-													0xae, 0xaf, 0xb0, 0xb1, 0xb2, 0xb3, 0xb4, 0xb5, 0xb6, 0xb7, 0xb8, 0xb9, 0xba, 0xbb, 0xbc, 0xbd, 0xbe, 0xbf, 0xc0, 0xc1, 0xc2, 0xc3, 0xc4, 0xc5, 0xc6, 0xc7, 0xc8, 0xc9, 0xca,
-													0xcb, 0xcc, 0xcd, 0xce, 0xcf, 0xd0, 0xd1, 0xd2, 0xd3, 0xd4, 0xd5, 0xd6, 0xd7, 0xd8, 0xd9, 0xda, 0xdb, 0xdc, 0xdd, 0xde, 0xdf, 0xe0, 0xe1, 0xe2, 0xe3, 0xe4, 0xe5, 0xe6, 0xe7,
-													0xe8, 0xe9, 0xea, 0xeb, 0xec, 0xed, 0xee, 0xef, 0xf0, 0xf1, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7, 0xf8, 0xf9, 0xfa, 0xfb, 0xfc, 0xfd, 0xfe, 0xff };
+const unsigned char OSUtils::TOLOWER_TABLE[256] = {
+	0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, 0x10, 0x11, 0x12,
+	0x13, 0x14, 0x15, 0x16, 0x17, 0x18, 0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, 0x1f, ' ',	'!',  '"',	'#',  '$',	'%',
+	'&',  0x27, '(',  ')',	'*',  '+',	',',  '-',	'.',  '/',	'0',  '1',	'2',  '3',	'4',  '5',	'6',  '7',	'8',
+	'9',  ':',	';',  '<',	'=',  '>',	'?',  '@',	'a',  'b',	'c',  'd',	'e',  'f',	'g',  'h',	'i',  'j',	'k',
+	'l',  'm',	'n',  'o',	'p',  'q',	'r',  's',	't',  'u',	'v',  'w',	'x',  'y',	'z',  '{',	'|',  '}',	'~',
+	'_',  '`',	'a',  'b',	'c',  'd',	'e',  'f',	'g',  'h',	'i',  'j',	'k',  'l',	'm',  'n',	'o',  'p',	'q',
+	'r',  's',	't',  'u',	'v',  'w',	'x',  'y',	'z',  '{',	'|',  '}',	'~',  0x7f, 0x80, 0x81, 0x82, 0x83, 0x84,
+	0x85, 0x86, 0x87, 0x88, 0x89, 0x8a, 0x8b, 0x8c, 0x8d, 0x8e, 0x8f, 0x90, 0x91, 0x92, 0x93, 0x94, 0x95, 0x96, 0x97,
+	0x98, 0x99, 0x9a, 0x9b, 0x9c, 0x9d, 0x9e, 0x9f, 0xa0, 0xa1, 0xa2, 0xa3, 0xa4, 0xa5, 0xa6, 0xa7, 0xa8, 0xa9, 0xaa,
+	0xab, 0xac, 0xad, 0xae, 0xaf, 0xb0, 0xb1, 0xb2, 0xb3, 0xb4, 0xb5, 0xb6, 0xb7, 0xb8, 0xb9, 0xba, 0xbb, 0xbc, 0xbd,
+	0xbe, 0xbf, 0xc0, 0xc1, 0xc2, 0xc3, 0xc4, 0xc5, 0xc6, 0xc7, 0xc8, 0xc9, 0xca, 0xcb, 0xcc, 0xcd, 0xce, 0xcf, 0xd0,
+	0xd1, 0xd2, 0xd3, 0xd4, 0xd5, 0xd6, 0xd7, 0xd8, 0xd9, 0xda, 0xdb, 0xdc, 0xdd, 0xde, 0xdf, 0xe0, 0xe1, 0xe2, 0xe3,
+	0xe4, 0xe5, 0xe6, 0xe7, 0xe8, 0xe9, 0xea, 0xeb, 0xec, 0xed, 0xee, 0xef, 0xf0, 0xf1, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6,
+	0xf7, 0xf8, 0xf9, 0xfa, 0xfb, 0xfc, 0xfd, 0xfe, 0xff
+};
 
 }	// namespace ZeroTier

osdep/OSUtils.hpp

@@ -293,6 +293,7 @@ class OSUtils {
 	static nlohmann::json jsonParse(const std::string& buf);
 	static std::string jsonDump(const nlohmann::json& j, int indentation = 1);
 	static uint64_t jsonInt(const nlohmann::json& jv, const uint64_t dfl);
+	static int64_t jsonUInt(const nlohmann::json& jv, const int64_t dfl);
 	static double jsonDouble(const nlohmann::json& jv, const double dfl);
 	static uint64_t jsonIntHex(const nlohmann::json& jv, const uint64_t dfl);
 	static bool jsonBool(const nlohmann::json& jv, const bool dfl);