[tor-commits] [tor/main] Downgrade "Rejecting RENDEZVOUS1 cell with unrecognized cookie"

[dgoulet at torproject.org]

commit d10ceb7165effc30d38edbbe370f311c4719d2b6
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Oct 14 12:21:30 2021 -0400

    Downgrade "Rejecting RENDEZVOUS1 cell with unrecognized cookie"
    
    This is the loudest of our LOG_PROTOCOL_WARN messages, it can occur
    naturally, and there doesn't seem to be a great response to it.
    
    Partial fix for 40400; bugfix on 0.1.1.13-alpha.
---
 changes/bug40400_part2     | 5 +++++
 src/feature/rend/rendmid.c | 6 +++++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/changes/bug40400_part2 b/changes/bug40400_part2
new file mode 100644
index 0000000000..9b834d5ea1
--- /dev/null
+++ b/changes/bug40400_part2
@@ -0,0 +1,5 @@
+  o Minor bugfixes (usability):
+    - Do not log "RENDEZVOUS1 cell with unrecognized rendezvous cookie"
+      at LOG_PROTOCOL_WARN; instead log it at DEBUG. This warning can happen
+      naturally if a client gives up on a rendezvous circuit after sending
+      INTRODUCE1. Fixes part of bug 40400; bugfix on 0.1.1.13-alpha.
diff --git a/src/feature/rend/rendmid.c b/src/feature/rend/rendmid.c
index df838aa527..8f6a45dfef 100644
--- a/src/feature/rend/rendmid.c
+++ b/src/feature/rend/rendmid.c
@@ -131,7 +131,11 @@ rend_mid_rendezvous(or_circuit_t *circ, const uint8_t *request,
 
   rend_circ = hs_circuitmap_get_rend_circ_relay_side(request);
   if (!rend_circ) {
-    log_fn(LOG_PROTOCOL_WARN, LD_PROTOCOL,
+    /* Once this was a LOG_PROTOCOL_WARN, but it can happen naturally if a
+     * client gives up on a rendezvous circuit after sending INTRODUCE1, but
+     * before the onion service sends the RENDEZVOUS1 cell.
+     */
+    log_fn(LOG_DEBUG, LD_PROTOCOL,
          "Rejecting RENDEZVOUS1 cell with unrecognized rendezvous cookie %s.",
          hexid);
     reason = END_CIRC_REASON_TORPROTOCOL;