gfwleak/zhangyang-zerotierone
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add noupdate flag in root topologies, add ability for mktopology to read from a template.

Browse Source
This commit is contained in:
Adam Ierymenko
2014-09-03 11:56:36 -07:00
parent 644db7a04a
commit dcea212e40
3 changed files with 43 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
root-topology/mktopology.cpp
View File

@@ -16,6 +16,7 @@ int main(int argc,char **argv)
{
std::string buf;
// Read root-topology-authority.secret signing authority, must be symlinked and online
if (!Utils::readFile("root-topology-authority.secret",buf)) {
std::cerr << "Cannot read root-topology-authority.secret" << std::endl;
return 1;
@@ -24,6 +25,14 @@ int main(int argc,char **argv)
Dictionary topology;
// Read template.dict to populate default fields in root topology
// if this file exists. Otherwise we just start empty.
buf.clear();
if (Utils::readFile("template.dict",buf))
topology.fromString(buf);
// Read all entries in supernodes/ that correspond to supernode entry dictionaries
// and add them to topology under supernodes/ subkey.
Dictionary supernodes;
std::map<std::string,bool> supernodeDictionaries(Utils::listDirectory("supernodes"));
for(std::map<std::string,bool>::iterator sn(supernodeDictionaries.begin());sn!=supernodeDictionaries.end();++sn) {
@@ -38,17 +47,21 @@ int main(int argc,char **argv)
}
topology["supernodes"] = supernodes.toString();
// Sign topology with root-topology-authority.secret
if (!topology.sign(topologyAuthority)) {
std::cerr << "Unable to sign!" << std::endl;
return 1;
}
// Test signature to make sure signing worked
Dictionary test(topology.toString());
if (!test.verify(topologyAuthority)) {
std::cerr << "Test verification of signed dictionary failed!" << std::endl;
return 1;
}
// Output to stdout
std::cout << topology.toString();
return 0;
}