tor-commits February 2018

tor-commits@lists.torproject.org

19 participants
1579 discussions

[collector/master] Make logging statements comply to Metrics' standards.
by karsten＠torproject.org 20 Feb '18

20 Feb '18

commit 43cd15876635d763d0f6adbf6bcc5c7df6380406 Author: iwakeh <iwakeh(a)torproject.org> Date: Fri Oct 27 17:35:18 2017 +0000 Make logging statements comply to Metrics' standards. Also edit here and there for more readability and less lines. --- .../bridgedescs/SanitizedBridgesWriter.java | 145 +++++++++------------ 1 file changed, 62 insertions(+), 83 deletions(-) diff --git a/src/main/java/org/torproject/collector/bridgedescs/SanitizedBridgesWriter.java b/src/main/java/org/torproject/collector/bridgedescs/SanitizedBridgesWriter.java index b4cd49e..22bf8f7 100644 --- a/src/main/java/org/torproject/collector/bridgedescs/SanitizedBridgesWriter.java +++ b/src/main/java/org/torproject/collector/bridgedescs/SanitizedBridgesWriter.java @@ -167,9 +167,9 @@ public class SanitizedBridgesWriter extends CollecTorMain { && line.length() != ("yyyy-MM,".length() + 83 * 2)) || parts.length != 2) { logger.warn("Invalid line in bridge-ip-secrets file " - + "starting with '" + line.substring(0, 7) + "'! " + + "starting with '{}'! " + "Not calculating any IP address hashes in this " - + "execution!"); + + "execution!", line.substring(0, 7)); this.persistenceProblemWithSecrets = true; break; } @@ -178,19 +178,16 @@ public class SanitizedBridgesWriter extends CollecTorMain { this.secretsForHashingIpAddresses.put(month, secret); } if (!this.persistenceProblemWithSecrets) { - logger.debug("Read " - + this.secretsForHashingIpAddresses.size() + " secrets for " - + "hashing bridge IP addresses."); + logger.debug("Read {} secrets for hashing bridge IP addresses.", + this.secretsForHashingIpAddresses.size()); } } catch (DecoderException e) { - logger.warn("Failed to decode hex string in " - + this.bridgeIpSecretsFile + "! Not calculating any IP " - + "address hashes in this execution!", e); + logger.warn("Failed to decode hex string in {}! Not calculating any IP " + + "address hashes in this execution!", this.bridgeIpSecretsFile, e); this.persistenceProblemWithSecrets = true; } catch (IOException e) { - logger.warn("Failed to read " - + this.bridgeIpSecretsFile + "! Not calculating any IP " - + "address hashes in this execution!", e); + logger.warn("Failed to read {}! Not calculating any IP " + + "address hashes in this execution!", this.bridgeIpSecretsFile, e); this.persistenceProblemWithSecrets = true; } } @@ -490,8 +487,8 @@ public class SanitizedBridgesWriter extends CollecTorMain { } else if (line.startsWith("fingerprint ")) { if (!("fingerprint " + authorityFingerprint).equals(line)) { logger.warn("Mismatch between authority fingerprint expected from " - + "file name (" + authorityFingerprint + ") and parsed from " - + "\"fingerprint\" line (\"" + line + "\")."); + + "file name ({}) and parsed from \"fingerprint\" " + + "line (\"{}\").", authorityFingerprint, line); return; } header.append(line).newLine(); @@ -511,13 +508,13 @@ public class SanitizedBridgesWriter extends CollecTorMain { /* Parse the relevant parts of this r line. */ String[] parts = line.split(" "); if (parts.length < 9) { - logger.warn("Illegal line '" + line + "' in bridge network " - + "status. Skipping descriptor."); + logger.warn("Illegal line '{}' in bridge network " + + "status. Skipping descriptor.", line); return; } if (!Base64.isBase64(parts[2])) { - logger.warn("Illegal base64 character in r line '" + parts[2] - + "'. Skipping descriptor."); + logger.warn("Illegal base64 character in r line '{}'. " + + "Skipping descriptor.", parts[2]); return; } fingerprintBytes = Base64.decodeBase64(parts[2] + "=="); @@ -567,8 +564,8 @@ public class SanitizedBridgesWriter extends CollecTorMain { if (scrubbedOrAddress != null) { scrubbed.append("a " + scrubbedOrAddress + "\n"); } else { - logger.warn("Invalid address in line '" + line - + "' in bridge network status. Skipping line!"); + logger.warn("Invalid address in line '{}' " + + "in bridge network status. Skipping line!", line); } /* Nothing special about s, w, and p lines; just copy them. */ @@ -581,8 +578,8 @@ public class SanitizedBridgesWriter extends CollecTorMain { * network status. If there is, we should probably learn before * writing anything to the sanitized descriptors. */ } else { - logger.debug("Unknown line '" + line + "' in bridge " - + "network status. Not writing to disk!"); + logger.debug("Unknown line '{}' in bridge " + + "network status. Not writing to disk!", line); return; } } @@ -602,25 +599,23 @@ public class SanitizedBridgesWriter extends CollecTorMain { "yyyy-MM-dd HH:mm:ss"); formatter.setTimeZone(TimeZone.getTimeZone("UTC")); if (null == mostRecentDescPublished) { - logger.warn("The bridge network status published at " + publicationTime + logger.warn("The bridge network status published at {}" + " does not contain a single entry. Please ask the bridge " - + "authority operator to check!"); + + "authority operator to check!", publicationTime); } else if (formatter.parse(publicationTime).getTime() - formatter.parse(mostRecentDescPublished).getTime() > 60L * 60L * 1000L) { logger.warn("The most recent descriptor in the bridge " - + "network status published at " + publicationTime + " was " - + "published at " + mostRecentDescPublished + " which is " + + "network status published at {} was published at {} which is " + "more than 1 hour before the status. This is a sign for " - + "the status being stale. Please check!"); + + "the status being stale. Please check!", + publicationTime, mostRecentDescPublished); } } catch (ParseException e) { - logger.warn("Could not parse timestamp in " - + "bridge network status.", e); + logger.warn("Could not parse timestamp in bridge network status.", e); return; } catch (IOException e) { - logger.warn("Could not parse bridge network " - + "status.", e); + logger.warn("Could not parse bridge network status.", e); return; } @@ -699,7 +694,7 @@ public class SanitizedBridgesWriter extends CollecTorMain { } else if (line.startsWith("router ")) { String[] parts = line.split(" "); if (parts.length != 6) { - logger.warn("Invalid router line: '" + line + "'. Skipping."); + logger.warn("Invalid router line: '{}'. Skipping.", line); return; } address = parts[2]; @@ -783,15 +778,15 @@ public class SanitizedBridgesWriter extends CollecTorMain { } if (parts.length > 3) { logger.warn("extra-info-digest line contains more arguments than" - + "expected: '" + line + "'. Skipping descriptor."); + + "expected: '{}'. Skipping descriptor.", line); return; } scrubbed.append("extra-info-digest ").append(DigestUtils.sha1Hex( Hex.decodeHex(parts[1].toCharArray())).toUpperCase()); if (parts.length > 2) { if (!Base64.isBase64(parts[2])) { - logger.warn("Illegal base64 character in extra-info-digest line '" - + line + "'. Skipping descriptor."); + logger.warn("Illegal base64 character in extra-info-digest line " + + "'{}'. Skipping descriptor.", line); return; } scrubbed.space().append(Base64.encodeBase64String( @@ -917,14 +912,12 @@ public class SanitizedBridgesWriter extends CollecTorMain { * that we need to remove or replace for the sanitized descriptor * version. */ } else { - logger.warn("Unrecognized line '" + line - + "'. Skipping."); + logger.warn("Unrecognized line '{}'. Skipping.", line); return; } } } catch (Exception e) { - logger.warn("Could not parse server " - + "descriptor.", e); + logger.warn("Could not parse server descriptor.", e); return; } @@ -991,8 +984,7 @@ public class SanitizedBridgesWriter extends CollecTorMain { /* Handle below. */ } if (descriptorDigest == null) { - logger.warn("Could not calculate server " - + "descriptor digest."); + logger.warn("Could not calculate server descriptor digest."); return; } String descriptorDigestSha256Base64 = null; @@ -1014,8 +1006,7 @@ public class SanitizedBridgesWriter extends CollecTorMain { /* Handle below. */ } if (descriptorDigestSha256Base64 == null) { - logger.warn("Could not calculate server " - + "descriptor SHA256 digest."); + logger.warn("Could not calculate server descriptor SHA256 digest."); return; } } @@ -1056,8 +1047,7 @@ public class SanitizedBridgesWriter extends CollecTorMain { bw.close(); } } catch (ConfigurationException | IOException e) { - logger.warn("Could not write sanitized server " - + "descriptor to disk.", e); + logger.warn("Could not write sanitized server descriptor to disk.", e); return; } } @@ -1066,27 +1056,26 @@ public class SanitizedBridgesWriter extends CollecTorMain { String identityEd25519Base64) { byte[] identityEd25519 = Base64.decodeBase64(identityEd25519Base64); if (identityEd25519.length < 40) { - logger.warn("Invalid length of identity-ed25519 (in " - + "bytes): " + identityEd25519.length); + logger.warn("Invalid length of identity-ed25519 (in bytes): {}", + identityEd25519.length); } else if (identityEd25519[0] != 0x01) { - logger.warn("Unknown version in identity-ed25519: " - + identityEd25519[0]); + logger.warn("Unknown version in identity-ed25519: {}", + identityEd25519[0]); } else if (identityEd25519[1] != 0x04) { - logger.warn("Unknown cert type in identity-ed25519: " - + identityEd25519[1]); + logger.warn("Unknown cert type in identity-ed25519: {}", + identityEd25519[1]); } else if (identityEd25519[6] != 0x01) { logger.warn("Unknown certified key type in " + "identity-ed25519: " + identityEd25519[1]); } else if (identityEd25519[39] == 0x00) { logger.warn("No extensions in identity-ed25519 (which " - + "would contain the encoded master-key-ed25519): " - + identityEd25519[39]); + + "would contain the encoded master-key-ed25519): {}", + identityEd25519[39]); } else { int extensionStart = 40; for (int i = 0; i < (int) identityEd25519[39]; i++) { if (identityEd25519.length < extensionStart + 4) { - logger.warn("Invalid extension with id " + i - + " in identity-ed25519."); + logger.warn("Invalid extension with id {} in identity-ed25519.", i); break; } int extensionLength = identityEd25519[extensionStart]; @@ -1095,8 +1084,7 @@ public class SanitizedBridgesWriter extends CollecTorMain { int extensionType = identityEd25519[extensionStart + 2]; if (extensionLength == 32 && extensionType == 4) { if (identityEd25519.length < extensionStart + 4 + 32) { - logger.warn("Invalid extension with id " + i - + " in identity-ed25519."); + logger.warn("Invalid extension with id {} in identity-ed25519.", i); break; } byte[] masterKeyEd25519 = new byte[32]; @@ -1111,8 +1099,7 @@ public class SanitizedBridgesWriter extends CollecTorMain { extensionStart += 4 + extensionLength; } } - logger.warn("Unable to locate master-key-ed25519 in " - + "identity-ed25519."); + logger.warn("Unable to locate master-key-ed25519 in identity-ed25519."); return null; } @@ -1142,8 +1129,8 @@ public class SanitizedBridgesWriter extends CollecTorMain { String[] parts = line.split(" "); if (line.startsWith("extra-info ")) { if (parts.length < 3) { - logger.debug("Illegal line in extra-info descriptor: '" + line - + "'. Skipping descriptor."); + logger.debug("Illegal line in extra-info descriptor: '{}'. " + + "Skipping descriptor.", line); return; } hashedBridgeIdentity = DigestUtils.sha1Hex(Hex.decodeHex( @@ -1164,8 +1151,8 @@ public class SanitizedBridgesWriter extends CollecTorMain { * name. */ } else if (line.startsWith("transport ")) { if (parts.length < 3) { - logger.debug("Illegal line in extra-info descriptor: '" - + line + "'. Skipping descriptor."); + logger.debug("Illegal line in extra-info descriptor: '{}'. " + + "Skipping descriptor.", line); return; } scrubbed.append("transport " + parts[1] + "\n"); @@ -1244,19 +1231,13 @@ public class SanitizedBridgesWriter extends CollecTorMain { * that we need to remove or replace for the sanitized descriptor * version. */ } else { - logger.warn("Unrecognized line '" + line - + "'. Skipping."); + logger.warn("Unrecognized line '{}'. Skipping.", line); return; } } br.close(); - } catch (IOException e) { - logger.warn("Could not parse extra-info " - + "descriptor.", e); - return; - } catch (DecoderException e) { - logger.warn("Could not parse extra-info " - + "descriptor.", e); + } catch (DecoderException | IOException e) { + logger.warn("Could not parse extra-info descriptor.", e); return; } @@ -1277,8 +1258,7 @@ public class SanitizedBridgesWriter extends CollecTorMain { /* Handle below. */ } if (descriptorDigest == null) { - logger.warn("Could not calculate extra-info " - + "descriptor digest."); + logger.warn("Could not calculate extra-info descriptor digest."); return; } String descriptorDigestSha256Base64 = null; @@ -1375,8 +1355,8 @@ public class SanitizedBridgesWriter extends CollecTorMain { } } bw.close(); - logger.info("Deleted " + deleted + " secrets that we don't " - + "need anymore and kept " + kept + "."); + logger.info("Deleted {} secrets that we don't " + + "need anymore and kept {}.", deleted, kept); } catch (IOException e) { logger.warn("Could not store reduced set of " + "secrets to disk! This is a bad sign, better check what's " @@ -1396,8 +1376,8 @@ public class SanitizedBridgesWriter extends CollecTorMain { if (maxNetworkStatusPublishedMillis > 0L && maxNetworkStatusPublishedMillis < tooOldMillis) { logger.warn("The last known bridge network status was " - + "published " + maxNetworkStatusPublishedTime + ", which is " - + "more than 5:30 hours in the past."); + + "published {}, which is more than 5:30 hours in the past.", + maxNetworkStatusPublishedTime); } long maxServerDescriptorPublishedMillis = dateTimeFormat.parse(maxServerDescriptorPublishedTime) @@ -1405,8 +1385,8 @@ public class SanitizedBridgesWriter extends CollecTorMain { if (maxServerDescriptorPublishedMillis > 0L && maxServerDescriptorPublishedMillis < tooOldMillis) { logger.warn("The last known bridge server descriptor was " - + "published " + maxServerDescriptorPublishedTime + ", which " - + "is more than 5:30 hours in the past."); + + "published {}, which is more than 5:30 hours in the past.", + maxServerDescriptorPublishedTime); } long maxExtraInfoDescriptorPublishedMillis = dateTimeFormat.parse(maxExtraInfoDescriptorPublishedTime) @@ -1414,12 +1394,11 @@ public class SanitizedBridgesWriter extends CollecTorMain { if (maxExtraInfoDescriptorPublishedMillis > 0L && maxExtraInfoDescriptorPublishedMillis < tooOldMillis) { logger.warn("The last known bridge extra-info descriptor " - + "was published " + maxExtraInfoDescriptorPublishedTime - + ", which is more than 5:30 hours in the past."); + + "was published {}, which is more than 5:30 hours in the past.", + maxExtraInfoDescriptorPublishedTime); } } catch (ParseException e) { - logger.warn("Unable to parse timestamp for " - + "stale check.", e); + logger.warn("Unable to parse timestamp for stale check.", e); } }

1 0

[collector/master] Add a finalized state to DescriptorBuilder.
by karsten＠torproject.org 20 Feb '18

20 Feb '18

commit afe07d8efd4dc94b9dfb9b5896002286ba71dc6d Author: iwakeh <iwakeh(a)torproject.org> Date: Fri Oct 27 17:35:16 2017 +0000 Add a finalized state to DescriptorBuilder. To avoid possible inconsistencies DescriptorBuilder is finalized after the first call to 'toString' and cannot be altered anymore. Any attempt to add more leads to an IllegalStateException. --- .../collector/bridgedescs/DescriptorBuilder.java | 34 ++++++++++++++++++++-- 1 file changed, 31 insertions(+), 3 deletions(-) diff --git a/src/main/java/org/torproject/collector/bridgedescs/DescriptorBuilder.java b/src/main/java/org/torproject/collector/bridgedescs/DescriptorBuilder.java index 4ca9dd1..9c47b5e 100644 --- a/src/main/java/org/torproject/collector/bridgedescs/DescriptorBuilder.java +++ b/src/main/java/org/torproject/collector/bridgedescs/DescriptorBuilder.java @@ -12,25 +12,43 @@ import java.util.stream.Collectors; * <p>This builder class can be used while parsing and processing an original * descriptor. It accepts {@code String}s, {@code DescriptorBuilder}s and * {@code StringBuilder}s. The latter two as placeholders for parts that can - * only be processed after finishing the parsing step.</p> */ + * only be processed after finishing the parsing step.</p> + * + * <p>Calling {@code toString} finalizes the builder and any subsequent + * method calls other than {@code toString} will result in an + * {@code IllegalStateException}. + */ class DescriptorBuilder { private List<Object> parts; private StringBuilder lastPart; + private boolean finalized = false; + + private String value; + public DescriptorBuilder() { this.parts = new ArrayList<>(); this.lastPart = new StringBuilder(); this.parts.add(this.lastPart); } + private void throwExceptionIfFinalized() { + if (this.finalized) { + throw new IllegalStateException("This DescriptorBuilder is finalized and" + + " calling anything other than 'toString' is illegal."); + } + } + public DescriptorBuilder append(String sanitizedString) { + this.throwExceptionIfFinalized(); this.lastPart.append(sanitizedString); return this; } public DescriptorBuilder append(StringBuilder placeholder) { + this.throwExceptionIfFinalized(); this.parts.add(placeholder); this.lastPart = new StringBuilder(); this.parts.add(this.lastPart); @@ -38,6 +56,7 @@ class DescriptorBuilder { } public DescriptorBuilder append(DescriptorBuilder placeholder) { + this.throwExceptionIfFinalized(); this.parts.add(placeholder); this.lastPart = new StringBuilder(); this.parts.add(this.lastPart); @@ -45,18 +64,27 @@ class DescriptorBuilder { } public DescriptorBuilder space() { + this.throwExceptionIfFinalized(); this.lastPart.append(' '); return this; } public DescriptorBuilder newLine() { + this.throwExceptionIfFinalized(); this.lastPart.append('\n'); return this; } @Override public String toString() { - return this.parts.stream().map(part -> part.toString()) - .collect(Collectors.joining("")); + if (!this.finalized) { + this.finalized = true; + this.value = this.parts.stream().map(part -> part.toString()) + .collect(Collectors.joining("")); + this.parts.clear(); // not needed anymore + this.lastPart = null; + } + return value; } + }

1 0

[collector/master] Use Java8 idiom for toString method.
by karsten＠torproject.org 20 Feb '18

20 Feb '18

commit 2457eb5be72d508c4ec4e2d2c3b6f7a88c69ed4c Author: iwakeh <iwakeh(a)torproject.org> Date: Fri Oct 27 17:35:15 2017 +0000 Use Java8 idiom for toString method. --- .../org/torproject/collector/bridgedescs/DescriptorBuilder.java | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/main/java/org/torproject/collector/bridgedescs/DescriptorBuilder.java b/src/main/java/org/torproject/collector/bridgedescs/DescriptorBuilder.java index cc57662..4ca9dd1 100644 --- a/src/main/java/org/torproject/collector/bridgedescs/DescriptorBuilder.java +++ b/src/main/java/org/torproject/collector/bridgedescs/DescriptorBuilder.java @@ -5,6 +5,7 @@ package org.torproject.collector.bridgedescs; import java.util.ArrayList; import java.util.List; +import java.util.stream.Collectors; /** Builder for descriptors. * @@ -55,10 +56,7 @@ class DescriptorBuilder { @Override public String toString() { - StringBuilder full = new StringBuilder(); - for (Object part : this.parts) { - full.append(part.toString()); - } - return full.toString(); + return this.parts.stream().map(part -> part.toString()) + .collect(Collectors.joining("")); } }

1 0

[collector/master] Use DescriptorBuilder more often.
by karsten＠torproject.org 20 Feb '18

20 Feb '18

commit 4e61bb792bc4cd4db9df6eb49ab88890b34ff489 Author: iwakeh <iwakeh(a)torproject.org> Date: Fri Oct 27 17:35:17 2017 +0000 Use DescriptorBuilder more often. Add convenience constructor accepting the first string as argument. --- .../torproject/collector/bridgedescs/DescriptorBuilder.java | 5 +++++ .../collector/bridgedescs/SanitizedBridgesWriter.java | 12 ++++++------ 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/src/main/java/org/torproject/collector/bridgedescs/DescriptorBuilder.java b/src/main/java/org/torproject/collector/bridgedescs/DescriptorBuilder.java index 9c47b5e..f530368 100644 --- a/src/main/java/org/torproject/collector/bridgedescs/DescriptorBuilder.java +++ b/src/main/java/org/torproject/collector/bridgedescs/DescriptorBuilder.java @@ -34,6 +34,11 @@ class DescriptorBuilder { this.parts.add(this.lastPart); } + public DescriptorBuilder(String firstString) { + this(); + this.append(firstString); + } + private void throwExceptionIfFinalized() { if (this.finalized) { throw new IllegalStateException("This DescriptorBuilder is finalized and" diff --git a/src/main/java/org/torproject/collector/bridgedescs/SanitizedBridgesWriter.java b/src/main/java/org/torproject/collector/bridgedescs/SanitizedBridgesWriter.java index 1d264a5..b4cd49e 100644 --- a/src/main/java/org/torproject/collector/bridgedescs/SanitizedBridgesWriter.java +++ b/src/main/java/org/torproject/collector/bridgedescs/SanitizedBridgesWriter.java @@ -461,7 +461,7 @@ public class SanitizedBridgesWriter extends CollecTorMain { } /* Parse the given network status line by line. */ - StringBuilder header = new StringBuilder(); + DescriptorBuilder header = new DescriptorBuilder(); boolean includesFingerprintLine = false; SortedMap<String, String> scrubbedLines = new TreeMap<>(); try { @@ -483,7 +483,7 @@ public class SanitizedBridgesWriter extends CollecTorMain { /* Additional header lines don't have to be cleaned up. */ } else if (line.startsWith("flag-thresholds ")) { - header.append(line + "\n"); + header.append(line).newLine(); /* The authority fingerprint in the "fingerprint" line can go in * unscrubbed. */ @@ -494,7 +494,7 @@ public class SanitizedBridgesWriter extends CollecTorMain { + "\"fingerprint\" line (\"" + line + "\")."); return; } - header.append(line + "\n"); + header.append(line).newLine(); includesFingerprintLine = true; /* r lines contain sensitive information that needs to be removed @@ -593,7 +593,7 @@ public class SanitizedBridgesWriter extends CollecTorMain { scrubbed = new StringBuilder(); } if (!includesFingerprintLine) { - header.append("fingerprint ").append(authorityFingerprint).append("\n"); + header.append("fingerprint ").append(authorityFingerprint).newLine(); } /* Check if we can tell from the descriptor publication times @@ -879,13 +879,13 @@ public class SanitizedBridgesWriter extends CollecTorMain { /* Replace node fingerprints in the family line with their hashes * and leave nicknames unchanged. */ } else if (line.startsWith("family ")) { - StringBuilder familyLine = new StringBuilder("family"); + DescriptorBuilder familyLine = new DescriptorBuilder("family"); for (String s : line.substring(7).split(" ")) { if (s.startsWith("$")) { familyLine.append(" $").append(DigestUtils.sha1Hex(Hex.decodeHex( s.substring(1).toCharArray())).toUpperCase()); } else { - familyLine.append(" ").append(s); + familyLine.space().append(s); } } scrubbed.append(familyLine.toString()).newLine();

1 0

[collector/master] Add hasContent method to make even more use of DescriptorBuilder.
by karsten＠torproject.org 20 Feb '18

20 Feb '18

commit 5b68aaf8aa7c5f3769544061344e75f7884e87ef Author: iwakeh <iwakeh(a)torproject.org> Date: Fri Oct 27 17:35:19 2017 +0000 Add hasContent method to make even more use of DescriptorBuilder. --- .../collector/bridgedescs/DescriptorBuilder.java | 4 +++ .../bridgedescs/SanitizedBridgesWriter.java | 42 +++++++++++----------- 2 files changed, 26 insertions(+), 20 deletions(-) diff --git a/src/main/java/org/torproject/collector/bridgedescs/DescriptorBuilder.java b/src/main/java/org/torproject/collector/bridgedescs/DescriptorBuilder.java index f530368..9d23adf 100644 --- a/src/main/java/org/torproject/collector/bridgedescs/DescriptorBuilder.java +++ b/src/main/java/org/torproject/collector/bridgedescs/DescriptorBuilder.java @@ -80,6 +80,10 @@ class DescriptorBuilder { return this; } + public boolean hasContent() { + return this.parts.size() > 1 || lastPart.length() > 0; + } + @Override public String toString() { if (!this.finalized) { diff --git a/src/main/java/org/torproject/collector/bridgedescs/SanitizedBridgesWriter.java b/src/main/java/org/torproject/collector/bridgedescs/SanitizedBridgesWriter.java index 22bf8f7..af54e03 100644 --- a/src/main/java/org/torproject/collector/bridgedescs/SanitizedBridgesWriter.java +++ b/src/main/java/org/torproject/collector/bridgedescs/SanitizedBridgesWriter.java @@ -462,7 +462,7 @@ public class SanitizedBridgesWriter extends CollecTorMain { boolean includesFingerprintLine = false; SortedMap<String, String> scrubbedLines = new TreeMap<>(); try { - StringBuilder scrubbed = new StringBuilder(); + DescriptorBuilder scrubbed = new DescriptorBuilder(); BufferedReader br = new BufferedReader(new StringReader(new String( data, "US-ASCII"))); String line = null; @@ -499,10 +499,10 @@ public class SanitizedBridgesWriter extends CollecTorMain { } else if (line.startsWith("r ")) { /* Clear buffer from previously scrubbed lines. */ - if (scrubbed.length() > 0) { + if (scrubbed.hasContent()) { String scrubbedLine = scrubbed.toString(); scrubbedLines.put(hashedBridgeIdentityHex, scrubbedLine); - scrubbed = new StringBuilder(); + scrubbed = new DescriptorBuilder(); } /* Parse the relevant parts of this r line. */ @@ -549,11 +549,13 @@ public class SanitizedBridgesWriter extends CollecTorMain { fingerprintBytes, descPublicationTime); String scrubbedDirPort = this.scrubTcpPort(dirPort, fingerprintBytes, descPublicationTime); - scrubbed.append("r " + nickname + " " - + hashedBridgeIdentityBase64 + " " - + hashedDescriptorIdentifier + " " + descPublicationTime - + " " + scrubbedAddress + " " + scrubbedOrPort + " " - + scrubbedDirPort + "\n"); + scrubbed.append("r ").append(nickname).space() + .append(hashedBridgeIdentityBase64).space() + .append(hashedDescriptorIdentifier).space() + .append(descPublicationTime).space() + .append(scrubbedAddress).space() + .append(scrubbedOrPort).space() + .append(scrubbedDirPort).newLine(); /* Sanitize any addresses in a lines using the fingerprint and * descriptor publication time from the previous r line. */ @@ -562,7 +564,7 @@ public class SanitizedBridgesWriter extends CollecTorMain { line.substring("a ".length()), fingerprintBytes, descPublicationTime); if (scrubbedOrAddress != null) { - scrubbed.append("a " + scrubbedOrAddress + "\n"); + scrubbed.append("a ").append(scrubbedOrAddress).newLine(); } else { logger.warn("Invalid address in line '{}' " + "in bridge network status. Skipping line!", line); @@ -572,7 +574,7 @@ public class SanitizedBridgesWriter extends CollecTorMain { } else if (line.startsWith("s ") || line.equals("s") || line.startsWith("w ") || line.equals("w") || line.startsWith("p ") || line.equals("p")) { - scrubbed.append(line + "\n"); + scrubbed.append(line).newLine(); /* There should be nothing else but r, a, w, p, and s lines in the * network status. If there is, we should probably learn before @@ -584,10 +586,10 @@ public class SanitizedBridgesWriter extends CollecTorMain { } } br.close(); - if (scrubbed.length() > 0) { + if (scrubbed.hasContent()) { String scrubbedLine = scrubbed.toString(); scrubbedLines.put(hashedBridgeIdentityHex, scrubbedLine); - scrubbed = new StringBuilder(); + scrubbed = new DescriptorBuilder(); } if (!includesFingerprintLine) { header.append("fingerprint ").append(authorityFingerprint).newLine(); @@ -1119,7 +1121,7 @@ public class SanitizedBridgesWriter extends CollecTorMain { BufferedReader br = new BufferedReader(new StringReader(new String( data, "US-ASCII"))); String line = null; - StringBuilder scrubbed = null; + DescriptorBuilder scrubbed = null; String hashedBridgeIdentity = null; String masterKeyEd25519 = null; while ((line = br.readLine()) != null) { @@ -1135,12 +1137,12 @@ public class SanitizedBridgesWriter extends CollecTorMain { } hashedBridgeIdentity = DigestUtils.sha1Hex(Hex.decodeHex( parts[2].toCharArray())).toLowerCase(); - scrubbed = new StringBuilder("extra-info " + parts[1] + " " - + hashedBridgeIdentity.toUpperCase() + "\n"); + scrubbed = new DescriptorBuilder("extra-info ").append(parts[1]) + .space().append(hashedBridgeIdentity.toUpperCase()).newLine(); /* Parse the publication time to determine the file name. */ } else if (line.startsWith("published ")) { - scrubbed.append(line + "\n"); + scrubbed.append(line).newLine(); published = line.substring("published ".length()); if (published.compareTo(maxExtraInfoDescriptorPublishedTime) > 0) { @@ -1155,7 +1157,7 @@ public class SanitizedBridgesWriter extends CollecTorMain { + "Skipping descriptor.", line); return; } - scrubbed.append("transport " + parts[1] + "\n"); + scrubbed.append("transport ").append(parts[1]).newLine(); /* Skip transport-info lines entirely. */ } else if (line.startsWith("transport-info ")) { @@ -1177,8 +1179,8 @@ public class SanitizedBridgesWriter extends CollecTorMain { DigestUtils.sha256(Base64.decodeBase64( masterKeyEd25519FromIdentityEd25519 + "="))) .replaceAll("=", ""); - scrubbed.append("master-key-ed25519 " + sha256MasterKeyEd25519 - + "\n"); + scrubbed.append("master-key-ed25519 ").append(sha256MasterKeyEd25519) + .newLine(); if (masterKeyEd25519 != null && !masterKeyEd25519.equals( masterKeyEd25519FromIdentityEd25519)) { logger.warn("Mismatch between identity-ed25519 and " @@ -1213,7 +1215,7 @@ public class SanitizedBridgesWriter extends CollecTorMain { || line.startsWith("exit-") || line.startsWith("hidserv-") || line.startsWith("padding-counts ")) { - scrubbed.append(line + "\n"); + scrubbed.append(line).newLine(); /* When we reach the signature, we're done. Write the sanitized * descriptor to disk below. */

1 0

[translation/exoneratorproperties_completed] Update translations for exoneratorproperties_completed
by translation＠torproject.org 20 Feb '18

20 Feb '18

commit efd262c6371f13de35a459313acb54b03e3e7f90 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Feb 20 16:21:14 2018 +0000 Update translations for exoneratorproperties_completed --- fr/exonerator.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fr/exonerator.properties b/fr/exonerator.properties index 9b3d6c459..f1a5a7615 100644 --- a/fr/exonerator.properties +++ b/fr/exonerator.properties @@ -33,7 +33,7 @@ summary.negative.body=Nous n’avons pas trouvé l’adresse IP %s, le %s ou à technicaldetails.heading=Détails techniques technicaldetails.pre=Recherche de l’adresse IP %s, le %s ou à un jour près. Des clients Tor pourraient avoir choisi ce ou ces relais Tor pour construire des circuits. technicaldetails.colheader.timestamp=Date et heure (UTC) -technicaldetails.colheader.ip=Adresse(s) IP +technicaldetails.colheader.ip=Adresses IP technicaldetails.colheader.fingerprint=Empreinte technicaldetails.colheader.nickname=Pseudonyme technicaldetails.colheader.exit=Relais de sortie

1 0

[translation/exoneratorproperties] Update translations for exoneratorproperties
by translation＠torproject.org 20 Feb '18

20 Feb '18

commit f6e4015934eddf1ea21f9511bcc26777b1a3987b Author: Translation commit bot <translation(a)torproject.org> Date: Tue Feb 20 16:21:08 2018 +0000 Update translations for exoneratorproperties --- fr/exonerator.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fr/exonerator.properties b/fr/exonerator.properties index 9b3d6c459..f1a5a7615 100644 --- a/fr/exonerator.properties +++ b/fr/exonerator.properties @@ -33,7 +33,7 @@ summary.negative.body=Nous n’avons pas trouvé l’adresse IP %s, le %s ou à technicaldetails.heading=Détails techniques technicaldetails.pre=Recherche de l’adresse IP %s, le %s ou à un jour près. Des clients Tor pourraient avoir choisi ce ou ces relais Tor pour construire des circuits. technicaldetails.colheader.timestamp=Date et heure (UTC) -technicaldetails.colheader.ip=Adresse(s) IP +technicaldetails.colheader.ip=Adresses IP technicaldetails.colheader.fingerprint=Empreinte technicaldetails.colheader.nickname=Pseudonyme technicaldetails.colheader.exit=Relais de sortie

1 0

[translation/tails-onioncircuits_completed] Update translations for tails-onioncircuits_completed
by translation＠torproject.org 20 Feb '18

20 Feb '18

commit a853e3a92020b38d19e1555a4ff625b72d7cd47b Author: Translation commit bot <translation(a)torproject.org> Date: Tue Feb 20 16:19:36 2018 +0000 Update translations for tails-onioncircuits_completed --- fr/onioncircuits.pot | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fr/onioncircuits.pot b/fr/onioncircuits.pot index 7cfd708f6..53b55afc0 100644 --- a/fr/onioncircuits.pot +++ b/fr/onioncircuits.pot @@ -13,7 +13,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2017-08-03 13:00+0000\n" -"PO-Revision-Date: 2018-02-13 21:26+0000\n" +"PO-Revision-Date: 2018-02-20 16:13+0000\n" "Last-Translator: French language coordinator <french.coordinator(a)rbox.me>\n" "Language-Team: French (http://www.transifex.com/otf/torproject/language/fr/)\n" "MIME-Version: 1.0\n"

1 0

[translation/tails-onioncircuits] Update translations for tails-onioncircuits
by translation＠torproject.org 20 Feb '18

20 Feb '18

commit be57c2893a07c0c3170373057dea886b05c16e29 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Feb 20 16:19:30 2018 +0000 Update translations for tails-onioncircuits --- fr/onioncircuits.pot | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fr/onioncircuits.pot b/fr/onioncircuits.pot index 7cfd708f6..53b55afc0 100644 --- a/fr/onioncircuits.pot +++ b/fr/onioncircuits.pot @@ -13,7 +13,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2017-08-03 13:00+0000\n" -"PO-Revision-Date: 2018-02-13 21:26+0000\n" +"PO-Revision-Date: 2018-02-20 16:13+0000\n" "Last-Translator: French language coordinator <french.coordinator(a)rbox.me>\n" "Language-Team: French (http://www.transifex.com/otf/torproject/language/fr/)\n" "MIME-Version: 1.0\n"

1 0

[translation/tails-openpgp-applet_completed] Update translations for tails-openpgp-applet_completed
by translation＠torproject.org 20 Feb '18

20 Feb '18

commit da186462e73a3b1d677d50badf39a259a597eb47 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Feb 20 16:19:15 2018 +0000 Update translations for tails-openpgp-applet_completed --- fr/openpgp-applet.pot | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fr/openpgp-applet.pot b/fr/openpgp-applet.pot index 9aed758e1..0eb921543 100644 --- a/fr/openpgp-applet.pot +++ b/fr/openpgp-applet.pot @@ -3,7 +3,7 @@ # This file is distributed under the same license as the OpenPGP_Applet package. # # Translators: -# French language coordinator <french.coordinator(a)rbox.me>, 2017 +# French language coordinator <french.coordinator(a)rbox.me>, 2017-2018 # French language coordinator <french.coordinator(a)rbox.me>, 2016 # Gwennole Hangard <gwennole.hangard(a)gmail.com>, 2015 # syl_, 2016 @@ -12,7 +12,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: tails(a)boum.org\n" "POT-Creation-Date: 2017-08-05 15:07-0400\n" -"PO-Revision-Date: 2018-01-19 19:43+0000\n" +"PO-Revision-Date: 2018-02-20 16:13+0000\n" "Last-Translator: French language coordinator <french.coordinator(a)rbox.me>\n" "Language-Team: French (http://www.transifex.com/otf/torproject/language/fr/)\n" "MIME-Version: 1.0\n"

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits February 2018