mirror of
https://github.com/oxen-io/lokinet.git
synced 2024-11-11 07:10:36 +00:00
af6caf776a
* Config file API/comment improvements API improvements: ================= Make the config API use position-independent tag parameters (Required, Default{123}, MultiValue) rather than a sequence of bools with overloads. For example, instead of: conf.defineOption<int>("a", "b", false, true, 123, [] { ... }); you now write: conf.defineOption<int>("a", "b", MultiValue, Default{123}, [] { ... }); The tags are: - Required - MultiValue - Default{value} plus new abilities (see below): - Hidden - RelayOnly - ClientOnly - Comment{"line1", "line2", "line3"} Made option definition more powerful: ===================================== - `Hidden` allows you to define an option that won't show up in the generated config file if it isn't set. - `RelayOnly`/`ClientOnly` sets up an option that is only accepted and only shows up for relay or client configs. (If neither is specified the option shows up in both modes). - `Comment{...}` lets the option comments be specified as part of the defineOption. Comment improvements ==================== - Rewrote comments for various options to expand on details. - Inlined all the comments with the option definitions. - Several options that were missing comments got comments added. - Made various options for deprecated and or internal options hidden by default so that they don't show up in a default config file. - show the section comment (but not option comments) *after* the [section] tag instead of before it as it makes more sense that way (particularly for the [bind] section which has a new long comment to describe how it works). Disable profiling by default ============================ We had this weird state where we use and store profiling by default but never *load* it when starting up. This commit makes us just not use profiling at all unless explicitly enabled. Other misc changes: =================== - change default worker threads to 0 (= num cpus) instead of 1, and fix it to allow 0. - Actually apply worker-threads option - fixed default data-dir value erroneously having quotes around it - reordered ifname/ifaddr/mapaddr (was previously mapaddr/ifaddr/ifname) as mapaddr is a sort of specialization of ifaddr and so makes more sense to come after it (particularly because it now references ifaddr in its help message). - removed peer-stats option (since we always require it for relays and never use it for clients) - removed router profiles filename option (this doesn't need to be configurable) - removed defunct `service-node-seed` option - Change default logging output file to "" (which means stdout), and also made "-" work for stdout. * Router hive compilation fixes * Comments for SNApp SRV settings in ini file * Add extra blank line after section comments * Better deprecated option handling Allow {client,relay}-only options in {relay,client} configs to be specified as implicitly deprecated options: they warn, and don't set anything. Add an explicit `Deprecated` tag and move deprecated option handling into definition.cpp. * Move backwards compat options into section definitions Keep the "addBackwardsCompatibleConfigOptions" only for options in sections that no longer exist. * Fix INI parsing issues & C++17-ify - don't allow inline comments because it seems they aren't allowed in ini formats in general, and is going to cause problems if there is a comment character in a value (e.g. an exit auth string). Additionally it was breaking on a line such as: # some comment; see? because it was treating only `; see?` as the comment and then producing an error message about the rest of the line being invalid. - make section parsing stricter: the `[` and `]` have to be at the beginning at end of the line now (after stripping whitespace). - Move whitespace stripping to the top since everything in here does it. - chop off string_view suffix/prefix rather than maintaining position values - fix potential infinite loop/segfault when given a line such as `]foo[` * Make config parsing failure fatal Load() LogError's and returns false on failure, so we weren't aborting on config file errors. * Formatting: allow `{}` for empty functions/structs Instead of using two lines when empty: { } * Make default dns bind 127.0.0.1 on non-Linux * Don't show empty section; fix tests We can conceivably have sections that only make sense for clients or relays, and so want to completely omit that section if we have no options for the type of config being generated. Also fixes missing empty lines between tests. Co-authored-by: Thomas Winget <tewinget@gmail.com>
245 lines
6.1 KiB
C++
245 lines
6.1 KiB
C++
#ifndef LLARP_CONFIG_HPP
|
|
#define LLARP_CONFIG_HPP
|
|
|
|
#include <chrono>
|
|
#include <crypto/types.hpp>
|
|
#include <router_contact.hpp>
|
|
#include <util/fs.hpp>
|
|
#include <util/str.hpp>
|
|
#include <config/ini.hpp>
|
|
#include <config/definition.hpp>
|
|
#include <constants/files.hpp>
|
|
#include <net/ip_address.hpp>
|
|
#include <net/net_int.hpp>
|
|
#include <net/ip_range_map.hpp>
|
|
#include <service/address.hpp>
|
|
#include <service/auth.hpp>
|
|
#include <dns/srv_data.hpp>
|
|
|
|
#include <cstdlib>
|
|
#include <functional>
|
|
#include <string>
|
|
#include <utility>
|
|
#include <vector>
|
|
#include <unordered_set>
|
|
|
|
#include <lokimq/address.h>
|
|
|
|
namespace llarp
|
|
{
|
|
using SectionValues_t = llarp::ConfigParser::SectionValues_t;
|
|
using Config_impl_t = llarp::ConfigParser::Config_impl_t;
|
|
|
|
// TODO: don't use these maps. they're sloppy and difficult to follow
|
|
/// Small struct to gather all parameters needed for config generation to reduce the number of
|
|
/// parameters that need to be passed around.
|
|
struct ConfigGenParameters
|
|
{
|
|
bool isRelay = false;
|
|
fs::path defaultDataDir;
|
|
};
|
|
|
|
struct RouterConfig
|
|
{
|
|
size_t m_minConnectedRouters = 0;
|
|
size_t m_maxConnectedRouters = 0;
|
|
|
|
std::string m_netId;
|
|
std::string m_nickname;
|
|
|
|
fs::path m_dataDir;
|
|
|
|
bool m_blockBogons = false;
|
|
|
|
IpAddress m_publicAddress;
|
|
|
|
int m_workerThreads = -1;
|
|
int m_numNetThreads = -1;
|
|
|
|
size_t m_JobQueueSize = 0;
|
|
|
|
std::string m_routerContactFile;
|
|
std::string m_encryptionKeyFile;
|
|
std::string m_identityKeyFile;
|
|
std::string m_transportKeyFile;
|
|
|
|
bool m_isRelay = false;
|
|
|
|
void
|
|
defineConfigOptions(ConfigDefinition& conf, const ConfigGenParameters& params);
|
|
};
|
|
|
|
struct NetworkConfig
|
|
{
|
|
std::optional<bool> m_enableProfiling;
|
|
std::string m_strictConnect;
|
|
std::string m_ifname;
|
|
IPRange m_ifaddr;
|
|
|
|
std::optional<fs::path> m_keyfile;
|
|
std::string m_endpointType;
|
|
bool m_reachable = false;
|
|
std::optional<int> m_Hops;
|
|
std::optional<int> m_Paths;
|
|
bool m_AllowExit = false;
|
|
std::set<RouterID> m_snodeBlacklist;
|
|
net::IPRangeMap<service::Address> m_ExitMap;
|
|
std::unordered_map<service::Address, service::AuthInfo, service::Address::Hash> m_ExitAuths;
|
|
std::unordered_map<huint128_t, service::Address> m_mapAddrs;
|
|
|
|
service::AuthType m_AuthType = service::AuthType::eAuthTypeNone;
|
|
std::optional<std::string> m_AuthUrl;
|
|
std::optional<std::string> m_AuthMethod;
|
|
std::unordered_set<service::Address, service::Address::Hash> m_AuthWhitelist;
|
|
|
|
std::vector<llarp::dns::SRVData> m_SRVRecords;
|
|
|
|
// TODO:
|
|
// on-up
|
|
// on-down
|
|
// on-ready
|
|
|
|
void
|
|
defineConfigOptions(ConfigDefinition& conf, const ConfigGenParameters& params);
|
|
};
|
|
|
|
struct DnsConfig
|
|
{
|
|
IpAddress m_bind;
|
|
std::vector<IpAddress> m_upstreamDNS;
|
|
|
|
void
|
|
defineConfigOptions(ConfigDefinition& conf, const ConfigGenParameters& params);
|
|
};
|
|
|
|
struct LinksConfig
|
|
{
|
|
struct LinkInfo
|
|
{
|
|
std::string interface;
|
|
int addressFamily = -1;
|
|
uint16_t port = -1;
|
|
};
|
|
/// Create a LinkInfo from the given string.
|
|
/// @throws if str does not represent a LinkInfo.
|
|
LinkInfo
|
|
LinkInfoFromINIValues(std::string_view name, std::string_view value);
|
|
|
|
LinkInfo m_OutboundLink;
|
|
std::vector<LinkInfo> m_InboundLinks;
|
|
|
|
void
|
|
defineConfigOptions(ConfigDefinition& conf, const ConfigGenParameters& params);
|
|
};
|
|
|
|
struct ConnectConfig
|
|
{
|
|
std::vector<fs::path> routers;
|
|
|
|
void
|
|
defineConfigOptions(ConfigDefinition& conf, const ConfigGenParameters& params);
|
|
};
|
|
|
|
struct ApiConfig
|
|
{
|
|
bool m_enableRPCServer = false;
|
|
std::string m_rpcBindAddr;
|
|
|
|
void
|
|
defineConfigOptions(ConfigDefinition& conf, const ConfigGenParameters& params);
|
|
};
|
|
|
|
struct LokidConfig
|
|
{
|
|
bool whitelistRouters = false;
|
|
fs::path ident_keyfile;
|
|
lokimq::address lokidRPCAddr;
|
|
|
|
void
|
|
defineConfigOptions(ConfigDefinition& conf, const ConfigGenParameters& params);
|
|
};
|
|
|
|
struct BootstrapConfig
|
|
{
|
|
std::vector<fs::path> routers;
|
|
/// for unit tests
|
|
bool skipBootstrap = false;
|
|
void
|
|
defineConfigOptions(ConfigDefinition& conf, const ConfigGenParameters& params);
|
|
};
|
|
|
|
struct LoggingConfig
|
|
{
|
|
LogType m_logType = LogType::Unknown;
|
|
LogLevel m_logLevel = eLogNone;
|
|
std::string m_logFile;
|
|
|
|
void
|
|
defineConfigOptions(ConfigDefinition& conf, const ConfigGenParameters& params);
|
|
};
|
|
|
|
struct Config
|
|
{
|
|
RouterConfig router;
|
|
NetworkConfig network;
|
|
ConnectConfig connect;
|
|
DnsConfig dns;
|
|
LinksConfig links;
|
|
ApiConfig api;
|
|
LokidConfig lokid;
|
|
BootstrapConfig bootstrap;
|
|
LoggingConfig logging;
|
|
|
|
// Initialize config definition
|
|
void
|
|
initializeConfig(ConfigDefinition& conf, const ConfigGenParameters& params);
|
|
|
|
/// Insert config entries for backwards-compatibility (e.g. so that the config system will
|
|
/// tolerate old values that are no longer accepted)
|
|
///
|
|
/// @param conf is the config to modify
|
|
void
|
|
addBackwardsCompatibleConfigOptions(ConfigDefinition& conf);
|
|
|
|
// Load a config from the given file
|
|
bool
|
|
Load(const fs::path fname, bool isRelay, fs::path defaultDataDir);
|
|
|
|
/// Load (initialize) a default config.
|
|
///
|
|
/// This delegates to the ConfigDefinition to generate a default config,
|
|
/// as though an empty config were specified.
|
|
///
|
|
/// If using Config without the intention of loading from file (or string), this is necessary
|
|
/// in order to obtain sane defaults.
|
|
///
|
|
/// @param isRelay determines whether the config will reflect that of a relay or client
|
|
/// @param dataDir is a path representing a directory to be used as the data dir
|
|
/// @return true on success, false otherwise
|
|
bool
|
|
LoadDefault(bool isRelay, fs::path dataDir);
|
|
|
|
std::string
|
|
generateBaseClientConfig(fs::path defaultDataDir);
|
|
|
|
std::string
|
|
generateBaseRouterConfig(fs::path defaultDataDir);
|
|
|
|
void
|
|
Save();
|
|
|
|
void
|
|
Override(std::string section, std::string key, std::string value);
|
|
|
|
private:
|
|
ConfigParser m_Parser;
|
|
};
|
|
|
|
void
|
|
ensureConfig(
|
|
const fs::path& defaultDataDir, const fs::path& confFile, bool overwrite, bool asRouter);
|
|
|
|
} // namespace llarp
|
|
|
|
#endif
|