Archives/lokinet
2
0
Fork 0
mirror of https://github.com/oxen-io/lokinet.git synced 2024-11-11 07:10:36 +00:00
Code Issues Projects Releases Wiki Activity

Reintroduce support for configurable key files

Browse Source
This commit is contained in:
Stephen Shelton 2020-04-29 13:41:39 -06:00
parent 5c6c7c7020
commit 517922e4c3
No known key found for this signature in database
GPG Key ID: EE4BADACCE8B631C
3 changed files with 38 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
llarp/config/config.cpp
View File

@ -124,6 +124,18 @@ namespace llarp
conf.defineOption<bool>( conf.defineOption<bool>(
"router", "block-bogons", false, DefaultBlockBogons, AssignmentAcceptor(m_blockBogons)); "router", "block-bogons", false, DefaultBlockBogons, AssignmentAcceptor(m_blockBogons));
conf.defineOption<std::string>(
"router", "contact-file", false, "", AssignmentAcceptor(m_routerContactFile));
conf.defineOption<std::string>(
"router", "encryption-privkey", false, "", AssignmentAcceptor(m_encryptionKeyFile));
conf.defineOption<std::string>(
"router", "ident-privkey", false, "", AssignmentAcceptor(m_identityKeyFile));
conf.defineOption<std::string>(
"router", "transport-privkey", false, "", AssignmentAcceptor(m_transportKeyFile));
} }
void void

5
llarp/config/config.hpp
View File

@ -55,6 +55,11 @@ namespace llarp
size_t m_JobQueueSize; size_t m_JobQueueSize;
std::string m_routerContactFile;
std::string m_encryptionKeyFile;
std::string m_identityKeyFile;
std::string m_transportKeyFile;
void void
defineConfigOptions(ConfigDefinition& conf, const ConfigGenParameters& params); defineConfigOptions(ConfigDefinition& conf, const ConfigGenParameters& params);
}; };

26
llarp/config/key_manager.cpp
View File

@ -33,11 +33,27 @@ namespace llarp
fs::path root = config.router.m_dataDir; fs::path root = config.router.m_dataDir;
// TODO: use fs::path, or at least support windows-style separators // utility function to assign a path, using the specified config parameter if present and
m_rcPath = root / our_rc_filename; // falling back to root / defaultName if not
m_idKeyPath = root / our_identity_filename; auto deriveFile = [&](const std::string& defaultName, const std::string& option) {
m_encKeyPath = root / our_enc_key_filename; if (option.empty())
m_transportKeyPath = root / our_transport_key_filename; {
return root / defaultName;
}
else
{
fs::path file(option);
if (not file.is_absolute())
throw std::runtime_error(stringify("override for ", defaultName, " cannot be relative"));
return file;
}
};
m_rcPath = deriveFile(our_rc_filename, config.router.m_routerContactFile);
m_idKeyPath = deriveFile(our_identity_filename, config.router.m_identityKeyFile);
m_encKeyPath = deriveFile(our_enc_key_filename, config.router.m_encryptionKeyFile);
m_transportKeyPath = deriveFile(our_transport_key_filename, config.router.m_transportKeyFile);
m_usingLokid = config.lokid.whitelistRouters; m_usingLokid = config.lokid.whitelistRouters;
m_lokidRPCAddr = config.lokid.lokidRPCAddr; m_lokidRPCAddr = config.lokid.lokidRPCAddr;