Ticket31684

changes/ticket31684

@@ -0,0 +1,2 @@
+  o Minor features (onion services):
+    - GETINFO dir/status-vote/current/consensus-microdesc dumps microdesc consensus. Closes ticket 31684.

src/feature/control/control_getinfo.c

@@ -325,6 +325,51 @@ getinfo_helper_current_time(control_connection_t *control_conn,
   return 0;
 }
 
+/**
+ * Switch between microdesc vs networkstatus descriptor dumps
+ * Assumes that question would be either:
+ * - dir/status-vote/current/consensus-microdesc
+ * or
+ * - dir/status-vote/current/consensus
+ */
+STATIC int
+getinfo_helper_current_consensus(const char* question,
+                          char** answer,
+                          const char** errmsg)
+{
+  // Ensures question contains a request for
+  // ns or microdesc consensus
+  if (
+      strcmp(question, "dir/status-vote/current/consensus") &&
+      strcmp(question, "dir/status-vote/current/consensus-microdesc")) {
+    return 0;
+  }
+
+  const char* consensus_type = !strcmp(
+     question, "dir/status-vote/current/consensus-microdesc"
+  ) ? "microdesc" : "ns";
+
+  if (we_want_to_fetch_flavor(get_options(), FLAV_NS)) {
+    const cached_dir_t *consensus = dirserv_get_consensus(consensus_type);
+    if (consensus) {
+      *answer = tor_strdup(consensus->dir);
+    }
+  }
+  if (!*answer) { /* try loading it from disk */
+    tor_mmap_t *mapped = networkstatus_map_cached_consensus(consensus_type);
+    if (mapped) {
+      *answer = tor_memdup_nulterm(mapped->data, mapped->size);
+      tor_munmap_file(mapped);
+    }
+    if (!*answer) { /* generate an error */
+      *errmsg = "Could not open cached consensus. "
+        "Make sure FetchUselessDescriptors is set to 1.";
+       return -1;
+   }
+  }
+  return 0;
+}
+
 /** Implementation helper for GETINFO: knows the answers for questions about
  * directory information. */
 STATIC int
@@ -362,6 +407,7 @@ getinfo_helper_dir(control_connection_t *control_conn,
       if (body)
         *answer = tor_strndup(body, ri->cache_info.signed_descriptor_len);
     } else if (! we_fetch_router_descriptors(get_options())) {
+
       /* Descriptors won't be available, provide proper error */
       *errmsg = "We fetch microdescriptors, not router "
                 "descriptors. You'll need to use md/name/* "
@@ -576,24 +622,16 @@ getinfo_helper_dir(control_connection_t *control_conn,
     smartlist_free(descs);
   } else if (!strcmpstart(question, "dir/status/")) {
     *answer = tor_strdup("");
-  } else if (!strcmp(question, "dir/status-vote/current/consensus")) { /* v3 */
-    if (we_want_to_fetch_flavor(get_options(), FLAV_NS)) {
-      const cached_dir_t *consensus = dirserv_get_consensus("ns");
-      if (consensus)
-        *answer = tor_strdup(consensus->dir);
-    }
-    if (!*answer) { /* try loading it from disk */
-      tor_mmap_t *mapped = networkstatus_map_cached_consensus("ns");
-      if (mapped) {
-        *answer = tor_memdup_nulterm(mapped->data, mapped->size);
-        tor_munmap_file(mapped);
-      }
-      if (!*answer) { /* generate an error */
-        *errmsg = "Could not open cached consensus. "
-          "Make sure FetchUselessDescriptors is set to 1.";
-        return -1;
-      }
-    }
+  } else if (-1 == getinfo_helper_current_consensus(
+                                                    question,
+                                                    answer,
+                                                    errmsg))
+  {
+    /**
+     * answer is set by getinfo_helper_current_consensus
+     * if the question matches
+     */
+    return -1;
   } else if (!strcmp(question, "network-status")) { /* v1 */
     static int network_status_warned = 0;
     if (!network_status_warned) {
@@ -1513,6 +1551,8 @@ static const getinfo_item_t getinfo_items[] = {
          "v2 networkstatus docs as retrieved from a DirPort."),
   ITEM("dir/status-vote/current/consensus", dir,
        "v3 Networkstatus consensus as retrieved from a DirPort."),
+  ITEM("dir/status-vote/current/consensus-microdesc", dir,
+       "v3 Microdescriptors consensus as retrieved from a DirPort."),
   ITEM("exit-policy/default", policies,
        "The default value appended to the configured exit policy."),
   ITEM("exit-policy/reject-private/default", policies,

src/feature/control/control_getinfo.h

@@ -48,6 +48,9 @@ STATIC int getinfo_helper_downloads(
     control_connection_t *control_conn,
     const char *question, char **answer,
     const char **errmsg);
+STATIC int getinfo_helper_current_consensus(
+    const char *question, char **answer,
+    const char **errmsg);
 STATIC int getinfo_helper_dir(
     control_connection_t *control_conn,
     const char *question, char **answer,