浏览代码

Default to built-in root topology if signature check fails (instead of exiting)

Adam Ierymenko 11 年之前
父节点
当前提交
715afc0314
共有 1 个文件被更改,包括 7 次插入3 次删除
  1. 7 3
      node/Node.cpp

+ 7 - 3
node/Node.cpp

@@ -552,9 +552,13 @@ Node::ReasonForTermination Node::run()
 			rootTopology = ZT_DEFAULTS.defaultRootTopology;
 		try {
 			Dictionary rt(rootTopology);
-			if (!Topology::authenticateRootTopology(rt))
-				return impl->terminateBecause(Node::NODE_UNRECOVERABLE_ERROR,"root-topology failed signature verification check");
-			_r->topology->setSupernodes(Dictionary(rt.get("supernodes")));
+			if (Topology::authenticateRootTopology(rt)) {
+				_r->topology->setSupernodes(Dictionary(rt.get("supernodes")));
+			} else {
+				LOG("%s failed signature check, using built-in defaults instead",rootTopologyPath.c_str());
+				Utils::rm(rootTopologyPath.c_str());
+				_r->topology->setSupernodes(Dictionary(Dictionary(ZT_DEFAULTS.defaultRootTopology).get("supernodes")));
+			}
 		} catch ( ... ) {
 			return impl->terminateBecause(Node::NODE_UNRECOVERABLE_ERROR,"invalid root-topology format");
 		}