mirror of
https://github.com/zerotier/ZeroTierOne.git
synced 2025-06-06 12:33:44 +02:00
Remove "members" from Network record and instead enumerate members via specific query to /network/nwid/member sub-path. More RESTful, scalable, and compatible with how OnePoint code works.
This commit is contained in:
Adam Ierymenko
parent
b343eac10d
commit
a061aa3d87
2 changed files with 124 additions and 114 deletions
|
|
@ -1278,111 +1278,136 @@ unsigned int SqliteNetworkController::_doCPGet(
|
||||||
Utils::snprintf(nwids,sizeof(nwids),"%.16llx",(unsigned long long)nwid);
|
Utils::snprintf(nwids,sizeof(nwids),"%.16llx",(unsigned long long)nwid);
|
||||||
|
|
||||||
if (path.size() >= 3) {
|
if (path.size() >= 3) {
|
||||||
if ((path.size() == 4)&&(path[2] == "member")&&(path[3].length() == 10)) {
|
// /network/<nwid>/...
|
||||||
uint64_t address = Utils::hexStrToU64(path[3].c_str());
|
|
||||||
char addrs[24];
|
|
||||||
Utils::snprintf(addrs,sizeof(addrs),"%.10llx",address);
|
|
||||||
|
|
||||||
sqlite3_reset(_sGetMember2);
|
if (path[2] == "member") {
|
||||||
sqlite3_bind_text(_sGetMember2,1,nwids,16,SQLITE_STATIC);
|
|
||||||
sqlite3_bind_text(_sGetMember2,2,addrs,10,SQLITE_STATIC);
|
|
||||||
if (sqlite3_step(_sGetMember2) == SQLITE_ROW) {
|
|
||||||
Utils::snprintf(json,sizeof(json),
|
|
||||||
"{\n"
|
|
||||||
"\t\"nwid\": \"%s\",\n"
|
|
||||||
"\t\"address\": \"%s\",\n"
|
|
||||||
"\t\"controllerInstanceId\": \"%s\",\n"
|
|
||||||
"\t\"authorized\": %s,\n"
|
|
||||||
"\t\"activeBridge\": %s,\n"
|
|
||||||
"\t\"memberRevision\": %llu,\n"
|
|
||||||
"\t\"identity\": \"%s\",\n"
|
|
||||||
"\t\"ipAssignments\": [",
|
|
||||||
nwids,
|
|
||||||
addrs,
|
|
||||||
_instanceId.c_str(),
|
|
||||||
(sqlite3_column_int(_sGetMember2,0) > 0) ? "true" : "false",
|
|
||||||
(sqlite3_column_int(_sGetMember2,1) > 0) ? "true" : "false",
|
|
||||||
(unsigned long long)sqlite3_column_int64(_sGetMember2,2),
|
|
||||||
_jsonEscape((const char *)sqlite3_column_text(_sGetMember2,3)).c_str());
|
|
||||||
responseBody = json;
|
|
||||||
|
|
||||||
sqlite3_reset(_sGetIpAssignmentsForNode2);
|
if (path.size() >= 4) {
|
||||||
sqlite3_bind_text(_sGetIpAssignmentsForNode2,1,nwids,16,SQLITE_STATIC);
|
// Get specific member info
|
||||||
sqlite3_bind_text(_sGetIpAssignmentsForNode2,2,addrs,10,SQLITE_STATIC);
|
|
||||||
sqlite3_bind_int(_sGetIpAssignmentsForNode2,3,(int)ZT_IP_ASSIGNMENT_TYPE_ADDRESS);
|
uint64_t address = Utils::hexStrToU64(path[3].c_str());
|
||||||
bool firstIp = true;
|
char addrs[24];
|
||||||
while (sqlite3_step(_sGetIpAssignmentsForNode2) == SQLITE_ROW) {
|
Utils::snprintf(addrs,sizeof(addrs),"%.10llx",address);
|
||||||
int ipversion = sqlite3_column_int(_sGetIpAssignmentsForNode2,2);
|
|
||||||
char ipBlob[16];
|
sqlite3_reset(_sGetMember2);
|
||||||
memcpy(ipBlob,(const void *)sqlite3_column_blob(_sGetIpAssignmentsForNode2,0),16);
|
sqlite3_bind_text(_sGetMember2,1,nwids,16,SQLITE_STATIC);
|
||||||
InetAddress ip(
|
sqlite3_bind_text(_sGetMember2,2,addrs,10,SQLITE_STATIC);
|
||||||
(const void *)(ipversion == 6 ? ipBlob : &ipBlob[12]),
|
if (sqlite3_step(_sGetMember2) == SQLITE_ROW) {
|
||||||
(ipversion == 6 ? 16 : 4),
|
Utils::snprintf(json,sizeof(json),
|
||||||
(unsigned int)sqlite3_column_int(_sGetIpAssignmentsForNode2,1)
|
"{\n"
|
||||||
);
|
"\t\"nwid\": \"%s\",\n"
|
||||||
responseBody.append(firstIp ? "\"" : ",\"");
|
"\t\"address\": \"%s\",\n"
|
||||||
firstIp = false;
|
"\t\"controllerInstanceId\": \"%s\",\n"
|
||||||
responseBody.append(_jsonEscape(ip.toString()));
|
"\t\"authorized\": %s,\n"
|
||||||
|
"\t\"activeBridge\": %s,\n"
|
||||||
|
"\t\"memberRevision\": %llu,\n"
|
||||||
|
"\t\"identity\": \"%s\",\n"
|
||||||
|
"\t\"ipAssignments\": [",
|
||||||
|
nwids,
|
||||||
|
addrs,
|
||||||
|
_instanceId.c_str(),
|
||||||
|
(sqlite3_column_int(_sGetMember2,0) > 0) ? "true" : "false",
|
||||||
|
(sqlite3_column_int(_sGetMember2,1) > 0) ? "true" : "false",
|
||||||
|
(unsigned long long)sqlite3_column_int64(_sGetMember2,2),
|
||||||
|
_jsonEscape((const char *)sqlite3_column_text(_sGetMember2,3)).c_str());
|
||||||
|
responseBody = json;
|
||||||
|
|
||||||
|
sqlite3_reset(_sGetIpAssignmentsForNode2);
|
||||||
|
sqlite3_bind_text(_sGetIpAssignmentsForNode2,1,nwids,16,SQLITE_STATIC);
|
||||||
|
sqlite3_bind_text(_sGetIpAssignmentsForNode2,2,addrs,10,SQLITE_STATIC);
|
||||||
|
sqlite3_bind_int(_sGetIpAssignmentsForNode2,3,(int)ZT_IP_ASSIGNMENT_TYPE_ADDRESS);
|
||||||
|
bool firstIp = true;
|
||||||
|
while (sqlite3_step(_sGetIpAssignmentsForNode2) == SQLITE_ROW) {
|
||||||
|
int ipversion = sqlite3_column_int(_sGetIpAssignmentsForNode2,2);
|
||||||
|
char ipBlob[16];
|
||||||
|
memcpy(ipBlob,(const void *)sqlite3_column_blob(_sGetIpAssignmentsForNode2,0),16);
|
||||||
|
InetAddress ip(
|
||||||
|
(const void *)(ipversion == 6 ? ipBlob : &ipBlob[12]),
|
||||||
|
(ipversion == 6 ? 16 : 4),
|
||||||
|
(unsigned int)sqlite3_column_int(_sGetIpAssignmentsForNode2,1)
|
||||||
|
);
|
||||||
|
responseBody.append(firstIp ? "\"" : ",\"");
|
||||||
|
firstIp = false;
|
||||||
|
responseBody.append(_jsonEscape(ip.toString()));
|
||||||
|
responseBody.push_back('"');
|
||||||
|
}
|
||||||
|
|
||||||
|
responseBody.append("]");
|
||||||
|
|
||||||
|
/* It's possible to get the actual netconf dictionary by including these
|
||||||
|
* three URL arguments. The member identity must be the string
|
||||||
|
* serialized identity of this member, and the signing identity must be
|
||||||
|
* the full secret identity of this network controller. The have revision
|
||||||
|
* is optional but would designate the revision our hypothetical client
|
||||||
|
* already has.
|
||||||
|
*
|
||||||
|
* This is primarily for testing and is not used in production. It makes
|
||||||
|
* it easy to test the entire network controller via its JSON API.
|
||||||
|
*
|
||||||
|
* If these arguments are included, three more object fields are returned:
|
||||||
|
* 'netconf', 'netconfResult', and 'netconfResultMessage'. These are all
|
||||||
|
* string fields and contain the actual netconf dictionary, the query
|
||||||
|
* result code, and any verbose message e.g. an error description. */
|
||||||
|
std::map<std::string,std::string>::const_iterator memids(urlArgs.find("memberIdentity"));
|
||||||
|
std::map<std::string,std::string>::const_iterator sigids(urlArgs.find("signingIdentity"));
|
||||||
|
std::map<std::string,std::string>::const_iterator hrs(urlArgs.find("haveRevision"));
|
||||||
|
if ((memids != urlArgs.end())&&(sigids != urlArgs.end())) {
|
||||||
|
Dictionary netconf;
|
||||||
|
Identity memid,sigid;
|
||||||
|
try {
|
||||||
|
if (memid.fromString(memids->second)&&sigid.fromString(sigids->second)&&sigid.hasPrivate()) {
|
||||||
|
uint64_t hr = 0;
|
||||||
|
if (hrs != urlArgs.end())
|
||||||
|
hr = Utils::strToU64(hrs->second.c_str());
|
||||||
|
const char *result = "";
|
||||||
|
switch(this->doNetworkConfigRequest(InetAddress(),sigid,memid,nwid,Dictionary(),hr,netconf)) {
|
||||||
|
case NetworkController::NETCONF_QUERY_OK: result = "OK"; break;
|
||||||
|
case NetworkController::NETCONF_QUERY_OK_BUT_NOT_NEWER: result = "OK_BUT_NOT_NEWER"; break;
|
||||||
|
case NetworkController::NETCONF_QUERY_OBJECT_NOT_FOUND: result = "OBJECT_NOT_FOUND"; break;
|
||||||
|
case NetworkController::NETCONF_QUERY_ACCESS_DENIED: result = "ACCESS_DENIED"; break;
|
||||||
|
case NetworkController::NETCONF_QUERY_INTERNAL_SERVER_ERROR: result = "INTERNAL_SERVER_ERROR"; break;
|
||||||
|
default: result = "(unrecognized result code)"; break;
|
||||||
|
}
|
||||||
|
responseBody.append(",\n\t\"netconf\": \"");
|
||||||
|
responseBody.append(_jsonEscape(netconf.toString().c_str()));
|
||||||
|
responseBody.append("\",\n\t\"netconfResult\": \"");
|
||||||
|
responseBody.append(result);
|
||||||
|
responseBody.append("\",\n\t\"netconfResultMessage\": \"");
|
||||||
|
responseBody.append(_jsonEscape(netconf["error"].c_str()));
|
||||||
|
responseBody.append("\"");
|
||||||
|
} else {
|
||||||
|
responseBody.append(",\n\t\"netconf\": \"\",\n\t\"netconfResult\": \"INTERNAL_SERVER_ERROR\",\n\t\"netconfResultMessage\": \"invalid member or signing identity\"");
|
||||||
|
}
|
||||||
|
} catch ( ... ) {
|
||||||
|
responseBody.append(",\n\t\"netconf\": \"\",\n\t\"netconfResult\": \"INTERNAL_SERVER_ERROR\",\n\t\"netconfResultMessage\": \"unexpected exception\"");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
responseBody.append("\n}\n");
|
||||||
|
|
||||||
|
responseContentType = "application/json";
|
||||||
|
return 200;
|
||||||
|
} // else 404
|
||||||
|
|
||||||
|
} else {
|
||||||
|
// List members
|
||||||
|
|
||||||
|
sqlite3_reset(_sListNetworkMembers);
|
||||||
|
sqlite3_bind_text(_sListNetworkMembers,1,nwids,16,SQLITE_STATIC);
|
||||||
|
while (sqlite3_step(_sListNetworkMembers) == SQLITE_ROW) {
|
||||||
|
responseBody.push_back((responseBody.length()) ? ',' : '[');
|
||||||
|
responseBody.push_back('"');
|
||||||
|
responseBody.append((const char *)sqlite3_column_text(_sListNetworkMembers,0));
|
||||||
responseBody.push_back('"');
|
responseBody.push_back('"');
|
||||||
}
|
}
|
||||||
|
responseBody.push_back(']');
|
||||||
responseBody.append("]");
|
|
||||||
|
|
||||||
/* It's possible to get the actual netconf dictionary by including these
|
|
||||||
* three URL arguments. The member identity must be the string
|
|
||||||
* serialized identity of this member, and the signing identity must be
|
|
||||||
* the full secret identity of this network controller. The have revision
|
|
||||||
* is optional but would designate the revision our hypothetical client
|
|
||||||
* already has.
|
|
||||||
*
|
|
||||||
* This is primarily for testing and is not used in production. It makes
|
|
||||||
* it easy to test the entire network controller via its JSON API.
|
|
||||||
*
|
|
||||||
* If these arguments are included, three more object fields are returned:
|
|
||||||
* 'netconf', 'netconfResult', and 'netconfResultMessage'. These are all
|
|
||||||
* string fields and contain the actual netconf dictionary, the query
|
|
||||||
* result code, and any verbose message e.g. an error description. */
|
|
||||||
std::map<std::string,std::string>::const_iterator memids(urlArgs.find("memberIdentity"));
|
|
||||||
std::map<std::string,std::string>::const_iterator sigids(urlArgs.find("signingIdentity"));
|
|
||||||
std::map<std::string,std::string>::const_iterator hrs(urlArgs.find("haveRevision"));
|
|
||||||
if ((memids != urlArgs.end())&&(sigids != urlArgs.end())) {
|
|
||||||
Dictionary netconf;
|
|
||||||
Identity memid,sigid;
|
|
||||||
try {
|
|
||||||
if (memid.fromString(memids->second)&&sigid.fromString(sigids->second)&&sigid.hasPrivate()) {
|
|
||||||
uint64_t hr = 0;
|
|
||||||
if (hrs != urlArgs.end())
|
|
||||||
hr = Utils::strToU64(hrs->second.c_str());
|
|
||||||
const char *result = "";
|
|
||||||
switch(this->doNetworkConfigRequest(InetAddress(),sigid,memid,nwid,Dictionary(),hr,netconf)) {
|
|
||||||
case NetworkController::NETCONF_QUERY_OK: result = "OK"; break;
|
|
||||||
case NetworkController::NETCONF_QUERY_OK_BUT_NOT_NEWER: result = "OK_BUT_NOT_NEWER"; break;
|
|
||||||
case NetworkController::NETCONF_QUERY_OBJECT_NOT_FOUND: result = "OBJECT_NOT_FOUND"; break;
|
|
||||||
case NetworkController::NETCONF_QUERY_ACCESS_DENIED: result = "ACCESS_DENIED"; break;
|
|
||||||
case NetworkController::NETCONF_QUERY_INTERNAL_SERVER_ERROR: result = "INTERNAL_SERVER_ERROR"; break;
|
|
||||||
default: result = "(unrecognized result code)"; break;
|
|
||||||
}
|
|
||||||
responseBody.append(",\n\t\"netconf\": \"");
|
|
||||||
responseBody.append(_jsonEscape(netconf.toString().c_str()));
|
|
||||||
responseBody.append("\",\n\t\"netconfResult\": \"");
|
|
||||||
responseBody.append(result);
|
|
||||||
responseBody.append("\",\n\t\"netconfResultMessage\": \"");
|
|
||||||
responseBody.append(_jsonEscape(netconf["error"].c_str()));
|
|
||||||
responseBody.append("\"");
|
|
||||||
} else {
|
|
||||||
responseBody.append(",\n\t\"netconf\": \"\",\n\t\"netconfResult\": \"INTERNAL_SERVER_ERROR\",\n\t\"netconfResultMessage\": \"invalid member or signing identity\"");
|
|
||||||
}
|
|
||||||
} catch ( ... ) {
|
|
||||||
responseBody.append(",\n\t\"netconf\": \"\",\n\t\"netconfResult\": \"INTERNAL_SERVER_ERROR\",\n\t\"netconfResultMessage\": \"unexpected exception\"");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
responseBody.append("\n}\n");
|
|
||||||
|
|
||||||
responseContentType = "application/json";
|
responseContentType = "application/json";
|
||||||
return 200;
|
return 200;
|
||||||
} // else 404
|
|
||||||
|
}
|
||||||
|
|
||||||
} // else 404
|
} // else 404
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
// get network info
|
// get network info
|
||||||
sqlite3_reset(_sGetNetworkById);
|
sqlite3_reset(_sGetNetworkById);
|
||||||
|
|
@ -1402,7 +1427,7 @@ unsigned int SqliteNetworkController::_doCPGet(
|
||||||
"\t\"creationTime\": %llu,\n"
|
"\t\"creationTime\": %llu,\n"
|
||||||
"\t\"revision\": %llu,\n"
|
"\t\"revision\": %llu,\n"
|
||||||
"\t\"memberRevisionCounter\": %llu,\n"
|
"\t\"memberRevisionCounter\": %llu,\n"
|
||||||
"\t\"members\": [",
|
"\t\"relays\": [",
|
||||||
nwids,
|
nwids,
|
||||||
_instanceId.c_str(),
|
_instanceId.c_str(),
|
||||||
_jsonEscape((const char *)sqlite3_column_text(_sGetNetworkById,0)).c_str(),
|
_jsonEscape((const char *)sqlite3_column_text(_sGetNetworkById,0)).c_str(),
|
||||||
|
|
@ -1417,20 +1442,6 @@ unsigned int SqliteNetworkController::_doCPGet(
|
||||||
(unsigned long long)sqlite3_column_int64(_sGetNetworkById,9));
|
(unsigned long long)sqlite3_column_int64(_sGetNetworkById,9));
|
||||||
responseBody = json;
|
responseBody = json;
|
||||||
|
|
||||||
sqlite3_reset(_sListNetworkMembers);
|
|
||||||
sqlite3_bind_text(_sListNetworkMembers,1,nwids,16,SQLITE_STATIC);
|
|
||||||
bool firstMember = true;
|
|
||||||
while (sqlite3_step(_sListNetworkMembers) == SQLITE_ROW) {
|
|
||||||
if (!firstMember)
|
|
||||||
responseBody.push_back(',');
|
|
||||||
responseBody.push_back('"');
|
|
||||||
responseBody.append((const char *)sqlite3_column_text(_sListNetworkMembers,0));
|
|
||||||
responseBody.push_back('"');
|
|
||||||
firstMember = false;
|
|
||||||
}
|
|
||||||
|
|
||||||
responseBody.append("],\n\t\"relays\": [");
|
|
||||||
|
|
||||||
sqlite3_reset(_sGetRelays);
|
sqlite3_reset(_sGetRelays);
|
||||||
sqlite3_bind_text(_sGetRelays,1,nwids,16,SQLITE_STATIC);
|
sqlite3_bind_text(_sGetRelays,1,nwids,16,SQLITE_STATIC);
|
||||||
bool firstRelay = true;
|
bool firstRelay = true;
|
||||||
|
|
|
||||||
|
|
@ -173,7 +173,6 @@ To create a new network with a random last six digits safely and atomically, you
|
||||||
<tr><td>creationTime</td><td>integer</td><td>Time network was created in ms since epoch</td><td>no</td></tr>
|
<tr><td>creationTime</td><td>integer</td><td>Time network was created in ms since epoch</td><td>no</td></tr>
|
||||||
<tr><td>revision</td><td>integer</td><td>Network config revision number</td><td>no</td></tr>
|
<tr><td>revision</td><td>integer</td><td>Network config revision number</td><td>no</td></tr>
|
||||||
<tr><td>memberRevisionCounter</td><td>integer</td><td>Current value of network revision counter (incremented after every member add or revision)</td><td>no</td></tr>
|
<tr><td>memberRevisionCounter</td><td>integer</td><td>Current value of network revision counter (incremented after every member add or revision)</td><td>no</td></tr>
|
||||||
<tr><td>members</td><td>[string]</td><td>Array of ZeroTier addresses of network members</td><td>no</td></tr>
|
|
||||||
<tr><td>relays</td><td>[object]</td><td>Array of network-specific relay nodes (see below)</td><td>yes</td></tr>
|
<tr><td>relays</td><td>[object]</td><td>Array of network-specific relay nodes (see below)</td><td>yes</td></tr>
|
||||||
<tr><td>ipLocalRoutes</td><td>[string]</td><td>Array of IP network/netmask entries corresponding to networks routed directly via this interface (e.g. 10.0.0.0/8 to route 10.0.0.0 via this interface)</td></tr>
|
<tr><td>ipLocalRoutes</td><td>[string]</td><td>Array of IP network/netmask entries corresponding to networks routed directly via this interface (e.g. 10.0.0.0/8 to route 10.0.0.0 via this interface)</td></tr>
|
||||||
<tr><td>ipAssignmentPools</td><td>[object]</td><td>Array of IP auto-assignment pools for 'zt' assignment mode</td><td>yes</td></tr>
|
<tr><td>ipAssignmentPools</td><td>[object]</td><td>Array of IP auto-assignment pools for 'zt' assignment mode</td><td>yes</td></tr>
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue