[tor-commits] [collector/master] Retain hidserv-* lines when sanitizing descriptors.

[karsten at torproject.org]

commit 8a00f1c702e319ad80c181553c771a48043666ba
Author: Karsten Loesing <karsten.loesing at gmx.net>
Date:   Wed Nov 23 11:13:03 2016 +0100

    Retain hidserv-* lines when sanitizing descriptors.
    
    Some bridges report these hidserv-* lines, probably shortly after
    switching from relay to bridge mode.  There's nothing particular
    sensitive in these lines that would reveal the bridge IP address or
    location.  We can simply copy them over like the other statistics
    lines.
    
    Fixes #20714.
---
 CHANGELOG.md                                                        | 6 ++++++
 .../torproject/collector/bridgedescs/SanitizedBridgesWriter.java    | 3 ++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 523e0b1..1c1def5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,9 @@
+# Changes in version ?.?.? - 201?-??-??
+
+ * Medium changes
+   - Retain hidserv-* lines in sanitized extra-info descriptors.
+
+
 # Changes in version 1.1.0 - 2016-10-28
 
  * Major changes
diff --git a/src/main/java/org/torproject/collector/bridgedescs/SanitizedBridgesWriter.java b/src/main/java/org/torproject/collector/bridgedescs/SanitizedBridgesWriter.java
index 5e101eb..c54d83e 100644
--- a/src/main/java/org/torproject/collector/bridgedescs/SanitizedBridgesWriter.java
+++ b/src/main/java/org/torproject/collector/bridgedescs/SanitizedBridgesWriter.java
@@ -1192,7 +1192,8 @@ public class SanitizedBridgesWriter extends CollecTorMain {
             || line.startsWith("dirreq-")
             || line.startsWith("cell-")
             || line.startsWith("entry-")
-            || line.startsWith("exit-")) {
+            || line.startsWith("exit-")
+            || line.startsWith("hidserv-")) {
           scrubbed.append(line + "\n");
 
         /* When we reach the signature, we're done. Write the sanitized