torproject/metrics-lib
1
0
Fork 0
mirror of https://github.com/torproject/metrics-lib.git synced 2024-11-27 11:10:34 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix encoding bug in RelayDirectoryImpl and NetworkStatusImpl.

Browse Source
This commit is contained in:
Karsten Loesing 2017-05-29 14:35:40 +02:00
parent 232ea426b5
commit fadcaa4b20
3 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGELOG.md
View File

@ -10,6 +10,10 @@
- Move descriptor digest computation to DescriptorImpl. - Move descriptor digest computation to DescriptorImpl.
- Fix a bug in digest computation by making sure that the - Fix a bug in digest computation by making sure that the
descriptor string actually contains the end token. descriptor string actually contains the end token.
- Fix a bug where both RelayDirectoryImpl and all NetworkStatusImpl
subclasses fail to get indexes right if parts of raw descriptor
strings contain non-ASCII chars. In practice, this only affects
version 1 directories which were last archived in 2007.
# Changes in version 1.7.0 - 2017-05-17 # Changes in version 1.7.0 - 2017-05-17

4
src/main/java/org/torproject/descriptor/impl/NetworkStatusImpl.java
View File

@ -8,6 +8,7 @@ import org.torproject.descriptor.DirSourceEntry;
import org.torproject.descriptor.DirectorySignature; import org.torproject.descriptor.DirectorySignature;
import org.torproject.descriptor.NetworkStatusEntry; import org.torproject.descriptor.NetworkStatusEntry;
import java.nio.charset.StandardCharsets;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.SortedMap; import java.util.SortedMap;
@ -33,7 +34,8 @@ public abstract class NetworkStatusImpl extends DescriptorImpl {
if (this.rawDescriptorBytes.length == 0) { if (this.rawDescriptorBytes.length == 0) {
throw new DescriptorParseException("Descriptor is empty."); throw new DescriptorParseException("Descriptor is empty.");
} }
String descriptorString = new String(rawDescriptorBytes); String descriptorString = new String(rawDescriptorBytes,
StandardCharsets.US_ASCII);
int firstRIndex = this.findFirstIndexOfKeyword(descriptorString, int firstRIndex = this.findFirstIndexOfKeyword(descriptorString,
Key.R.keyword); Key.R.keyword);
int endIndex = descriptorString.length(); int endIndex = descriptorString.length();

4
src/main/java/org/torproject/descriptor/impl/RelayDirectoryImpl.java
View File

@ -8,6 +8,7 @@ import org.torproject.descriptor.RelayDirectory;
import org.torproject.descriptor.RouterStatusEntry; import org.torproject.descriptor.RouterStatusEntry;
import org.torproject.descriptor.ServerDescriptor; import org.torproject.descriptor.ServerDescriptor;
import java.nio.charset.StandardCharsets;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.EnumSet; import java.util.EnumSet;
import java.util.List; import java.util.List;
@ -56,7 +57,8 @@ public class RelayDirectoryImpl extends DescriptorImpl
if (this.rawDescriptorBytes.length == 0) { if (this.rawDescriptorBytes.length == 0) {
throw new DescriptorParseException("Descriptor is empty."); throw new DescriptorParseException("Descriptor is empty.");
} }
String descriptorString = new String(rawDescriptorBytes); String descriptorString = new String(rawDescriptorBytes,
StandardCharsets.US_ASCII);
int startIndex = 0; int startIndex = 0;
int firstRouterIndex = this.findFirstIndexOfKeyword(descriptorString, int firstRouterIndex = this.findFirstIndexOfKeyword(descriptorString,
Key.ROUTER.keyword); Key.ROUTER.keyword);