From 6cf5244bc514042fe419fffe1cd26a7f5e3c778f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Roman=20Smr=C5=BE?= <roman.smrz@seznam.cz>
Date: Thu, 16 Apr 2020 21:42:45 +0200
Subject: Remove optional from load result

Makes loading of data well-defined for arbitrary object contents.
Introduce zero reference and object to represent missing or mismatched
parts.
---
 src/network.cpp | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

(limited to 'src/network.cpp')

diff --git a/src/network.cpp b/src/network.cpp
index b31d949..91f1923 100644
--- a/src/network.cpp
+++ b/src/network.cpp
@@ -298,7 +298,7 @@ Server::Peer & Server::Priv::getPeer(const sockaddr_in & paddr)
 void Server::Priv::handlePacket(Server::Peer & peer, const TransportHeader & header, ReplyBuilder & reply)
 {
 	unordered_set<Digest> plaintextRefs;
-	for (const auto & obj : collectStoredObjects(*Stored<Object>::load(*self.ref())))
+	for (const auto & obj : collectStoredObjects(Stored<Object>::load(*self.ref())))
 		plaintextRefs.insert(obj.ref().digest());
 
 	optional<UUID> serviceType;
@@ -397,9 +397,11 @@ void Server::Priv::handlePacket(Server::Peer & peer, const TransportHeader & hea
 
 				auto cres = peer.tempStorage.copy(pref);
 				if (auto r = std::get_if<Ref>(&cres)) {
-					if (auto acc = ChannelAccept::load(*r)) {
+					auto acc = ChannelAccept::load(*r);
+					if (holds_alternative<Identity>(peer.identity) &&
+							acc.isSignedBy(std::get<Identity>(peer.identity).keyMessage())) {
 						reply.header({ TransportHeader::Type::Acknowledged, pref });
-						peer.channel.emplace<Stored<Channel>>(acc->data->channel());
+						peer.channel.emplace<Stored<Channel>>(acc.data->channel());
 					}
 				}
 			}
@@ -485,8 +487,10 @@ void Server::Peer::updateChannel(ReplyBuilder & reply)
 
 	if (holds_alternative<shared_ptr<WaitingRef>>(channel)) {
 		if (auto ref = std::get<shared_ptr<WaitingRef>>(channel)->check(reply)) {
-			if (auto req = Stored<ChannelRequest>::load(*ref)) {
-				if (auto acc = Channel::acceptRequest(server.self, std::get<Identity>(identity), *req)) {
+			auto req = Stored<ChannelRequest>::load(*ref);
+			if (holds_alternative<Identity>(identity) &&
+					req->isSignedBy(std::get<Identity>(identity).keyMessage())) {
+				if (auto acc = Channel::acceptRequest(server.self, std::get<Identity>(identity), req)) {
 					channel.emplace<Stored<ChannelAccept>>(*acc);
 					reply.header({ TransportHeader::Type::ChannelAccept, acc->ref() });
 					reply.body(acc->ref());
-- 
cgit v1.2.3