Disable checking of INVOCATION request IDs

crossbario/crossbar#2081
ecorm · May 26, 2023 · 7a2aa62 · 7a2aa62
1 parent 6b9d8e8
commit 7a2aa62
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 6 deletions.
diff --git a/cppwamp/include/cppwamp/internal/client.hpp b/cppwamp/include/cppwamp/internal/client.hpp
@@ -882,6 +882,11 @@ class ProcedureRegistry
     WampErrc onProcedureInvocation(Invocation& inv,
                                    const ProcedureRegistration& reg)
     {
+        // Progressive calls not allowed on procedures not registered
+        // as streams.
+        if (inv.isProgress({}) || inv.resultsAreProgressive({}))
+            return WampErrc::optionNotAllowed;
+
         auto requestId = inv.requestId();
         auto registrationId = inv.registrationId();
         auto emplaced = invocations_.emplace(requestId,
@@ -891,11 +896,6 @@ class ProcedureRegistry
         if (!emplaced.second)
             return WampErrc::protocolViolation;
 
-        // Progressive calls not allowed on procedures not registered
-        // as streams.
-        if (inv.isProgress({}) || inv.resultsAreProgressive({}))
-            return WampErrc::optionNotAllowed;
-
         auto& invocationRec = emplaced.first->second;
         invocationRec.closed = true;
         postRpcRequest(reg.callSlot, inv, reg.registrationId);
@@ -1547,15 +1547,19 @@ class Client : public std::enable_shared_from_this<Client>, private PeerListener
         auto reqId = inv.requestId();
         auto regId = inv.registrationId();
 
+        // Crossbar uses the same INVOCATION request ID generator for
+        // all callee sessions.
+        // https://github.com/crossbario/crossbar/issues/2081
+#ifdef CPPWAMP_STRICT_INVOCATION_ID_CHECKS
         auto maxRequestId = inboundRequestIdWatermark_ + 1u;
         if (reqId > maxRequestId)
         {
             return failProtocol("Router used non-sequential request ID "
                                 "in INVOCATION message");
         }
-
         if (reqId == maxRequestId)
             ++inboundRequestIdWatermark_;
+#endif
 
         switch (registry_.onInvocation(std::move(inv)))
         {
@@ -2337,7 +2341,10 @@ class Client : public std::enable_shared_from_this<Client>, private PeerListener
         abandonPending(MiscErrc::abandoned);
         readership_.clear();
         registry_.clear();
+
+#ifdef CPPWAMP_STRICT_INVOCATION_ID_CHECKS
         inboundRequestIdWatermark_ = 0;
+#endif
     }
 
     void sendUnsubscribe(SubscriptionId subId)
@@ -2474,7 +2481,9 @@ class Client : public std::enable_shared_from_this<Client>, private PeerListener
     IncidentSlot incidentSlot_;
     ChallengeSlot challengeSlot_;
     Connecting::Ptr currentConnector_;
+#ifdef CPPWAMP_STRICT_INVOCATION_ID_CHECKS
     RequestId inboundRequestIdWatermark_ = 0;
+#endif
     bool isTerminating_ = false;
 
     friend class ClientContext;

diff --git a/test/clientprotocolerrors.cpp b/test/clientprotocolerrors.cpp
@@ -169,6 +169,7 @@ TEST_CASE( "WAMP protocol violation detection by client", "[WAMP][Advanced]" )
         ioctx.restart();
     }
 
+#ifdef CPPWAMP_STRICT_INVOCATION_ID_CHECKS
     {
         INFO("Non-sequential INVOCATION request ID");
 
@@ -198,6 +199,7 @@ TEST_CASE( "WAMP protocol violation detection by client", "[WAMP][Advanced]" )
         ioctx.run();
         ioctx.restart();
     }
+#endif
 
     {
         INFO("Progressive invocation on RPC not registered as stream");