July 2016 - tor-commits - lists.torproject.org

[metrics-lib/master] Update CONTRIB.md.
by karsten＠torproject.org 06 Jul '16

06 Jul '16

commit 163442b786b7aeabe62714e91b1fdf0afeb05ddb Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Wed Jul 6 10:29:49 2016 +0200 Update CONTRIB.md. --- CONTRIB.md | 69 +++++++++++++++++++++++++++++++------------------------------- 1 file changed, 35 insertions(+), 34 deletions(-) diff --git a/CONTRIB.md b/CONTRIB.md index 93cba3b..3120193 100644 --- a/CONTRIB.md +++ b/CONTRIB.md @@ -95,18 +95,17 @@ Deprecating features -------------------- We have to assume that applications don't update their metrics-lib version -very often. This is related to the lack of a release process so far. If -we want to remove a feature we'll have to deprecate it and basically keep -it working for at least another year. +very often. This is related to the lack of a release process until +recently. If we want to remove a feature we'll have to deprecate it and +basically keep it working for at least another year. Change log ---------- -We didn't have a change log for a long time, but we should totally have -one if we want to put out releases. Here we're going to describe what -deserves a change log entry and whether those changes are major, medium, -or minor: +We're keeping a change log since we started putting out releases. Here +we're going to describe what deserves a change log entry and whether those +changes are major, medium, or minor: - Bug fixes obviously need a change log entry, but it depends on the bug whether it should be listed as major or medium change. @@ -142,21 +141,20 @@ or minor: Releases -------- -As mentioned before we didn't put out releases for far too long. But -we're about to change that. As a rule of thumb, we should put out a new -release of metrics-lib soon after making a major change as listed under -"Change log" above. If we're planning to make more changes soon after, -let's wait for them and make a release with everything. But we shouldn't -let a major change sit in an unreleased metrics-lib for more than, say, -two weeks. In contrast to that, medium changes can stay unreleased for -longer, though they don't have to if we want to use them in an application -sooner. Minor changes can be collected and usually will be released with -changes on higher stages, but when necessary they can be released earlier. - -Regarding version numbers, we'll start with 1.0.0 and bump to 1.0.1, -1.1.0, 1.2.0, etc. for each backwards-compatible change. When we remove a -previously deprecated feature, making a backwards-incompatible change, -we'll bump to 2.0.0. +As a rule of thumb, we should put out a new release of metrics-lib soon +after making a major change as listed under "Change log" above. If we're +planning to make more changes soon after, let's wait for them and make a +release with everything. But we shouldn't let a major change sit in an +unreleased metrics-lib for more than, say, two weeks. In contrast to +that, medium changes can stay unreleased for longer, though they don't +have to if we want to use them in an application sooner. Minor changes +can be collected and usually will be released with changes on higher +stages, but when necessary they can be released earlier. + +Regarding version numbers, we started with 1.0.0 and bumped to 1.1.0, +1.2.0, etc. which were all backwards-compatible changes. Whenever we'll +remove a previously deprecated feature, making a backwards-incompatible +change, we'll bump to 2.0.0. For minor changes, we'd bump to x.x.1. Releases are cryptographically signed on multiple levels: the Git tag created for the release is signed using GnuPG, the produced .jar files are @@ -207,18 +205,8 @@ release. Commit these changes. -Create a signed Git tag for the new release: - -``` -git tag -s descriptor-1.0.0 -m "DescripTor 1.0.0" -``` - -Push the branch. Ideally, verify the tag signature by cloning it on -another system and running the following command: - -``` -git verify-tag descriptor-1.0.0 -``` +Clean up the src/ and lib/ directories from any files that may have been +used locally for developing and that shouldn't be included in the tarball. Use Ant to first clean up and then create a tarball containing all sources and signed .jar files: @@ -237,6 +225,19 @@ gpg --detach-sign --armor --local-user 0x4EFD4FDC3F46D41E \ Verify the signed tarball, ideally on a different system, as described in `README.md`. +Create a signed Git tag for the new release: + +``` +git tag -s descriptor-1.0.0 -m "DescripTor 1.0.0" +``` + +Push the branch. Ideally, verify the tag signature by cloning it on +another system and running the following command: + +``` +git verify-tag descriptor-1.0.0 +``` + Upload the tarball and signature file and announce the new version. Edit `build.xml` again and raise `release.version` to the current release

1 0

[metrics-lib/master] Prepare for 1.3.0 release.
by karsten＠torproject.org 06 Jul '16

06 Jul '16

commit 9195a7c4a104fdc96ef873e9558e6b99681338e6 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Wed Jul 6 09:45:32 2016 +0200 Prepare for 1.3.0 release. --- CHANGELOG.md | 2 +- build.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9785681..d71b148 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,4 @@ -# Changes in version 1.3.0 - 2016-0x-xx +# Changes in version 1.3.0 - 2016-07-06 * Medium changes - Parse "package" lines in consensuses and votes. diff --git a/build.xml b/build.xml index ca880a1..4043d76 100644 --- a/build.xml +++ b/build.xml @@ -1,5 +1,5 @@ <project default="jar" name="descriptor" basedir="."> - <property name="release.version" value="1.2.0-dev" /> + <property name="release.version" value="1.3.0" /> <property name="sources" value="src/main/java"/> <property name="resources" value="src/main/resources"/> <property name="generated" value="generated/"/>

1 0

[metrics-lib/master] Checkstyle complaints reduced to three.
by karsten＠torproject.org 06 Jul '16

06 Jul '16

commit 72942181589bfe2118df316dc4850681213fad25 Author: iwakeh <iwakeh(a)torproject.org> Date: Wed Jul 6 18:14:46 2016 +0000 Checkstyle complaints reduced to three. --- .gitignore | 1 + .../descriptor/DescriptorParseException.java | 5 ++++ .../descriptor/DescriptorSourceFactory.java | 12 ++++------ .../ImplementationNotAccessibleException.java | 9 +++++-- .../descriptor/impl/BlockingIteratorImpl.java | 3 +++ .../descriptor/impl/BridgeNetworkStatusImpl.java | 10 ++++---- .../descriptor/impl/BridgePoolAssignmentImpl.java | 6 ++--- .../descriptor/impl/DescriptorCollectorImpl.java | 28 +++++++++++----------- .../torproject/descriptor/impl/DescriptorImpl.java | 6 ++--- .../descriptor/impl/DescriptorParseException.java | 5 ++++ .../descriptor/impl/DirSourceEntryImpl.java | 6 ++--- .../descriptor/impl/DirectoryDownloader.java | 6 ++--- .../impl/DirectoryKeyCertificateImpl.java | 6 ++--- .../descriptor/impl/DirectorySignatureImpl.java | 6 ++--- .../descriptor/impl/ExitListEntryImpl.java | 6 ++--- .../torproject/descriptor/impl/ExitListImpl.java | 10 ++++---- .../descriptor/impl/ExtraInfoDescriptorImpl.java | 6 ++--- .../descriptor/impl/MicrodescriptorImpl.java | 6 ++--- .../descriptor/impl/NetworkStatusEntryImpl.java | 12 +++++----- .../descriptor/impl/NetworkStatusImpl.java | 16 ++++++------- .../torproject/descriptor/impl/ParseHelper.java | 4 ++-- .../descriptor/impl/RelayDirectoryImpl.java | 14 +++++------ .../impl/RelayNetworkStatusConsensusImpl.java | 12 +++++----- .../descriptor/impl/RelayNetworkStatusImpl.java | 12 +++++----- .../impl/RelayNetworkStatusVoteImpl.java | 12 +++++----- .../descriptor/impl/ServerDescriptorImpl.java | 6 ++--- .../descriptor/impl/TorperfResultImpl.java | 6 ++--- 27 files changed, 123 insertions(+), 108 deletions(-) diff --git a/.gitignore b/.gitignore index ff410d7..bb59c26 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,5 @@ classes/ +generated/ lib/ descriptor-*.jar descriptor-*.tar.gz diff --git a/src/main/java/org/torproject/descriptor/DescriptorParseException.java b/src/main/java/org/torproject/descriptor/DescriptorParseException.java index 731db3e..65e774a 100644 --- a/src/main/java/org/torproject/descriptor/DescriptorParseException.java +++ b/src/main/java/org/torproject/descriptor/DescriptorParseException.java @@ -18,5 +18,10 @@ public class DescriptorParseException public DescriptorParseException(String message) { super(message); } + + public DescriptorParseException(String message, Exception ex) { + super(message, ex); + } + } diff --git a/src/main/java/org/torproject/descriptor/DescriptorSourceFactory.java b/src/main/java/org/torproject/descriptor/DescriptorSourceFactory.java index f51434f..9c78e5c 100644 --- a/src/main/java/org/torproject/descriptor/DescriptorSourceFactory.java +++ b/src/main/java/org/torproject/descriptor/DescriptorSourceFactory.java @@ -168,16 +168,14 @@ public final class DescriptorSourceFactory { case COLLECTOR_PROPERTY: clazzName = System.getProperty(type, COLLECTOR_DEFAULT); break; + default: + throw new ImplementationNotAccessibleException("Cannot " + + "retrieve class for type " + type + "."); } object = ClassLoader.getSystemClassLoader().loadClass(clazzName) .newInstance(); - } catch (ClassNotFoundException ex) { - throw new ImplementationNotAccessibleException("Cannot load class " - + clazzName + "for type " + type, ex); - } catch (InstantiationException ex) { - throw new ImplementationNotAccessibleException("Cannot load class " - + clazzName + "for type " + type, ex); - } catch (IllegalAccessException ex) { + } catch (ClassNotFoundException | InstantiationException + | IllegalAccessException ex) { throw new ImplementationNotAccessibleException("Cannot load class " + clazzName + "for type " + type, ex); } diff --git a/src/main/java/org/torproject/descriptor/ImplementationNotAccessibleException.java b/src/main/java/org/torproject/descriptor/ImplementationNotAccessibleException.java index c54e48f..1c7e937 100644 --- a/src/main/java/org/torproject/descriptor/ImplementationNotAccessibleException.java +++ b/src/main/java/org/torproject/descriptor/ImplementationNotAccessibleException.java @@ -14,9 +14,14 @@ package org.torproject.descriptor; public class ImplementationNotAccessibleException extends RuntimeException { - public ImplementationNotAccessibleException(String string, + public ImplementationNotAccessibleException(String message, Throwable ex) { - super(string, ex); + super(message, ex); } + + public ImplementationNotAccessibleException(String message) { + super(message); + } + } diff --git a/src/main/java/org/torproject/descriptor/impl/BlockingIteratorImpl.java b/src/main/java/org/torproject/descriptor/impl/BlockingIteratorImpl.java index 7ec395b..3e7fa86 100644 --- a/src/main/java/org/torproject/descriptor/impl/BlockingIteratorImpl.java +++ b/src/main/java/org/torproject/descriptor/impl/BlockingIteratorImpl.java @@ -39,6 +39,7 @@ public class BlockingIteratorImpl<T> implements Iterator<T> { try { wait(); } catch (InterruptedException e) { + /* nothing to be done */ } } this.queue.offer(object); @@ -66,6 +67,7 @@ public class BlockingIteratorImpl<T> implements Iterator<T> { try { wait(); } catch (InterruptedException e) { + /* nothing to be done */ } } return this.queue.peek() != null; @@ -81,6 +83,7 @@ public class BlockingIteratorImpl<T> implements Iterator<T> { try { wait(); } catch (InterruptedException e) { + /* nothing to be done */ } } if (this.queue.peek() == null) { diff --git a/src/main/java/org/torproject/descriptor/impl/BridgeNetworkStatusImpl.java b/src/main/java/org/torproject/descriptor/impl/BridgeNetworkStatusImpl.java index ab44452..6a56d44 100644 --- a/src/main/java/org/torproject/descriptor/impl/BridgeNetworkStatusImpl.java +++ b/src/main/java/org/torproject/descriptor/impl/BridgeNetworkStatusImpl.java @@ -45,6 +45,8 @@ public class BridgeNetworkStatusImpl extends NetworkStatusImpl this.publishedMillis = fileNameFormat.parse(publishedString) .getTime(); } catch (ParseException e) { + throw new DescriptorParseException("Cannot parse published time " + + "for status file name '" + fileName + "'.", e); } } if (this.publishedMillis == 0L) { @@ -69,9 +71,9 @@ public class BridgeNetworkStatusImpl extends NetworkStatusImpl this.enoughMtbfInfo = -1; this.ignoringAdvertisedBws = -1; - Scanner s = new Scanner(new String(headerBytes)).useDelimiter("\n"); - while (s.hasNext()) { - String line = s.next(); + Scanner scanner = new Scanner(new String(headerBytes)).useDelimiter("\n"); + while (scanner.hasNext()) { + String line = scanner.next(); String[] parts = line.split("[ \t]+"); String keyword = parts[0]; switch (keyword) { @@ -146,7 +148,7 @@ public class BridgeNetworkStatusImpl extends NetworkStatusImpl } } catch (NumberFormatException ex) { throw new DescriptorParseException("Illegal value in line '" - + line + "'."); + + line + "'.", ex); } } diff --git a/src/main/java/org/torproject/descriptor/impl/BridgePoolAssignmentImpl.java b/src/main/java/org/torproject/descriptor/impl/BridgePoolAssignmentImpl.java index 75451a2..c4f04cf 100644 --- a/src/main/java/org/torproject/descriptor/impl/BridgePoolAssignmentImpl.java +++ b/src/main/java/org/torproject/descriptor/impl/BridgePoolAssignmentImpl.java @@ -48,10 +48,10 @@ public class BridgePoolAssignmentImpl extends DescriptorImpl } private void parseDescriptorBytes() throws DescriptorParseException { - Scanner s = new Scanner(new String(this.rawDescriptorBytes)) + Scanner scanner = new Scanner(new String(this.rawDescriptorBytes)) .useDelimiter("\n"); - while (s.hasNext()) { - String line = s.next(); + while (scanner.hasNext()) { + String line = scanner.next(); if (line.startsWith("bridge-pool-assignment ")) { this.parseBridgePoolAssignmentLine(line); } else { diff --git a/src/main/java/org/torproject/descriptor/impl/DescriptorCollectorImpl.java b/src/main/java/org/torproject/descriptor/impl/DescriptorCollectorImpl.java index fb6aa2e..9aa3e62 100644 --- a/src/main/java/org/torproject/descriptor/impl/DescriptorCollectorImpl.java +++ b/src/main/java/org/torproject/descriptor/impl/DescriptorCollectorImpl.java @@ -111,12 +111,12 @@ public class DescriptorCollectorImpl implements DescriptorCollector { return fetchedDirectoryListings; } - String fetchRemoteDirectory(String url) { + String fetchRemoteDirectory(String urlString) { StringBuilder sb = new StringBuilder(); HttpURLConnection huc = null; try { - URL u = new URL(url); - huc = (HttpURLConnection) u.openConnection(); + URL url = new URL(urlString); + huc = (HttpURLConnection) url.openConnection(); huc.setRequestMethod("GET"); huc.connect(); int responseCode = huc.getResponseCode(); @@ -139,7 +139,7 @@ public class DescriptorCollectorImpl implements DescriptorCollector { return sb.toString(); } - final Pattern DIRECTORY_LISTING_LINE_PATTERN = + final Pattern directoryListingLinePattern = Pattern.compile(".* href=\"([^\"/]+)\"" /* filename */ + ".*>(\\d{2}-\\w{3}-\\d{4} \\d{2}:\\d{2})\\s*<.*"); /* dateTime */ @@ -149,11 +149,11 @@ public class DescriptorCollectorImpl implements DescriptorCollector { DateFormat dateTimeFormat = ParseHelper.getDateFormat( "dd-MMM-yyyy HH:mm"); try { - Scanner s = new Scanner(directoryListing); - s.useDelimiter("\n"); - while (s.hasNext()) { - String line = s.next(); - Matcher matcher = DIRECTORY_LISTING_LINE_PATTERN.matcher(line); + Scanner scanner = new Scanner(directoryListing); + scanner.useDelimiter("\n"); + while (scanner.hasNext()) { + String line = scanner.next(); + Matcher matcher = directoryListingLinePattern.matcher(line); if (matcher.matches()) { String filename = matcher.group(1); long lastModifiedMillis = dateTimeFormat.parse( @@ -161,7 +161,7 @@ public class DescriptorCollectorImpl implements DescriptorCollector { remoteFiles.put(remoteDirectory + filename, lastModifiedMillis); } } - s.close(); + scanner.close(); } catch (ParseException e) { e.printStackTrace(); return null; @@ -187,7 +187,7 @@ public class DescriptorCollectorImpl implements DescriptorCollector { } } - void fetchRemoteFile(String url, File destinationFile, + void fetchRemoteFile(String urlString, File destinationFile, long lastModifiedMillis) { HttpURLConnection huc = null; try { @@ -197,10 +197,10 @@ public class DescriptorCollectorImpl implements DescriptorCollector { + destinationFile.getName()); BufferedOutputStream bos = new BufferedOutputStream( new FileOutputStream(tempDestinationFile)); - URL u = new URL(url); - huc = (HttpURLConnection) u.openConnection(); + URL url = new URL(urlString); + huc = (HttpURLConnection) url.openConnection(); huc.setRequestMethod("GET"); - if (!url.endsWith(".xz")) { + if (!urlString.endsWith(".xz")) { huc.addRequestProperty("Accept-Encoding", "gzip"); } huc.connect(); diff --git a/src/main/java/org/torproject/descriptor/impl/DescriptorImpl.java b/src/main/java/org/torproject/descriptor/impl/DescriptorImpl.java index e16e1ee..718321a 100644 --- a/src/main/java/org/torproject/descriptor/impl/DescriptorImpl.java +++ b/src/main/java/org/torproject/descriptor/impl/DescriptorImpl.java @@ -235,9 +235,9 @@ public abstract class DescriptorImpl implements Descriptor { throw new DescriptorParseException("Blank lines are not allowed."); } boolean skipCrypto = false; - Scanner s = new Scanner(descriptorString).useDelimiter("\n"); - while (s.hasNext()) { - String line = s.next(); + Scanner scanner = new Scanner(descriptorString).useDelimiter("\n"); + while (scanner.hasNext()) { + String line = scanner.next(); if (line.startsWith("-----BEGIN")) { skipCrypto = true; } else if (line.startsWith("-----END")) { diff --git a/src/main/java/org/torproject/descriptor/impl/DescriptorParseException.java b/src/main/java/org/torproject/descriptor/impl/DescriptorParseException.java index 22959c9..0ac4d2c 100644 --- a/src/main/java/org/torproject/descriptor/impl/DescriptorParseException.java +++ b/src/main/java/org/torproject/descriptor/impl/DescriptorParseException.java @@ -14,5 +14,10 @@ package org.torproject.descriptor.impl; protected DescriptorParseException(String message) { super(message); } + + protected DescriptorParseException(String message, Exception ex) { + super(message, ex); + } + } diff --git a/src/main/java/org/torproject/descriptor/impl/DirSourceEntryImpl.java b/src/main/java/org/torproject/descriptor/impl/DirSourceEntryImpl.java index 2898f3d..f053a9d 100644 --- a/src/main/java/org/torproject/descriptor/impl/DirSourceEntryImpl.java +++ b/src/main/java/org/torproject/descriptor/impl/DirSourceEntryImpl.java @@ -83,11 +83,11 @@ public class DirSourceEntryImpl implements DirSourceEntry { private void parseDirSourceEntryBytes() throws DescriptorParseException { - Scanner s = new Scanner(new String(this.dirSourceEntryBytes)) + Scanner scanner = new Scanner(new String(this.dirSourceEntryBytes)) .useDelimiter("\n"); boolean skipCrypto = false; - while (s.hasNext()) { - String line = s.next(); + while (scanner.hasNext()) { + String line = scanner.next(); String[] parts = line.split(" "); switch (parts[0]) { case "dir-source": diff --git a/src/main/java/org/torproject/descriptor/impl/DirectoryDownloader.java b/src/main/java/org/torproject/descriptor/impl/DirectoryDownloader.java index 89cf721..5d7d4a9 100644 --- a/src/main/java/org/torproject/descriptor/impl/DirectoryDownloader.java +++ b/src/main/java/org/torproject/descriptor/impl/DirectoryDownloader.java @@ -63,13 +63,13 @@ public class DirectoryDownloader implements Runnable { DescriptorRequestImpl request = this.downloadCoordinator.createRequest(this.nickname); if (request != null) { - String url = "http://" + this.ipPort + String urlString = "http://" + this.ipPort + request.getRequestedResource(); request.setRequestStart(System.currentTimeMillis()); HttpURLConnection huc = null; try { - URL u = new URL(url); - huc = (HttpURLConnection) u.openConnection(); + URL url = new URL(urlString); + huc = (HttpURLConnection) url.openConnection(); huc.setConnectTimeout((int) this.connectTimeout); huc.setReadTimeout((int) this.readTimeout); huc.setRequestMethod("GET"); diff --git a/src/main/java/org/torproject/descriptor/impl/DirectoryKeyCertificateImpl.java b/src/main/java/org/torproject/descriptor/impl/DirectoryKeyCertificateImpl.java index 28bc65d..21a992d 100644 --- a/src/main/java/org/torproject/descriptor/impl/DirectoryKeyCertificateImpl.java +++ b/src/main/java/org/torproject/descriptor/impl/DirectoryKeyCertificateImpl.java @@ -59,12 +59,12 @@ public class DirectoryKeyCertificateImpl extends DescriptorImpl } private void parseDescriptorBytes() throws DescriptorParseException { - Scanner s = new Scanner(new String(this.rawDescriptorBytes)) + Scanner scanner = new Scanner(new String(this.rawDescriptorBytes)) .useDelimiter("\n"); String nextCrypto = ""; StringBuilder crypto = null; - while (s.hasNext()) { - String line = s.next(); + while (scanner.hasNext()) { + String line = scanner.next(); String[] parts = line.split("[ \t]+"); String keyword = parts[0]; switch (keyword) { diff --git a/src/main/java/org/torproject/descriptor/impl/DirectorySignatureImpl.java b/src/main/java/org/torproject/descriptor/impl/DirectorySignatureImpl.java index b2fa705..744bc51 100644 --- a/src/main/java/org/torproject/descriptor/impl/DirectorySignatureImpl.java +++ b/src/main/java/org/torproject/descriptor/impl/DirectorySignatureImpl.java @@ -35,11 +35,11 @@ public class DirectorySignatureImpl implements DirectorySignature { private void parseDirectorySignatureBytes() throws DescriptorParseException { - Scanner s = new Scanner(new String(this.directorySignatureBytes)) + Scanner scanner = new Scanner(new String(this.directorySignatureBytes)) .useDelimiter("\n"); StringBuilder crypto = null; - while (s.hasNext()) { - String line = s.next(); + while (scanner.hasNext()) { + String line = scanner.next(); String[] parts = line.split(" ", -1); String keyword = parts[0]; switch (keyword) { diff --git a/src/main/java/org/torproject/descriptor/impl/ExitListEntryImpl.java b/src/main/java/org/torproject/descriptor/impl/ExitListEntryImpl.java index 1f92afd..5e4bbd2 100644 --- a/src/main/java/org/torproject/descriptor/impl/ExitListEntryImpl.java +++ b/src/main/java/org/torproject/descriptor/impl/ExitListEntryImpl.java @@ -94,10 +94,10 @@ public class ExitListEntryImpl implements ExitListEntry, ExitList.Entry { private void parseExitListEntryBytes() throws DescriptorParseException { - Scanner s = new Scanner(new String(this.exitListEntryBytes)) + Scanner scanner = new Scanner(new String(this.exitListEntryBytes)) .useDelimiter(ExitList.EOL); - while (s.hasNext()) { - String line = s.next(); + while (scanner.hasNext()) { + String line = scanner.next(); String[] parts = line.split(" "); String keyword = parts[0]; switch (keyword) { diff --git a/src/main/java/org/torproject/descriptor/impl/ExitListImpl.java b/src/main/java/org/torproject/descriptor/impl/ExitListImpl.java index 6470130..9afee31 100644 --- a/src/main/java/org/torproject/descriptor/impl/ExitListImpl.java +++ b/src/main/java/org/torproject/descriptor/impl/ExitListImpl.java @@ -52,16 +52,16 @@ public class ExitListImpl extends DescriptorImpl implements ExitList { throw new DescriptorParseException("Descriptor is empty."); } String descriptorString = new String(rawDescriptorBytes); - Scanner s = new Scanner(descriptorString).useDelimiter(EOL); + Scanner scanner = new Scanner(descriptorString).useDelimiter(EOL); StringBuilder sb = new StringBuilder(); boolean firstEntry = true; - while (s.hasNext()) { - String line = s.next(); + while (scanner.hasNext()) { + String line = scanner.next(); if (line.startsWith("@")) { /* Skip annotation. */ - if (!s.hasNext()) { + if (!scanner.hasNext()) { throw new DescriptorParseException("Descriptor is empty."); } else { - line = s.next(); + line = scanner.next(); } } String[] parts = line.split(" "); diff --git a/src/main/java/org/torproject/descriptor/impl/ExtraInfoDescriptorImpl.java b/src/main/java/org/torproject/descriptor/impl/ExtraInfoDescriptorImpl.java index 586d385..154c86b 100644 --- a/src/main/java/org/torproject/descriptor/impl/ExtraInfoDescriptorImpl.java +++ b/src/main/java/org/torproject/descriptor/impl/ExtraInfoDescriptorImpl.java @@ -78,12 +78,12 @@ public abstract class ExtraInfoDescriptorImpl extends DescriptorImpl } private void parseDescriptorBytes() throws DescriptorParseException { - Scanner s = new Scanner(new String(this.rawDescriptorBytes)) + Scanner scanner = new Scanner(new String(this.rawDescriptorBytes)) .useDelimiter("\n"); String nextCrypto = ""; List<String> cryptoLines = null; - while (s.hasNext()) { - String line = s.next(); + while (scanner.hasNext()) { + String line = scanner.next(); String lineNoOpt = line.startsWith("opt ") ? line.substring("opt ".length()) : line; String[] partsNoOpt = lineNoOpt.split("[ \t]+"); diff --git a/src/main/java/org/torproject/descriptor/impl/MicrodescriptorImpl.java b/src/main/java/org/torproject/descriptor/impl/MicrodescriptorImpl.java index c1f607b..ab859a0 100644 --- a/src/main/java/org/torproject/descriptor/impl/MicrodescriptorImpl.java +++ b/src/main/java/org/torproject/descriptor/impl/MicrodescriptorImpl.java @@ -56,12 +56,12 @@ public class MicrodescriptorImpl extends DescriptorImpl } private void parseDescriptorBytes() throws DescriptorParseException { - Scanner s = new Scanner(new String(this.rawDescriptorBytes)) + Scanner scanner = new Scanner(new String(this.rawDescriptorBytes)) .useDelimiter("\n"); String nextCrypto = ""; StringBuilder crypto = null; - while (s.hasNext()) { - String line = s.next(); + while (scanner.hasNext()) { + String line = scanner.next(); if (line.startsWith("@")) { continue; } diff --git a/src/main/java/org/torproject/descriptor/impl/NetworkStatusEntryImpl.java b/src/main/java/org/torproject/descriptor/impl/NetworkStatusEntryImpl.java index b21bb60..807dd76 100644 --- a/src/main/java/org/torproject/descriptor/impl/NetworkStatusEntryImpl.java +++ b/src/main/java/org/torproject/descriptor/impl/NetworkStatusEntryImpl.java @@ -71,17 +71,17 @@ public class NetworkStatusEntryImpl implements NetworkStatusEntry { } private void parseStatusEntryBytes() throws DescriptorParseException { - Scanner s = new Scanner(new String(this.statusEntryBytes)) + Scanner scanner = new Scanner(new String(this.statusEntryBytes)) .useDelimiter("\n"); String line = null; - if (!s.hasNext() || !(line = s.next()).startsWith("r ")) { + if (!scanner.hasNext() || !(line = scanner.next()).startsWith("r ")) { throw new DescriptorParseException("Status entry must start with " + "an r line."); } - String[] rLineParts = line.split("[ \t]+"); - this.parseRLine(line, rLineParts); - while (s.hasNext()) { - line = s.next(); + String[] rlineParts = line.split("[ \t]+"); + this.parseRLine(line, rlineParts); + while (scanner.hasNext()) { + line = scanner.next(); String[] parts = !line.startsWith("opt ") ? line.split("[ \t]+") : line.substring("opt ".length()).split("[ \t]+"); String keyword = parts[0]; diff --git a/src/main/java/org/torproject/descriptor/impl/NetworkStatusImpl.java b/src/main/java/org/torproject/descriptor/impl/NetworkStatusImpl.java index c458961..b6c274d 100644 --- a/src/main/java/org/torproject/descriptor/impl/NetworkStatusImpl.java +++ b/src/main/java/org/torproject/descriptor/impl/NetworkStatusImpl.java @@ -34,30 +34,28 @@ public abstract class NetworkStatusImpl extends DescriptorImpl { throw new DescriptorParseException("Descriptor is empty."); } String descriptorString = new String(rawDescriptorBytes); - int startIndex = 0; - int firstDirSourceIndex = !containsDirSourceEntries ? -1 - : this.findFirstIndexOfKeyword(descriptorString, "dir-source"); int firstRIndex = this.findFirstIndexOfKeyword(descriptorString, "r"); - int directoryFooterIndex = this.findFirstIndexOfKeyword( - descriptorString, "directory-footer"); + int endIndex = descriptorString.length(); int firstDirectorySignatureIndex = this.findFirstIndexOfKeyword( descriptorString, "directory-signature"); - int endIndex = descriptorString.length(); if (firstDirectorySignatureIndex < 0) { firstDirectorySignatureIndex = endIndex; } + int directoryFooterIndex = this.findFirstIndexOfKeyword( + descriptorString, "directory-footer"); if (directoryFooterIndex < 0) { directoryFooterIndex = firstDirectorySignatureIndex; } if (firstRIndex < 0) { firstRIndex = directoryFooterIndex; } + int firstDirSourceIndex = !containsDirSourceEntries ? -1 + : this.findFirstIndexOfKeyword(descriptorString, "dir-source"); if (firstDirSourceIndex < 0) { firstDirSourceIndex = firstRIndex; } - if (firstDirSourceIndex > startIndex) { - this.parseHeaderBytes(descriptorString, startIndex, - firstDirSourceIndex); + if (firstDirSourceIndex > 0) { + this.parseHeaderBytes(descriptorString, 0, firstDirSourceIndex); } if (firstRIndex > firstDirSourceIndex) { this.parseDirSourceBytes(descriptorString, firstDirSourceIndex, diff --git a/src/main/java/org/torproject/descriptor/impl/ParseHelper.java b/src/main/java/org/torproject/descriptor/impl/ParseHelper.java index fb57e93..86d53a1 100644 --- a/src/main/java/org/torproject/descriptor/impl/ParseHelper.java +++ b/src/main/java/org/torproject/descriptor/impl/ParseHelper.java @@ -285,9 +285,9 @@ public class ParseHelper { return nickname; } - protected static boolean parseBoolean(String b, String line) + protected static boolean parseBoolean(String boolString, String line) throws DescriptorParseException { - switch (b) { + switch (boolString) { case "1": return true; case "0": diff --git a/src/main/java/org/torproject/descriptor/impl/RelayDirectoryImpl.java b/src/main/java/org/torproject/descriptor/impl/RelayDirectoryImpl.java index 69709ad..4f29a90 100644 --- a/src/main/java/org/torproject/descriptor/impl/RelayDirectoryImpl.java +++ b/src/main/java/org/torproject/descriptor/impl/RelayDirectoryImpl.java @@ -20,8 +20,6 @@ import java.util.Set; import javax.xml.bind.DatatypeConverter; -/* TODO Write unit tests. */ - public class RelayDirectoryImpl extends DescriptorImpl implements RelayDirectory { @@ -189,14 +187,14 @@ public class RelayDirectoryImpl extends DescriptorImpl private void parseHeader(byte[] headerBytes) throws DescriptorParseException { - Scanner s = new Scanner(new String(headerBytes)).useDelimiter("\n"); + Scanner scanner = new Scanner(new String(headerBytes)).useDelimiter("\n"); String publishedLine = null; String nextCrypto = ""; String runningRoutersLine = null; String routerStatusLine = null; StringBuilder crypto = null; - while (s.hasNext()) { - String line = s.next(); + while (scanner.hasNext()) { + String line = scanner.next(); if (line.isEmpty() || line.startsWith("@")) { continue; } @@ -309,12 +307,12 @@ public class RelayDirectoryImpl extends DescriptorImpl private void parseDirectorySignature(byte[] directorySignatureBytes) throws DescriptorParseException { - Scanner s = new Scanner(new String(directorySignatureBytes)) + Scanner scanner = new Scanner(new String(directorySignatureBytes)) .useDelimiter("\n"); String nextCrypto = ""; StringBuilder crypto = null; - while (s.hasNext()) { - String line = s.next(); + while (scanner.hasNext()) { + String line = scanner.next(); String lineNoOpt = line.startsWith("opt ") ? line.substring("opt ".length()) : line; String[] partsNoOpt = lineNoOpt.split("[ \t]+"); diff --git a/src/main/java/org/torproject/descriptor/impl/RelayNetworkStatusConsensusImpl.java b/src/main/java/org/torproject/descriptor/impl/RelayNetworkStatusConsensusImpl.java index 87971a4..66ab776 100644 --- a/src/main/java/org/torproject/descriptor/impl/RelayNetworkStatusConsensusImpl.java +++ b/src/main/java/org/torproject/descriptor/impl/RelayNetworkStatusConsensusImpl.java @@ -91,9 +91,9 @@ public class RelayNetworkStatusConsensusImpl extends NetworkStatusImpl protected void parseHeader(byte[] headerBytes) throws DescriptorParseException { - Scanner s = new Scanner(new String(headerBytes)).useDelimiter("\n"); - while (s.hasNext()) { - String line = s.next(); + Scanner scanner = new Scanner(new String(headerBytes)).useDelimiter("\n"); + while (scanner.hasNext()) { + String line = scanner.next(); String[] parts = line.split("[ \t]+"); String keyword = parts[0]; switch (keyword) { @@ -167,9 +167,9 @@ public class RelayNetworkStatusConsensusImpl extends NetworkStatusImpl protected void parseFooter(byte[] footerBytes) throws DescriptorParseException { - Scanner s = new Scanner(new String(footerBytes)).useDelimiter("\n"); - while (s.hasNext()) { - String line = s.next(); + Scanner scanner = new Scanner(new String(footerBytes)).useDelimiter("\n"); + while (scanner.hasNext()) { + String line = scanner.next(); String[] parts = line.split("[ \t]+"); String keyword = parts[0]; switch (keyword) { diff --git a/src/main/java/org/torproject/descriptor/impl/RelayNetworkStatusImpl.java b/src/main/java/org/torproject/descriptor/impl/RelayNetworkStatusImpl.java index 1807b33..308c1b2 100644 --- a/src/main/java/org/torproject/descriptor/impl/RelayNetworkStatusImpl.java +++ b/src/main/java/org/torproject/descriptor/impl/RelayNetworkStatusImpl.java @@ -86,11 +86,11 @@ public class RelayNetworkStatusImpl extends NetworkStatusImpl protected void parseHeader(byte[] headerBytes) throws DescriptorParseException { - Scanner s = new Scanner(new String(headerBytes)).useDelimiter("\n"); + Scanner scanner = new Scanner(new String(headerBytes)).useDelimiter("\n"); String nextCrypto = ""; StringBuilder crypto = null; - while (s.hasNext()) { - String line = s.next(); + while (scanner.hasNext()) { + String line = scanner.next(); if (line.isEmpty()) { continue; } @@ -165,12 +165,12 @@ public class RelayNetworkStatusImpl extends NetworkStatusImpl protected void parseDirectorySignature(byte[] directorySignatureBytes) throws DescriptorParseException { - Scanner s = new Scanner(new String(directorySignatureBytes)) + Scanner scanner = new Scanner(new String(directorySignatureBytes)) .useDelimiter("\n"); String nextCrypto = ""; StringBuilder crypto = null; - while (s.hasNext()) { - String line = s.next(); + while (scanner.hasNext()) { + String line = scanner.next(); String[] parts = line.split("[ \t]+"); String keyword = parts[0]; switch (keyword) { diff --git a/src/main/java/org/torproject/descriptor/impl/RelayNetworkStatusVoteImpl.java b/src/main/java/org/torproject/descriptor/impl/RelayNetworkStatusVoteImpl.java index 8735017..2bf8e88 100644 --- a/src/main/java/org/torproject/descriptor/impl/RelayNetworkStatusVoteImpl.java +++ b/src/main/java/org/torproject/descriptor/impl/RelayNetworkStatusVoteImpl.java @@ -79,11 +79,11 @@ public class RelayNetworkStatusVoteImpl extends NetworkStatusImpl this.enoughMtbfInfo = -1; this.ignoringAdvertisedBws = -1; - Scanner s = new Scanner(new String(headerBytes)).useDelimiter("\n"); + Scanner scanner = new Scanner(new String(headerBytes)).useDelimiter("\n"); String nextCrypto = ""; StringBuilder crypto = null; - while (s.hasNext()) { - String line = s.next(); + while (scanner.hasNext()) { + String line = scanner.next(); String[] parts = line.split("[ \t]+"); String keyword = parts[0]; switch (keyword) { @@ -500,9 +500,9 @@ public class RelayNetworkStatusVoteImpl extends NetworkStatusImpl protected void parseFooter(byte[] footerBytes) throws DescriptorParseException { - Scanner s = new Scanner(new String(footerBytes)).useDelimiter("\n"); - while (s.hasNext()) { - String line = s.next(); + Scanner scanner = new Scanner(new String(footerBytes)).useDelimiter("\n"); + while (scanner.hasNext()) { + String line = scanner.next(); if (!line.equals("directory-footer")) { if (this.failUnrecognizedDescriptorLines) { throw new DescriptorParseException("Unrecognized line '" diff --git a/src/main/java/org/torproject/descriptor/impl/ServerDescriptorImpl.java b/src/main/java/org/torproject/descriptor/impl/ServerDescriptorImpl.java index c75d5a0..08b9271 100644 --- a/src/main/java/org/torproject/descriptor/impl/ServerDescriptorImpl.java +++ b/src/main/java/org/torproject/descriptor/impl/ServerDescriptorImpl.java @@ -54,12 +54,12 @@ public abstract class ServerDescriptorImpl extends DescriptorImpl } private void parseDescriptorBytes() throws DescriptorParseException { - Scanner s = new Scanner(new String(this.rawDescriptorBytes)) + Scanner scanner = new Scanner(new String(this.rawDescriptorBytes)) .useDelimiter("\n"); String nextCrypto = ""; List<String> cryptoLines = null; - while (s.hasNext()) { - String line = s.next(); + while (scanner.hasNext()) { + String line = scanner.next(); if (line.startsWith("@")) { continue; } diff --git a/src/main/java/org/torproject/descriptor/impl/TorperfResultImpl.java b/src/main/java/org/torproject/descriptor/impl/TorperfResultImpl.java index 71c762f..33ca328 100644 --- a/src/main/java/org/torproject/descriptor/impl/TorperfResultImpl.java +++ b/src/main/java/org/torproject/descriptor/impl/TorperfResultImpl.java @@ -27,10 +27,10 @@ public class TorperfResultImpl extends DescriptorImpl } List<Descriptor> parsedDescriptors = new ArrayList<>(); String descriptorString = new String(rawDescriptorBytes); - Scanner s = new Scanner(descriptorString).useDelimiter("\r?\n"); + Scanner scanner = new Scanner(descriptorString).useDelimiter("\r?\n"); String typeAnnotation = ""; - while (s.hasNext()) { - String line = s.next(); + while (scanner.hasNext()) { + String line = scanner.next(); if (line.startsWith("@type torperf ")) { String[] parts = line.split(" "); if (parts.length != 3) {

1 0

[depictor/vote-tracking] Accidently was getting the javascript externally
by tom＠torproject.org 06 Jul '16

06 Jul '16

commit 8883e81e437200d08a4cc6b4994551a001fd059c Author: Tom Ritter <tom(a)ritter.vg> Date: Wed Jul 6 13:12:54 2016 -0500 Accidently was getting the javascript externally --- graphs.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/graphs.py b/graphs.py index e36ca45..176ec27 100755 --- a/graphs.py +++ b/graphs.py @@ -42,7 +42,7 @@ class GraphWriter(WebsiteWriter): + " <meta http-equiv=\"content-type\" content=\"text/html; charset=ISO-8859-1\">\n" + " <link href=\"stylesheet-ltr.css\" type=\"text/css\" rel=\"stylesheet\">\n" + " <link href=\"favicon.ico\" type=\"image/x-icon\" rel=\"shortcut icon\">\n" - + " <script src=\"https://d3js.org/d3.v4.min.js\"></script>\n" + + " <script src=\"d3.v4.min.js\"></script>\n" + " </head>\n" + " <body>\n" + " <style>\n"

1 0

[tor/master] test coverage on onion_fast: 0%->100%
by nickm＠torproject.org 06 Jul '16

06 Jul '16

commit acba4cc9546f66be95353e37fc22b81d0dc91732 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jul 6 13:43:12 2016 -0400 test coverage on onion_fast: 0%->100% --- src/or/onion_fast.c | 8 +++++--- src/test/test.c | 38 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 43 insertions(+), 3 deletions(-) diff --git a/src/or/onion_fast.c b/src/or/onion_fast.c index 1f79860..6b5d12e 100644 --- a/src/or/onion_fast.c +++ b/src/or/onion_fast.c @@ -59,8 +59,8 @@ fast_server_handshake(const uint8_t *key_in, /* DIGEST_LEN bytes */ memcpy(tmp+DIGEST_LEN, handshake_reply_out, DIGEST_LEN); out_len = key_out_len+DIGEST_LEN; out = tor_malloc(out_len); - if (crypto_expand_key_material_TAP(tmp, sizeof(tmp), out, out_len)) { - goto done; + if (BUG(crypto_expand_key_material_TAP(tmp, sizeof(tmp), out, out_len))) { + goto done; // LCOV_EXCL_LINE } memcpy(handshake_reply_out+DIGEST_LEN, out, DIGEST_LEN); memcpy(key_out, out+DIGEST_LEN, key_out_len); @@ -100,10 +100,12 @@ fast_client_handshake(const fast_handshake_state_t *handshake_state, memcpy(tmp+DIGEST_LEN, handshake_reply_out, DIGEST_LEN); out_len = key_out_len+DIGEST_LEN; out = tor_malloc(out_len); - if (crypto_expand_key_material_TAP(tmp, sizeof(tmp), out, out_len)) { + if (BUG(crypto_expand_key_material_TAP(tmp, sizeof(tmp), out, out_len))) { + /* LCOV_EXCL_START */ if (msg_out) *msg_out = "Failed to expand key material"; goto done; + /* LCOV_EXCL_STOP */ } if (tor_memneq(out, handshake_reply_out+DIGEST_LEN, DIGEST_LEN)) { /* H(K) does *not* match. Something fishy. */ diff --git a/src/test/test.c b/src/test/test.c index 2f18346..f861016 100644 --- a/src/test/test.c +++ b/src/test/test.c @@ -55,6 +55,7 @@ double fabs(double x); #include "memarea.h" #include "onion.h" #include "onion_ntor.h" +#include "onion_fast.h" #include "onion_tap.h" #include "policies.h" #include "rephist.h" @@ -266,6 +267,42 @@ test_ntor_handshake(void *arg) dimap_free(s_keymap, NULL); } +static void +test_fast_handshake(void *arg) +{ + /* tests for the obsolete "CREATE_FAST" handshake. */ + (void) arg; + fast_handshake_state_t *state = NULL; + uint8_t client_handshake[CREATE_FAST_LEN]; + uint8_t server_handshake[CREATED_FAST_LEN]; + uint8_t s_keys[100], c_keys[100]; + + /* First, test an entire handshake. */ + memset(client_handshake, 0, sizeof(client_handshake)); + tt_int_op(0, OP_EQ, fast_onionskin_create(&state, client_handshake)); + tt_assert(! tor_mem_is_zero((char*)client_handshake, + sizeof(client_handshake))); + + tt_int_op(0, OP_EQ, + fast_server_handshake(client_handshake, server_handshake, + s_keys, 100)); + const char *msg = NULL; + tt_int_op(0, OP_EQ, + fast_client_handshake(state, server_handshake, c_keys, 100, &msg)); + tt_ptr_op(msg, OP_EQ, NULL); + tt_mem_op(s_keys, OP_EQ, c_keys, 100); + + /* Now test a failing handshake. */ + server_handshake[0] ^= 3; + tt_int_op(-1, OP_EQ, + fast_client_handshake(state, server_handshake, c_keys, 100, &msg)); + tt_str_op(msg, OP_EQ, "Digest DOES NOT MATCH on fast handshake. " + "Bug or attack."); + + done: + fast_handshake_state_free(state); +} + /** Run unit tests for the onion queues. */ static void test_onion_queues(void *arg) @@ -1130,6 +1167,7 @@ static struct testcase_t test_array[] = { { "bad_onion_handshake", test_bad_onion_handshake, 0, NULL, NULL }, ENT(onion_queues), { "ntor_handshake", test_ntor_handshake, 0, NULL, NULL }, + { "fast_handshake", test_fast_handshake, 0, NULL, NULL }, FORK(circuit_timeout), FORK(rend_fns), ENT(geoip),

1 0

[tor/master] When saving mocked log messages, always create the list.
by nickm＠torproject.org 06 Jul '16

06 Jul '16

commit 96d32f02f2f9d37454665325237cdc2adf7ee2d8 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jul 6 12:59:43 2016 -0400 When saving mocked log messages, always create the list. Otherwise, our code needs to check "list && smarlist_len(list)..." --- src/test/log_test_helpers.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/test/log_test_helpers.c b/src/test/log_test_helpers.c index 3bb36ac..166a777 100644 --- a/src/test/log_test_helpers.c +++ b/src/test/log_test_helpers.c @@ -12,6 +12,7 @@ setup_capture_of_logs(int new_level) int previous_log = log_global_min_severity_; log_global_min_severity_ = new_level; mock_clean_saved_logs(); + saved_logs = smartlist_new(); MOCK(logv, mock_saving_logv); return previous_log; }

1 0

[tor/master] Capture the LOG_ERR messages in our tests that had logged errors.
by nickm＠torproject.org 06 Jul '16

06 Jul '16

commit 08cc0ef8320e614c1a33ea5e70bef4f5809981f2 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jul 6 13:01:08 2016 -0400 Capture the LOG_ERR messages in our tests that had logged errors. (It's confusing for the test to write an expected error to stdout, and then tell the user "OK".) --- src/test/test_address.c | 6 +++++- src/test/test_util.c | 9 +++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/src/test/test_address.c b/src/test/test_address.c index 3e5af56..d621ee5 100644 --- a/src/test/test_address.c +++ b/src/test/test_address.c @@ -26,6 +26,7 @@ #include "or.h" #include "address.h" #include "test.h" +#include "log_test_helpers.h" /** Return 1 iff <b>sockaddr1</b> and <b>sockaddr2</b> represent * the same IP address and port combination. Otherwise, return 0. @@ -822,7 +823,10 @@ test_address_get_if_addrs6_list_no_internal(void *arg) (void)arg; + int prev_level = setup_capture_of_logs(LOG_ERR); /* We might drop a log_err */ results = get_interface_address6_list(LOG_ERR, AF_INET6, 0); + tt_int_op(smartlist_len(mock_saved_logs()), OP_LE, 1); + teardown_capture_of_logs(prev_level); tt_assert(results != NULL); /* Work even on systems without IPv6 interfaces */ @@ -1110,7 +1114,7 @@ struct testcase_t address_tests[] = { ADDRESS_TEST(get_if_addrs_list_internal, 0), ADDRESS_TEST(get_if_addrs_list_no_internal, 0), ADDRESS_TEST(get_if_addrs6_list_internal, 0), - ADDRESS_TEST(get_if_addrs6_list_no_internal, 0), + ADDRESS_TEST(get_if_addrs6_list_no_internal, TT_FORK), ADDRESS_TEST(get_if_addrs_internal_fail, 0), ADDRESS_TEST(get_if_addrs_no_internal_fail, 0), ADDRESS_TEST(get_if_addrs, 0), diff --git a/src/test/test_util.c b/src/test/test_util.c index c331a66..19763fb 100644 --- a/src/test/test_util.c +++ b/src/test/test_util.c @@ -13,6 +13,7 @@ #include "test.h" #include "memarea.h" #include "util_process.h" +#include "log_test_helpers.h" #ifdef HAVE_PWD_H #include <pwd.h> @@ -5187,6 +5188,7 @@ test_util_pwdb(void *arg) const struct passwd *me = NULL, *me2, *me3; char *name = NULL; char *dir = NULL; + int prev_level = -100; /* Uncached case. */ /* Let's assume that we exist. */ @@ -5225,8 +5227,13 @@ test_util_pwdb(void *arg) } tt_assert(found); tor_free(dir); + + prev_level = setup_capture_of_logs(LOG_ERR); /* We should do a LOG_ERR */ dir = get_user_homedir(badname); tt_assert(dir == NULL); + tt_int_op(smartlist_len(mock_saved_logs()), OP_EQ, 1); + teardown_capture_of_logs(prev_level); + prev_level = -100; /* Now try to find a user that doesn't exist by ID. */ found = 0; @@ -5243,6 +5250,8 @@ test_util_pwdb(void *arg) done: tor_free(name); tor_free(dir); + if (prev_level >= 0) + teardown_capture_of_logs(prev_level); } #endif

1 0

[tor/master] Improve test coverage a little on onion*.c
by nickm＠torproject.org 06 Jul '16

06 Jul '16

commit ae22c249c3423acfb7938a36c2c8c5b2cac7fb29 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jul 6 12:37:52 2016 -0400 Improve test coverage a little on onion*.c --- src/or/onion.c | 15 +++++++++++++++ src/or/onion_ntor.c | 5 +++++ src/or/onion_tap.c | 12 ++++++++++++ src/test/test.c | 21 ++++++++++++++++++--- 4 files changed, 50 insertions(+), 3 deletions(-) diff --git a/src/or/onion.c b/src/or/onion.c index 7c7f97f..5495074 100644 --- a/src/or/onion.c +++ b/src/or/onion.c @@ -130,9 +130,12 @@ onion_pending_add(or_circuit_t *circ, create_cell_t *onionskin) time_t now = time(NULL); if (onionskin->handshake_type > MAX_ONION_HANDSHAKE_TYPE) { + /* LCOV_EXCL_START + * We should have rejected this far before this point */ log_warn(LD_BUG, "Handshake %d out of range! Dropping.", onionskin->handshake_type); return -1; + /* LCOV_EXCL_STOP */ } tmp = tor_malloc_zero(sizeof(onion_queue_t)); @@ -305,10 +308,13 @@ static void onion_queue_entry_remove(onion_queue_t *victim) { if (victim->handshake_type > MAX_ONION_HANDSHAKE_TYPE) { + /* LCOV_EXCL_START + * We should have rejected this far before this point */ log_warn(LD_BUG, "Handshake %d out of range! Dropping.", victim->handshake_type); /* XXX leaks */ return; + /* LCOV_EXCL_STOP */ } TOR_TAILQ_REMOVE(&ol_list[victim->handshake_type], victim, next); @@ -391,9 +397,12 @@ onion_handshake_state_release(onion_handshake_state_t *state) state->u.ntor = NULL; break; default: + /* LCOV_EXCL_START + * This state should not even exist. */ log_warn(LD_BUG, "called with unknown handshake state type %d", (int)state->tag); tor_fragile_assert(); + /* LCOV_EXCL_STOP */ } } @@ -441,9 +450,12 @@ onion_skin_create(int type, r = NTOR_ONIONSKIN_LEN; break; default: + /* LCOV_EXCL_START + * We should never try to create an impossible handshake type. */ log_warn(LD_BUG, "called with unknown handshake state type %d", type); tor_fragile_assert(); r = -1; + /* LCOV_EXCL_STOP */ } if (r > 0) @@ -512,9 +524,12 @@ onion_skin_server_handshake(int type, } break; default: + /* LCOV_EXCL_START + * We should have rejected this far before this point */ log_warn(LD_BUG, "called with unknown handshake state type %d", type); tor_fragile_assert(); return -1; + /* LCOV_EXCL_STOP */ } return r; diff --git a/src/or/onion_ntor.c b/src/or/onion_ntor.c index 33afc27..d1a268f 100644 --- a/src/or/onion_ntor.c +++ b/src/or/onion_ntor.c @@ -85,8 +85,13 @@ onion_skin_ntor_create(const uint8_t *router_id, memcpy(state->router_id, router_id, DIGEST_LEN); memcpy(&state->pubkey_B, router_key, sizeof(curve25519_public_key_t)); if (curve25519_secret_key_generate(&state->seckey_x, 0) < 0) { + /* LCOV_EXCL_START + * Secret key generation should be unable to fail when the key isn't + * marked as "extra-strong" */ + tor_assert_nonfatal_unreached(); tor_free(state); return -1; + /* LCOV_EXCL_STOP */ } curve25519_public_key_generate(&state->pubkey_X, &state->seckey_x); diff --git a/src/or/onion_tap.c b/src/or/onion_tap.c index bfd4723..abe7793 100644 --- a/src/or/onion_tap.c +++ b/src/or/onion_tap.c @@ -74,9 +74,13 @@ onion_skin_TAP_create(crypto_pk_t *dest_router_key, return 0; err: + /* LCOV_EXCL_START + * We only get here if RSA encryption fails or DH keygen fails. Those + * shouldn't be possible. */ memwipe(challenge, 0, sizeof(challenge)); if (dh) crypto_dh_free(dh); return -1; + /* LCOV_EXCL_STOP */ } /** Given an encrypted DH public key as generated by onion_skin_create, @@ -130,12 +134,20 @@ onion_skin_TAP_server_handshake( dh = crypto_dh_new(DH_TYPE_CIRCUIT); if (!dh) { + /* LCOV_EXCL_START + * Failure to allocate a DH key should be impossible. + */ log_warn(LD_BUG, "Couldn't allocate DH key"); goto err; + /* LCOV_EXCL_STOP */ } if (crypto_dh_get_public(dh, handshake_reply_out, DH_KEY_LEN)) { + /* LCOV_EXCL_START + * This can only fail if the length of the key we just allocated is too + * big. That should be impossible. */ log_info(LD_GENERAL, "crypto_dh_get_public failed."); goto err; + /* LCOV_EXCP_STOP */ } key_material_len = DIGEST_LEN+key_out_len; diff --git a/src/test/test.c b/src/test/test.c index 3a1054d..2f18346 100644 --- a/src/test/test.c +++ b/src/test/test.c @@ -178,20 +178,26 @@ test_bad_onion_handshake(void *arg) s_buf, s_keys, 40)); /* Client: Case 1: The server sent back junk. */ + const char *msg = NULL; s_buf[64] ^= 33; tt_int_op(-1, OP_EQ, - onion_skin_TAP_client_handshake(c_dh, s_buf, c_keys, 40, NULL)); + onion_skin_TAP_client_handshake(c_dh, s_buf, c_keys, 40, &msg)); s_buf[64] ^= 33; + tt_str_op(msg, OP_EQ, "Digest DOES NOT MATCH on onion handshake. " + "Bug or attack."); /* Let the client finish; make sure it can. */ + msg = NULL; tt_int_op(0, OP_EQ, - onion_skin_TAP_client_handshake(c_dh, s_buf, c_keys, 40, NULL)); + onion_skin_TAP_client_handshake(c_dh, s_buf, c_keys, 40, &msg)); tt_mem_op(s_keys,OP_EQ, c_keys, 40); + tt_ptr_op(msg, OP_EQ, NULL); /* Client: Case 2: The server sent back a degenerate DH. */ memset(s_buf, 0, sizeof(s_buf)); tt_int_op(-1, OP_EQ, - onion_skin_TAP_client_handshake(c_dh, s_buf, c_keys, 40, NULL)); + onion_skin_TAP_client_handshake(c_dh, s_buf, c_keys, 40, &msg)); + tt_str_op(msg, OP_EQ, "DH computation failed."); done: crypto_dh_free(c_dh); @@ -246,6 +252,15 @@ test_ntor_handshake(void *arg) memset(s_buf, 0, 40); tt_mem_op(c_keys,OP_NE, s_buf, 40); + /* Now try with a bogus server response. Zero input should trigger + * All The Problems. */ + memset(c_keys, 0, 400); + memset(s_buf, 0, NTOR_REPLY_LEN); + const char *msg = NULL; + tt_int_op(-1, OP_EQ, onion_skin_ntor_client_handshake(c_state, s_buf, + c_keys, 400, &msg)); + tt_str_op(msg, OP_EQ, "Zero output from curve25519 handshake"); + done: ntor_handshake_state_free(c_state); dimap_free(s_keymap, NULL);

1 0

[stem/master] Stacktrace when CircuitEvent compared
by atagar＠torproject.org 06 Jul '16

06 Jul '16

commit 52348a6ab4a58ac48af61fbe14a56677625ae8ef Author: Damian Johnson <atagar(a)torproject.org> Date: Wed Jul 6 09:35:15 2016 -0700 Stacktrace when CircuitEvent compared Nyx is getting stacktraces which are due to referring to an attribute that doesn't exist. CircuitEvents aren't documented as having a socks_port but they *do* have a socks_password... File "/home/atagar/Desktop/nyx/nyx/panel/connection.py", line 625, in _update new_entries.append(Entry.from_circuit(circ)) File "/home/atagar/Desktop/nyx/stem/util/lru_cache.py", line 122, in wrapper link = cache_get(key) File "/home/atagar/Desktop/nyx/stem/response/events.py", line 419, in __eq__ return self._compare(other, lambda s, o: s == o) File "/home/atagar/Desktop/nyx/stem/response/events.py", line 392, in _compare my_attr = getattr(self, attr) AttributeError: 'CircuitEvent' object has no attribute 'socks_port' --- stem/response/events.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stem/response/events.py b/stem/response/events.py index 86ed2b4..91aaecd 100644 --- a/stem/response/events.py +++ b/stem/response/events.py @@ -388,7 +388,7 @@ class CircuitEvent(Event): if not isinstance(other, CircuitEvent): return False - for attr in ('id', 'status', 'path', 'build_flags', 'purpose', 'hs_state', 'rend_query', 'created', 'reason', 'remote_reason', 'socks_username', 'socks_port'): + for attr in ('id', 'status', 'path', 'build_flags', 'purpose', 'hs_state', 'rend_query', 'created', 'reason', 'remote_reason', 'socks_username', 'socks_password'): my_attr = getattr(self, attr) other_attr = getattr(other, attr)

1 0

[tor/release-0.2.8] attempted clarity improvements in changelog.
by nickm＠torproject.org 06 Jul '16

06 Jul '16

commit 2238e60b9254834a1de04fcafe7c4053350a8a42 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jul 6 11:36:35 2016 -0400 attempted clarity improvements in changelog. --- ChangeLog | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/ChangeLog b/ChangeLog index f204bbf..1cea4eb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -8,15 +8,13 @@ Changes in version 0.2.8.5-rc - 2016-07-0? - Urras is no longer a directory authority. Closes ticket 19271. o Major bugfixes (heartbeat): - - Fix a regression that would crash Tor when heartbeats are - disabled. Fixes bug 19454; bugfix on tor-0.2.8.1-alpha. Reported - by "kubaku". + - Fix a regression that would crash Tor when the periodic + "heartbeat" log messages were disabled. Fixes bug 19454; bugfix on + tor-0.2.8.1-alpha. Reported by "kubaku". o Minor features (build): - Tor now again builds with the recent OpenSSL 1.1 development branch (tested against 1.1.0-pre6-dev). Closes ticket 19499. - - o Minor bugfixes (build): - When building manual pages, set the timezone to "UTC", so that the output is reproducible. Fixes bug 19558; bugfix on 0.2.2.9-alpha. Patch from intrigeri. @@ -34,16 +32,16 @@ Changes in version 0.2.8.5-rc - 2016-07-0? on 0.2.8.2-alpha. o Minor bugfixes (logging): - - Reduce excessive logging when directory servers can't be found. - Fixes bug 18849; bugfix on 0.2.8.3-alpha and 0.2.8.1-alpha. Patch - by teor. + - Reduce pointlessly verbose log messages when directory servers + can't be found. Fixes bug 18849; bugfix on 0.2.8.3-alpha and + 0.2.8.1-alpha. Patch by teor. - When a fallback directory changes its fingerprint from the hard- coded fingerprint, log a less severe, more explanatory log message. Fixes bug 18812; bugfix on 0.2.8.1-alpha. Patch by teor. - o Minor bugfixes (sandboxing): - - Allow statistics to be written to disk when sandboxing is enabled. - Fixes bugs 19556 and 19957; bugfix on 0.2.5.1-alpha and + o Minor bugfixes (Linux seccomp2 sandboxing): + - Allow statistics to be written to disk when "Sandbox 1" is + enabled. Fixes bugs 19556 and 19957; bugfix on 0.2.5.1-alpha and 0.2.6.1-alpha respectively. o Minor bugfixes (user interface): @@ -58,8 +56,8 @@ Changes in version 0.2.8.5-rc - 2016-07-0? explains how to comment out unsuitable fallbacks in a way that's compatible with the stem fallback parser. - Update fallback whitelist and blacklist based on relay operator - emails. Blacklist unsuitable fallbacks. Resolves ticket 19071. - Patch by teor. + emails. Blacklist unsuitable (non-working, over-volatile) + fallbacks. Resolves ticket 19071. Patch by teor. - Update hard-coded fallback list to remove unsuitable fallbacks. Resolves ticket 19071. Patch by teor.

1 0