void/ZeroTierOne
2
0
Fork 0
mirror of https://github.com/zerotier/ZeroTierOne.git synced 2025-06-06 12:33:44 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add Vault configuration option parsing to local.conf

Browse source 
{
   "settings": {
       ...
      "valut": {
         "vaultURL": "...",
         "vaultKey": "...",
         "vaultPath": "..."
      }
   }
}
This commit is contained in:
Grant Limberg 2018-01-10 16:05:39 -08:00
parent 1bec8ddce4
commit 9574d635c1
1 changed files with 31 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
service/OneService.cpp
View file

@ -477,6 +477,12 @@ public:
PortMapper *_portMapper; PortMapper *_portMapper;
#endif #endif
// HashiCorp Vault Settings
bool _vaultEnabled;
std::string _vaultURL;
std::string _vaultKey;
std::string _vaultPath; // defaults to cubbyhole/zerotier/identity.secret for per-access key storage
// Set to false to force service to stop // Set to false to force service to stop
volatile bool _run; volatile bool _run;
Mutex _run_m; Mutex _run_m;
@ -509,6 +515,10 @@ public:
#ifdef ZT_USE_MINIUPNPC #ifdef ZT_USE_MINIUPNPC
,_portMapper((PortMapper *)0) ,_portMapper((PortMapper *)0)
#endif #endif
,_vaultEnabled(false)
,_vaultURL()
,_vaultKey()
,_vaultPath("cubbyhole/zerotier/identity.secret")
,_run(true) ,_run(true)
{ {
_ports[0] = 0; _ports[0] = 0;
@ -653,6 +663,9 @@ public:
for(std::map<InetAddress,ZT_PhysicalPathConfiguration>::iterator i(ppc.begin());i!=ppc.end();++i) for(std::map<InetAddress,ZT_PhysicalPathConfiguration>::iterator i(ppc.begin());i!=ppc.end();++i)
_node->setPhysicalPathConfiguration(reinterpret_cast<const struct sockaddr_storage *>(&(i->first)),&(i->second)); _node->setPhysicalPathConfiguration(reinterpret_cast<const struct sockaddr_storage *>(&(i->first)),&(i->second));
} }
json &vaultConfig = _localConfig["vault"];
} }
// Apply other runtime configuration from local.conf // Apply other runtime configuration from local.conf
@ -1510,6 +1523,24 @@ public:
_allowManagementFrom.push_back(nw); _allowManagementFrom.push_back(nw);
} }
} }
json &vault = settings["valut"];
if (vault.is_object()) {
const std::string url(OSUtils::jsonString(vault["vaultURL"], "").c_str());
if (!url.empty())
_vaultURL = url;
const std::string key(OSUtils::jsonString(vault["vaultKey"], "").c_str());
if (!key.empty())
_vaultKey = key;
const std::string path(OSUtils::jsonString(vault["vaultPath"], "").c_str());
if (!path.empty())
_vaultPath = path;
if (!_vaultURL.empty() && !_vaultKey.empty())
_vaultEnabled = true;
}
} }
// Checks if a managed IP or route target is allowed // Checks if a managed IP or route target is allowed