stephenseo/UDPConnection
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Packages 1 Wiki Activity Actions

Add verification of verification time server-side

Browse source 
Verification string is no longer a string but seconds since epoch.
This commit is contained in:
Stephen Seo 2020-01-02 16:33:17 +09:00
parent db2c3fed97
commit 26e8b95d94
2 changed files with 73 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/UDPC_Defines.hpp
View file

@ -39,7 +39,7 @@
#define UDPC_MIN_HEADER_SIZE 20 #define UDPC_MIN_HEADER_SIZE 20
#define UDPC_CON_HEADER_SIZE (UDPC_MIN_HEADER_SIZE+4) #define UDPC_CON_HEADER_SIZE (UDPC_MIN_HEADER_SIZE+4)
#define UDPC_CCL_HEADER_SIZE (UDPC_MIN_HEADER_SIZE+4+crypto_sign_PUBLICKEYBYTES+4) #define UDPC_CCL_HEADER_SIZE (UDPC_MIN_HEADER_SIZE+4+crypto_sign_PUBLICKEYBYTES+8)
#define UDPC_CSR_HEADER_SIZE (UDPC_MIN_HEADER_SIZE+4+crypto_sign_PUBLICKEYBYTES+crypto_sign_BYTES) #define UDPC_CSR_HEADER_SIZE (UDPC_MIN_HEADER_SIZE+4+crypto_sign_PUBLICKEYBYTES+crypto_sign_BYTES)
#define UDPC_LSFULL_HEADER_SIZE (UDPC_MIN_HEADER_SIZE+1+crypto_sign_BYTES) #define UDPC_LSFULL_HEADER_SIZE (UDPC_MIN_HEADER_SIZE+1+crypto_sign_BYTES)
#define UDPC_NSFULL_HEADER_SIZE (UDPC_MIN_HEADER_SIZE+1) #define UDPC_NSFULL_HEADER_SIZE (UDPC_MIN_HEADER_SIZE+1)
@ -249,6 +249,9 @@ Context *verifyContext(UDPC_HContext ctx);
bool isBigEndian(); bool isBigEndian();
void be64(char *integer);
void be64_copy(char *out, const char *in);
/* /*
* flags: * flags:
* 0x1 - connect * 0x1 - connect

111
src/UDPConnection.cpp
View file

@ -300,18 +300,21 @@ void UDPC::Context::update_impl() {
newCon.sent = std::chrono::steady_clock::now() - UDPC::INIT_PKT_INTERVAL_DT; newCon.sent = std::chrono::steady_clock::now() - UDPC::INIT_PKT_INTERVAL_DT;
if(flags.test(2) && newCon.flags.test(6)) { if(flags.test(2) && newCon.flags.test(6)) {
// set up verification string to send to server // set up verification string to send to server
std::stringstream ss; std::time_t time = std::time(nullptr);
auto timeT = std::chrono::system_clock::to_time_t(std::chrono::system_clock::now()); if(time <= 0) {
ss << std::put_time(std::gmtime(&timeT), "%c %Z"); UDPC_CHECK_LOG(this, UDPC_LoggingType::UDPC_ERROR,
auto timeString = ss.str(); "Failed to get current epoch time");
newCon.verifyMessage = std::unique_ptr<char[]>(new char[4 + timeString.size()]); continue;
*((uint32_t*)newCon.verifyMessage.get()) = timeString.size(); }
std::memcpy(newCon.verifyMessage.get() + 4, timeString.c_str(), timeString.size()); uint64_t timeInt = time;
#ifndef NDEBUG #ifndef NDEBUG
UDPC_CHECK_LOG(this, UDPC_LoggingType::UDPC_DEBUG, UDPC_CHECK_LOG(this, UDPC_LoggingType::UDPC_DEBUG,
"Client set up verification string \"", "Client set up verification epoch time \"",
timeString, "\""); timeInt, "\"");
#endif #endif
UDPC::be64((char*)&timeInt);
newCon.verifyMessage = std::unique_ptr<char[]>(new char[8]);
std::memcpy(newCon.verifyMessage.get(), &timeInt, 8);
} }
if(conMap.find(optE->conId) == conMap.end()) { if(conMap.find(optE->conId) == conMap.end()) {
@ -385,18 +388,21 @@ void UDPC::Context::update_impl() {
newCon.sent = std::chrono::steady_clock::now() - UDPC::INIT_PKT_INTERVAL_DT; newCon.sent = std::chrono::steady_clock::now() - UDPC::INIT_PKT_INTERVAL_DT;
if(flags.test(2) && newCon.flags.test(6)) { if(flags.test(2) && newCon.flags.test(6)) {
// set up verification string to send to server // set up verification string to send to server
std::stringstream ss; std::time_t time = std::time(nullptr);
auto timeT = std::chrono::system_clock::to_time_t(std::chrono::system_clock::now()); if(time <= 0) {
ss << std::put_time(std::gmtime(&timeT), "%c %Z"); UDPC_CHECK_LOG(this, UDPC_LoggingType::UDPC_ERROR,
auto timeString = ss.str(); "Failed to get current epoch time");
newCon.verifyMessage = std::unique_ptr<char[]>(new char[4 + timeString.size()]); continue;
*((uint32_t*)newCon.verifyMessage.get()) = timeString.size(); }
std::memcpy(newCon.verifyMessage.get() + 4, timeString.c_str(), timeString.size()); uint64_t timeInt = time;
#ifndef NDEBUG #ifndef NDEBUG
UDPC_CHECK_LOG(this, UDPC_LoggingType::UDPC_DEBUG, UDPC_CHECK_LOG(this, UDPC_LoggingType::UDPC_DEBUG,
"Client set up verification string \"", "Client set up verification epoch time \"",
timeString, "\""); timeInt, "\"");
#endif #endif
UDPC::be64((char*)&timeInt);
newCon.verifyMessage = std::unique_ptr<char[]>(new char[8]);
std::memcpy(newCon.verifyMessage.get(), &timeInt, 8);
// set peer public key // set peer public key
std::memcpy( std::memcpy(
@ -735,7 +741,7 @@ void UDPC::Context::update_impl() {
#ifdef UDPC_LIBSODIUM_ENABLED #ifdef UDPC_LIBSODIUM_ENABLED
assert(iter->second.verifyMessage assert(iter->second.verifyMessage
&& "Verify message should already exist"); && "Verify message should already exist");
sendSize = UDPC_CCL_HEADER_SIZE + *((uint32_t*)iter->second.verifyMessage.get()); sendSize = UDPC_CCL_HEADER_SIZE;
buf = std::unique_ptr<char[]>(new char[sendSize]); buf = std::unique_ptr<char[]>(new char[sendSize]);
// set type 1 // set type 1
*((uint32_t*)(buf.get() + UDPC_MIN_HEADER_SIZE)) = htonl(1); *((uint32_t*)(buf.get() + UDPC_MIN_HEADER_SIZE)) = htonl(1);
@ -744,17 +750,11 @@ void UDPC::Context::update_impl() {
buf.get() + UDPC_MIN_HEADER_SIZE + 4, buf.get() + UDPC_MIN_HEADER_SIZE + 4,
iter->second.pk, iter->second.pk,
crypto_sign_PUBLICKEYBYTES); crypto_sign_PUBLICKEYBYTES);
// set verify message size
uint32_t temp = htonl(*((uint32_t*)iter->second.verifyMessage.get()));
std::memcpy(
buf.get() + UDPC_MIN_HEADER_SIZE + 4 + crypto_sign_PUBLICKEYBYTES,
&temp,
4);
// set verify message // set verify message
std::memcpy( std::memcpy(
buf.get() + UDPC_MIN_HEADER_SIZE + 4 + crypto_sign_PUBLICKEYBYTES + 4, buf.get() + UDPC_MIN_HEADER_SIZE + 4 + crypto_sign_PUBLICKEYBYTES,
iter->second.verifyMessage.get() + 4, iter->second.verifyMessage.get(),
*((uint32_t*)iter->second.verifyMessage.get())); 8);
#else #else
assert(!"libsodium is disabled, invalid state"); assert(!"libsodium is disabled, invalid state");
UDPC_CHECK_LOG(this, UDPC_LoggingType::UDPC_ERROR, UDPC_CHECK_LOG(this, UDPC_LoggingType::UDPC_ERROR,
@ -1299,26 +1299,33 @@ void UDPC::Context::update_impl() {
} }
if(pktType == 1 && flags.test(2)) { if(pktType == 1 && flags.test(2)) {
#ifdef UDPC_LIBSODIUM_ENABLED #ifdef UDPC_LIBSODIUM_ENABLED
# ifndef NDEBUG
if(willLog(UDPC_LoggingType::UDPC_DEBUG)) {
std::string verificationString(
recvBuf + UDPC_MIN_HEADER_SIZE + 4 + crypto_sign_PUBLICKEYBYTES + 4,
ntohl(*((uint32_t*)(recvBuf + UDPC_MIN_HEADER_SIZE + 4 + crypto_sign_PUBLICKEYBYTES))));
log_impl(UDPC_LoggingType::UDPC_DEBUG,
"Server got verification string \"",
verificationString, "\"");
}
# endif
std::memcpy( std::memcpy(
newConnection.peer_pk, newConnection.peer_pk,
recvBuf + UDPC_MIN_HEADER_SIZE + 4, recvBuf + UDPC_MIN_HEADER_SIZE + 4,
crypto_sign_PUBLICKEYBYTES); crypto_sign_PUBLICKEYBYTES);
newConnection.verifyMessage = std::unique_ptr<char[]>(new char[crypto_sign_BYTES]); newConnection.verifyMessage = std::unique_ptr<char[]>(new char[crypto_sign_BYTES]);
std::time_t currentTime = std::time(nullptr);
uint64_t receivedTime;
std::memcpy(&receivedTime, recvBuf + UDPC_MIN_HEADER_SIZE + 4 + crypto_sign_PUBLICKEYBYTES, 8);
UDPC::be64((char*)&receivedTime);
# ifndef NDEBUG
if(willLog(UDPC_LoggingType::UDPC_DEBUG)) {
log_impl(UDPC_LoggingType::UDPC_DEBUG,
"Server got verification epoch time \"",
receivedTime, "\"");
}
# endif
std::time_t receivedTimeT = receivedTime;
if(currentTime < receivedTimeT || currentTime - receivedTimeT > 3) {
UDPC_CHECK_LOG(this, UDPC_LoggingType::UDPC_WARNING,
"Got invalid epoch time from client, ignoring");
return;
}
crypto_sign_detached( crypto_sign_detached(
(unsigned char*)newConnection.verifyMessage.get(), (unsigned char*)newConnection.verifyMessage.get(),
nullptr, nullptr,
(unsigned char*)(recvBuf + UDPC_MIN_HEADER_SIZE + 4 + crypto_sign_PUBLICKEYBYTES + 4), (unsigned char*)(recvBuf + UDPC_MIN_HEADER_SIZE + 4 + crypto_sign_PUBLICKEYBYTES),
ntohl(*((uint32_t*)(recvBuf + UDPC_MIN_HEADER_SIZE + 4 + crypto_sign_PUBLICKEYBYTES))), 8,
newConnection.sk); newConnection.sk);
#else #else
assert(!"libsodium disabled, invalid state"); assert(!"libsodium disabled, invalid state");
@ -1412,8 +1419,8 @@ void UDPC::Context::update_impl() {
} }
if(crypto_sign_verify_detached( if(crypto_sign_verify_detached(
(unsigned char*)(recvBuf + UDPC_MIN_HEADER_SIZE + 4 + crypto_sign_PUBLICKEYBYTES), (unsigned char*)(recvBuf + UDPC_MIN_HEADER_SIZE + 4 + crypto_sign_PUBLICKEYBYTES),
(unsigned char*)(iter->second.verifyMessage.get() + 4), (unsigned char*)(iter->second.verifyMessage.get()),
*((uint32_t*)(iter->second.verifyMessage.get())), 8,
iter->second.peer_pk) != 0) { iter->second.peer_pk) != 0) {
UDPC_CHECK_LOG(this, UDPC_LoggingType::UDPC_WARNING, UDPC_CHECK_LOG(this, UDPC_LoggingType::UDPC_WARNING,
"Failed to verify peer (server) ", "Failed to verify peer (server) ",
@ -1743,6 +1750,26 @@ bool UDPC::isBigEndian() {
return isBigEndian; return isBigEndian;
} }
void UDPC::be64(char *integer) {
if(UDPC::isBigEndian()) {
return;
}
char conv[8];
for(unsigned int i = 0; i < 8; ++i) {
conv[i] = integer[7 - i];
}
std::memcpy(integer, conv, 8);
}
void UDPC::be64_copy(char *out, const char *in) {
if(UDPC::isBigEndian()) {
return;
}
for(unsigned int i = 0; i < 8; ++i) {
out[i] = in[7 - i];
}
}
void UDPC::preparePacket( void UDPC::preparePacket(
char *data, uint32_t protocolID, uint32_t conID, uint32_t rseq, char *data, uint32_t protocolID, uint32_t conID, uint32_t rseq,
uint32_t ack, uint32_t *seqID, int flags) { uint32_t ack, uint32_t *seqID, int flags) {