oxen-io/oxen-storage-server
1
0
Fork 0
mirror of https://github.com/oxen-io/oxen-storage-server.git synced 2023-12-13 21:00:26 +01:00
Code Issues Projects Releases Wiki Activity

merge conflicts

Browse source
This commit is contained in:
Sean Darcy 2021-01-07 15:34:09 +11:00
parent d23c8417aa
commit d6b77e8fa4
5 changed files with 18 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
crypto/CMakeLists.txt
View file

@ -4,10 +4,10 @@ add_library(crypto STATIC
src/oxend_key.cpp
src/channel_encryption.cpp
src/signature.cpp
${CMAKE_CURRENT_LIST_DIR}/../vendors/loki/crypto-ops/crypto-ops.c
${CMAKE_CURRENT_LIST_DIR}/../vendors/loki/crypto-ops/crypto-ops-data.c
${CMAKE_CURRENT_LIST_DIR}/../vendors/loki/crypto-ops/keccak.c
${CMAKE_CURRENT_LIST_DIR}/../vendors/loki/crypto-ops/hash-ops.c
${CMAKE_CURRENT_LIST_DIR}/../vendors/oxen/crypto-ops/crypto-ops.c
${CMAKE_CURRENT_LIST_DIR}/../vendors/oxen/crypto-ops/crypto-ops-data.c
${CMAKE_CURRENT_LIST_DIR}/../vendors/oxen/crypto-ops/keccak.c
${CMAKE_CURRENT_LIST_DIR}/../vendors/oxen/crypto-ops/hash-ops.c
)
if (NOT OPENSSL_FOUND)

2
httpserver/main.cpp
View file

@ -185,7 +185,7 @@ int main(int argc, char* argv[]) {
OXEN_LOG(info, "ed25519 SECRET KEY: {}", options.oxend_ed25519_key);
#endif
const auto public_key = loki::derive_pubkey_legacy(private_key);
const auto public_key = oxen::derive_pubkey_legacy(private_key);
OXEN_LOG(info, "Retrieved keys from Lokid; our SN pubkey is: {}",
lokimq::to_hex(public_key.begin(), public_key.end()));

8
httpserver/security.cpp
View file

@ -7,15 +7,9 @@
#include <filesystem>
#include <fstream>
<<<<<<< HEAD
namespace loki {
Security::Security(const lokid_key_pair_t& key_pair,
const std::filesystem::path& base_path)
=======
namespace oxen {
Security::Security(const oxend_key_pair_t& key_pair,
const boost::filesystem::path& base_path)
>>>>>>> initial rebrand
const std::filesystem::path& base_path)
: key_pair_(key_pair), base_path_(base_path) {}
std::string Security::base64_sign(const std::string& body) {

8
httpserver/service_node.cpp
View file

@ -251,7 +251,7 @@ parse_swarm_update(const std::shared_ptr<std::string>& response_body) {
const auto& pubkey =
sn_json.at("service_node_pubkey").get_ref<const std::string&>();
if (!lokimq::is_hex(pubkey)) {
LOKI_LOG(warn, "service_node_pubkey is not valid hex");
OXEN_LOG(warn, "service_node_pubkey is not valid hex");
continue;
}
std::string snode_address =
@ -469,7 +469,7 @@ void ServiceNode::send_to_sn(const sn_record_t& sn, ss_client::ReqMethod method,
switch (method) {
case ss_client::ReqMethod::DATA: {
OXEN_LOG(debug, "Sending sn.data request to {}",
lokimq::as_hex(sn.pubkey_x25519_bin()));
lokimq::to_hex(sn.pubkey_x25519_bin()));
lmq_server_->request(sn.pubkey_x25519_bin(), "sn.data", std::move(cb),
req.body);
break;
@ -481,7 +481,7 @@ void ServiceNode::send_to_sn(const sn_record_t& sn, ss_client::ReqMethod method,
// parameters...
if (client_key != req.headers.end()) {
OXEN_LOG(debug, "Sending sn.proxy_exit request to {}",
lokimq::as_hex(sn.pubkey_x25519_bin()));
lokimq::to_hex(sn.pubkey_x25519_bin()));
lmq_server_->request(sn.pubkey_x25519_bin(), "sn.proxy_exit",
std::move(cb), client_key->second, req.body);
} else {
@ -1075,7 +1075,7 @@ void ServiceNode::attach_signature(std::shared_ptr<request_t>& request,
raw_sig.insert(raw_sig.begin(), sig.c.begin(), sig.c.end());
raw_sig.insert(raw_sig.end(), sig.r.begin(), sig.r.end());
const std::string sig_b64 = lokimq::base64_encode(raw_sig);
const std::string sig_b64 = lokimq::to_base64(raw_sig);
request->set(OXEN_SNODE_SIGNATURE_HEADER, sig_b64);
request->set(OXEN_SENDER_SNODE_PUBKEY_HEADER,

16
unit_test/command_line.cpp
View file

@ -57,7 +57,7 @@ BOOST_AUTO_TEST_CASE(it_parses_version) {
}
BOOST_AUTO_TEST_CASE(it_parses_force_start) {
loki::command_line_parser parser;
oxen::command_line_parser parser;
const char* argv[] = {"httpserver", "0.0.0.0", "80", "--lmq-port", "123", "--force-start"};
BOOST_CHECK_NO_THROW(parser.parse_args(sizeof(argv) / sizeof(char*),
const_cast<char**>(argv)));
@ -66,7 +66,7 @@ BOOST_AUTO_TEST_CASE(it_parses_force_start) {
}
BOOST_AUTO_TEST_CASE(it_parses_ip_and_port) {
loki::command_line_parser parser;
oxen::command_line_parser parser;
const char* argv[] = {"httpserver", "0.0.0.0", "80", "--lmq-port", "123"};
BOOST_CHECK_NO_THROW(parser.parse_args(sizeof(argv) / sizeof(char*),
const_cast<char**>(argv)));
@ -85,8 +85,8 @@ BOOST_AUTO_TEST_CASE(it_throw_with_invalid_port) {
std::exception);
}
BOOST_AUTO_TEST_CASE(it_parses_lokid_rpc_port) {
loki::command_line_parser parser;
BOOST_AUTO_TEST_CASE(it_parses_oxend_rpc_port) {
oxen::command_line_parser parser;
const char* argv[] = {"httpserver", "0.0.0.0", "80", "--lmq-port", "123", "--oxend-rpc-port",
"12345"};
BOOST_CHECK_NO_THROW(parser.parse_args(sizeof(argv) / sizeof(char*),
@ -96,7 +96,7 @@ BOOST_AUTO_TEST_CASE(it_parses_lokid_rpc_port) {
}
BOOST_AUTO_TEST_CASE(it_parses_data_dir) {
loki::command_line_parser parser;
oxen::command_line_parser parser;
const char* argv[] = {"httpserver", "0.0.0.0", "80", "--lmq-port", "123", "--data-dir",
"foobar"};
BOOST_CHECK_NO_THROW(parser.parse_args(sizeof(argv) / sizeof(char*),
@ -106,7 +106,7 @@ BOOST_AUTO_TEST_CASE(it_parses_data_dir) {
}
BOOST_AUTO_TEST_CASE(it_returns_default_data_dir) {
loki::command_line_parser parser;
oxen::command_line_parser parser;
const char* argv[] = {"httpserver", "0.0.0.0", "80", "--lmq-port", "123"};
BOOST_CHECK_NO_THROW(parser.parse_args(sizeof(argv) / sizeof(char*),
const_cast<char**>(argv)));
@ -115,7 +115,7 @@ BOOST_AUTO_TEST_CASE(it_returns_default_data_dir) {
}
BOOST_AUTO_TEST_CASE(it_parses_log_levels) {
loki::command_line_parser parser;
oxen::command_line_parser parser;
const char* argv[] = {"httpserver", "0.0.0.0", "80", "--lmq-port", "123", "--log-level",
"foobar"};
BOOST_CHECK_NO_THROW(parser.parse_args(sizeof(argv) / sizeof(char*),
@ -125,7 +125,7 @@ BOOST_AUTO_TEST_CASE(it_parses_log_levels) {
}
BOOST_AUTO_TEST_CASE(it_throws_with_config_file_not_found) {
loki::command_line_parser parser;
oxen::command_line_parser parser;
const char* argv[] = {"httpserver", "0.0.0.0", "80", "--lmq-port", "123", "--config-file",
"foobar"};
BOOST_CHECK_THROW(parser.parse_args(sizeof(argv) / sizeof(char*),