When cannibalizing a circuit, make sure it has no ExcludeNodes on it

This could happen if StrictNodes was 0 and we were forced to pick an
excluded node as the last hop of the circuit.

1 files changed, 14 insertions, 5 deletions

diff --git a/src/or/circuitlist.c b/src/or/circuitlist.c
index 42073fb96..ce324cad4 100644
--- a/src/or/circuitlist.c
+++ b/src/or/circuitlist.c
@@ -923,6 +923,7 @@ circuit_find_to_cannibalize(uint8_t purpose, extend_info_t *info,
   int need_uptime = (flags & CIRCLAUNCH_NEED_UPTIME) != 0;
   int need_capacity = (flags & CIRCLAUNCH_NEED_CAPACITY) != 0;
   int internal = (flags & CIRCLAUNCH_IS_INTERNAL) != 0;
+  or_options_t *options = get_options();
 
   /* Make sure we're not trying to create a onehop circ by
    * cannibalization. */
@@ -933,11 +934,6 @@ circuit_find_to_cannibalize(uint8_t purpose, extend_info_t *info,
             "capacity %d, internal %d",
             purpose, need_uptime, need_capacity, internal);
 
-  /* XXX022-1090 We should make sure that when we cannibalize a circuit, it
-   * contains no excluded nodes.  (This is possible if StrictNodes is 0, and
-   * we thought we needed to use an excluded exit node for, say, a directory
-   * operation.) -NM */
-
   for (_circ=global_circuitlist; _circ; _circ = _circ->next) {
     if (CIRCUIT_IS_ORIGIN(_circ) &&
         _circ->state == CIRCUIT_STATE_OPEN &&
@@ -966,6 +962,19 @@ circuit_find_to_cannibalize(uint8_t purpose, extend_info_t *info,
             hop=hop->next;
           } while (hop!=circ->cpath);
         }
+        if (options->ExcludeNodes) {
+          /* Make sure no existing nodes in the circuit are excluded for
+           * general use.  (This may be possible if StrictNodes is 0, and we
+           * thought we needed to use an otherwise excluded node for, say, a
+           * directory operation.) */
+          crypt_path_t *hop = circ->cpath;
+          do {
+            if (routerset_contains_extendinfo(options->ExcludeNodes,
+                                              hop->extend_info))
+              goto next;
+            hop = hop->next;
+          } while (hop != circ->cpath);
+        }
         if (!best || (best->build_state->need_uptime && !need_uptime))
           best = circ;
       next: ;