From 19583bfb75d4a15a75d70355dd3b752bfc1d8b03 Mon Sep 17 00:00:00 2001 From: alpine Date: Mon, 15 Jun 2020 21:34:40 +0200 Subject: Removed xor as it was slowing down everything alot. Finished file/message streaming, really fast. --- server/src/client/client.cpp | 58 +++++++++++++++++++++++++++++++++++++++++++- server/src/client/client.h | 29 ++++++---------------- server/src/main.cpp | 8 ++++-- server/src/server/packet.h | 16 +++++------- server/src/server/ssl.h | 2 +- server/src/util/xor.cpp | 39 ----------------------------- server/src/util/xor.h | 12 --------- 7 files changed, 78 insertions(+), 86 deletions(-) delete mode 100644 server/src/util/xor.cpp delete mode 100644 server/src/util/xor.h (limited to 'server') diff --git a/server/src/client/client.cpp b/server/src/client/client.cpp index 4c458c8..782017f 100644 --- a/server/src/client/client.cpp +++ b/server/src/client/client.cpp @@ -16,6 +16,12 @@ bool tcp::client::init_ssl(SSL_CTX *server_ctx) { } ret = SSL_accept(m_ssl); + + long result = SSL_get_verify_result(m_ssl); + + auto str = X509_verify_cert_error_string(result); + io::logger->info("verify returned {}", str); + if (ret <= 0) { int err = SSL_get_error(m_ssl, ret); io::logger->error("client {} failed to accept ssl, return code {}", m_ip, @@ -24,4 +30,54 @@ bool tcp::client::init_ssl(SSL_CTX *server_ctx) { } return true; -} \ No newline at end of file +} + +int tcp::client::stream(std::vector &data) { + auto size = data.size(); + + auto networked_size = htonl(size); + write(&networked_size, sizeof(networked_size)); + + // with 4kb chunk size, speed peaks at 90mb/s + constexpr size_t chunk_size = 4096; + size_t sent = 0; + + while(size > 0) { + auto to_send = std::min(size, chunk_size); + + int ret = write(&data[sent], to_send); + if(ret <= 0) { + break; + } + + sent += ret; + size -= ret; + } + + return sent; + } + + int tcp::client::read_stream(std::vector &out) { + size_t size; + read(&size, sizeof(size)); + + size = ntohl(size); + out.resize(size); + + constexpr size_t chunk_size = 4096; + size_t total = 0; + + while(size > 0) { + auto to_read = std::min(size, chunk_size); + + int ret = read(&out[total], to_read); + if(ret <= 0) { + break; + } + + size -= ret; + total += ret; + } + + return total; + } \ No newline at end of file diff --git a/server/src/client/client.h b/server/src/client/client.h index 5242ae7..28094ba 100644 --- a/server/src/client/client.h +++ b/server/src/client/client.h @@ -11,13 +11,12 @@ class client { time_t m_time; std::string m_ip; - std::array m_uid; + std::string m_uid; + public: client() : m_socket{-1} {}; client(const int &socket, const std::string_view ip) - : m_socket{std::move(socket)}, m_ip{ip}, m_ssl{nullptr} { - - } + : m_socket{std::move(socket)}, m_ip{ip}, m_ssl{nullptr} {} ~client() = default; bool init_ssl(SSL_CTX *server_ctx); @@ -28,27 +27,15 @@ class client { SSL_free(m_ssl); } - int write(void *data, size_t size) { - return SSL_write(m_ssl, data, size); - } + int write(void *data, size_t size) { return SSL_write(m_ssl, data, size); } - int read(void *data, size_t size) { - return SSL_read(m_ssl, data, size); - } + int read(void *data, size_t size) { return SSL_read(m_ssl, data, size); } - bool set_uid(const std::string_view uid_str) { - const size_t uid_str_len = uid_str.size(); - if (uid_str_len != tcp::uid_len) { - io::logger->error("packet uid len mismatch!"); - return false; - } + int stream(std::vector &data); - for (size_t i = 0; i < uid_len; ++i) { - m_uid[i] = uid_str[i]; - } + int read_stream(std::vector &out); - return true; - } + void set_uid(const std::string_view uid_str) { m_uid = uid_str; } int &get_socket() { return m_socket; } auto &get_ip() { return m_ip; } diff --git a/server/src/main.cpp b/server/src/main.cpp index 9db266f..21cad38 100644 --- a/server/src/main.cpp +++ b/server/src/main.cpp @@ -2,7 +2,6 @@ #include "util/io.h" #include "util/commands.h" #include "server/server.h" -#include "util/xor.h" int main(int argc, char *argv[]) { io::init(false); @@ -31,8 +30,13 @@ int main(int argc, char *argv[]) { io::logger->info("{} : {}", packet.uid.data(), packet.message); - tcp::packet_t resp("hello nigga", tcp::packet_type::write, "1234567890"); + tcp::packet_t resp("stream", tcp::packet_type::write, "1234567890"); client.write(resp.message.data(), resp.message.size()); + + std::vector out; + io::read_file("test.dll", out); + client.stream(out); + }); std::thread t{tcp::server::monitor, std::ref(server)}; diff --git a/server/src/server/packet.h b/server/src/server/packet.h index 3930243..09eaf1d 100644 --- a/server/src/server/packet.h +++ b/server/src/server/packet.h @@ -1,5 +1,4 @@ #pragma once -#include "../util/xor.h" namespace tcp { constexpr size_t uid_len = 10; @@ -14,27 +13,24 @@ struct packet_t { packet_t() {} packet_t(const std::string msg, const packet_type &type, std::string userid = "") { if (type == read) { - std::string decrypted{msg}; - enc::decrypt_message(decrypted); - - if (decrypted.size() < uid_len) { + if (msg.size() < uid_len) { io::logger->error("client packet message invalid!"); return; } - uid = decrypted.substr(0, uid_len); + uid = msg.substr(0, uid_len); - action = decrypted[uid_len]; - message = decrypted.substr(uid_len); + action = msg[uid_len]; + message = msg.substr(uid_len); } else { uid = userid; message = fmt::format("{}{}", uid, msg); - - enc::encrypt_message(message); } } + + operator bool() const { return !message.empty() && !uid.empty(); } diff --git a/server/src/server/ssl.h b/server/src/server/ssl.h index 06826be..745aa14 100644 --- a/server/src/server/ssl.h +++ b/server/src/server/ssl.h @@ -21,7 +21,7 @@ class ssl { } int res = - SSL_CTX_use_certificate_file(m_ctx, m_cert.data(), SSL_FILETYPE_PEM); + SSL_CTX_use_certificate_chain_file(m_ctx, m_cert.data()); if (res != 1) { io::logger->error("failed to load certificate."); return false; diff --git a/server/src/util/xor.cpp b/server/src/util/xor.cpp deleted file mode 100644 index a00ecc9..0000000 --- a/server/src/util/xor.cpp +++ /dev/null @@ -1,39 +0,0 @@ -#include "../include.h" -#include "xor.h" - -char enc::gen_key() { - std::random_device r; - - std::default_random_engine e1(r()); - std::uniform_real_distribution<> uniform_dist(0, 255); - return static_cast(uniform_dist(e1)); -} - -void enc::encrypt_message(std::string &str) { - std::array keys; - for (size_t i = 0; i < key_len; i++) { - keys[i] = gen_key(); - str.insert(str.end(), keys[i]); - } - - for (auto &key : keys) { - for (size_t i = 0; i < str.size() - key_len; i++) { - str[i] ^= key; - } - } -} - -void enc::decrypt_message(std::string &str) { - if (str.size() <= key_len) return; - - std::string keys = str.substr(0, key_len); - std::reverse(keys.begin(), keys.end()); - - for (auto &key : keys) { - for (size_t i = key_len; i < str.size(); i++) { - str[i] ^= key; - } - } - - str.erase(str.begin(), str.begin() + key_len); -} \ No newline at end of file diff --git a/server/src/util/xor.h b/server/src/util/xor.h deleted file mode 100644 index 7180945..0000000 --- a/server/src/util/xor.h +++ /dev/null @@ -1,12 +0,0 @@ -#pragma once - -namespace enc { -constexpr size_t key_len = 50; - -char gen_key(); - -void encrypt_message(std::string &str); - -void decrypt_message(std::string &str); - -} // namespace enc \ No newline at end of file -- cgit v1.2.3