fix: double request send on quick reinitialization of sesame dhke (#1064)

fix: double request send on quick reinitialization of sesame diffie hellman

Author: andjordan

services/util/EchoPolicyDiffieHellman.cpp

@@ -38,11 +38,16 @@ namespace services
 
     void EchoPolicyDiffieHellman::Initialized()
     {
+        if (busy)
+            DiffieHellmanKeyEstablishmentProxy::Rpc().CancelRequestSend(*this);
+
         initializingKeys = true;
         nextKeyPair.reset();
+        verifier.reset();
 
         keyExchange.emplace(keyExchangeCreator, randomDataGenerator);
 
+        busy = true;
         DiffieHellmanKeyEstablishmentProxy::RequestSend([this]()
             {
                 DiffieHellmanKeyEstablishmentProxy::PresentCertificate(dsaCertificate);
@@ -53,6 +58,7 @@ namespace services
                         auto [r, s] = signer.Sign(encodedDhPublicKey);
 
                         DiffieHellmanKeyEstablishmentProxy::Exchange(encodedDhPublicKey, r, s);
+                        busy = false;
                     });
             });
     }

services/util/EchoPolicyDiffieHellman.hpp

@@ -78,6 +78,7 @@ namespace services
         infra::Function<void(ServiceProxy& proxy)> onRequest;
 
         bool initializingKeys = true;
+        bool busy = false;
         std::optional<std::pair<std::array<uint8_t, 16>, std::array<uint8_t, 16>>> nextKeyPair;
         infra::IntrusiveList<ServiceProxy> waitingProxies;
 

services/util/test/TestEchoPolicyDiffieHellman.cpp

@@ -165,6 +165,16 @@ TEST_F(EchoPolicyDiffieHellmanTest, send_and_receive)
     ExchangeData();
 }
 
+TEST_F(EchoPolicyDiffieHellmanTest, intialize_while_initializing_starts_over)
+{
+    Initialized(); // second initialization
+
+    EXPECT_CALL(echoPolicyLeft, KeyExchangeSuccessful());
+    EXPECT_CALL(echoPolicyRight, KeyExchangeSuccessful());
+
+    ExchangeData();
+}
+
 namespace
 {
     class DiffieHellmanKeyEstablishmentMock