Commit ac9b4e14 authored by Hiro's avatar Hiro 🏄
Browse files

Stop sanitizing contact info

parent 405c5253

build @ c5d7511a

Compare 6e9a32a8 to c5d7511a
Original line number Diff line number Diff line 
Subproject commit 6e9a32a89e8f48c70988d9f5cb0eb27a14b3ebe8
 
Subproject commit c5d7511a7300dd535d368ccb3390b52bff453534

src/main/java/org/torproject/metrics/collector/bridgedescs/SanitizedBridgeServerDescriptor.java

+1 −2
Original line number Diff line number Diff line
@@ -117,7 +117,7 @@ public class SanitizedBridgeServerDescriptor 


          /* Replace the contact line (if present) with a generic one. */

        } else if (line.startsWith("contact ")) {

          scrubbed.append("contact somebody").newLine();

          scrubbed.append(line).newLine();



          /* When we reach the signature, we're done. Write the sanitized

           * descriptor to disk below. */
@@ -362,4 +362,3 @@ public class SanitizedBridgeServerDescriptor 
    return this.descriptorDigest;

  }

}

src/test/java/org/torproject/metrics/collector/bridgedescs/SanitizedBridgesWriterTest.java

+2 −2
Original line number Diff line number Diff line
@@ -191,7 +191,8 @@ public class SanitizedBridgesWriterTest { 
        "extra-info-digest B026CF0F81712D94BBF1362294882688DF247887 "

            + "/XWPeILeik+uTGaKL3pnUeQfYS87SfjKVkwTiCmbqi0",

        "hidden-service-dir",

        "contact somebody",

        "contact jvictors at jessevictors com, PGP 0xC20BEC80, BTC "

            + "1M6tuPXNmhbgSfaJqnxBUAf5tKi4TVhup8",

        "ntor-onion-key YjZG5eaQ1gmXvlSMGEBwM7OLswv8AtXZr6ccOnDUKQw=",

        "reject *:*",

        "router-digest-sha256 "
@@ -854,4 +855,3 @@ public class SanitizedBridgesWriterTest { 
        this.parsedNetworkStatuses.isEmpty());

  }

}