mirror of
https://github.com/oxen-io/lokinet.git
synced 2024-11-03 23:15:52 +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>
249 lines
6.0 KiB
C++
249 lines
6.0 KiB
C++
#ifndef LLARP_CRYPTO_TYPES_HPP
|
|
#define LLARP_CRYPTO_TYPES_HPP
|
|
|
|
#include <crypto/constants.hpp>
|
|
#include <router_id.hpp>
|
|
#include <util/aligned.hpp>
|
|
#include <util/types.hpp>
|
|
#include <util/fs.hpp>
|
|
|
|
#include <algorithm>
|
|
#include <iostream>
|
|
|
|
namespace llarp
|
|
{
|
|
using SharedSecret = AlignedBuffer<SHAREDKEYSIZE>;
|
|
using KeyExchangeNonce = AlignedBuffer<32>;
|
|
|
|
struct PubKey final : public AlignedBuffer<PUBKEYSIZE>
|
|
{
|
|
PubKey() = default;
|
|
|
|
explicit PubKey(const byte_t* ptr) : AlignedBuffer<SIZE>(ptr)
|
|
{}
|
|
|
|
explicit PubKey(const Data& data) : AlignedBuffer<SIZE>(data)
|
|
{}
|
|
|
|
explicit PubKey(const AlignedBuffer<SIZE>& other) : AlignedBuffer<SIZE>(other)
|
|
{}
|
|
|
|
std::string
|
|
ToString() const;
|
|
|
|
bool
|
|
FromString(const std::string& str);
|
|
|
|
operator RouterID() const
|
|
{
|
|
return RouterID(as_array());
|
|
}
|
|
|
|
PubKey&
|
|
operator=(const byte_t* ptr)
|
|
{
|
|
std::copy(ptr, ptr + SIZE, begin());
|
|
return *this;
|
|
}
|
|
};
|
|
|
|
inline std::ostream&
|
|
operator<<(std::ostream& out, const PubKey& k)
|
|
{
|
|
return out << k.ToString();
|
|
}
|
|
|
|
inline bool
|
|
operator==(const PubKey& lhs, const PubKey& rhs)
|
|
{
|
|
return lhs.as_array() == rhs.as_array();
|
|
}
|
|
|
|
inline bool
|
|
operator==(const PubKey& lhs, const RouterID& rhs)
|
|
{
|
|
return lhs.as_array() == rhs.as_array();
|
|
}
|
|
|
|
inline bool
|
|
operator==(const RouterID& lhs, const PubKey& rhs)
|
|
{
|
|
return lhs.as_array() == rhs.as_array();
|
|
}
|
|
|
|
struct PrivateKey;
|
|
|
|
/// Stores a sodium "secret key" value, which is actually the seed
|
|
/// concatenated with the public key. Note that the seed is *not* the private
|
|
/// key value itself, but rather the seed from which it can be calculated.
|
|
struct SecretKey final : public AlignedBuffer<SECKEYSIZE>
|
|
{
|
|
SecretKey() = default;
|
|
|
|
explicit SecretKey(const byte_t* ptr) : AlignedBuffer<SECKEYSIZE>(ptr)
|
|
{}
|
|
|
|
// The full data
|
|
explicit SecretKey(const AlignedBuffer<SECKEYSIZE>& seed) : AlignedBuffer<SECKEYSIZE>(seed)
|
|
{}
|
|
|
|
// Just the seed, we recalculate the pubkey
|
|
explicit SecretKey(const AlignedBuffer<32>& seed)
|
|
{
|
|
std::copy(seed.begin(), seed.end(), begin());
|
|
Recalculate();
|
|
}
|
|
|
|
/// recalculate public component
|
|
bool
|
|
Recalculate();
|
|
|
|
std::ostream&
|
|
print(std::ostream& stream, int level, int spaces) const
|
|
{
|
|
Printer printer(stream, level, spaces);
|
|
printer.printValue("secretkey");
|
|
return stream;
|
|
}
|
|
|
|
PubKey
|
|
toPublic() const
|
|
{
|
|
return PubKey(data() + 32);
|
|
}
|
|
|
|
/// Computes the private key from the secret key (which is actually the
|
|
/// seed)
|
|
bool
|
|
toPrivate(PrivateKey& key) const;
|
|
|
|
bool
|
|
LoadFromFile(const fs::path& fname);
|
|
|
|
bool
|
|
SaveToFile(const fs::path& fname) const;
|
|
};
|
|
|
|
inline std::ostream&
|
|
operator<<(std::ostream& out, const SecretKey&)
|
|
{
|
|
// return out << k.ToHex();
|
|
// make sure we never print out secret keys
|
|
return out << "[secretkey]";
|
|
}
|
|
|
|
/// PrivateKey is similar to SecretKey except that it only stores the private
|
|
/// key value and a hash, unlike SecretKey which stores the seed from which
|
|
/// the private key and hash value are generated. This is primarily intended
|
|
/// for use with derived keys, where we can derive the private key but not the
|
|
/// seed.
|
|
struct PrivateKey final : public AlignedBuffer<64>
|
|
{
|
|
PrivateKey() = default;
|
|
|
|
explicit PrivateKey(const byte_t* ptr) : AlignedBuffer<64>(ptr)
|
|
{}
|
|
|
|
explicit PrivateKey(const AlignedBuffer<64>& key_and_hash) : AlignedBuffer<64>(key_and_hash)
|
|
{}
|
|
|
|
/// Returns a pointer to the beginning of the 32-byte hash which is used for
|
|
/// pseudorandomness when signing with this private key.
|
|
const byte_t*
|
|
signingHash() const
|
|
{
|
|
return data() + 32;
|
|
}
|
|
|
|
/// Returns a pointer to the beginning of the 32-byte hash which is used for
|
|
/// pseudorandomness when signing with this private key.
|
|
byte_t*
|
|
signingHash()
|
|
{
|
|
return data() + 32;
|
|
}
|
|
|
|
std::ostream&
|
|
print(std::ostream& stream, int level, int spaces) const
|
|
{
|
|
Printer printer(stream, level, spaces);
|
|
printer.printValue("privatekey");
|
|
return stream;
|
|
}
|
|
|
|
/// Computes the public key
|
|
bool
|
|
toPublic(PubKey& pubkey) const;
|
|
};
|
|
|
|
inline std::ostream&
|
|
operator<<(std::ostream& out, const PrivateKey&)
|
|
{
|
|
// return out << k.ToHex();
|
|
// make sure we never print out private keys
|
|
return out << "[privatekey]";
|
|
}
|
|
|
|
/// IdentitySecret is a secret key from a service node secret seed
|
|
struct IdentitySecret final : public AlignedBuffer<32>
|
|
{
|
|
IdentitySecret() : AlignedBuffer<32>()
|
|
{}
|
|
|
|
/// no copy constructor
|
|
explicit IdentitySecret(const IdentitySecret&) = delete;
|
|
// no byte data constructor
|
|
explicit IdentitySecret(const byte_t*) = delete;
|
|
|
|
/// load service node seed from file
|
|
bool
|
|
LoadFromFile(const fs::path& fname);
|
|
};
|
|
|
|
inline std::ostream&
|
|
operator<<(std::ostream& out, const IdentitySecret&)
|
|
{
|
|
// make sure we never print out secret keys
|
|
return out << "[IdentitySecret]";
|
|
}
|
|
|
|
using ShortHash = AlignedBuffer<SHORTHASHSIZE>;
|
|
using LongHash = AlignedBuffer<HASHSIZE>;
|
|
|
|
struct Signature final : public AlignedBuffer<SIGSIZE>
|
|
{
|
|
byte_t*
|
|
Hi();
|
|
|
|
const byte_t*
|
|
Hi() const;
|
|
|
|
byte_t*
|
|
Lo();
|
|
|
|
const byte_t*
|
|
Lo() const;
|
|
};
|
|
|
|
using TunnelNonce = AlignedBuffer<TUNNONCESIZE>;
|
|
using SymmNonce = AlignedBuffer<NONCESIZE>;
|
|
using SymmKey = AlignedBuffer<32>;
|
|
|
|
using PQCipherBlock = AlignedBuffer<PQ_CIPHERTEXTSIZE + 1>;
|
|
using PQPubKey = AlignedBuffer<PQ_PUBKEYSIZE>;
|
|
using PQKeyPair = AlignedBuffer<PQ_KEYPAIRSIZE>;
|
|
|
|
/// PKE(result, publickey, secretkey, nonce)
|
|
using path_dh_func =
|
|
std::function<bool(SharedSecret&, const PubKey&, const SecretKey&, const TunnelNonce&)>;
|
|
|
|
/// TKE(result, publickey, secretkey, nonce)
|
|
using transport_dh_func =
|
|
std::function<bool(SharedSecret&, const PubKey&, const SecretKey&, const TunnelNonce&)>;
|
|
|
|
/// SH(result, body)
|
|
using shorthash_func = std::function<bool(ShortHash&, const llarp_buffer_t&)>;
|
|
} // namespace llarp
|
|
|
|
#endif
|