torproject/collector
1
0
Fork 0
mirror of https://github.com/torproject/collector.git synced 2024-11-23 17:39:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Check bridge stats in sanitized bridge descriptors.

Browse Source 
Make sure that there's always a bridge-stats-end line preceding the
bridge-ips line.

We should add more such checks in the future.  This is probably something
to implement in metrics-lib once it's more stable.
This commit is contained in:
Karsten Loesing 2011-12-27 16:33:08 +01:00
parent ff73f5b682
commit 5986188f93
1 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/org/torproject/ernie/db/SanitizedBridgesWriter.java
View File

@ -787,6 +787,7 @@ public class SanitizedBridgesWriter {
String line = null;
StringBuilder scrubbed = null;
String hashedBridgeIdentity = null;
boolean hasParsedBridgeStatsEndLine = false;
while ((line = br.readLine()) != null) {
/* When we have parsed both published and fingerprint line, look
@ -828,14 +829,27 @@ public class SanitizedBridgesWriter {
this.haveWarnedAboutLimitedMapping = true;
}
/* Write bridge-stats lines unmodified to the sanitized
* descriptor and make sure that there's always a bridge-stats-end
* line preceding the bridge-ips line. */
} else if (line.startsWith("bridge-stats-end ")) {
scrubbed.append(line + "\n");
hasParsedBridgeStatsEndLine = true;
} else if (line.startsWith("bridge-ips ")) {
if (!hasParsedBridgeStatsEndLine) {
this.logger.fine("bridge-ips line without preceding "
+ "bridge-stats-end line in bridge descriptor. "
+ "Skipping.");
return;
}
scrubbed.append(line + "\n");
/* Write the following lines unmodified to the sanitized
* descriptor. */
} else if (line.startsWith("write-history ")
|| line.startsWith("read-history ")
|| line.startsWith("geoip-start-time ")
|| line.startsWith("geoip-client-origins ")
|| line.startsWith("bridge-stats-end ")
|| line.startsWith("bridge-ips ")
|| line.startsWith("geoip-db-digest ")) {
scrubbed.append(line + "\n");