Compare commits

...
8 changed files with 64 additions and 58 deletions

No files matched your search

+9 -5
View File
@@ -1,9 +1,13 @@
#nusers: 1 #nusers: 1
#allow concurrent : false #allow concurrent : true
#expires: 2019-Sep-30 00:00:00 637053984000000000 #expires: 2019-Dec-31 00:00:00 637133472000000000
#generation_time: 2019-Jun-18 18:25:44.333280 5248650809870720704 #generation_time: 2019-Sep-20 14:35:45.291997 5248731887880307874
EncryptedKeyCode { EncryptedKeyCode {
value { value {
keycode: "pgtv/OmievnpmNlgxTYuN801Hbetgu7ZGkHnlGWtK+DBrKSEgKxr5lGvCW1ld/jsztkWhKHDh0iediMDjrPm4+C5qmXlt4JJlAFvKolMN8HVC59m82fECvakcqKq28WSEjf6/DuPJNP1ZwxjcmKouxx1LZ15VlNkECtNrC9pkCnifazbfQZGV3kD08zMEyw/RPmOaVLFFeav8lwI5UpcjPYBIK1rJowXdGSvm1CJViwG5Z2JbdHR39QbKjVx112d5VbVtBq9nO3i0FEKvobjN/Gzcz/5x4TgQtEShKsbmgEN+MBVL3AItQlcFzZvE/05JLmfACUFmk5Eu0a3DlLs3A==" keycode: "mcNlq7VIEIPFM2SDFJfYCR3yi1O1/uTi41zZ80wJ1s33A7AOz22qvd6AVb/MpazYhqVr083d5QeIKFRHCNgoZjp8vpAeyDuQaA5mQxuvAG3CInSDW/umk7NmF9cwAwB0zLwurrQkosNqgCoJOGGEtOJtZ85RwFmwygeguAq16AL25kbQGpJNz8PlA6o/m2mDAY9vVAk1YS4DgiQxDpbjrssDPGi83D9/Z/NaiKpzlIAGOAemV3LfHLL6M/rzYxLPWP97Q+cRKo+SAZP6vkYBruR3vKf6sLrSskz94QIFBgXuaBsQNq79RN9DKjH6T6zZebloTfUc3DuNmU0XyTEh3Q=="
} }
} }
+2 -12
View File
@@ -28,22 +28,12 @@
namespace bts { namespace bts {
namespace api { namespace api {
namespace auth { namespace auth {
const std::string AuthSessionManager::PUBLIC_KEY =
"-----BEGIN PUBLIC KEY-----\n"
"MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAseguRgLD88QdhK0agy8f"
"gz3SXp/hmp377+Q+z3OQqGG5kWyKnQfkAQDFeSv8o1iwSQupN0D1QOXyDnV1jmue"
"rqTitasGeq4AwKLhY89O/VuXc+URAO+HZ7EqVWfb3Nv4EOZRiiVsxmVBkld73Rcy"
"UAS4OXh4jDtE8IzOoXB7HhlMPBIAkueqdyy/v9zamzKrxPzWd+IW/IYEdCrUS8ES"
"mxOkeadSHVeH2nlHVREdktE3wKRd3fZ3OkyGaHnUPxBoUW1Ex57BpwdMGUqLZ3W2"
"92yQa/32dsLocoTri4iiImvQ/0JvfhnY9MDTZnmIgb8bPWSvPblQN0RR9OkRDFT9"
"3QIDAQAB"
"\n-----END PUBLIC KEY-----\n";
AuthSessionManager::AuthSessionManager() : _map(), _nusers(), _expiration(), _concurrent(false) AuthSessionManager::AuthSessionManager() : _map(), _nusers(), _expiration(), _concurrent(false)
{ {
const auto& ekc = config::get<config::EncryptedKeyCode>(); const auto& ekc = config::get<config::EncryptedKeyCode>();
auto pub = bts::crypto::PublicKey::read_string(PUBLIC_KEY); auto pub = bts::crypto::PublicKey::read_string(bts::crypto::PublicKey::PUBLIC_KEY);
bts::config::KeyCode kc; bts::config::KeyCode kc;
auto valid = bts::crypto::decrypt_keycode(*pub, ekc, &kc); auto valid = bts::crypto::decrypt_keycode(*pub, ekc, &kc);
bts_assert_msg(valid, "Your BTS Keycode is invalid"); bts_assert_msg(valid, "Your BTS Keycode is invalid");
+1 -2
View File
@@ -24,8 +24,7 @@ public:
private: private:
bool validate_ip_port(const bts::config::KeyCode& kc); bool validate_ip_port(const bts::config::KeyCode& kc);
private: private:
static const std::string PUBLIC_KEY;
typedef std::map<uint32_t, Session> SessionMap; typedef std::map<uint32_t, Session> SessionMap;
SessionMap _map; SessionMap _map;
uint32_t _nusers; uint32_t _nusers;
+3 -3
View File
@@ -18,7 +18,7 @@ namespace bts
namespace crypto namespace crypto
{ {
static const char rnd_seed[] = "string to make the random number generator think it has entropy"; static const char rnd_seed[] = "I swear by my life and my love of it that I will never live for the sake of another man, nor ask another man to live for mine.";
bool CryptoInit::init = false; bool CryptoInit::init = false;
tbb::spin_mutex _lock; tbb::spin_mutex _lock;
@@ -30,10 +30,10 @@ void CryptoInit::initialize()
tbb::spin_mutex::scoped_lock lock(_lock); tbb::spin_mutex::scoped_lock lock(_lock);
if(!init) if(!init)
{ {
openssl::RAND_seed(rnd_seed, sizeof rnd_seed);
openssl::OpenSSL_add_all_algorithms(); openssl::OpenSSL_add_all_algorithms();
openssl::OpenSSL_add_all_ciphers(); openssl::OpenSSL_add_all_ciphers();
openssl::OpenSSL_add_all_digests(); openssl::OpenSSL_add_all_digests();
openssl::RAND_seed(rnd_seed, sizeof rnd_seed);
init = true; init = true;
} }
} }
+11
View File
@@ -20,6 +20,17 @@ namespace bts
{ {
namespace crypto namespace crypto
{ {
//openssl rsa -in spark_private.pem -pubout
const std::string PublicKey::PUBLIC_KEY =
"-----BEGIN PUBLIC KEY-----\n"
"MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA3qX8qdOOyLGb9KukwHHq"
"blOsQtf8W/vvI2xrLjauwoOWbg0m7e7tnzBzHnzrjUCPXRdvFbeTo+pjZ9kDKfIb"
"285E8gqSU5G44EVI0QPar7JyDoyouTDrE7DTGbyZYT0I8sXXY6S+plEZhFMhipPe"
"jMNpZ3zY3Y8NvqVfFV0iQWbeygdTDnUB80iYnmC+KdV2QhLogTIYbfBKBV1xfrms"
"GQcIcUkiagH1aDfGy82+qNyLz25ueJZqH/AzZoqDv1OgB3vIljdvsRkxsD3gES5P"
"Br7SviSf31MFYiSsWVT/u7sHHQuaxcjzzy8caZ9ghKtb1wVoCi/aK6/fJ03wA/6n"
"HwIDAQAB"
"\n-----END PUBLIC KEY-----\n";
PublicKey::PublicKey(openssl::EVP_PKEY* key) : PrivateKey(key) PublicKey::PublicKey(openssl::EVP_PKEY* key) : PrivateKey(key)
{ {
+3 -1
View File
@@ -23,7 +23,9 @@ public:
static const PublicKeyPtr read_file(const std::string& filename); static const PublicKeyPtr read_file(const std::string& filename);
static const PublicKeyPtr read_stream(std::istream& stream); static const PublicKeyPtr read_stream(std::istream& stream);
static const PublicKeyPtr read_string(const std::string& public_key); static const PublicKeyPtr read_string(const std::string& public_key);
public:
static const std::string PUBLIC_KEY;
protected: protected:
virtual void write(openssl::BIO* bio, CipherType::type cipher_type) const; virtual void write(openssl::BIO* bio, CipherType::type cipher_type) const;
+28 -28
View File
@@ -1,30 +1,30 @@
-----BEGIN ENCRYPTED PRIVATE KEY----- -----BEGIN ENCRYPTED PRIVATE KEY-----
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
vws8TcB/c30oidvXwDCpVQ== Y8LpypFboI70yD7XP4CBtQ==
-----END ENCRYPTED PRIVATE KEY----- -----END ENCRYPTED PRIVATE KEY-----
+7 -7
View File
@@ -1,9 +1,9 @@
-----BEGIN PUBLIC KEY----- -----BEGIN PUBLIC KEY-----
MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAseguRgLD88QdhK0agy8f MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA3qX8qdOOyLGb9KukwHHq
gz3SXp/hmp377+Q+z3OQqGG5kWyKnQfkAQDFeSv8o1iwSQupN0D1QOXyDnV1jmue blOsQtf8W/vvI2xrLjauwoOWbg0m7e7tnzBzHnzrjUCPXRdvFbeTo+pjZ9kDKfIb
rqTitasGeq4AwKLhY89O/VuXc+URAO+HZ7EqVWfb3Nv4EOZRiiVsxmVBkld73Rcy 285E8gqSU5G44EVI0QPar7JyDoyouTDrE7DTGbyZYT0I8sXXY6S+plEZhFMhipPe
UAS4OXh4jDtE8IzOoXB7HhlMPBIAkueqdyy/v9zamzKrxPzWd+IW/IYEdCrUS8ES jMNpZ3zY3Y8NvqVfFV0iQWbeygdTDnUB80iYnmC+KdV2QhLogTIYbfBKBV1xfrms
mxOkeadSHVeH2nlHVREdktE3wKRd3fZ3OkyGaHnUPxBoUW1Ex57BpwdMGUqLZ3W2 GQcIcUkiagH1aDfGy82+qNyLz25ueJZqH/AzZoqDv1OgB3vIljdvsRkxsD3gES5P
92yQa/32dsLocoTri4iiImvQ/0JvfhnY9MDTZnmIgb8bPWSvPblQN0RR9OkRDFT9 Br7SviSf31MFYiSsWVT/u7sHHQuaxcjzzy8caZ9ghKtb1wVoCi/aK6/fJ03wA/6n
3QIDAQAB HwIDAQAB
-----END PUBLIC KEY----- -----END PUBLIC KEY-----