2015-02-05 16:36:25 +00:00
|
|
|
#include <arpa/inet.h>
|
2015-02-08 19:02:37 +00:00
|
|
|
#include <fcntl.h>
|
2015-02-05 16:36:25 +00:00
|
|
|
#include <netinet/in.h>
|
2015-02-08 19:02:37 +00:00
|
|
|
#include <sys/stat.h>
|
|
|
|
|
#include <sys/types.h>
|
2015-02-08 04:05:36 +00:00
|
|
|
#include <signal.h>
|
2015-02-05 16:36:25 +00:00
|
|
|
#include <stdio.h>
|
2015-02-08 19:02:37 +00:00
|
|
|
#include <string.h>
|
2015-02-05 16:36:25 +00:00
|
|
|
#include <unistd.h>
|
|
|
|
|
|
2015-02-06 16:27:47 +00:00
|
|
|
#include <cassert>
|
2015-02-07 13:25:46 -08:00
|
|
|
#include <fstream>
|
2015-02-05 16:36:25 +00:00
|
|
|
#include <iostream>
|
|
|
|
|
|
2015-02-06 16:27:47 +00:00
|
|
|
#include <sodium/crypto_box.h>
|
|
|
|
|
#include <sodium/crypto_secretbox.h>
|
2015-02-07 19:01:48 +01:00
|
|
|
#include <sodium/crypto_scalarmult.h>
|
2015-02-06 16:27:47 +00:00
|
|
|
#include <sodium/randombytes.h>
|
2015-02-08 19:02:37 +00:00
|
|
|
#include <sodium/utils.h>
|
2015-02-06 16:27:47 +00:00
|
|
|
|
2015-02-05 12:55:48 +00:00
|
|
|
#include "crypto.h"
|
2015-02-07 17:32:57 +01:00
|
|
|
|
2015-02-07 19:01:48 +01:00
|
|
|
|
|
|
|
|
#define TLV_TYPE_ENCRYPTED_BLOB 0x0000
|
|
|
|
|
#define TLV_TYPE_NONCE 0x0001
|
|
|
|
|
#define TLV_TYPE_PUBLIC_KEY 0x0002
|
2015-02-07 14:32:53 -08:00
|
|
|
#define TLV_TYPE_DOWNSTREAM_BITRATE 0x0003
|
2015-02-07 19:01:48 +01:00
|
|
|
|
|
|
|
|
#define TLV_TYPE_ENCRYPTED 0x8000
|
2015-02-07 15:07:34 -08:00
|
|
|
#define TLV_TYPE_HANDSHAKE 0x8001
|
|
|
|
|
#define TLV_TYPE_HANDSHAKE_SECURE 0x8002
|
|
|
|
|
#define TLV_TYPE_TUNNEL_REQUEST 0x8003
|
|
|
|
|
#define TLV_TYPE_CHANNEL 0x8004
|
2015-02-05 12:55:48 +00:00
|
|
|
|
|
|
|
|
|
2015-02-08 19:02:37 +00:00
|
|
|
void CryptoUtil::GenKey(SharedKey* key) {
|
|
|
|
|
randombytes_buf(key->MutableKey(), crypto_secretbox_KEYBYTES);
|
|
|
|
|
key->MarkSet();
|
2015-02-05 13:02:42 +00:00
|
|
|
}
|
|
|
|
|
|
2015-02-08 19:02:37 +00:00
|
|
|
void CryptoUtil::GenKeyPair(SecretKey* secret_key, PublicKey* public_key) {
|
|
|
|
|
assert(!crypto_box_keypair(public_key->MutableKey(), secret_key->MutableKey()));
|
|
|
|
|
public_key->MarkSet();
|
|
|
|
|
secret_key->MarkSet();
|
2015-02-05 12:55:48 +00:00
|
|
|
}
|
2015-02-05 16:36:25 +00:00
|
|
|
|
2015-02-08 19:02:37 +00:00
|
|
|
void CryptoUtil::DerivePublicKey(const SecretKey& secret_key, PublicKey* public_key) {
|
|
|
|
|
assert(!crypto_scalarmult_base(public_key->MutableKey(), secret_key.Key()));
|
|
|
|
|
public_key->MarkSet();
|
2015-02-07 19:01:48 +01:00
|
|
|
}
|
|
|
|
|
|
2015-02-08 19:02:37 +00:00
|
|
|
std::unique_ptr<TLVNode> CryptoUtil::EncodeEncrypt(const SecretKey& secret_key, const PublicKey& public_key, const TLVNode& input) {
|
2015-02-07 19:01:48 +01:00
|
|
|
std::string encoded;
|
|
|
|
|
input.Encode(&encoded);
|
|
|
|
|
|
|
|
|
|
size_t encrypted_bytes = encoded.length() + crypto_box_MACBYTES;
|
|
|
|
|
|
|
|
|
|
unsigned char nonce[crypto_box_NONCEBYTES];
|
|
|
|
|
randombytes_buf(nonce, crypto_box_NONCEBYTES);
|
|
|
|
|
|
|
|
|
|
unsigned char output[encrypted_bytes];
|
2015-02-08 19:02:37 +00:00
|
|
|
assert(!crypto_box_easy(output, (const unsigned char*)encoded.data(), encoded.length(), nonce, public_key.Key(), secret_key.Key()));
|
2015-02-07 19:01:48 +01:00
|
|
|
|
2015-02-07 15:07:34 -08:00
|
|
|
std::unique_ptr<TLVNode> encrypted(new TLVNode(TLV_TYPE_ENCRYPTED));
|
2015-02-07 10:35:29 -08:00
|
|
|
encrypted->AppendChild(new TLVNode(TLV_TYPE_NONCE, std::string((char*)nonce, crypto_box_NONCEBYTES)));
|
|
|
|
|
encrypted->AppendChild(new TLVNode(TLV_TYPE_ENCRYPTED_BLOB, std::string((char*)output, encrypted_bytes)));
|
2015-02-07 19:01:48 +01:00
|
|
|
|
2015-02-07 15:07:34 -08:00
|
|
|
return encrypted;
|
2015-02-07 19:01:48 +01:00
|
|
|
}
|
|
|
|
|
|
2015-02-08 19:02:37 +00:00
|
|
|
std::unique_ptr<TLVNode> CryptoUtil::DecryptDecode(const SecretKey& secret_key, const PublicKey& public_key, const TLVNode& input) {
|
2015-02-07 10:35:29 -08:00
|
|
|
assert(input.GetType() == TLV_TYPE_ENCRYPTED);
|
|
|
|
|
|
|
|
|
|
auto nonce = input.FindChild(TLV_TYPE_NONCE);
|
|
|
|
|
if (!nonce || nonce->GetValue().length() != crypto_box_NONCEBYTES) {
|
|
|
|
|
return nullptr;
|
|
|
|
|
}
|
|
|
|
|
auto encrypted = input.FindChild(TLV_TYPE_ENCRYPTED_BLOB);
|
|
|
|
|
if (!encrypted || encrypted->GetValue().length() < crypto_box_MACBYTES) {
|
|
|
|
|
return nullptr;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
size_t decrypted_bytes = encrypted->GetValue().length() - crypto_box_MACBYTES;
|
|
|
|
|
|
|
|
|
|
unsigned char output[decrypted_bytes];
|
2015-02-08 19:02:37 +00:00
|
|
|
if (crypto_box_open_easy(output, (const unsigned char*)encrypted->GetValue().data(), encrypted->GetValue().length(), (const unsigned char*)nonce->GetValue().data(), public_key.Key(), secret_key.Key())) {
|
2015-02-07 10:35:29 -08:00
|
|
|
return nullptr;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return TLVNode::Decode(std::string((char*)output, decrypted_bytes));
|
|
|
|
|
}
|
|
|
|
|
|
2015-02-08 19:02:37 +00:00
|
|
|
|
|
|
|
|
CryptoKey::CryptoKey(const size_t key_bytes)
|
|
|
|
|
: key_bytes_(key_bytes),
|
|
|
|
|
is_set_(false),
|
|
|
|
|
key_((unsigned char*)sodium_malloc(key_bytes)) {
|
|
|
|
|
assert(key_);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
CryptoKey::~CryptoKey() {
|
|
|
|
|
sodium_free(key_);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void CryptoKey::WriteToFile(const std::string& filename) const {
|
|
|
|
|
assert(is_set_);
|
|
|
|
|
int fd = open(filename.c_str(), O_WRONLY);
|
|
|
|
|
assert(fd != -1);
|
|
|
|
|
assert(write(fd, key_, key_bytes_) == key_bytes_);
|
|
|
|
|
assert(!close(fd));
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void CryptoKey::ReadFromFile(const std::string& filename) {
|
|
|
|
|
assert(!is_set_);
|
|
|
|
|
int fd = open(filename.c_str(), O_RDONLY);
|
|
|
|
|
assert(fd != -1);
|
|
|
|
|
assert(read(fd, key_, key_bytes_ + 1) == key_bytes_);
|
|
|
|
|
assert(!close(fd));
|
|
|
|
|
MarkSet();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
const unsigned char* CryptoKey::Key() const {
|
|
|
|
|
assert(is_set_);
|
|
|
|
|
return key_;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
unsigned char* CryptoKey::MutableKey() {
|
|
|
|
|
assert(!is_set_);
|
|
|
|
|
return key_;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void CryptoKey::MarkSet() {
|
|
|
|
|
assert(!is_set_);
|
|
|
|
|
is_set_ = true;
|
|
|
|
|
assert(!sodium_mprotect_readonly(key_));
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
SharedKey::SharedKey()
|
|
|
|
|
: CryptoKey(crypto_secretbox_KEYBYTES) {}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
SecretKey::SecretKey()
|
|
|
|
|
: CryptoKey(crypto_box_SECRETKEYBYTES) {}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
PublicKey::PublicKey()
|
|
|
|
|
: CryptoKey(crypto_box_PUBLICKEYBYTES) {}
|
|
|
|
|
|
|
|
|
|
std::string PublicKey::AsString() const {
|
|
|
|
|
assert(is_set_);
|
|
|
|
|
return std::string((char*)key_, key_bytes_);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
std::string PublicKey::ToHex() const {
|
|
|
|
|
static const char hex[] = "0123456789abcdef";
|
|
|
|
|
std::string ret;
|
|
|
|
|
ret.reserve(key_bytes_ * 2);
|
|
|
|
|
for (int i = 0; i < key_bytes_; i++) {
|
|
|
|
|
ret.push_back(hex[(key_[i] & 0xf0) >> 4]);
|
|
|
|
|
ret.push_back(hex[key_[i] & 0x0f]);
|
|
|
|
|
}
|
|
|
|
|
return ret;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void PublicKey::FromString(const std::string& str) {
|
|
|
|
|
assert(!is_set_);
|
|
|
|
|
assert(str.length() == key_bytes_);
|
|
|
|
|
memcpy(key_, str.data(), key_bytes_);
|
|
|
|
|
MarkSet();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2015-02-07 11:18:31 -08:00
|
|
|
std::ostream& CryptoBase::Log(void *obj) {
|
|
|
|
|
char buf[64];
|
|
|
|
|
snprintf(buf, 64, "[%p] ", obj ? obj : this);
|
|
|
|
|
return std::cerr << buf;
|
|
|
|
|
}
|
|
|
|
|
|
2015-02-05 16:36:25 +00:00
|
|
|
|
2015-02-08 19:02:37 +00:00
|
|
|
CryptoPubConnBase::CryptoPubConnBase(const SecretKey& secret_key)
|
2015-02-07 14:32:53 -08:00
|
|
|
: secret_key_(secret_key),
|
|
|
|
|
state_(AWAITING_HANDSHAKE) {}
|
|
|
|
|
|
2015-02-07 15:56:29 -08:00
|
|
|
CryptoPubConnBase::~CryptoPubConnBase() {
|
|
|
|
|
bufferevent_free(bev_);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void CryptoPubConnBase::LogFatal(const std::string& msg, void *obj) {
|
|
|
|
|
Log(obj) << msg << std::endl;
|
|
|
|
|
delete this;
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
2015-02-07 15:26:39 -08:00
|
|
|
std::unique_ptr<TLVNode> CryptoPubConnBase::BuildSecureHandshake() {
|
2015-02-08 19:02:37 +00:00
|
|
|
PublicKey ephemeral_public_key;
|
2015-02-07 15:07:34 -08:00
|
|
|
CryptoUtil::GenKeyPair(&ephemeral_secret_key_, &ephemeral_public_key);
|
|
|
|
|
|
|
|
|
|
TLVNode secure_handshake(TLV_TYPE_HANDSHAKE_SECURE);
|
2015-02-08 19:02:37 +00:00
|
|
|
secure_handshake.AppendChild(new TLVNode(TLV_TYPE_PUBLIC_KEY, ephemeral_public_key.AsString()));
|
2015-02-07 15:07:34 -08:00
|
|
|
return CryptoUtil::EncodeEncrypt(secret_key_, peer_public_key_, secure_handshake);
|
|
|
|
|
}
|
|
|
|
|
|
2015-02-07 15:26:39 -08:00
|
|
|
bool CryptoPubConnBase::HandleSecureHandshake(const TLVNode& node) {
|
2015-02-07 15:07:34 -08:00
|
|
|
assert(node.GetType() == TLV_TYPE_ENCRYPTED);
|
|
|
|
|
|
|
|
|
|
std::unique_ptr<TLVNode> decrypted(CryptoUtil::DecryptDecode(secret_key_, peer_public_key_, node));
|
|
|
|
|
if (!decrypted.get()) {
|
2015-02-07 15:56:29 -08:00
|
|
|
LogFatal("Protocol error (handshake; decryption failure)");
|
2015-02-07 15:07:34 -08:00
|
|
|
return false;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
auto peer_ephemeral_public_key = decrypted->FindChild(TLV_TYPE_PUBLIC_KEY);
|
|
|
|
|
if (!peer_ephemeral_public_key) {
|
2015-02-07 15:56:29 -08:00
|
|
|
LogFatal("Protocol error (handshake; no ephemeral public key)");
|
2015-02-07 15:07:34 -08:00
|
|
|
return false;
|
|
|
|
|
}
|
2015-02-08 19:02:37 +00:00
|
|
|
if (peer_ephemeral_public_key->GetValue().length() != crypto_box_PUBLICKEYBYTES) {
|
2015-02-07 15:56:29 -08:00
|
|
|
LogFatal("Protocol error (handshake; wrong ephemeral public key length)");
|
2015-02-07 15:07:34 -08:00
|
|
|
return false;
|
|
|
|
|
}
|
2015-02-08 19:02:37 +00:00
|
|
|
peer_ephemeral_public_key_.FromString(peer_ephemeral_public_key->GetValue());
|
2015-02-07 15:07:34 -08:00
|
|
|
return true;
|
|
|
|
|
}
|
|
|
|
|
|
2015-02-07 15:37:45 -08:00
|
|
|
void CryptoPubConnBase::EncryptSend(const TLVNode& node) {
|
|
|
|
|
auto encrypted = CryptoUtil::EncodeEncrypt(ephemeral_secret_key_, peer_ephemeral_public_key_, node);
|
|
|
|
|
std::string out;
|
|
|
|
|
encrypted->Encode(&out);
|
|
|
|
|
bufferevent_write(bev_, out.data(), out.length());
|
|
|
|
|
}
|
|
|
|
|
|
2015-02-07 15:26:39 -08:00
|
|
|
void CryptoPubConnBase::OnReadable_(struct bufferevent* bev, void* this__) {
|
|
|
|
|
auto this_ = (CryptoPubConnBase*)this__;
|
2015-02-07 15:25:22 -08:00
|
|
|
this_->OnReadable();
|
|
|
|
|
}
|
|
|
|
|
|
2015-02-07 15:26:39 -08:00
|
|
|
void CryptoPubConnBase::OnReadable() {
|
2015-02-07 15:25:22 -08:00
|
|
|
char buf[UINT16_MAX];
|
|
|
|
|
int bytes = bufferevent_read(bev_, buf, UINT16_MAX);
|
|
|
|
|
const std::string input(buf, bytes);
|
|
|
|
|
std::unique_ptr<TLVNode> decoded(TLVNode::Decode(input));
|
|
|
|
|
|
|
|
|
|
if (!decoded.get()) {
|
|
|
|
|
// TODO: re-buffer?
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (state_ == AWAITING_HANDSHAKE) {
|
|
|
|
|
OnHandshake(*decoded);
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (decoded->GetType() != TLV_TYPE_ENCRYPTED) {
|
2015-02-07 15:56:29 -08:00
|
|
|
LogFatal("Protocol error (wrong message type)");
|
2015-02-07 15:25:22 -08:00
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
std::unique_ptr<TLVNode> decrypted(CryptoUtil::DecryptDecode(ephemeral_secret_key_, peer_ephemeral_public_key_, *decoded));
|
|
|
|
|
if (!decrypted.get()) {
|
2015-02-07 15:56:29 -08:00
|
|
|
LogFatal("Protocol error (decryption failure)");
|
2015-02-07 15:25:22 -08:00
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (!OnMessage(*decrypted)) {
|
2015-02-07 15:56:29 -08:00
|
|
|
LogFatal("Protocol error (message handling)");
|
2015-02-07 15:25:22 -08:00
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2015-02-07 14:32:53 -08:00
|
|
|
|
2015-02-08 19:02:37 +00:00
|
|
|
CryptoPubServer::CryptoPubServer(const SecretKey& secret_key)
|
2015-02-07 16:44:42 +01:00
|
|
|
: secret_key_(secret_key),
|
|
|
|
|
event_base_(event_base_new()) {
|
2015-02-07 16:18:07 -08:00
|
|
|
auto signal_event = evsignal_new(event_base_, SIGINT, &CryptoPubServer::Shutdown_, this);
|
|
|
|
|
event_add(signal_event, NULL);
|
|
|
|
|
|
2015-02-07 16:44:42 +01:00
|
|
|
struct sockaddr_in6 server_addr = {0};
|
|
|
|
|
server_addr.sin6_family = AF_INET6;
|
|
|
|
|
server_addr.sin6_addr = in6addr_any;
|
|
|
|
|
server_addr.sin6_port = htons(4990);
|
|
|
|
|
|
2015-02-07 17:15:09 +01:00
|
|
|
listener_ = evconnlistener_new_bind(event_base_, &CryptoPubServer::OnNewConn_, this, LEV_OPT_REUSEABLE|LEV_OPT_CLOSE_ON_FREE, -1, (struct sockaddr*)&server_addr, sizeof(server_addr));
|
2015-02-05 16:36:25 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
CryptoPubServer::~CryptoPubServer() {
|
2015-02-07 16:44:42 +01:00
|
|
|
evconnlistener_free(listener_);
|
|
|
|
|
event_base_free(event_base_);
|
2015-02-05 16:36:25 +00:00
|
|
|
}
|
|
|
|
|
|
2015-02-07 17:15:09 +01:00
|
|
|
void CryptoPubServer::OnNewConn_(struct evconnlistener* listener, int client_fd, struct sockaddr* client_addr_, int client_addrlen, void* this__) {
|
2015-02-07 16:44:42 +01:00
|
|
|
auto this_ = (CryptoPubServer*)this__;
|
2015-02-07 17:15:09 +01:00
|
|
|
this_->OnNewConn(client_fd, client_addr_, client_addrlen);
|
|
|
|
|
}
|
2015-02-07 16:44:42 +01:00
|
|
|
|
2015-02-07 17:15:09 +01:00
|
|
|
void CryptoPubServer::OnNewConn(int client_fd, struct sockaddr* client_addr_, int client_addrlen) {
|
2015-02-07 16:44:42 +01:00
|
|
|
assert(client_addr_->sa_family == AF_INET6);
|
|
|
|
|
auto client_addr = (struct sockaddr_in6*)client_addr_;
|
2015-02-05 16:36:25 +00:00
|
|
|
|
|
|
|
|
char buf[128];
|
2015-02-07 16:44:42 +01:00
|
|
|
inet_ntop(AF_INET6, &client_addr->sin6_addr, buf, 128);
|
|
|
|
|
|
2015-02-07 17:15:09 +01:00
|
|
|
auto bev = bufferevent_socket_new(this->event_base_, client_fd, BEV_OPT_CLOSE_ON_FREE);
|
2015-02-07 16:44:42 +01:00
|
|
|
bufferevent_enable(bev, EV_READ);
|
2015-02-07 10:58:20 -08:00
|
|
|
bufferevent_enable(bev, EV_WRITE);
|
2015-02-07 17:15:09 +01:00
|
|
|
auto peer = new CryptoPubServerConnection(bev, this->secret_key_);
|
|
|
|
|
bufferevent_setcb(bev, &CryptoPubServerConnection::OnReadable_, NULL, &CryptoPubServerConnection::OnError_, peer);
|
2015-02-07 11:18:31 -08:00
|
|
|
|
|
|
|
|
Log(peer) << "New connection from [" << buf << "]:" << ntohs(client_addr->sin6_port) << std::endl;
|
2015-02-05 16:36:25 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void CryptoPubServer::Loop() {
|
2015-02-07 16:44:42 +01:00
|
|
|
event_base_dispatch(event_base_);
|
2015-02-05 16:36:25 +00:00
|
|
|
}
|
|
|
|
|
|
2015-02-07 16:18:07 -08:00
|
|
|
void CryptoPubServer::Shutdown_(evutil_socket_t sig, short events, void *this__) {
|
|
|
|
|
auto this_ = (CryptoPubServer*)this__;
|
|
|
|
|
this_->Shutdown();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void CryptoPubServer::Shutdown() {
|
|
|
|
|
event_base_loopexit(event_base_, NULL);
|
|
|
|
|
}
|
|
|
|
|
|
2015-02-05 16:36:25 +00:00
|
|
|
|
2015-02-08 19:02:37 +00:00
|
|
|
CryptoPubServerConnection::CryptoPubServerConnection(struct bufferevent* bev, const SecretKey& secret_key)
|
2015-02-07 15:26:39 -08:00
|
|
|
: CryptoPubConnBase(secret_key) {
|
2015-02-07 15:25:22 -08:00
|
|
|
bev_ = bev;
|
2015-02-05 16:36:25 +00:00
|
|
|
}
|
|
|
|
|
|
2015-02-07 16:44:42 +01:00
|
|
|
CryptoPubServerConnection::~CryptoPubServerConnection() {
|
2015-02-07 11:18:31 -08:00
|
|
|
Log() << "Connection closed" << std::endl;
|
2015-02-07 16:44:42 +01:00
|
|
|
}
|
|
|
|
|
|
2015-02-07 13:49:19 -08:00
|
|
|
void CryptoPubServerConnection::OnHandshake(const TLVNode& decoded) {
|
2015-02-07 15:07:34 -08:00
|
|
|
if (decoded.GetType() != TLV_TYPE_HANDSHAKE) {
|
2015-02-07 15:56:29 -08:00
|
|
|
LogFatal("Protocol error (client handshake -- wrong message type)");
|
2015-02-07 13:53:15 -08:00
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
2015-02-07 14:32:53 -08:00
|
|
|
auto peer_public_key = decoded.FindChild(TLV_TYPE_PUBLIC_KEY);
|
|
|
|
|
if (!peer_public_key) {
|
2015-02-07 15:56:29 -08:00
|
|
|
LogFatal("Protocol error (client handshake -- no public key)");
|
2015-02-07 10:47:03 -08:00
|
|
|
return;
|
|
|
|
|
}
|
2015-02-08 19:02:37 +00:00
|
|
|
if (peer_public_key->GetValue().length() != crypto_box_PUBLICKEYBYTES) {
|
2015-02-07 15:56:29 -08:00
|
|
|
LogFatal("Protocol error (client handshake -- wrong public key length)");
|
2015-02-07 10:35:29 -08:00
|
|
|
return;
|
|
|
|
|
}
|
2015-02-08 19:02:37 +00:00
|
|
|
peer_public_key_.FromString(peer_public_key->GetValue());
|
2015-02-07 13:49:19 -08:00
|
|
|
auto encrypted = decoded.FindChild(TLV_TYPE_ENCRYPTED);
|
2015-02-07 10:35:29 -08:00
|
|
|
if (!encrypted) {
|
2015-02-07 15:56:29 -08:00
|
|
|
LogFatal("Protocol error (client handshake -- no encrypted portion)");
|
2015-02-07 10:35:29 -08:00
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
2015-02-07 15:07:34 -08:00
|
|
|
if (!HandleSecureHandshake(*encrypted)) {
|
2015-02-07 10:47:03 -08:00
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
2015-02-07 14:32:53 -08:00
|
|
|
SendHandshake();
|
|
|
|
|
|
|
|
|
|
this->state_ = READY;
|
2015-02-08 19:02:37 +00:00
|
|
|
Log() << "Handshake successful (client ID: " << peer_public_key_.ToHex() << ")" << std::endl;
|
2015-02-07 14:32:53 -08:00
|
|
|
}
|
|
|
|
|
|
2015-02-07 15:25:22 -08:00
|
|
|
bool CryptoPubServerConnection::OnMessage(const TLVNode& message) {
|
|
|
|
|
switch (message.GetType()) {
|
2015-02-07 16:04:40 -08:00
|
|
|
case TLV_TYPE_TUNNEL_REQUEST:
|
|
|
|
|
return OnTunnelRequest(message);
|
2015-02-07 15:25:22 -08:00
|
|
|
default:
|
|
|
|
|
return false;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2015-02-07 16:04:40 -08:00
|
|
|
bool CryptoPubServerConnection::OnTunnelRequest(const TLVNode& message) {
|
|
|
|
|
Log() << "New tunnel request" << std::endl;
|
|
|
|
|
for (auto child : message.GetChildren()) {
|
|
|
|
|
if (child->GetType() != TLV_TYPE_CHANNEL) {
|
|
|
|
|
continue;
|
|
|
|
|
}
|
|
|
|
|
Log() << "Channel" << std::endl;
|
|
|
|
|
}
|
|
|
|
|
return true;
|
|
|
|
|
}
|
|
|
|
|
|
2015-02-07 14:32:53 -08:00
|
|
|
void CryptoPubServerConnection::SendHandshake() {
|
2015-02-07 15:07:34 -08:00
|
|
|
auto handshake = BuildSecureHandshake();
|
2015-02-07 10:58:20 -08:00
|
|
|
std::string out;
|
2015-02-07 15:07:34 -08:00
|
|
|
handshake->Encode(&out);
|
2015-02-07 10:58:20 -08:00
|
|
|
bufferevent_write(bev_, out.data(), out.length());
|
2015-02-07 16:44:42 +01:00
|
|
|
}
|
|
|
|
|
|
2015-02-07 17:15:09 +01:00
|
|
|
void CryptoPubServerConnection::OnError_(struct bufferevent* bev, const short what, void* this__) {
|
2015-02-07 16:44:42 +01:00
|
|
|
auto this_ = (CryptoPubServerConnection*)this__;
|
2015-02-07 17:15:09 +01:00
|
|
|
this_->OnError(what);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void CryptoPubServerConnection::OnError(const short what) {
|
|
|
|
|
delete this;
|
2015-02-05 16:36:25 +00:00
|
|
|
}
|
2015-02-07 17:07:31 +01:00
|
|
|
|
|
|
|
|
|
2015-02-08 19:02:37 +00:00
|
|
|
CryptoPubClient::CryptoPubClient(struct sockaddr* addr, socklen_t addrlen, const SecretKey& secret_key, const PublicKey& server_public_key, const std::list<uint32_t>& channel_bitrates)
|
2015-02-07 15:26:39 -08:00
|
|
|
: CryptoPubConnBase(secret_key),
|
2015-02-07 14:32:53 -08:00
|
|
|
event_base_(event_base_new()),
|
|
|
|
|
channel_bitrates_(channel_bitrates) {
|
2015-02-07 15:25:22 -08:00
|
|
|
bev_ = bufferevent_socket_new(event_base_, -1, BEV_OPT_CLOSE_ON_FREE);
|
2015-02-08 19:02:37 +00:00
|
|
|
peer_public_key_.FromString(server_public_key.AsString());
|
2015-02-07 19:01:48 +01:00
|
|
|
|
2015-02-07 17:32:57 +01:00
|
|
|
bufferevent_setcb(bev_, &CryptoPubClient::OnReadable_, NULL, &CryptoPubClient::OnConnectOrError_, this);
|
|
|
|
|
bufferevent_enable(bev_, EV_READ);
|
|
|
|
|
bufferevent_enable(bev_, EV_WRITE);
|
2015-02-07 17:07:31 +01:00
|
|
|
bufferevent_socket_connect(bev_, addr, addrlen);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
CryptoPubClient::~CryptoPubClient() {
|
|
|
|
|
event_base_free(event_base_);
|
|
|
|
|
}
|
|
|
|
|
|
2015-02-08 19:02:37 +00:00
|
|
|
CryptoPubClient* CryptoPubClient::FromHostname(const std::string& server_address, const std::string& server_port, const SecretKey& secret_key, const PublicKey& server_public_key, const std::list<uint32_t>& channel_bitrates) {
|
2015-02-07 17:07:31 +01:00
|
|
|
struct addrinfo* res;
|
|
|
|
|
int gai_ret = getaddrinfo(server_address.c_str(), server_port.c_str(), NULL, &res);
|
|
|
|
|
if (gai_ret) {
|
|
|
|
|
std::cerr << "Failed to resolve server_address: " << gai_strerror(gai_ret) << std::endl;
|
|
|
|
|
return nullptr;
|
|
|
|
|
}
|
2015-02-07 14:32:53 -08:00
|
|
|
auto ret = new CryptoPubClient((struct sockaddr*)res->ai_addr, res->ai_addrlen, secret_key, server_public_key, channel_bitrates);
|
2015-02-07 17:07:31 +01:00
|
|
|
freeaddrinfo(res);
|
|
|
|
|
return ret;
|
|
|
|
|
}
|
|
|
|
|
|
2015-02-07 13:49:19 -08:00
|
|
|
void CryptoPubClient::OnHandshake(const TLVNode& decoded) {
|
2015-02-07 15:07:34 -08:00
|
|
|
if (!HandleSecureHandshake(decoded)) {
|
2015-02-07 10:58:20 -08:00
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
this->state_ = READY;
|
2015-02-07 11:18:31 -08:00
|
|
|
Log() << "Handshake successful" << std::endl;
|
2015-02-07 14:32:53 -08:00
|
|
|
|
|
|
|
|
SendTunnelRequest();
|
2015-02-07 17:32:57 +01:00
|
|
|
}
|
|
|
|
|
|
2015-02-07 15:25:22 -08:00
|
|
|
bool CryptoPubClient::OnMessage(const TLVNode& message) {
|
|
|
|
|
switch (message.GetType()) {
|
|
|
|
|
default:
|
|
|
|
|
return false;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2015-02-07 17:32:57 +01:00
|
|
|
void CryptoPubClient::OnConnectOrError_(struct bufferevent* bev, const short what, void* this__) {
|
|
|
|
|
auto this_ = (CryptoPubClient*)this__;
|
|
|
|
|
if (what == BEV_EVENT_CONNECTED) {
|
|
|
|
|
this_->OnConnect();
|
2015-02-07 11:18:31 -08:00
|
|
|
} else {
|
|
|
|
|
this_->OnError();
|
2015-02-07 17:32:57 +01:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void CryptoPubClient::OnConnect() {
|
2015-02-07 11:18:31 -08:00
|
|
|
Log() << "Connected to server" << std::endl;
|
2015-02-07 14:32:53 -08:00
|
|
|
SendHandshake();
|
|
|
|
|
}
|
2015-02-07 10:58:20 -08:00
|
|
|
|
2015-02-07 14:32:53 -08:00
|
|
|
void CryptoPubClient::SendHandshake() {
|
2015-02-07 15:07:34 -08:00
|
|
|
auto secure_handshake = BuildSecureHandshake();
|
2015-02-07 19:01:48 +01:00
|
|
|
|
2015-02-07 15:07:34 -08:00
|
|
|
TLVNode handshake(TLV_TYPE_HANDSHAKE);
|
2015-02-08 19:02:37 +00:00
|
|
|
PublicKey public_key;
|
2015-02-07 14:32:53 -08:00
|
|
|
CryptoUtil::DerivePublicKey(secret_key_, &public_key);
|
2015-02-08 19:02:37 +00:00
|
|
|
handshake.AppendChild(new TLVNode(TLV_TYPE_PUBLIC_KEY, public_key.AsString()));
|
2015-02-07 15:07:34 -08:00
|
|
|
handshake.AppendChild(secure_handshake.release());
|
2015-02-07 19:01:48 +01:00
|
|
|
|
2015-02-07 17:32:57 +01:00
|
|
|
std::string out;
|
|
|
|
|
handshake.Encode(&out);
|
|
|
|
|
bufferevent_write(bev_, out.data(), out.length());
|
|
|
|
|
}
|
|
|
|
|
|
2015-02-07 14:32:53 -08:00
|
|
|
void CryptoPubClient::SendTunnelRequest() {
|
2015-02-07 15:37:45 -08:00
|
|
|
TLVNode tunnel_request(TLV_TYPE_TUNNEL_REQUEST);
|
|
|
|
|
for (auto channel_bitrate : channel_bitrates_) {
|
|
|
|
|
auto channel = new TLVNode(TLV_TYPE_CHANNEL);
|
|
|
|
|
channel_bitrate = htonl(channel_bitrate);
|
|
|
|
|
channel->AppendChild(new TLVNode(TLV_TYPE_DOWNSTREAM_BITRATE, std::string((char*)&channel_bitrate, sizeof(channel_bitrate))));
|
|
|
|
|
tunnel_request.AppendChild(channel);
|
|
|
|
|
}
|
|
|
|
|
EncryptSend(tunnel_request);
|
2015-02-07 14:32:53 -08:00
|
|
|
}
|
|
|
|
|
|
2015-02-07 11:18:31 -08:00
|
|
|
void CryptoPubClient::OnError() {
|
|
|
|
|
Log() << "Connection error" << std::endl;
|
|
|
|
|
}
|
|
|
|
|
|
2015-02-07 17:07:31 +01:00
|
|
|
void CryptoPubClient::Loop() {
|
|
|
|
|
event_base_dispatch(event_base_);
|
|
|
|
|
}
|