[tor-commits] [tor/master] Check if fallbacks support extrainfo descriptors before requesting them

[nickm at torproject.org]

commit b1569e39c87a32b64fe06702c1f18b43eb35f5ad
Author: teor (Tim Wilson-Brown) <teor2345 at gmail.com>
Date:   Thu Mar 24 22:03:58 2016 +1100

    Check if fallbacks support extrainfo descriptors before requesting them
    
    When requesting extrainfo descriptors from a trusted directory
    server, check whether it is an authority or a fallback directory
    which supports extrainfo descriptors.
    
    Fixes bug 18489; bugfix on 90f6071d8d in tor-0.2.4.7-alpha.
    
    Reported by "atagar", patch by "teor".
---
 changes/bug18489    | 6 ++++++
 src/or/routerlist.c | 4 +++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/changes/bug18489 b/changes/bug18489
new file mode 100644
index 0000000..d8c171a
--- /dev/null
+++ b/changes/bug18489
@@ -0,0 +1,6 @@
+  o Minor bugfixes (fallback directory mirrors):
+    - When requesting extrainfo descriptors from a trusted directory
+      server, check whether it is an authority or a fallback directory
+      which supports extrainfo descriptors.
+      Fixes bug 18489; bugfix on 90f6071d8d in tor-0.2.4.7-alpha.
+      Reported by "atagar", patch by "teor".
diff --git a/src/or/routerlist.c b/src/or/routerlist.c
index ecfcb9b..7ec84f0 100644
--- a/src/or/routerlist.c
+++ b/src/or/routerlist.c
@@ -1857,8 +1857,10 @@ router_pick_trusteddirserver_impl(const smartlist_t *sourcelist,
       if (!d->is_running) continue;
       if ((type & d->type) == 0)
         continue;
+      int is_trusted_extrainfo = router_digest_is_trusted_dir_type(
+                                 d->digest, EXTRAINFO_DIRINFO);
       if ((type & EXTRAINFO_DIRINFO) &&
-          !router_supports_extrainfo(d->digest, 1))
+          !router_supports_extrainfo(d->digest, is_trusted_extrainfo))
         continue;
       if (requireother && me && router_digest_is_me(d->digest))
         continue;