mirror of https://github.com/oxen-io/lokinet
Revert "Merge pull request #679 from tewinget/revert-config-refactor"
This reverts commitpull/685/head2996a7f29c, reversing changes made to10df3bd4b3.
Michael
5 years ago
parent
c15fc4c8fb
commit
a2326efa37
@ -1,369 +0,0 @@
|
||||
#include <config.hpp>
|
||||
|
||||
#include <constants/defaults.hpp>
|
||||
#include <net/net.hpp>
|
||||
#include <util/fs.hpp>
|
||||
#include <util/ini.hpp>
|
||||
#include <util/logger.hpp>
|
||||
#include <util/mem.hpp>
|
||||
|
||||
#include <fstream>
|
||||
#include <ios>
|
||||
#include <iostream>
|
||||
|
||||
namespace llarp
|
||||
{
|
||||
template < typename Config, typename Section >
|
||||
Section
|
||||
find_section(Config &c, const std::string &name, const Section &fallback)
|
||||
{
|
||||
Section ret;
|
||||
if(c.VisitSection(name.c_str(),
|
||||
[&ret](const ConfigParser::Section_t &s) -> bool {
|
||||
for(const auto &item : s)
|
||||
{
|
||||
ret.emplace_back(string_view_string(item.first),
|
||||
string_view_string(item.second));
|
||||
}
|
||||
return true;
|
||||
}))
|
||||
return ret;
|
||||
else
|
||||
return fallback;
|
||||
}
|
||||
|
||||
bool
|
||||
Config::Load(const char *fname)
|
||||
{
|
||||
ConfigParser parser;
|
||||
if(!parser.LoadFile(fname))
|
||||
{
|
||||
return false;
|
||||
}
|
||||
router = find_section(parser, "router", section_t{});
|
||||
network = find_section(parser, "network", section_t{});
|
||||
connect = find_section(parser, "connect", section_t{});
|
||||
netdb = find_section(parser, "netdb", section_t{});
|
||||
dns = find_section(parser, "dns", section_t{});
|
||||
iwp_links = find_section(parser, "bind", section_t{});
|
||||
services = find_section(parser, "services", section_t{});
|
||||
system = find_section(parser, "system", section_t{});
|
||||
metrics = find_section(parser, "metrics", section_t{});
|
||||
api = find_section(parser, "api", section_t{});
|
||||
lokid = find_section(parser, "lokid", section_t{});
|
||||
bootstrap = find_section(parser, "bootstrap", section_t{});
|
||||
logging = find_section(parser, "logging", section_t{});
|
||||
return true;
|
||||
}
|
||||
|
||||
void
|
||||
Config::visit(const Visitor &functor)
|
||||
{
|
||||
std::unordered_map< std::string, const llarp::Config::section_t & >
|
||||
sections = {{"network", network},
|
||||
{"connect", connect},
|
||||
{"bootstrap", bootstrap},
|
||||
{"system", system},
|
||||
{"metrics", metrics},
|
||||
{"netdb", netdb},
|
||||
{"api", api},
|
||||
{"services", services}};
|
||||
|
||||
auto visitor = [&](const char *name, const auto &item) {
|
||||
functor(name, item.first.c_str(), item.second.c_str());
|
||||
};
|
||||
|
||||
using namespace std::placeholders;
|
||||
|
||||
std::for_each(logging.begin(), logging.end(),
|
||||
std::bind(visitor, "logging", _1));
|
||||
// end of logging section commit settings and go
|
||||
functor("logging", "", "");
|
||||
std::for_each(lokid.begin(), lokid.end(), std::bind(visitor, "lokid", _1));
|
||||
std::for_each(router.begin(), router.end(),
|
||||
std::bind(visitor, "router", _1));
|
||||
|
||||
std::for_each(dns.begin(), dns.end(), std::bind(visitor, "dns", _1));
|
||||
std::for_each(iwp_links.begin(), iwp_links.end(),
|
||||
std::bind(visitor, "bind", _1));
|
||||
|
||||
std::for_each(sections.begin(), sections.end(), [&](const auto §ion) {
|
||||
std::for_each(section.second.begin(), section.second.end(),
|
||||
std::bind(visitor, section.first.c_str(), _1));
|
||||
});
|
||||
}
|
||||
|
||||
} // namespace llarp
|
||||
|
||||
/// fname should be a relative path (from CWD) or absolute path to the config
|
||||
/// file
|
||||
extern "C" bool
|
||||
llarp_ensure_config(const char *fname, const char *basedir, bool overwrite,
|
||||
bool asRouter)
|
||||
{
|
||||
std::error_code ec;
|
||||
if(fs::exists(fname, ec) && !overwrite)
|
||||
{
|
||||
return true;
|
||||
}
|
||||
if(ec)
|
||||
{
|
||||
llarp::LogError(ec);
|
||||
return false;
|
||||
}
|
||||
|
||||
std::string basepath = "";
|
||||
if(basedir)
|
||||
{
|
||||
basepath = basedir;
|
||||
#ifndef _WIN32
|
||||
basepath += "/";
|
||||
#else
|
||||
basepath += "\\";
|
||||
#endif
|
||||
}
|
||||
|
||||
llarp::LogInfo("Attempting to create config file ", fname);
|
||||
|
||||
// abort if config already exists
|
||||
if(!asRouter)
|
||||
{
|
||||
if(fs::exists(fname, ec) && !overwrite)
|
||||
{
|
||||
llarp::LogError(fname, " currently exists, please use -f to overwrite");
|
||||
return true;
|
||||
}
|
||||
if(ec)
|
||||
{
|
||||
llarp::LogError(ec);
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
// write fname ini
|
||||
auto optional_f =
|
||||
llarp::util::OpenFileStream< std::ofstream >(fname, std::ios::binary);
|
||||
if(!optional_f || !optional_f.value().is_open())
|
||||
{
|
||||
llarp::LogError("failed to open ", fname, " for writing");
|
||||
return false;
|
||||
}
|
||||
auto &f = optional_f.value();
|
||||
llarp_generic_ensure_config(f, basepath);
|
||||
if(asRouter)
|
||||
{
|
||||
llarp_ensure_router_config(f, basepath);
|
||||
}
|
||||
else
|
||||
{
|
||||
llarp_ensure_client_config(f, basepath);
|
||||
}
|
||||
llarp::LogInfo("Generated new config ", fname);
|
||||
return true;
|
||||
}
|
||||
|
||||
void
|
||||
llarp_generic_ensure_config(std::ofstream &f, std::string basepath)
|
||||
{
|
||||
f << "# this configuration was auto generated with 'sane' defaults"
|
||||
<< std::endl;
|
||||
f << "# change these values as desired" << std::endl;
|
||||
f << std::endl << std::endl;
|
||||
f << "[router]" << std::endl;
|
||||
f << "# number of crypto worker threads " << std::endl;
|
||||
f << "threads=4" << std::endl;
|
||||
f << "# path to store signed RC" << std::endl;
|
||||
f << "contact-file=" << basepath << "self.signed" << std::endl;
|
||||
f << "# path to store transport private key" << std::endl;
|
||||
f << "transport-privkey=" << basepath << "transport.private" << std::endl;
|
||||
f << "# path to store identity signing key" << std::endl;
|
||||
f << "ident-privkey=" << basepath << "identity.private" << std::endl;
|
||||
f << "# encryption key for onion routing" << std::endl;
|
||||
f << "encryption-privkey=" << basepath << "encryption.private" << std::endl;
|
||||
f << std::endl;
|
||||
f << "# uncomment following line to set router nickname to 'lokinet'"
|
||||
<< std::endl;
|
||||
f << "#nickname=lokinet" << std::endl;
|
||||
f << std::endl << std::endl;
|
||||
|
||||
// logging
|
||||
f << "[logging]" << std::endl;
|
||||
f << "level=info" << std::endl;
|
||||
f << "# uncomment for logging to file" << std::endl;
|
||||
f << "#type=file" << std::endl;
|
||||
f << "#file=/path/to/logfile" << std::endl;
|
||||
f << "# uncomment for syslog logging" << std::endl;
|
||||
f << "#type=syslog" << std::endl;
|
||||
|
||||
// metrics
|
||||
f << "[metrics]" << std::endl;
|
||||
f << "json-metrics-path=" << basepath << "metrics.json" << std::endl;
|
||||
|
||||
f << std::endl << std::endl;
|
||||
|
||||
f << "# admin api (disabled by default)" << std::endl;
|
||||
f << "[api]" << std::endl;
|
||||
f << "enabled=false" << std::endl;
|
||||
f << "#authkey=insertpubkey1here" << std::endl;
|
||||
f << "#authkey=insertpubkey2here" << std::endl;
|
||||
f << "#authkey=insertpubkey3here" << std::endl;
|
||||
f << "bind=127.0.0.1:1190" << std::endl;
|
||||
f << std::endl << std::endl;
|
||||
|
||||
f << "# system settings for privileges and such" << std::endl;
|
||||
f << "[system]" << std::endl;
|
||||
f << "user=" << DEFAULT_LOKINET_USER << std::endl;
|
||||
f << "group=" << DEFAULT_LOKINET_GROUP << std::endl;
|
||||
f << "pidfile=" << basepath << "lokinet.pid" << std::endl;
|
||||
f << std::endl << std::endl;
|
||||
|
||||
f << "# dns provider configuration section" << std::endl;
|
||||
f << "[dns]" << std::endl;
|
||||
f << "# resolver" << std::endl;
|
||||
f << "upstream=" << DEFAULT_RESOLVER_US << std::endl;
|
||||
|
||||
// Make auto-config smarter
|
||||
// will this break reproducibility rules?
|
||||
// (probably)
|
||||
#ifdef __linux__
|
||||
#ifdef ANDROID
|
||||
f << "bind=127.0.0.1:1153" << std::endl;
|
||||
#else
|
||||
f << "bind=127.3.2.1:53" << std::endl;
|
||||
#endif
|
||||
#else
|
||||
f << "bind=127.0.0.1:53" << std::endl;
|
||||
#endif
|
||||
f << std::endl << std::endl;
|
||||
|
||||
f << "# network database settings block " << std::endl;
|
||||
f << "[netdb]" << std::endl;
|
||||
f << "# directory for network database skiplist storage" << std::endl;
|
||||
f << "dir=" << basepath << "netdb" << std::endl;
|
||||
f << std::endl << std::endl;
|
||||
|
||||
f << "# bootstrap settings" << std::endl;
|
||||
f << "[bootstrap]" << std::endl;
|
||||
f << "# add a bootstrap node's signed identity to the list of nodes we want "
|
||||
"to bootstrap from"
|
||||
<< std::endl;
|
||||
f << "# if we don't have any peers we connect to this router" << std::endl;
|
||||
f << "add-node=" << basepath << "bootstrap.signed" << std::endl;
|
||||
// we only process one of these...
|
||||
// f << "# add another bootstrap node" << std::endl;
|
||||
// f << "#add-node=/path/to/alternative/self.signed" << std::endl;
|
||||
f << std::endl << std::endl;
|
||||
}
|
||||
|
||||
void
|
||||
llarp_ensure_router_config(std::ofstream &f, std::string basepath)
|
||||
{
|
||||
f << "# lokid settings (disabled by default)" << std::endl;
|
||||
f << "[lokid]" << std::endl;
|
||||
f << "enabled=false" << std::endl;
|
||||
f << "jsonrpc=127.0.0.1:22023" << std::endl;
|
||||
f << "#service-node-seed=/path/to/servicenode/seed" << std::endl;
|
||||
f << std::endl;
|
||||
f << "# network settings " << std::endl;
|
||||
f << "[network]" << std::endl;
|
||||
f << "profiles=" << basepath << "profiles.dat" << std::endl;
|
||||
// better to let the routers auto-configure
|
||||
// f << "ifaddr=auto" << std::endl;
|
||||
// f << "ifname=auto" << std::endl;
|
||||
f << "enabled=true" << std::endl;
|
||||
f << "exit=false" << std::endl;
|
||||
f << "#exit-blacklist=tcp:25" << std::endl;
|
||||
f << "#exit-whitelist=tcp:*" << std::endl;
|
||||
f << "#exit-whitelist=udp:*" << std::endl;
|
||||
f << std::endl;
|
||||
f << "# ROUTERS ONLY: publish network interfaces for handling inbound traffic"
|
||||
<< std::endl;
|
||||
f << "[bind]" << std::endl;
|
||||
// get ifname
|
||||
std::string ifname;
|
||||
if(llarp::GetBestNetIF(ifname, AF_INET))
|
||||
f << ifname << "=1090" << std::endl;
|
||||
else
|
||||
f << "# could not autodetect network interface" << std::endl
|
||||
<< "#eth0=1090" << std::endl;
|
||||
|
||||
f << std::endl;
|
||||
}
|
||||
|
||||
bool
|
||||
llarp_ensure_client_config(std::ofstream &f, std::string basepath)
|
||||
{
|
||||
// write snapp-example.ini
|
||||
const std::string snappExample_fpath = basepath + "snapp-example.ini";
|
||||
{
|
||||
auto stream = llarp::util::OpenFileStream< std::ofstream >(
|
||||
snappExample_fpath, std::ios::binary);
|
||||
if(!stream)
|
||||
return false;
|
||||
auto &example_f = stream.value();
|
||||
if(example_f.is_open())
|
||||
{
|
||||
// pick ip
|
||||
// don't revert me
|
||||
const static std::string ip = "10.33.0.1/16";
|
||||
/*
|
||||
std::string ip = llarp::findFreePrivateRange();
|
||||
if(ip == "")
|
||||
{
|
||||
llarp::LogError(
|
||||
"Couldn't easily detect a private range to map lokinet onto");
|
||||
return false;
|
||||
}
|
||||
*/
|
||||
example_f << "# this is an example configuration for a snapp"
|
||||
<< std::endl;
|
||||
example_f << "[example-snapp]" << std::endl;
|
||||
example_f << "# keyfile is the path to the private key of the snapp, "
|
||||
"your .loki is tied to this key, DON'T LOSE IT"
|
||||
<< std::endl;
|
||||
example_f << "keyfile=" << basepath << "example-snap-keyfile.private"
|
||||
<< std::endl;
|
||||
example_f << "# ifaddr is the ip range to allocate to this snapp"
|
||||
<< std::endl;
|
||||
example_f << "ifaddr=" << ip << std::endl;
|
||||
// probably fine to leave this (and not-auto-detect it) I'm not worried
|
||||
// about any collisions
|
||||
example_f << "# ifname is the name to try and give to the network "
|
||||
"interface this snap owns"
|
||||
<< std::endl;
|
||||
example_f << "ifname=snapp-tun0" << std::endl;
|
||||
}
|
||||
else
|
||||
{
|
||||
llarp::LogError("failed to write ", snappExample_fpath);
|
||||
}
|
||||
}
|
||||
// now do up fname
|
||||
f << std::endl << std::endl;
|
||||
f << "# snapps configuration section" << std::endl;
|
||||
f << "[services]";
|
||||
f << "# uncomment next line to enable a snapp" << std::endl;
|
||||
f << "#example-snapp=" << snappExample_fpath << std::endl;
|
||||
f << std::endl << std::endl;
|
||||
|
||||
f << "# network settings " << std::endl;
|
||||
f << "[network]" << std::endl;
|
||||
f << "profiles=" << basepath << "profiles.dat" << std::endl;
|
||||
f << "# uncomment next line to add router with pubkey to list of routers we "
|
||||
"connect directly to"
|
||||
<< std::endl;
|
||||
f << "#strict-connect=pubkey" << std::endl;
|
||||
f << "# uncomment next line to use router with pubkey as an exit node"
|
||||
<< std::endl;
|
||||
f << "#exit-node=pubkey" << std::endl;
|
||||
|
||||
// better to set them to auto then to hard code them now
|
||||
// operating environment may change over time and this will help adapt
|
||||
// f << "ifname=auto" << std::endl;
|
||||
// f << "ifaddr=auto" << std::endl;
|
||||
|
||||
// should this also be auto? or not declared?
|
||||
// probably auto in case they want to set up a hidden service
|
||||
f << "enabled=true" << std::endl;
|
||||
return true;
|
||||
}
|
||||
@ -1,50 +0,0 @@
|
||||
#ifndef LLARP_CONFIG_HPP
|
||||
#define LLARP_CONFIG_HPP
|
||||
|
||||
#include <functional>
|
||||
#include <string>
|
||||
#include <utility>
|
||||
#include <vector>
|
||||
|
||||
namespace llarp
|
||||
{
|
||||
struct Config
|
||||
{
|
||||
using section_t = std::vector< std::pair< std::string, std::string > >;
|
||||
|
||||
section_t router;
|
||||
section_t network;
|
||||
section_t netdb;
|
||||
section_t dns;
|
||||
section_t iwp_links;
|
||||
section_t connect;
|
||||
section_t services;
|
||||
section_t system;
|
||||
section_t metrics;
|
||||
section_t api;
|
||||
section_t lokid;
|
||||
section_t bootstrap;
|
||||
section_t logging;
|
||||
|
||||
bool
|
||||
Load(const char *fname);
|
||||
|
||||
using Visitor = std::function< void(const char *section, const char *key,
|
||||
const char *val) >;
|
||||
|
||||
void
|
||||
visit(const Visitor &visitor);
|
||||
};
|
||||
|
||||
} // namespace llarp
|
||||
|
||||
void
|
||||
llarp_generic_ensure_config(std::ofstream &f, std::string basepath);
|
||||
|
||||
void
|
||||
llarp_ensure_router_config(std::ofstream &f, std::string basepath);
|
||||
|
||||
bool
|
||||
llarp_ensure_client_config(std::ofstream &f, std::string basepath);
|
||||
|
||||
#endif
|
||||
@ -0,0 +1,704 @@
|
||||
#include <config/config.hpp>
|
||||
|
||||
#include <config/ini.hpp>
|
||||
#include <constants/defaults.hpp>
|
||||
#include <net/net.hpp>
|
||||
#include <util/fs.hpp>
|
||||
#include <util/logger.hpp>
|
||||
#include <util/logger_syslog.hpp>
|
||||
#include <util/mem.hpp>
|
||||
#include <util/memfn.hpp>
|
||||
#include <util/str.hpp>
|
||||
|
||||
#include <fstream>
|
||||
#include <ios>
|
||||
#include <iostream>
|
||||
|
||||
namespace llarp
|
||||
{
|
||||
bool
|
||||
RouterConfig::fromSection(string_view key, string_view val)
|
||||
{
|
||||
if(key == "netid")
|
||||
{
|
||||
if(val.size() <= rc.netID.size())
|
||||
{
|
||||
llarp::LogWarn("!!!! you have manually set netid to be '", val,
|
||||
"' which does not equal '", Version::LLARP_NET_ID,
|
||||
"' you will run as a different network, good luck "
|
||||
"and "
|
||||
"don't forget: something something MUH traffic "
|
||||
"shape "
|
||||
"correlation !!!!");
|
||||
NetID::DefaultValue() =
|
||||
NetID(reinterpret_cast< const byte_t * >(std::string(val).c_str()));
|
||||
// re set netid in our rc
|
||||
rc.netID = llarp::NetID();
|
||||
netid.assign(val.begin(), val.end());
|
||||
}
|
||||
else
|
||||
{
|
||||
llarp::LogError("invalid netid '", val, "', is too long");
|
||||
}
|
||||
}
|
||||
if(key == "max-connections")
|
||||
{
|
||||
std::string sVal(val.begin(), val.end());
|
||||
auto ival = atoi(sVal.c_str());
|
||||
if(ival > 0)
|
||||
{
|
||||
maxConnectedRouters = ival;
|
||||
LogInfo("max connections set to ", maxConnectedRouters);
|
||||
}
|
||||
}
|
||||
if(key == "min-connections")
|
||||
{
|
||||
std::string sVal(val.begin(), val.end());
|
||||
auto ival = atoi(sVal.c_str());
|
||||
if(ival > 0)
|
||||
{
|
||||
minConnectedRouters = ival;
|
||||
LogInfo("min connections set to ", minConnectedRouters);
|
||||
}
|
||||
}
|
||||
if(key == "nickname")
|
||||
{
|
||||
rc.SetNick(val);
|
||||
// set logger name here
|
||||
LogContext::Instance().nodeName = rc.Nick();
|
||||
}
|
||||
if(key == "encryption-privkey")
|
||||
{
|
||||
encryption_keyfile.assign(val.begin(), val.end());
|
||||
}
|
||||
if(key == "contact-file")
|
||||
{
|
||||
our_rc_file.assign(val.begin(), val.end());
|
||||
}
|
||||
if(key == "transport-privkey")
|
||||
{
|
||||
transport_keyfile.assign(val.begin(), val.end());
|
||||
}
|
||||
if((key == "identity-privkey" || key == "ident-privkey"))
|
||||
{
|
||||
ident_keyfile.assign(val.begin(), val.end());
|
||||
}
|
||||
if(key == "public-address" || key == "public-ip")
|
||||
{
|
||||
llarp::LogInfo("public ip ", val, " size ", val.size());
|
||||
if(val.size() < 17)
|
||||
{
|
||||
// assume IPv4
|
||||
llarp::Addr a(val);
|
||||
llarp::LogInfo("setting public ipv4 ", a);
|
||||
addrInfo.ip = *a.addr6();
|
||||
publicOverride = true;
|
||||
}
|
||||
// llarp::Addr a(val);
|
||||
}
|
||||
if(key == "public-port")
|
||||
{
|
||||
llarp::LogInfo("Setting public port ", val);
|
||||
int p = atoi(std::string(val).c_str());
|
||||
// Not needed to flip upside-down - this is done in llarp::Addr(const
|
||||
// AddressInfo&)
|
||||
ip4addr.sin_port = p;
|
||||
addrInfo.port = p;
|
||||
publicOverride = true;
|
||||
}
|
||||
if(key == "worker-threads")
|
||||
{
|
||||
workerThreads = atoi(std::string(val).c_str());
|
||||
}
|
||||
if(key == "net-threads")
|
||||
{
|
||||
num_nethreads = atoi(std::string(val).c_str());
|
||||
if(num_nethreads <= 0)
|
||||
num_nethreads = 1;
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
bool
|
||||
NetworkConfig::fromSection(string_view key, string_view val)
|
||||
{
|
||||
if(key == "profiling")
|
||||
{
|
||||
if(IsTrueValue(val))
|
||||
{
|
||||
enableProfiling.emplace(true);
|
||||
}
|
||||
else if(IsFalseValue(val))
|
||||
{
|
||||
enableProfiling.emplace(false);
|
||||
}
|
||||
}
|
||||
if(key == "profiles")
|
||||
{
|
||||
routerProfilesFile.assign(val.begin(), val.end());
|
||||
llarp::LogInfo("setting profiles to ", routerProfilesFile);
|
||||
}
|
||||
else if(key == "strict-connect")
|
||||
{
|
||||
strictConnect.assign(val.begin(), val.end());
|
||||
}
|
||||
else
|
||||
{
|
||||
netConfig.emplace(key, val);
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
bool
|
||||
NetdbConfig::fromSection(string_view key, string_view val)
|
||||
{
|
||||
if(key == "dir")
|
||||
{
|
||||
nodedb_dir.assign(val.begin(), val.end());
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
bool
|
||||
DnsConfig::fromSection(string_view key, string_view val)
|
||||
{
|
||||
if(key == "upstream")
|
||||
{
|
||||
llarp::LogInfo("add upstream resolver ", val);
|
||||
netConfig.emplace("upstream-dns", val);
|
||||
}
|
||||
if(key == "bind")
|
||||
{
|
||||
llarp::LogInfo("set local dns to ", val);
|
||||
netConfig.emplace("local-dns", val);
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
bool
|
||||
IwpConfig::fromSection(string_view key, string_view val)
|
||||
{
|
||||
// try IPv4 first
|
||||
uint16_t proto = 0;
|
||||
|
||||
std::set< std::string > parsed_opts;
|
||||
std::string v(val.begin(), val.end());
|
||||
std::string::size_type idx;
|
||||
do
|
||||
{
|
||||
idx = v.find_first_of(',');
|
||||
if(idx != std::string::npos)
|
||||
{
|
||||
parsed_opts.insert(v.substr(0, idx));
|
||||
v = v.substr(idx + 1);
|
||||
}
|
||||
else
|
||||
{
|
||||
parsed_opts.insert(v);
|
||||
}
|
||||
} while(idx != std::string::npos);
|
||||
|
||||
/// for each option
|
||||
for(const auto &item : parsed_opts)
|
||||
{
|
||||
/// see if it's a number
|
||||
auto port = std::atoi(item.c_str());
|
||||
if(port > 0)
|
||||
{
|
||||
/// set port
|
||||
if(proto == 0)
|
||||
{
|
||||
proto = port;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if(key == "*")
|
||||
{
|
||||
m_OutboundPort = proto;
|
||||
}
|
||||
else
|
||||
{
|
||||
servers.emplace_back(key, AF_INET, proto);
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
bool
|
||||
ConnectConfig::fromSection(ABSL_ATTRIBUTE_UNUSED string_view key,
|
||||
string_view val)
|
||||
{
|
||||
routers.emplace_back(val.begin(), val.end());
|
||||
return true;
|
||||
}
|
||||
|
||||
bool
|
||||
ServicesConfig::fromSection(string_view key, string_view val)
|
||||
{
|
||||
services.emplace_back(std::string(key.begin(), key.end()),
|
||||
std::string(val.begin(), val.end()));
|
||||
return true;
|
||||
}
|
||||
|
||||
bool
|
||||
SystemConfig::fromSection(string_view key, string_view val)
|
||||
{
|
||||
if(key == "pidfile")
|
||||
{
|
||||
pidfile.assign(val.begin(), val.end());
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
bool
|
||||
MetricsConfig::fromSection(string_view key, string_view val)
|
||||
{
|
||||
if(key == "disable-metrics")
|
||||
{
|
||||
disableMetrics = true;
|
||||
}
|
||||
else if(key == "disable-metrics-log")
|
||||
{
|
||||
disableMetricLogs = true;
|
||||
}
|
||||
else if(key == "json-metrics-path")
|
||||
{
|
||||
jsonMetricsPath.assign(val.begin(), val.end());
|
||||
}
|
||||
else if(key == "metric-tank-host")
|
||||
{
|
||||
metricTankHost.assign(val.begin(), val.end());
|
||||
}
|
||||
else
|
||||
{
|
||||
// consume everything else as a metric tag
|
||||
metricTags[std::string(key)] = std::string(val);
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
bool
|
||||
ApiConfig::fromSection(string_view key, string_view val)
|
||||
{
|
||||
if(key == "enabled")
|
||||
{
|
||||
enableRPCServer = IsTrueValue(val);
|
||||
}
|
||||
if(key == "bind")
|
||||
{
|
||||
rpcBindAddr.assign(val.begin(), val.end());
|
||||
}
|
||||
if(key == "authkey")
|
||||
{
|
||||
// TODO: add pubkey to whitelist
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
bool
|
||||
LokidConfig::fromSection(string_view key, string_view val)
|
||||
{
|
||||
if(key == "service-node-seed")
|
||||
{
|
||||
usingSNSeed = true;
|
||||
ident_keyfile.assign(val.begin(), val.end());
|
||||
}
|
||||
if(key == "enabled")
|
||||
{
|
||||
whitelistRouters = IsTrueValue(val);
|
||||
}
|
||||
if(key == "jsonrpc" || key == "addr")
|
||||
{
|
||||
lokidRPCAddr.assign(val.begin(), val.end());
|
||||
}
|
||||
if(key == "username")
|
||||
{
|
||||
lokidRPCUser.assign(val.begin(), val.end());
|
||||
}
|
||||
if(key == "password")
|
||||
{
|
||||
lokidRPCPassword.assign(val.begin(), val.end());
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
bool
|
||||
BootstrapConfig::fromSection(string_view key, string_view val)
|
||||
{
|
||||
if(key == "add-node")
|
||||
{
|
||||
routers.emplace_back(val.begin(), val.end());
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
bool
|
||||
LoggingConfig::fromSection(string_view key, string_view val)
|
||||
{
|
||||
if(key == "type" && val == "syslog")
|
||||
{
|
||||
// TODO(despair): write event log syslog class
|
||||
#if defined(_WIN32)
|
||||
LogError("syslog not supported on win32");
|
||||
#else
|
||||
LogInfo("Switching to syslog");
|
||||
LogContext::Instance().logStream = std::make_unique< SysLogStream >();
|
||||
#endif
|
||||
}
|
||||
if(key == "type" && val == "json")
|
||||
{
|
||||
m_LogJSON = true;
|
||||
}
|
||||
if(key == "file")
|
||||
{
|
||||
LogInfo("open log file: ", val);
|
||||
std::string fname(val.begin(), val.end());
|
||||
FILE *const logfile = ::fopen(fname.c_str(), "a");
|
||||
if(logfile)
|
||||
{
|
||||
m_LogFile = logfile;
|
||||
LogInfo("will log to file ", val);
|
||||
}
|
||||
else if(errno)
|
||||
{
|
||||
LogError("could not open log file at '", val, "': ", strerror(errno));
|
||||
errno = 0;
|
||||
}
|
||||
else
|
||||
{
|
||||
LogError("failed to open log file at '", val,
|
||||
"' for an unknown reason, bailing tf out kbai");
|
||||
::abort();
|
||||
}
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
template < typename Section, typename Config >
|
||||
Section
|
||||
find_section(Config &c, const std::string &name)
|
||||
{
|
||||
Section ret;
|
||||
|
||||
auto visitor = [&ret](const ConfigParser::Section_t §ion) -> bool {
|
||||
for(const auto &sec : section)
|
||||
{
|
||||
if(!ret.fromSection(sec.first, sec.second))
|
||||
{
|
||||
return false;
|
||||
}
|
||||
}
|
||||
return true;
|
||||
};
|
||||
|
||||
if(c.VisitSection(name.c_str(), visitor))
|
||||
return ret;
|
||||
else
|
||||
return {};
|
||||
}
|
||||
|
||||
bool
|
||||
Config::Load(const char *fname)
|
||||
{
|
||||
ConfigParser parser;
|
||||
if(!parser.LoadFile(fname))
|
||||
{
|
||||
return false;
|
||||
}
|
||||
router = find_section< RouterConfig >(parser, "router");
|
||||
network = find_section< NetworkConfig >(parser, "network");
|
||||
connect = find_section< ConnectConfig >(parser, "connect");
|
||||
netdb = find_section< NetdbConfig >(parser, "netdb");
|
||||
dns = find_section< DnsConfig >(parser, "dns");
|
||||
iwp_links = find_section< IwpConfig >(parser, "bind");
|
||||
services = find_section< ServicesConfig >(parser, "services");
|
||||
system = find_section< SystemConfig >(parser, "system");
|
||||
metrics = find_section< MetricsConfig >(parser, "metrics");
|
||||
api = find_section< ApiConfig >(parser, "api");
|
||||
lokid = find_section< LokidConfig >(parser, "lokid");
|
||||
bootstrap = find_section< BootstrapConfig >(parser, "bootstrap");
|
||||
logging = find_section< LoggingConfig >(parser, "logging");
|
||||
return true;
|
||||
}
|
||||
|
||||
} // namespace llarp
|
||||
|
||||
/// fname should be a relative path (from CWD) or absolute path to the config
|
||||
/// file
|
||||
extern "C" bool
|
||||
llarp_ensure_config(const char *fname, const char *basedir, bool overwrite,
|
||||
bool asRouter)
|
||||
{
|
||||
std::error_code ec;
|
||||
if(fs::exists(fname, ec) && !overwrite)
|
||||
{
|
||||
return true;
|
||||
}
|
||||
if(ec)
|
||||
{
|
||||
llarp::LogError(ec);
|
||||
return false;
|
||||
}
|
||||
|
||||
std::string basepath = "";
|
||||
if(basedir)
|
||||
{
|
||||
basepath = basedir;
|
||||
#ifndef _WIN32
|
||||
basepath += "/";
|
||||
#else
|
||||
basepath += "\\";
|
||||
#endif
|
||||
}
|
||||
|
||||
llarp::LogInfo("Attempting to create config file ", fname);
|
||||
|
||||
// abort if config already exists
|
||||
if(!asRouter)
|
||||
{
|
||||
if(fs::exists(fname, ec) && !overwrite)
|
||||
{
|
||||
llarp::LogError(fname, " currently exists, please use -f to overwrite");
|
||||
return true;
|
||||
}
|
||||
if(ec)
|
||||
{
|
||||
llarp::LogError(ec);
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
// write fname ini
|
||||
auto optional_f =
|
||||
llarp::util::OpenFileStream< std::ofstream >(fname, std::ios::binary);
|
||||
if(!optional_f || !optional_f.value().is_open())
|
||||
{
|
||||
llarp::LogError("failed to open ", fname, " for writing");
|
||||
return false;
|
||||
}
|
||||
auto &f = optional_f.value();
|
||||
llarp_generic_ensure_config(f, basepath);
|
||||
if(asRouter)
|
||||
{
|
||||
llarp_ensure_router_config(f, basepath);
|
||||
}
|
||||
else
|
||||
{
|
||||
llarp_ensure_client_config(f, basepath);
|
||||
}
|
||||
llarp::LogInfo("Generated new config ", fname);
|
||||
return true;
|
||||
}
|
||||
|
||||
void
|
||||
llarp_generic_ensure_config(std::ofstream &f, std::string basepath)
|
||||
{
|
||||
f << "# this configuration was auto generated with 'sane' defaults"
|
||||
<< std::endl;
|
||||
f << "# change these values as desired" << std::endl;
|
||||
f << std::endl << std::endl;
|
||||
f << "[router]" << std::endl;
|
||||
f << "# number of crypto worker threads " << std::endl;
|
||||
f << "threads=4" << std::endl;
|
||||
f << "# path to store signed RC" << std::endl;
|
||||
f << "contact-file=" << basepath << "self.signed" << std::endl;
|
||||
f << "# path to store transport private key" << std::endl;
|
||||
f << "transport-privkey=" << basepath << "transport.private" << std::endl;
|
||||
f << "# path to store identity signing key" << std::endl;
|
||||
f << "ident-privkey=" << basepath << "identity.private" << std::endl;
|
||||
f << "# encryption key for onion routing" << std::endl;
|
||||
f << "encryption-privkey=" << basepath << "encryption.private" << std::endl;
|
||||
f << std::endl;
|
||||
f << "# uncomment following line to set router nickname to 'lokinet'"
|
||||
<< std::endl;
|
||||
f << "#nickname=lokinet" << std::endl;
|
||||
f << std::endl << std::endl;
|
||||
|
||||
// logging
|
||||
f << "[logging]" << std::endl;
|
||||
f << "level=info" << std::endl;
|
||||
f << "# uncomment for logging to file" << std::endl;
|
||||
f << "#type=file" << std::endl;
|
||||
f << "#file=/path/to/logfile" << std::endl;
|
||||
f << "# uncomment for syslog logging" << std::endl;
|
||||
f << "#type=syslog" << std::endl;
|
||||
|
||||
// metrics
|
||||
f << "[metrics]" << std::endl;
|
||||
f << "json-metrics-path=" << basepath << "metrics.json" << std::endl;
|
||||
|
||||
f << std::endl << std::endl;
|
||||
|
||||
f << "# admin api (disabled by default)" << std::endl;
|
||||
f << "[api]" << std::endl;
|
||||
f << "enabled=false" << std::endl;
|
||||
f << "#authkey=insertpubkey1here" << std::endl;
|
||||
f << "#authkey=insertpubkey2here" << std::endl;
|
||||
f << "#authkey=insertpubkey3here" << std::endl;
|
||||
f << "bind=127.0.0.1:1190" << std::endl;
|
||||
f << std::endl << std::endl;
|
||||
|
||||
f << "# system settings for privileges and such" << std::endl;
|
||||
f << "[system]" << std::endl;
|
||||
f << "user=" << DEFAULT_LOKINET_USER << std::endl;
|
||||
f << "group=" << DEFAULT_LOKINET_GROUP << std::endl;
|
||||
f << "pidfile=" << basepath << "lokinet.pid" << std::endl;
|
||||
f << std::endl << std::endl;
|
||||
|
||||
f << "# dns provider configuration section" << std::endl;
|
||||
f << "[dns]" << std::endl;
|
||||
f << "# resolver" << std::endl;
|
||||
f << "upstream=" << DEFAULT_RESOLVER_US << std::endl;
|
||||
|
||||
// Make auto-config smarter
|
||||
// will this break reproducibility rules?
|
||||
// (probably)
|
||||
#ifdef __linux__
|
||||
#ifdef ANDROID
|
||||
f << "bind=127.0.0.1:1153" << std::endl;
|
||||
#else
|
||||
f << "bind=127.3.2.1:53" << std::endl;
|
||||
#endif
|
||||
#else
|
||||
f << "bind=127.0.0.1:53" << std::endl;
|
||||
#endif
|
||||
f << std::endl << std::endl;
|
||||
|
||||
f << "# network database settings block " << std::endl;
|
||||
f << "[netdb]" << std::endl;
|
||||
f << "# directory for network database skiplist storage" << std::endl;
|
||||
f << "dir=" << basepath << "netdb" << std::endl;
|
||||
f << std::endl << std::endl;
|
||||
|
||||
f << "# bootstrap settings" << std::endl;
|
||||
f << "[bootstrap]" << std::endl;
|
||||
f << "# add a bootstrap node's signed identity to the list of nodes we want "
|
||||
"to bootstrap from"
|
||||
<< std::endl;
|
||||
f << "# if we don't have any peers we connect to this router" << std::endl;
|
||||
f << "add-node=" << basepath << "bootstrap.signed" << std::endl;
|
||||
// we only process one of these...
|
||||
// f << "# add another bootstrap node" << std::endl;
|
||||
// f << "#add-node=/path/to/alternative/self.signed" << std::endl;
|
||||
f << std::endl << std::endl;
|
||||
}
|
||||
|
||||
void
|
||||
llarp_ensure_router_config(std::ofstream &f, std::string basepath)
|
||||
{
|
||||
f << "# lokid settings (disabled by default)" << std::endl;
|
||||
f << "[lokid]" << std::endl;
|
||||
f << "enabled=false" << std::endl;
|
||||
f << "jsonrpc=127.0.0.1:22023" << std::endl;
|
||||
f << "#service-node-seed=/path/to/servicenode/seed" << std::endl;
|
||||
f << std::endl;
|
||||
f << "# network settings " << std::endl;
|
||||
f << "[network]" << std::endl;
|
||||
f << "profiles=" << basepath << "profiles.dat" << std::endl;
|
||||
// better to let the routers auto-configure
|
||||
// f << "ifaddr=auto" << std::endl;
|
||||
// f << "ifname=auto" << std::endl;
|
||||
f << "enabled=true" << std::endl;
|
||||
f << "exit=false" << std::endl;
|
||||
f << "#exit-blacklist=tcp:25" << std::endl;
|
||||
f << "#exit-whitelist=tcp:*" << std::endl;
|
||||
f << "#exit-whitelist=udp:*" << std::endl;
|
||||
f << std::endl;
|
||||
f << "# ROUTERS ONLY: publish network interfaces for handling inbound traffic"
|
||||
<< std::endl;
|
||||
f << "[bind]" << std::endl;
|
||||
// get ifname
|
||||
std::string ifname;
|
||||
if(llarp::GetBestNetIF(ifname, AF_INET))
|
||||
f << ifname << "=1090" << std::endl;
|
||||
else
|
||||
f << "# could not autodetect network interface" << std::endl
|
||||
<< "#eth0=1090" << std::endl;
|
||||
|
||||
f << std::endl;
|
||||
}
|
||||
|
||||
bool
|
||||
llarp_ensure_client_config(std::ofstream &f, std::string basepath)
|
||||
{
|
||||
// write snapp-example.ini
|
||||
const std::string snappExample_fpath = basepath + "snapp-example.ini";
|
||||
{
|
||||
auto stream = llarp::util::OpenFileStream< std::ofstream >(
|
||||
snappExample_fpath, std::ios::binary);
|
||||
if(!stream)
|
||||
return false;
|
||||
auto &example_f = stream.value();
|
||||
if(example_f.is_open())
|
||||
{
|
||||
// pick ip
|
||||
// don't revert me
|
||||
const static std::string ip = "10.33.0.1/16";
|
||||
/*
|
||||
std::string ip = llarp::findFreePrivateRange();
|
||||
if(ip == "")
|
||||
{
|
||||
llarp::LogError(
|
||||
"Couldn't easily detect a private range to map lokinet onto");
|
||||
return false;
|
||||
}
|
||||
*/
|
||||
example_f << "# this is an example configuration for a snapp"
|
||||
<< std::endl;
|
||||
example_f << "[example-snapp]" << std::endl;
|
||||
example_f << "# keyfile is the path to the private key of the snapp, "
|
||||
"your .loki is tied to this key, DON'T LOSE IT"
|
||||
<< std::endl;
|
||||
example_f << "keyfile=" << basepath << "example-snap-keyfile.private"
|
||||
<< std::endl;
|
||||
example_f << "# ifaddr is the ip range to allocate to this snapp"
|
||||
<< std::endl;
|
||||
example_f << "ifaddr=" << ip << std::endl;
|
||||
// probably fine to leave this (and not-auto-detect it) I'm not worried
|
||||
// about any collisions
|
||||
example_f << "# ifname is the name to try and give to the network "
|
||||
"interface this snap owns"
|
||||
<< std::endl;
|
||||
example_f << "ifname=snapp-tun0" << std::endl;
|
||||
}
|
||||
else
|
||||
{
|
||||
llarp::LogError("failed to write ", snappExample_fpath);
|
||||
}
|
||||
}
|
||||
// now do up fname
|
||||
f << std::endl << std::endl;
|
||||
f << "# snapps configuration section" << std::endl;
|
||||
f << "[services]";
|
||||
f << "# uncomment next line to enable a snapp" << std::endl;
|
||||
f << "#example-snapp=" << snappExample_fpath << std::endl;
|
||||
f << std::endl << std::endl;
|
||||
|
||||
f << "# network settings " << std::endl;
|
||||
f << "[network]" << std::endl;
|
||||
f << "profiles=" << basepath << "profiles.dat" << std::endl;
|
||||
f << "# uncomment next line to add router with pubkey to list of routers we "
|
||||
"connect directly to"
|
||||
<< std::endl;
|
||||
f << "#strict-connect=pubkey" << std::endl;
|
||||
f << "# uncomment next line to use router with pubkey as an exit node"
|
||||
<< std::endl;
|
||||
f << "#exit-node=pubkey" << std::endl;
|
||||
|
||||
// better to set them to auto then to hard code them now
|
||||
// operating environment may change over time and this will help adapt
|
||||
// f << "ifname=auto" << std::endl;
|
||||
// f << "ifaddr=auto" << std::endl;
|
||||
|
||||
// should this also be auto? or not declared?
|
||||
// probably auto in case they want to set up a hidden service
|
||||
f << "enabled=true" << std::endl;
|
||||
return true;
|
||||
}
|
||||
@ -0,0 +1,190 @@
|
||||
#ifndef LLARP_CONFIG_HPP
|
||||
#define LLARP_CONFIG_HPP
|
||||
|
||||
#include <config/ini.hpp>
|
||||
#include <crypto/types.hpp>
|
||||
#include <router_contact.hpp>
|
||||
#include <util/fs.hpp>
|
||||
|
||||
#include <functional>
|
||||
#include <string>
|
||||
#include <utility>
|
||||
#include <vector>
|
||||
|
||||
namespace llarp
|
||||
{
|
||||
struct RouterConfig
|
||||
{
|
||||
/// always maintain this many connections to other routers
|
||||
size_t minConnectedRouters = 2;
|
||||
|
||||
/// hard upperbound limit on the number of router to router connections
|
||||
size_t maxConnectedRouters = 2000;
|
||||
|
||||
std::string netid;
|
||||
RouterContact rc;
|
||||
|
||||
fs::path encryption_keyfile = "encryption.key";
|
||||
|
||||
// path to write our self signed rc to
|
||||
fs::path our_rc_file = "rc.signed";
|
||||
|
||||
// transient iwp encryption key
|
||||
fs::path transport_keyfile = "transport.key";
|
||||
|
||||
// long term identity key
|
||||
fs::path ident_keyfile = "identity.key";
|
||||
|
||||
bool publicOverride = false;
|
||||
struct sockaddr_in ip4addr;
|
||||
AddressInfo addrInfo;
|
||||
|
||||
int workerThreads;
|
||||
int num_nethreads;
|
||||
|
||||
bool
|
||||
fromSection(string_view key, string_view val);
|
||||
};
|
||||
|
||||
struct NetworkConfig
|
||||
{
|
||||
absl::optional< bool > enableProfiling;
|
||||
std::string routerProfilesFile = "profiles.dat";
|
||||
std::string strictConnect;
|
||||
std::unordered_multimap< std::string, std::string > netConfig;
|
||||
|
||||
bool
|
||||
fromSection(string_view key, string_view val);
|
||||
};
|
||||
|
||||
struct NetdbConfig
|
||||
{
|
||||
std::string nodedb_dir;
|
||||
|
||||
bool
|
||||
fromSection(string_view key, string_view val);
|
||||
};
|
||||
|
||||
struct DnsConfig
|
||||
{
|
||||
std::unordered_multimap< std::string, std::string > netConfig;
|
||||
|
||||
bool
|
||||
fromSection(string_view key, string_view val);
|
||||
};
|
||||
|
||||
struct IwpConfig
|
||||
{
|
||||
uint16_t m_OutboundPort = 0;
|
||||
|
||||
std::vector< std::tuple< std::string, int, uint16_t > > servers;
|
||||
|
||||
bool
|
||||
fromSection(string_view key, string_view val);
|
||||
};
|
||||
|
||||
struct ConnectConfig
|
||||
{
|
||||
std::vector< std::string > routers;
|
||||
|
||||
bool
|
||||
fromSection(string_view key, string_view val);
|
||||
};
|
||||
|
||||
struct ServicesConfig
|
||||
{
|
||||
std::vector< std::pair< std::string, std::string > > services;
|
||||
bool
|
||||
fromSection(string_view key, string_view val);
|
||||
};
|
||||
|
||||
struct SystemConfig
|
||||
{
|
||||
std::string pidfile;
|
||||
|
||||
bool
|
||||
fromSection(string_view key, string_view val);
|
||||
};
|
||||
|
||||
struct MetricsConfig
|
||||
{
|
||||
bool disableMetrics = false;
|
||||
bool disableMetricLogs = false;
|
||||
fs::path jsonMetricsPath;
|
||||
std::string metricTankHost;
|
||||
std::map< std::string, std::string > metricTags;
|
||||
|
||||
bool
|
||||
fromSection(string_view key, string_view val);
|
||||
};
|
||||
|
||||
struct ApiConfig
|
||||
{
|
||||
bool enableRPCServer = false;
|
||||
std::string rpcBindAddr;
|
||||
|
||||
bool
|
||||
fromSection(string_view key, string_view val);
|
||||
};
|
||||
|
||||
struct LokidConfig
|
||||
{
|
||||
bool usingSNSeed = false;
|
||||
bool whitelistRouters = false;
|
||||
fs::path ident_keyfile = "identity.key";
|
||||
std::string lokidRPCAddr = "127.0.0.1:22023";
|
||||
std::string lokidRPCUser;
|
||||
std::string lokidRPCPassword;
|
||||
|
||||
bool
|
||||
fromSection(string_view key, string_view val);
|
||||
};
|
||||
|
||||
struct BootstrapConfig
|
||||
{
|
||||
std::vector< std::string > routers;
|
||||
bool
|
||||
fromSection(string_view key, string_view val);
|
||||
};
|
||||
|
||||
struct LoggingConfig
|
||||
{
|
||||
bool m_LogJSON = false;
|
||||
FILE *m_LogFile = stdout;
|
||||
|
||||
bool
|
||||
fromSection(string_view key, string_view val);
|
||||
};
|
||||
|
||||
struct Config
|
||||
{
|
||||
RouterConfig router;
|
||||
NetworkConfig network;
|
||||
ConnectConfig connect;
|
||||
NetdbConfig netdb;
|
||||
DnsConfig dns;
|
||||
IwpConfig iwp_links;
|
||||
ServicesConfig services;
|
||||
SystemConfig system;
|
||||
MetricsConfig metrics;
|
||||
ApiConfig api;
|
||||
LokidConfig lokid;
|
||||
BootstrapConfig bootstrap;
|
||||
LoggingConfig logging;
|
||||
|
||||
bool
|
||||
Load(const char *fname);
|
||||
};
|
||||
|
||||
} // namespace llarp
|
||||
|
||||
void
|
||||
llarp_generic_ensure_config(std::ofstream &f, std::string basepath);
|
||||
|
||||
void
|
||||
llarp_ensure_router_config(std::ofstream &f, std::string basepath);
|
||||
|
||||
bool
|
||||
llarp_ensure_client_config(std::ofstream &f, std::string basepath);
|
||||
|
||||
#endif
|
||||
@ -1,6 +1,6 @@
|
||||
#include <gtest/gtest.h>
|
||||
|
||||
#include <util/ini.hpp>
|
||||
#include <config/ini.hpp>
|
||||
|
||||
struct TestINIParser : public ::testing::Test
|
||||
{
|
||||
@ -0,0 +1,68 @@
|
||||
#include <util/str.hpp>
|
||||
|
||||
#include <gtest/gtest.h>
|
||||
#include <gmock/gmock.h>
|
||||
|
||||
using namespace llarp;
|
||||
using namespace ::testing;
|
||||
|
||||
struct CmpTestData
|
||||
{
|
||||
bool lt;
|
||||
std::string lhs;
|
||||
std::string rhs;
|
||||
};
|
||||
|
||||
class CaselessCmpTest : public ::testing::TestWithParam< CmpTestData >
|
||||
{
|
||||
};
|
||||
|
||||
TEST_P(CaselessCmpTest, test)
|
||||
{
|
||||
CaselessCmp cmp;
|
||||
auto d = GetParam();
|
||||
ASSERT_EQ(d.lt, cmp(d.lhs, d.rhs));
|
||||
}
|
||||
|
||||
std::vector< CmpTestData > CMPTESTDATA{
|
||||
{true, "", "1"}, {false, "1", ""}, {true, "abc", "abcd"},
|
||||
{true, "abc", "abd"}, {false, "11", "1"}, {false, "a", "A"},
|
||||
{false, "abc", "aBc"}, {false, "ABC", "abc"}};
|
||||
|
||||
INSTANTIATE_TEST_SUITE_P(TestStr, CaselessCmpTest, ValuesIn(CMPTESTDATA));
|
||||
|
||||
using TestData = std::pair< bool, std::string >;
|
||||
|
||||
class TestIsFalseValue : public ::testing::TestWithParam< TestData >
|
||||
{
|
||||
};
|
||||
|
||||
TEST_P(TestIsFalseValue, test)
|
||||
{
|
||||
ASSERT_EQ(GetParam().first, IsFalseValue(GetParam().second));
|
||||
}
|
||||
|
||||
std::vector< TestData > FALSE_DATA{
|
||||
{true, "false"}, {true, "FaLsE"}, {true, "no"}, {true, "nO"},
|
||||
{true, "No"}, {true, "NO"}, {true, "NO"}, {true, "0"},
|
||||
{true, "off"}, {true, "oFF"}, {false, "false y"}, {false, "true"},
|
||||
{false, "tRue"}, {false, "on"}};
|
||||
|
||||
INSTANTIATE_TEST_SUITE_P(TestStr, TestIsFalseValue, ValuesIn(FALSE_DATA));
|
||||
|
||||
class TestIsTrueValue : public ::testing::TestWithParam< TestData >
|
||||
{
|
||||
};
|
||||
|
||||
TEST_P(TestIsTrueValue, test)
|
||||
{
|
||||
ASSERT_EQ(GetParam().first, IsTrueValue(GetParam().second));
|
||||
}
|
||||
|
||||
std::vector< TestData > TRUE_DATA{
|
||||
{true, "true"}, {true, "TruE"}, {true, "yes"}, {true, "yeS"},
|
||||
{true, "yES"}, {true, "YES"}, {true, "1"}, {false, "0"},
|
||||
{true, "on"}, {true, "oN"}, {false, "false y"}, {false, "truth"},
|
||||
{false, "false"}, {false, "off"}};
|
||||
|
||||
INSTANTIATE_TEST_SUITE_P(TestStr, TestIsTrueValue, ValuesIn(TRUE_DATA));
|
||||
Loading…
Reference in New Issue