Compare commits
3 Commits
254de7a9ee
...
ssl
| Author | SHA1 | Date | |
|---|---|---|---|
| b482420d3a | |||
| 61d0ce3a47 | |||
| 5beb5e92a7 |
31
.github/workflows/ubuntu.yml
vendored
Normal file
31
.github/workflows/ubuntu.yml
vendored
Normal file
@@ -0,0 +1,31 @@
|
||||
name: Linux arm64
|
||||
run-name: Build And Test
|
||||
|
||||
on: [push]
|
||||
|
||||
|
||||
env:
|
||||
XMAKE_ROOT: y
|
||||
|
||||
jobs:
|
||||
Build:
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- name: Check out repository code
|
||||
uses: actions/checkout@v3
|
||||
|
||||
- name: Prepare XMake
|
||||
uses: xmake-io/github-action-setup-xmake@v1
|
||||
with:
|
||||
xmake-version: latest
|
||||
actions-cache-folder: '.xmake-cache'
|
||||
actions-cache-key: 'ubuntu'
|
||||
|
||||
- name: XMake config
|
||||
run: xmake f -p linux -y
|
||||
|
||||
- name: Build
|
||||
run: xmake
|
||||
|
||||
- name: Test
|
||||
run: xmake test
|
||||
@@ -166,7 +166,7 @@ class DataBuffer {
|
||||
K newKey;
|
||||
V newValue;
|
||||
*this >> newKey >> newValue;
|
||||
data.insert({newKey, newValue});
|
||||
data.emplace(newKey, newValue);
|
||||
}
|
||||
return *this;
|
||||
}
|
||||
|
||||
@@ -47,7 +47,7 @@ template <>
|
||||
class MessageEncapsulator<option::ZlibCompress> {
|
||||
public:
|
||||
static DataBuffer Encapsulate(const DataBuffer& a_Data, const option::ZlibCompress& a_Option);
|
||||
static DataBuffer Decapsulate(DataBuffer& a_Data, std::size_t a_Length, const option::ZlibCompress& a_Option);
|
||||
static DataBuffer Decapsulate(DataBuffer& a_Data, const option::ZlibCompress& a_Option);
|
||||
};
|
||||
|
||||
} // namespace io
|
||||
|
||||
41
include/sp/extensions/Encrypt.h
Normal file
41
include/sp/extensions/Encrypt.h
Normal file
@@ -0,0 +1,41 @@
|
||||
#pragma once
|
||||
|
||||
/**
|
||||
* \file Encrypt.h
|
||||
* \brief File containing encrypt utilities
|
||||
*/
|
||||
|
||||
#include <sp/common/DataBuffer.h>
|
||||
|
||||
namespace sp {
|
||||
namespace option {
|
||||
|
||||
struct TlsEncrypt {
|
||||
bool m_Enabled = true;
|
||||
};
|
||||
|
||||
} // namespace option
|
||||
} // namespace sp
|
||||
|
||||
#include <sp/io/IOInterface.h>
|
||||
|
||||
namespace sp {
|
||||
namespace ssl {
|
||||
|
||||
// encrypt
|
||||
|
||||
// decrypt
|
||||
|
||||
} // namespace ssl
|
||||
|
||||
namespace io {
|
||||
|
||||
template <>
|
||||
class MessageEncapsulator<option::TlsEncrypt> {
|
||||
public:
|
||||
static DataBuffer Encapsulate(const DataBuffer& a_Data, const option::TlsEncrypt& a_Option);
|
||||
static DataBuffer Decapsulate(DataBuffer& a_Data, const option::TlsEncrypt& a_Option);
|
||||
};
|
||||
|
||||
} // namespace io
|
||||
} // namespace sp
|
||||
@@ -17,7 +17,7 @@ template <typename TOption>
|
||||
class MessageEncapsulator {
|
||||
public:
|
||||
static DataBuffer Encapsulate(const DataBuffer& a_Data, const TOption& a_Option);
|
||||
static DataBuffer Decapsulate(DataBuffer& a_Data, std::size_t a_Length, const TOption& a_Option);
|
||||
static DataBuffer Decapsulate(DataBuffer& a_Data, const TOption& a_Option);
|
||||
};
|
||||
|
||||
template <typename IOTag, typename MessageDispatcher, typename MessageFactory, typename... TOptions>
|
||||
@@ -49,7 +49,7 @@ class Stream {
|
||||
|
||||
private:
|
||||
static DataBuffer Encapsulate(const DataBuffer& a_Data, const TOptions&... a_Options);
|
||||
static DataBuffer Decapsulate(DataBuffer& a_Data, std::size_t a_Length, const TOptions&... a_Options);
|
||||
static DataBuffer Decapsulate(DataBuffer& a_Data, const TOptions&... a_Options);
|
||||
};
|
||||
|
||||
} // namespace io
|
||||
|
||||
@@ -15,7 +15,7 @@ struct MessageEncapsulatorPack<> {
|
||||
static DataBuffer Encapsulate(const DataBuffer& a_Data) {
|
||||
return a_Data;
|
||||
}
|
||||
static DataBuffer Decapsulate(DataBuffer& a_Data, std::size_t a_Length) {
|
||||
static DataBuffer Decapsulate(DataBuffer& a_Data) {
|
||||
return a_Data;
|
||||
}
|
||||
};
|
||||
@@ -26,9 +26,9 @@ struct MessageEncapsulatorPack<TOption, TOptions...> {
|
||||
DataBuffer data = io::MessageEncapsulator<TOption>::Encapsulate(a_Data, a_Option);
|
||||
return MessageEncapsulatorPack<TOptions...>::Encapsulate(data, a_Options...);
|
||||
}
|
||||
static DataBuffer Decapsulate(DataBuffer& a_Data, std::size_t a_Length, const TOption& a_Option, const TOptions&... a_Options) {
|
||||
DataBuffer data = io::MessageEncapsulator<TOption>::Decapsulate(a_Data, a_Length, a_Option);
|
||||
return MessageEncapsulatorPack<TOptions...>::Decapsulate(data, data.GetSize(), a_Options...);
|
||||
static DataBuffer Decapsulate(DataBuffer& a_Data, const TOption& a_Option, const TOptions&... a_Options) {
|
||||
DataBuffer data = io::MessageEncapsulator<TOption>::Decapsulate(a_Data, a_Option);
|
||||
return MessageEncapsulatorPack<TOptions...>::Decapsulate(data, a_Options...);
|
||||
}
|
||||
};
|
||||
|
||||
@@ -94,7 +94,7 @@ void Stream<IOTag, MessageDispatcher, MessageFactory, TOptions...>::RecieveMessa
|
||||
buffer = m_Interface.Read(lenghtValue);
|
||||
|
||||
buffer = std::apply([&buffer, lenghtValue](const auto&... a_Options) {
|
||||
return Decapsulate(buffer, lenghtValue, a_Options...);
|
||||
return Decapsulate(buffer, a_Options...);
|
||||
}, m_Options);
|
||||
|
||||
VarInt packetType;
|
||||
@@ -120,8 +120,8 @@ DataBuffer Stream<IOTag, MessageDispatcher, MessageFactory, TOptions...>::Encaps
|
||||
|
||||
template <typename IOTag, typename MessageDispatcher, typename MessageFactory, typename... TOptions>
|
||||
DataBuffer Stream<IOTag, MessageDispatcher, MessageFactory, TOptions...>::Decapsulate(
|
||||
DataBuffer& a_Data, std::size_t a_Length, const TOptions&... a_Options) {
|
||||
return details::MessageEncapsulatorPack<TOptions...>::Decapsulate(a_Data, a_Length, a_Options...);
|
||||
DataBuffer& a_Data, const TOptions&... a_Options) {
|
||||
return details::MessageEncapsulatorPack<TOptions...>::Decapsulate(a_Data, a_Options...);
|
||||
}
|
||||
|
||||
} // namespace io
|
||||
|
||||
@@ -81,9 +81,8 @@ DataBuffer MessageEncapsulator<option::ZlibCompress>::Encapsulate(const DataBuff
|
||||
return zlib::Compress(a_Data, a_Option.m_Enabled ? a_Option.m_CompressionThreshold : MAX_COMPRESS_THRESHOLD);
|
||||
}
|
||||
|
||||
DataBuffer MessageEncapsulator<option::ZlibCompress>::Decapsulate(
|
||||
DataBuffer& a_Data, std::size_t a_Length, const option::ZlibCompress& a_Option) {
|
||||
return zlib::Decompress(a_Data, a_Length);
|
||||
DataBuffer MessageEncapsulator<option::ZlibCompress>::Decapsulate(DataBuffer& a_Data, const option::ZlibCompress& a_Option) {
|
||||
return zlib::Decompress(a_Data, a_Data.GetSize());
|
||||
}
|
||||
|
||||
} // namespace io
|
||||
|
||||
3
src/sp/extensions/Encrypt.cpp
Normal file
3
src/sp/extensions/Encrypt.cpp
Normal file
@@ -0,0 +1,3 @@
|
||||
#include <sp/extensions/Encrypt.h>
|
||||
|
||||
#include <openssl/ssl.h>
|
||||
@@ -6,9 +6,14 @@ local modules = {
|
||||
Compression = {
|
||||
Option = "zlib",
|
||||
Deps = {"zlib"},
|
||||
Packages = {"zlib"},
|
||||
Includes = {"include/(sp/extensions/Compress.h)"},
|
||||
Sources = {"src/sp/extensions/Compress.cpp"}
|
||||
},
|
||||
Encryption = {
|
||||
Option = "ssl",
|
||||
Deps = {"openssl"},
|
||||
Includes = {"include/(sp/extensions/Encrypt.h)"},
|
||||
Sources = {"src/sp/extensions/Encrypt.cpp"}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -37,7 +42,7 @@ for name, module in table.orderpairs(modules) do
|
||||
for _, source in table.orderpairs(module.Sources) do
|
||||
add_files(source)
|
||||
end
|
||||
for _, package in table.orderpairs(module.Packages) do
|
||||
for _, package in table.orderpairs(module.Deps) do
|
||||
add_packages(package)
|
||||
end
|
||||
set_group("Library")
|
||||
|
||||
Reference in New Issue
Block a user