diff --git a/src/common/network/RTPFNEHeader.h b/src/common/network/RTPFNEHeader.h index 54a55685..3896e75b 100644 --- a/src/common/network/RTPFNEHeader.h +++ b/src/common/network/RTPFNEHeader.h @@ -102,6 +102,8 @@ namespace network MASTER_SUBFUNC_DEACTIVE_TGS = 0x03U, //!< Deactive TGIDs MASTER_HA_PARAMS = 0xA3U, //!< HA Parameters + KEYS_UPDATE_STATUS = 0x04U, //!< Key Update Status Response + TRANSFER_SUBFUNC_ACTIVITY = 0x01U, //!< Activity Log Transfer TRANSFER_SUBFUNC_DIAG = 0x02U, //!< Diagnostic Log Transfer TRANSFER_SUBFUNC_STATUS = 0x03U, //!< Status Transfer diff --git a/src/fne/network/MetadataNetwork.cpp b/src/fne/network/MetadataNetwork.cpp index 88154a45..5b50462d 100644 --- a/src/fne/network/MetadataNetwork.cpp +++ b/src/fne/network/MetadataNetwork.cpp @@ -174,8 +174,10 @@ MetadataNetwork::PacketBufferEntryPtr MetadataNetwork::findPacketBufferEntry(Pac /* Finds or creates a packet buffer entry in the map. */ -MetadataNetwork::PacketBufferEntryPtr MetadataNetwork::findOrCreatePacketBufferEntry(PacketBufferMap& pktMap, uint32_t peerId, const char* name, uint32_t streamId) +MetadataNetwork::PacketBufferEntryPtr MetadataNetwork::findOrCreatePacketBufferEntry(PacketBufferMap& pktMap, uint32_t peerId, const char* name, uint32_t streamId, bool* created) { + if (created != nullptr) + *created = false; pktMap.lock(false); auto& entries = pktMap.get(); @@ -186,6 +188,8 @@ MetadataNetwork::PacketBufferEntryPtr MetadataNetwork::findOrCreatePacketBufferE pkt->streamId = streamId; it = entries.insert({ peerId, pkt }).first; + if (created != nullptr) + *created = true; } PacketBufferEntryPtr pkt = it->second; diff --git a/src/fne/network/MetadataNetwork.h b/src/fne/network/MetadataNetwork.h index 4af25af7..45797e46 100644 --- a/src/fne/network/MetadataNetwork.h +++ b/src/fne/network/MetadataNetwork.h @@ -157,9 +157,10 @@ namespace network * @param peerId Peer ID of the packet buffer entry. * @param name Name of the packet buffer entry. * @param streamId Stream ID of the packet buffer entry. + * @param created Optional pointer to a boolean that will be set to true if a new entry was created, false otherwise. * @returns PacketBufferEntryPtr Instance of the PacketBufferEntry class. */ - static PacketBufferEntryPtr findOrCreatePacketBufferEntry(PacketBufferMap& pktMap, uint32_t peerId, const char* name, uint32_t streamId); + static PacketBufferEntryPtr findOrCreatePacketBufferEntry(PacketBufferMap& pktMap, uint32_t peerId, const char* name, uint32_t streamId, bool* created = nullptr); /** * @brief Erases a packet buffer entry from the map. * @param pktMap Instance of the PacketBufferMap class. diff --git a/src/fne/network/packet/KeysUpdate.cpp b/src/fne/network/packet/KeysUpdate.cpp index 6d47dae2..727da49f 100644 --- a/src/fne/network/packet/KeysUpdate.cpp +++ b/src/fne/network/packet/KeysUpdate.cpp @@ -14,8 +14,24 @@ #include "fne/ActivityLog.h" #include "HostFNE.h" +#include +#include +#include + using namespace network; +// --------------------------------------------------------------------------- +// Constants +// --------------------------------------------------------------------------- + +#define KEY_UPDATE_STATUS_BUSY 0x01U + +// --------------------------------------------------------------------------- +// Static Class Members +// --------------------------------------------------------------------------- + +std::mutex s_keyUpdateCommitMutex; + // --------------------------------------------------------------------------- // Public Class Members // --------------------------------------------------------------------------- @@ -165,19 +181,36 @@ void MetadataNetwork::PacketHandler::keysUpdate(TrafficNetwork* network, Metadat } } - PacketBufferEntryPtr pkt = findOrCreatePacketBufferEntry(mdNetwork->m_peerKeyUpdatePkt, peerId, "Remote EKC, Key Update", streamId); + bool created = false; + PacketBufferEntryPtr pkt = findOrCreatePacketBufferEntry(mdNetwork->m_peerKeyUpdatePkt, peerId, "Remote EKC, Key Update", streamId, &created); if (pkt == nullptr || !pkt->buffer) { LogError(LOG_REPL, "PEER %u Remote EKC, Key Update, failed to initialize packet buffer", peerId); erasePacketBufferEntry(mdNetwork->m_peerKeyUpdatePkt, peerId); return; } + if (!created) { + LogWarning(LOG_REPL, "PEER %u requested enc. key update while another update is active", peerId); + uint8_t status = KEY_UPDATE_STATUS_BUSY; + mdNetwork->getFrameQueue()->write(&status, 1U, streamId, peerId, network->getPeerId(), + { NET_FUNC::KEYS_UPDATE, NET_SUBFUNC::KEYS_UPDATE_STATUS }, 0U, req->address, req->addrLen); + return; + } + LogInfoEx(LOG_REPL, "PEER %u Remote EKC, Key Update, authenticated transfer streamId = %u", peerId, streamId); return; } // scope intentional { + if (req->length == 80U) { + LogWarning(LOG_REPL, "PEER %u requested enc. key update while another update is active", peerId); + uint8_t status = KEY_UPDATE_STATUS_BUSY; + mdNetwork->getFrameQueue()->write(&status, 1U, streamId, peerId, network->getPeerId(), + { NET_FUNC::KEYS_UPDATE, NET_SUBFUNC::KEYS_UPDATE_STATUS }, 0U, req->address, req->addrLen); + return; + } + if (req->length < FRAG_SIZE) { LogWarning(LOG_REPL, "PEER %u Remote EKC, Key Update, ignoring short data phase frame (%u bytes)", peerId, req->length); return; @@ -230,7 +263,9 @@ void MetadataNetwork::PacketHandler::keysUpdate(TrafficNetwork* network, Metadat s << network->m_cryptoLookup->filename(); std::string filename = s.str(); - std::ofstream file(filename, std::ofstream::out); + std::lock_guard commitLock(s_keyUpdateCommitMutex); + std::string tempFilename = filename + ".tmp." + std::to_string(peerId) + "." + std::to_string(streamId); + std::ofstream file(tempFilename, std::ios::binary | std::ios::trunc); if (file.fail()) { LogError(LOG_PEER, "Cannot open the crypto container file - %s", filename.c_str()); pkt->buffer->clear(); @@ -243,12 +278,25 @@ void MetadataNetwork::PacketHandler::keysUpdate(TrafficNetwork* network, Metadat return; } - for (uint32_t i = 0U; i < decompressedLen; i++) { - file << (char)decompressed[i]; - } + file.write(reinterpret_cast(decompressed), static_cast(decompressedLen)); + file.flush(); + bool writeOk = file.good(); file.close(); + if (!writeOk || std::rename(tempFilename.c_str(), filename.c_str()) != 0) { + LogError(LOG_PEER, "Cannot atomically install the crypto container file - %s", filename.c_str()); + std::remove(tempFilename.c_str()); + pkt->buffer->clear(); + pkt->buffer.reset(); + pkt->streamId = 0U; + if (decompressed != nullptr) { + delete[] decompressed; + } + erasePacketBufferEntry(mdNetwork->m_peerKeyUpdatePkt, peerId); + return; + } + network->m_cryptoLookup->stop(true); network->m_cryptoLookup->reload();