[or-cvs] [tor/release-0.2.1 16/25] Fix a bug where seting allow_annotations==0 only ignores annotations, but does not block them

[arma@xxxxxxxxxxxxxx]

Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date: Tue, 2 Nov 2010 11:45:14 -0400
Subject: Fix a bug where seting allow_annotations==0 only ignores annotations, but does not block them
Commit: 089137f0112b0ad7c8ada8f2d5c7a967cfb87387

---
 changes/annotations_fix |    8 ++++++++
 src/or/routerparse.c    |   14 ++++++++++----
 2 files changed, 18 insertions(+), 4 deletions(-)
 create mode 100644 changes/annotations_fix

diff --git a/changes/annotations_fix b/changes/annotations_fix
new file mode 100644
index 0000000..d3cd7f3
--- /dev/null
+++ b/changes/annotations_fix
@@ -0,0 +1,8 @@
+  o Major bugfixes
+    - Do even more to reject (and not just ignore) annotations on
+      router descriptors received anywhere but from the cache.
+      Previously we would ignore such annotations at first, but cache
+      them to disk anyway.  Bugfix on 0.2.0.8-alpha. Found by piebeer.
+
+
+
diff --git a/src/or/routerparse.c b/src/or/routerparse.c
index aa1aba4..da08e46 100644
--- a/src/or/routerparse.c
+++ b/src/or/routerparse.c
@@ -1177,10 +1177,16 @@ router_parse_entry_from_string(const char *s, const char *end,
     s = cp+1;
   }
 
-  if (allow_annotations && start_of_annotations != s) {
-    if (tokenize_string(area,start_of_annotations,s,tokens,
-                        routerdesc_token_table,TS_NOCHECK)) {
-      log_warn(LD_DIR, "Error tokenizing router descriptor (annotations).");
+  if (start_of_annotations != s) { /* We have annotations */
+    if (allow_annotations) {
+      if (tokenize_string(area,start_of_annotations,s,tokens,
+                          routerdesc_token_table,TS_NOCHECK)) {
+        log_warn(LD_DIR, "Error tokenizing router descriptor (annotations).");
+        goto err;
+      }
+    } else {
+      log_warn(LD_DIR, "Found unexpected annotations on router descriptor not "
+               "loaded from disk.  Dropping it.");
       goto err;
     }
   }
-- 
1.7.1