tor-commits February 2018

tor-commits@lists.torproject.org

19 participants
1579 discussions

[metrics-lib/master] Enable handling of larger (> 2G) log files.
by karsten＠torproject.org 26 Feb '18

26 Feb '18

commit c01dfbdc4e5d817fb10fb45f79d8223853cdeac0 Author: iwakeh <iwakeh(a)torproject.org> Date: Fri Feb 16 09:05:46 2018 +0000 Enable handling of larger (> 2G) log files. As log files can be compressed very efficiently log descriptor raw bytes contain the compressed bytes. Added methods for accessing uncompressed log content, as well as stream based methods for decompression and compression in class FileType. Adapted all tests to the changes. Implements task-25329. --- .../org/torproject/descriptor/LogDescriptor.java | 26 ++++++++++++-- .../torproject/descriptor/internal/FileType.java | 18 ++++++++++ .../descriptor/log/LogDescriptorImpl.java | 25 ++++++++------ .../descriptor/log/WebServerAccessLogImpl.java | 12 +++---- .../descriptor/log/LogDescriptorTest.java | 40 +++++++++++----------- .../descriptor/log/WebServerModuleTest.java | 4 ++- 6 files changed, 82 insertions(+), 43 deletions(-) diff --git a/src/main/java/org/torproject/descriptor/LogDescriptor.java b/src/main/java/org/torproject/descriptor/LogDescriptor.java index 6a6bf84..826fcda 100644 --- a/src/main/java/org/torproject/descriptor/LogDescriptor.java +++ b/src/main/java/org/torproject/descriptor/LogDescriptor.java @@ -3,21 +3,34 @@ package org.torproject.descriptor; +import java.io.InputStream; import java.util.List; /** * Contains a log file. * * Unlike other descriptors, logs can get very large and are typically stored - * on disk in compressed form. However, all access to log contents through this - * interface and its subinterfaces is made available in uncompressed form. + * on disk in compressed form. Access to log contents through this + * interface and its subinterfaces is made available in compressed and + * decompressed form: + * <ul> + * <li>The raw descriptor bytes are compressed, because logs contain + * often redundant information that can achieve high compression rates. + * For example, a 500kB compressed log file might be deflated to 3GB.</li> + * <li>The uncompressed log contents can be accessed as a stream of bytes.</li> + * <li>A list of log lines (decompressed) can be retrieved.</li> + * </ul> + * * * @since 2.2.0 */ public interface LogDescriptor extends Descriptor { /** - * Returns the decompressed raw descriptor bytes of the log. + * Returns the raw compressed descriptor bytes of the log. + * + * For access to the log's decompressed bytes of + * use method {@code decompressedByteStream}. * * @since 2.2.0 */ @@ -25,6 +38,13 @@ public interface LogDescriptor extends Descriptor { public byte[] getRawDescriptorBytes(); /** + * Returns the decompressed raw descriptor bytes of the log as stream. + * + * @since 2.2.0 + */ + public InputStream decompressedByteStream() throws DescriptorParseException; + + /** * Returns annotations found in the log file, which may be an empty List if a * log format does not support adding annotations. * diff --git a/src/main/java/org/torproject/descriptor/internal/FileType.java b/src/main/java/org/torproject/descriptor/internal/FileType.java index 353f0bb..2c07df6 100644 --- a/src/main/java/org/torproject/descriptor/internal/FileType.java +++ b/src/main/java/org/torproject/descriptor/internal/FileType.java @@ -93,6 +93,24 @@ public enum FileType { } /** + * Compresses the given InputStream and returns an OutputStream. + * + * @since 2.2.0 + */ + public OutputStream compress(OutputStream os) throws Exception { + return this.outputStream(os); + } + + /** + * Decompresses the given InputStream and returns an OutputStream. + * + * @since 2.2.0 + */ + public InputStream decompress(InputStream is) throws Exception { + return this.inputStream(is); + } + + /** * Decompresses the given bytes in memory and returns the decompressed bytes. * * @since 2.2.0 diff --git a/src/main/java/org/torproject/descriptor/log/LogDescriptorImpl.java b/src/main/java/org/torproject/descriptor/log/LogDescriptorImpl.java index 97854e4..3583d26 100644 --- a/src/main/java/org/torproject/descriptor/log/LogDescriptorImpl.java +++ b/src/main/java/org/torproject/descriptor/log/LogDescriptorImpl.java @@ -14,10 +14,10 @@ import org.slf4j.LoggerFactory; import java.io.BufferedReader; import java.io.ByteArrayInputStream; import java.io.File; +import java.io.InputStream; import java.io.InputStreamReader; import java.util.ArrayList; import java.util.Arrays; -import java.util.Collection; import java.util.Collections; import java.util.List; import java.util.regex.Matcher; @@ -76,8 +76,7 @@ public abstract class LogDescriptorImpl this.fileType = FileType.findType(mat.group(1).toUpperCase()); if (FileType.PLAIN == this.fileType) { this.fileType = defaultCompression; - } else { - this.logBytes = this.fileType.decompress(this.logBytes); + this.logBytes = this.fileType.compress(this.logBytes); } } catch (Exception ex) { throw new DescriptorParseException("Cannot parse file " @@ -86,10 +85,19 @@ public abstract class LogDescriptorImpl } @Override + public InputStream decompressedByteStream() throws DescriptorParseException { + try { + return this.fileType.decompress(new ByteArrayInputStream(this.logBytes)); + } catch (Exception ex) { + throw new DescriptorParseException("Cannot provide deflated stream of " + + this.descriptorFile + ".", ex); + } + } + + @Override public void validate() throws DescriptorParseException { - try (BufferedReader br - = new BufferedReader(new InputStreamReader(new ByteArrayInputStream( - this.logBytes)))) { + try (BufferedReader br = new BufferedReader( + new InputStreamReader(decompressedByteStream()))) { this.unrecognizedLines.addAll(br.lines().parallel().filter((line) -> null != line && !line.isEmpty() && !validator.validate(line)) .limit(unrecognizedLinesLimit).collect(Collectors.toList())); @@ -114,11 +122,6 @@ public abstract class LogDescriptorImpl } } - public static byte[] collectionToBytes(Collection<String> lines) { - return lines.stream().collect(Collectors.joining("\n", "", "\n")) - .getBytes(); - } - @Override public void setValidator(Validator validator) { this.validator = validator; diff --git a/src/main/java/org/torproject/descriptor/log/WebServerAccessLogImpl.java b/src/main/java/org/torproject/descriptor/log/WebServerAccessLogImpl.java index 7b56528..e48a262 100644 --- a/src/main/java/org/torproject/descriptor/log/WebServerAccessLogImpl.java +++ b/src/main/java/org/torproject/descriptor/log/WebServerAccessLogImpl.java @@ -11,12 +11,10 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import java.io.BufferedReader; -import java.io.ByteArrayInputStream; import java.io.File; import java.io.InputStreamReader; import java.time.LocalDate; import java.time.format.DateTimeFormatter; -import java.util.Collection; import java.util.List; import java.util.regex.Matcher; import java.util.regex.Pattern; @@ -72,10 +70,9 @@ public class WebServerAccessLogImpl extends LogDescriptorImpl } /** For internal use only. */ - public WebServerAccessLogImpl(Collection<String> lines, String filename, + public WebServerAccessLogImpl(byte[] bytes, String filename, boolean validate) throws DescriptorParseException { - this(LogDescriptorImpl.collectionToBytes(lines), new File(filename), - FileType.XZ, validate); + this(bytes, new File(filename), FileType.XZ, validate); } private WebServerAccessLogImpl(byte[] logBytes, File file, @@ -135,9 +132,8 @@ public class WebServerAccessLogImpl extends LogDescriptorImpl @Override public List<WebServerAccessLog.Line> logLines() throws DescriptorParseException { - try (BufferedReader br - = new BufferedReader(new InputStreamReader(new ByteArrayInputStream( - this.getRawDescriptorBytes())))) { + try (BufferedReader br = new BufferedReader(new InputStreamReader( + this.decompressedByteStream()))) { return br.lines().map(line -> (WebServerAccessLog.Line) WebServerAccessLogLine.makeLine(line)) .filter(line -> line.isValid()).collect(Collectors.toList()); diff --git a/src/test/java/org/torproject/descriptor/log/LogDescriptorTest.java b/src/test/java/org/torproject/descriptor/log/LogDescriptorTest.java index a871791..67ba638 100644 --- a/src/test/java/org/torproject/descriptor/log/LogDescriptorTest.java +++ b/src/test/java/org/torproject/descriptor/log/LogDescriptorTest.java @@ -21,6 +21,7 @@ import org.junit.Test; import org.junit.rules.TemporaryFolder; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; +import org.junit.runners.Parameterized.Parameter; import org.junit.runners.Parameterized.Parameters; import java.io.File; @@ -46,46 +47,45 @@ public class LogDescriptorTest { protected DescriptorReader reader = DescriptorSourceFactory.createDescriptorReader(); - protected int size; - protected String[] pan; - protected Class<LogDescriptor> type; - protected boolean isDecompressionTest; - protected int lineCount; + @Parameter(0) + public boolean isDecompressedLog; + + @Parameter(1) + public int size; + + @Parameter(2) + public String[] pan; + + @Parameter(3) + public Class<LogDescriptor> type; + + @Parameter(4) + public int lineCount; /** All types of data that can be encountered during sync. */ @Parameters public static Collection<Object[]> pathAndName() { return Arrays.asList(new Object[][] { - {Boolean.TRUE, 1878, new String[]{"meronense.torproject.org", + {Boolean.FALSE, 1878, new String[]{"meronense.torproject.org", "metrics.torproject.org_meronense.torproject.org_access.log" + "_20170530.gz", "metrics.torproject.org", "20170530", "gz"}, WebServerAccessLog.class, 24}, - {Boolean.FALSE, 1878, new String[]{"meronense.torproject.org", + {Boolean.TRUE, 1878, new String[]{"meronense.torproject.org", "xy.host.org_meronense.torproject.org_access.log_20170530.log", "metrics.torproject.org", "20170530", "xz"}, WebServerAccessLog.class, 24}, - {Boolean.TRUE, 70730, new String[]{"archeotrichon.torproject.org", + {Boolean.FALSE, 70730, new String[]{"archeotrichon.torproject.org", "archive.torproject.org_archeotrichon.torproject.org_access.log_" + "20151007.xz", "archive.torproject.org", "20151007", "xz"}, WebServerAccessLog.class, 655}, - {Boolean.TRUE, 0, new String[]{"dummy.host.net", + {Boolean.FALSE, 0, new String[]{"dummy.host.net", "nix.server.org_dummy.host.net_access.log_20111111.bz2", "nix.server.org", "20111111", "bz2"}, WebServerAccessLog.class, 0}}); } - /** This constructor receives the above defined data for each run. */ - public LogDescriptorTest(boolean decompression, int size, String[] pan, - Class<LogDescriptor> type, int lineCount) { - this.pan = pan; - this.size = size; - this.type = type; - this.isDecompressionTest = decompression; - this.lineCount = lineCount; - } - /** Prepares the temporary folder and writes files to it for this test. */ private void createTemporaryFolderAndContents() throws IOException { this.indir = this.temp.newFolder(); @@ -157,7 +157,7 @@ public class LogDescriptorTest { @Test public void testCompressionInvalid() throws Exception { - if (!isDecompressionTest) { + if (isDecompressedLog) { return; } assertEquals(1, this.reader.getParsedFiles().size()); diff --git a/src/test/java/org/torproject/descriptor/log/WebServerModuleTest.java b/src/test/java/org/torproject/descriptor/log/WebServerModuleTest.java index a11bc30..66c8f54 100644 --- a/src/test/java/org/torproject/descriptor/log/WebServerModuleTest.java +++ b/src/test/java/org/torproject/descriptor/log/WebServerModuleTest.java @@ -6,6 +6,7 @@ package org.torproject.descriptor.log; import static org.junit.Assert.assertEquals; import org.torproject.descriptor.DescriptorParseException; +import org.torproject.descriptor.internal.FileType; import org.hamcrest.Matchers; @@ -104,7 +105,8 @@ public class WebServerModuleTest { WebServerAccessLogImpl wsal = new WebServerAccessLogImpl(logText.getBytes(), new File("vhost_host7_access.log_20170530")); assertEquals(wsal.getAnnotations().size(), 0); - assertEquals(logText, new String(wsal.getRawDescriptorBytes())); + assertEquals(logText, + new String(FileType.XZ.decompress(wsal.getRawDescriptorBytes()))); assertEquals("host7", wsal.getPhysicalHost()); assertEquals("vhost", wsal.getVirtualHost()); }

1 0

[tor-browser-build/master] Bug 25336: Bump obfs4proxy to 0.0.7
by gk＠torproject.org 26 Feb '18

26 Feb '18

commit 4bed9a85478b6fb16e0d654589d8cb8ed3865027 Author: Georg Koppen <gk(a)torproject.org> Date: Mon Feb 26 08:26:20 2018 +0000 Bug 25336: Bump obfs4proxy to 0.0.7 0.0.7 has long been out and OnionShare needs its meek_lite feature for macOS. Let's update to this latest stable obfs4 version then. --- projects/obfs4/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/obfs4/config b/projects/obfs4/config index 44db79d..916887f 100644 --- a/projects/obfs4/config +++ b/projects/obfs4/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 0.0.5 +version: 0.0.7 git_url: https://git.torproject.org/pluggable-transports/obfs4.git git_hash: 'obfs4proxy-[% c("version") %]' tag_gpg_id: 1

1 0

[stem/master] Print full stacktrace when a test fails to import
by atagar＠torproject.org 26 Feb '18

26 Feb '18

commit b005d31362ddf6ba0d87d26482a596cf4a3dd475 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Feb 25 16:16:16 2018 -0800 Print full stacktrace when a test fails to import Our tests preemptively import test modules so asynchronous tasks can register themselves. However, an import raises an exception then we only printed the error message, not the stacktrace complicating troubleshooting. --- test/task.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/test/task.py b/test/task.py index 20841be5..b28833bd 100644 --- a/test/task.py +++ b/test/task.py @@ -26,6 +26,7 @@ import os import re import sys import time +import traceback import stem import stem.prereq @@ -92,7 +93,10 @@ def _import_tests(): return for module in (CONFIG['test.unit_tests'].splitlines() + CONFIG['test.integ_tests'].splitlines()): - importlib.import_module(module.rsplit('.', 1)[0]) + try: + importlib.import_module(module.rsplit('.', 1)[0]) + except Exception as exc: + raise ImportError(traceback.format_exc()) def _check_for_unused_tests(paths):

1 0

[stem/master] Accept bytes in is_valid_ipv4_address
by atagar＠torproject.org 26 Feb '18

26 Feb '18

commit bd2df36146bfc2bb38fac4d7888ca84f7eb70e8c Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Feb 25 17:03:59 2018 -0800 Accept bytes in is_valid_ipv4_address With python3 byte arguments failed with... ====================================================================== ERROR: test_is_valid_ipv4_address ---------------------------------------------------------------------- Traceback (most recent call last): File "/home/atagar/Desktop/stem/test/unit/util/connection.py", line 464, in test_is_valid_ipv4_address self.assertTrue(stem.util.connection.is_valid_ipv4_address(address)) File "/home/atagar/Desktop/stem/stem/util/connection.py", line 415, in is_valid_ipv4_address if address.count('.') != 3: TypeError: a bytes-like object is required, not 'str' --- stem/util/connection.py | 9 +++++++-- test/unit/util/connection.py | 3 +++ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/stem/util/connection.py b/stem/util/connection.py index d989713a..3395a3a5 100644 --- a/stem/util/connection.py +++ b/stem/util/connection.py @@ -64,7 +64,7 @@ import re import stem.util.proc import stem.util.system -from stem.util import str_type, conf, enum, log +from stem.util import str_type, conf, enum, log, str_tools # Connection resolution is risky to log about since it's highly likely to # contain sensitive information. That said, it's also difficult to get right in @@ -407,7 +407,9 @@ def is_valid_ipv4_address(address): :returns: **True** if input is a valid IPv4 address, **False** otherwise """ - if not isinstance(address, (bytes, str_type)): + if isinstance(address, bytes): + address = str_tools._to_unicode(address) + elif not isinstance(address, str_type): return False # checks if theres four period separated values @@ -435,6 +437,9 @@ def is_valid_ipv6_address(address, allow_brackets = False): :returns: **True** if input is a valid IPv6 address, **False** otherwise """ + if isinstance(address, bytes): + address = str_tools._to_unicode(address) + if allow_brackets: if address.startswith('[') and address.endswith(']'): address = address[1:-1] diff --git a/test/unit/util/connection.py b/test/unit/util/connection.py index 58a5cb82..a2162029 100644 --- a/test/unit/util/connection.py +++ b/test/unit/util/connection.py @@ -444,8 +444,10 @@ class TestConnection(unittest.TestCase): valid_addresses = ( '0.0.0.0', '1.2.3.4', + '1.2.3.4', '192.168.0.1', '255.255.255.255', + b'255.255.255.255', ) invalid_addresses = ( @@ -455,6 +457,7 @@ class TestConnection(unittest.TestCase): '1.2.3.-1', '0.0.0.a', 'a.b.c.d', + b'a.b.c.d', ) for address in valid_addresses:

1 0

[stem/master] Fix python3 compatibility for tests
by atagar＠torproject.org 26 Feb '18

26 Feb '18

commit 17d571d0414df0691b54888614ab92dc8171c72e Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Feb 25 17:34:56 2018 -0800 Fix python3 compatibility for tests Mostly just the usual bytes/unicode issues with new additions. --- stem/client/cell.py | 8 ++--- stem/client/datatype.py | 10 +++--- stem/descriptor/remote.py | 3 ++ test/task.py | 2 +- test/unit/client/address.py | 24 +++++++------- test/unit/client/cell.py | 70 ++++++++++++++++++++--------------------- test/unit/client/certificate.py | 18 +++++------ test/unit/client/kdf.py | 24 +++++++------- test/unit/client/size.py | 26 +++++++-------- test/unit/descriptor/remote.py | 18 +++++------ 10 files changed, 103 insertions(+), 100 deletions(-) diff --git a/stem/client/cell.py b/stem/client/cell.py index c5f8f20b..a3a0f7f0 100644 --- a/stem/client/cell.py +++ b/stem/client/cell.py @@ -46,7 +46,7 @@ import sys from stem import UNDEFINED from stem.client.datatype import HASH_LEN, ZERO, Address, Certificate, CloseReason, RelayCommand, Size, split -from stem.util import _hash_attr, datetime_to_unix +from stem.util import _hash_attr, datetime_to_unix, str_type, str_tools FIXED_PAYLOAD_LEN = 509 AUTH_CHALLENGE_SIZE = 32 @@ -307,7 +307,7 @@ class RelayCell(CircuitCell): # isinstance() isn't such a great option. digest = Size.LONG.unpack(digest.digest()[:4]) - elif isinstance(digest, str): + elif isinstance(digest, (bytes, str_type)): digest = Size.LONG.unpack(digest[:4]) elif isinstance(digest, int): pass @@ -316,7 +316,7 @@ class RelayCell(CircuitCell): super(RelayCell, self).__init__(circ_id) self.command, self.command_int = RelayCommand.get(command) - self.data = data + self.data = str_tools._to_bytes(data) self.recognized = recognized self.digest = digest self.stream_id = stream_id @@ -619,7 +619,7 @@ class CertsCell(Cell): self.certificates = certs def pack(self, link_protocol): - return CertsCell._pack(link_protocol, Size.CHAR.pack(len(self.certificates)) + ''.join([cert.pack() for cert in self.certificates])) + return CertsCell._pack(link_protocol, Size.CHAR.pack(len(self.certificates)) + b''.join([cert.pack() for cert in self.certificates])) @classmethod def _unpack(cls, content, circ_id, link_protocol): diff --git a/stem/client/datatype.py b/stem/client/datatype.py index 352a643e..687c5081 100644 --- a/stem/client/datatype.py +++ b/stem/client/datatype.py @@ -121,7 +121,7 @@ import stem.util.enum from stem.util import _hash_attr -ZERO = '\x00' +ZERO = b'\x00' HASH_LEN = 20 KEY_LEN = 16 @@ -354,17 +354,17 @@ class Address(Field): if self.type == AddrType.IPv4: if stem.util.connection.is_valid_ipv4_address(value): self.value = value - self.value_bin = ''.join([Size.CHAR.pack(int(v)) for v in value.split('.')]) + self.value_bin = b''.join([Size.CHAR.pack(int(v)) for v in value.split('.')]) else: if len(value) != 4: raise ValueError('Packed IPv4 addresses should be four bytes, but was: %s' % repr(value)) - self.value = '.'.join([str(Size.CHAR.unpack(value[i])) for i in range(4)]) + self.value = '.'.join([str(Size.CHAR.unpack(value[i:i + 1])) for i in range(4)]) self.value_bin = value elif self.type == AddrType.IPv6: if stem.util.connection.is_valid_ipv6_address(value): self.value = stem.util.connection.expand_ipv6_address(value).lower() - self.value_bin = ''.join([Size.SHORT.pack(int(v, 16)) for v in self.value.split(':')]) + self.value_bin = b''.join([Size.SHORT.pack(int(v, 16)) for v in self.value.split(':')]) else: if len(value) != 16: raise ValueError('Packed IPv6 addresses should be sixteen bytes, but was: %s' % repr(value)) @@ -460,7 +460,7 @@ class KDF(collections.namedtuple('KDF', ['key_hash', 'forward_digest', 'backward # # K = H(K0 | [00]) | H(K0 | [01]) | H(K0 | [02]) | ... - derived_key = '' + derived_key = b'' counter = 0 while len(derived_key) < KEY_LEN * 2 + HASH_LEN * 3: diff --git a/stem/descriptor/remote.py b/stem/descriptor/remote.py index d2a6867c..9181dbcf 100644 --- a/stem/descriptor/remote.py +++ b/stem/descriptor/remote.py @@ -1132,6 +1132,9 @@ class FallbackDirectory(Directory): :raises: **ValueError** if content is malformed """ + if isinstance(content, bytes): + content = str_tools._to_unicode(content) + matches = {} for line in content.splitlines(): diff --git a/test/task.py b/test/task.py index b28833bd..89437c77 100644 --- a/test/task.py +++ b/test/task.py @@ -95,7 +95,7 @@ def _import_tests(): for module in (CONFIG['test.unit_tests'].splitlines() + CONFIG['test.integ_tests'].splitlines()): try: importlib.import_module(module.rsplit('.', 1)[0]) - except Exception as exc: + except: raise ImportError(traceback.format_exc()) diff --git a/test/unit/client/address.py b/test/unit/client/address.py index 09fcee95..aaa5fc0e 100644 --- a/test/unit/client/address.py +++ b/test/unit/client/address.py @@ -21,13 +21,13 @@ class TestAddress(unittest.TestCase): def test_constructor(self): test_data = ( - ((4, '\x7f\x00\x00\x01'), ExpectedAddress(AddrType.IPv4, 4, '127.0.0.1', '\x7f\x00\x00\x01')), - ((4, 'aq\x0f\x02'), ExpectedAddress(AddrType.IPv4, 4, '97.113.15.2', 'aq\x0f\x02')), - ((6, ' \x01\r\xb8\x00\x00\x00\x00\x00\x00\xff\x00\x00B\x83)'), ExpectedAddress(AddrType.IPv6, 6, '2001:0db8:0000:0000:0000:ff00:0042:8329', ' \x01\r\xb8\x00\x00\x00\x00\x00\x00\xff\x00\x00B\x83)')), - ((AddrType.IPv4, '127.0.0.1'), ExpectedAddress(AddrType.IPv4, 4, '127.0.0.1', '\x7f\x00\x00\x01')), - ((AddrType.IPv4, '97.113.15.2'), ExpectedAddress(AddrType.IPv4, 4, '97.113.15.2', 'aq\x0f\x02')), - ((AddrType.IPv6, '2001:0db8:0000:0000:0000:ff00:0042:8329'), ExpectedAddress(AddrType.IPv6, 6, '2001:0db8:0000:0000:0000:ff00:0042:8329', ' \x01\r\xb8\x00\x00\x00\x00\x00\x00\xff\x00\x00B\x83)')), - ((AddrType.IPv6, '2001:0DB8:AC10:FE01::'), ExpectedAddress(AddrType.IPv6, 6, '2001:0db8:ac10:fe01:0000:0000:0000:0000', ' \x01\r\xb8\xac\x10\xfe\x01\x00\x00\x00\x00\x00\x00\x00\x00')), # collaped and different case + ((4, b'\x7f\x00\x00\x01'), ExpectedAddress(AddrType.IPv4, 4, '127.0.0.1', b'\x7f\x00\x00\x01')), + ((4, b'aq\x0f\x02'), ExpectedAddress(AddrType.IPv4, 4, '97.113.15.2', b'aq\x0f\x02')), + ((6, b' \x01\r\xb8\x00\x00\x00\x00\x00\x00\xff\x00\x00B\x83)'), ExpectedAddress(AddrType.IPv6, 6, '2001:0db8:0000:0000:0000:ff00:0042:8329', b' \x01\r\xb8\x00\x00\x00\x00\x00\x00\xff\x00\x00B\x83)')), + ((AddrType.IPv4, '127.0.0.1'), ExpectedAddress(AddrType.IPv4, 4, '127.0.0.1', b'\x7f\x00\x00\x01')), + ((AddrType.IPv4, '97.113.15.2'), ExpectedAddress(AddrType.IPv4, 4, '97.113.15.2', b'aq\x0f\x02')), + ((AddrType.IPv6, '2001:0db8:0000:0000:0000:ff00:0042:8329'), ExpectedAddress(AddrType.IPv6, 6, '2001:0db8:0000:0000:0000:ff00:0042:8329', b' \x01\r\xb8\x00\x00\x00\x00\x00\x00\xff\x00\x00B\x83)')), + ((AddrType.IPv6, '2001:0DB8:AC10:FE01::'), ExpectedAddress(AddrType.IPv6, 6, '2001:0db8:ac10:fe01:0000:0000:0000:0000', b' \x01\r\xb8\xac\x10\xfe\x01\x00\x00\x00\x00\x00\x00\x00\x00')), # collaped and different case ) for (addr_type, addr_value), expected in test_data: @@ -55,18 +55,18 @@ class TestAddress(unittest.TestCase): def test_packing(self): test_data = { - '\x04\x04\x7f\x00\x00\x01': Address('127.0.0.1'), - '\x06\x10 \x01\r\xb8\x00\x00\x00\x00\x00\x00\xff\x00\x00B\x83)': Address('2001:0db8:0000:0000:0000:ff00:0042:8329'), + b'\x04\x04\x7f\x00\x00\x01': Address('127.0.0.1'), + b'\x06\x10 \x01\r\xb8\x00\x00\x00\x00\x00\x00\xff\x00\x00B\x83)': Address('2001:0db8:0000:0000:0000:ff00:0042:8329'), } for cell_bytes, address in test_data.items(): self.assertEqual(cell_bytes, address.pack()) self.assertEqual(address, Address.unpack(cell_bytes)) - addr, content = Address.pop('\x04\x04\x7f\x00\x00\x01\x01\x04\x04aq\x0f\x02\x00\x00\x00\x00') - self.assertEqual('\x01\x04\x04aq\x0f\x02\x00\x00\x00\x00', content) + addr, content = Address.pop(b'\x04\x04\x7f\x00\x00\x01\x01\x04\x04aq\x0f\x02\x00\x00\x00\x00') + self.assertEqual(b'\x01\x04\x04aq\x0f\x02\x00\x00\x00\x00', content) self.assertEqual(AddrType.IPv4, addr.type) self.assertEqual(4, addr.type_int) self.assertEqual('127.0.0.1', addr.value) - self.assertEqual('\x7f\x00\x00\x01', addr.value_bin) + self.assertEqual(b'\x7f\x00\x00\x01', addr.value_bin) diff --git a/test/unit/client/cell.py b/test/unit/client/cell.py index 19744c6d..f066cc4f 100644 --- a/test/unit/client/cell.py +++ b/test/unit/client/cell.py @@ -26,55 +26,55 @@ from stem.client.cell import ( ) RANDOM_PAYLOAD = os.urandom(FIXED_PAYLOAD_LEN) -CHALLENGE = '\x89Y\t\x99\xb2\x1e\xd9*V\xb6\x1bn\n\x05\xd8/\xe3QH\x85\x13Z\x17\xfc\x1c\x00{\xa9\xae\x83^K' +CHALLENGE = b'\x89Y\t\x99\xb2\x1e\xd9*V\xb6\x1bn\n\x05\xd8/\xe3QH\x85\x13Z\x17\xfc\x1c\x00{\xa9\xae\x83^K' PADDING_CELLS = { - '\x00\x00\x00' + RANDOM_PAYLOAD: RANDOM_PAYLOAD, + b'\x00\x00\x00' + RANDOM_PAYLOAD: RANDOM_PAYLOAD, } RELAY_CELLS = { - '\x00\x01\x03\r\x00\x00\x00\x01!\xa3?\xec' + ZERO * 500: ('RELAY_BEGIN_DIR', 13, 1, 1, '', 564346860), - '\x00\x01\x03\x02\x00\x00\x00\x01\x15:m\xe0\x00&GET /tor/server/authority HTTP/1.0\r\n\r\n' + ZERO * 460: ('RELAY_DATA', 2, 1, 1, 'GET /tor/server/authority HTTP/1.0\r\n\r\n', 356150752), + b'\x00\x01\x03\r\x00\x00\x00\x01!\xa3?\xec' + ZERO * 500: ('RELAY_BEGIN_DIR', 13, 1, 1, b'', 564346860), + b'\x00\x01\x03\x02\x00\x00\x00\x01\x15:m\xe0\x00&GET /tor/server/authority HTTP/1.0\r\n\r\n' + ZERO * 460: ('RELAY_DATA', 2, 1, 1, b'GET /tor/server/authority HTTP/1.0\r\n\r\n', 356150752), } DESTROY_CELLS = { - '\x80\x00\x00\x00\x04\x00' + ZERO * 508: (2147483648, CloseReason.NONE, 0), - '\x80\x00\x00\x00\x04\x03' + ZERO * 508: (2147483648, CloseReason.REQUESTED, 3), + b'\x80\x00\x00\x00\x04\x00' + ZERO * 508: (2147483648, CloseReason.NONE, 0), + b'\x80\x00\x00\x00\x04\x03' + ZERO * 508: (2147483648, CloseReason.REQUESTED, 3), } CREATE_FAST_CELLS = { - ('\x80\x00\x00\x00\x05\x92O\x0c\xcb\xa8\xac\xfb\xc9\x7f\xd0\rz\x1a\x03u\x91\xceas\xce' + ZERO * 489): (2147483648, '\x92O\x0c\xcb\xa8\xac\xfb\xc9\x7f\xd0\rz\x1a\x03u\x91\xceas\xce'), + (b'\x80\x00\x00\x00\x05\x92O\x0c\xcb\xa8\xac\xfb\xc9\x7f\xd0\rz\x1a\x03u\x91\xceas\xce' + ZERO * 489): (2147483648, b'\x92O\x0c\xcb\xa8\xac\xfb\xc9\x7f\xd0\rz\x1a\x03u\x91\xceas\xce'), } CREATED_FAST_CELLS = { - ('\x80\x00\x00\x00\x06\x92O\x0c\xcb\xa8\xac\xfb\xc9\x7f\xd0\rz\x1a\x03u\x91\xceas\xce\x13Z\x99\xb2\x1e\xb6\x05\x85\x17\xfc\x1c\x00{\xa9\xae\x83^K\x99\xb2' + ZERO * 469): (2147483648, '\x92O\x0c\xcb\xa8\xac\xfb\xc9\x7f\xd0\rz\x1a\x03u\x91\xceas\xce', '\x13Z\x99\xb2\x1e\xb6\x05\x85\x17\xfc\x1c\x00{\xa9\xae\x83^K\x99\xb2'), + (b'\x80\x00\x00\x00\x06\x92O\x0c\xcb\xa8\xac\xfb\xc9\x7f\xd0\rz\x1a\x03u\x91\xceas\xce\x13Z\x99\xb2\x1e\xb6\x05\x85\x17\xfc\x1c\x00{\xa9\xae\x83^K\x99\xb2' + ZERO * 469): (2147483648, b'\x92O\x0c\xcb\xa8\xac\xfb\xc9\x7f\xd0\rz\x1a\x03u\x91\xceas\xce', b'\x13Z\x99\xb2\x1e\xb6\x05\x85\x17\xfc\x1c\x00{\xa9\xae\x83^K\x99\xb2'), } VERSIONS_CELLS = { - '\x00\x00\x07\x00\x00': [], - '\x00\x00\x07\x00\x02\x00\x01': [1], - '\x00\x00\x07\x00\x06\x00\x01\x00\x02\x00\x03': [1, 2, 3], + b'\x00\x00\x07\x00\x00': [], + b'\x00\x00\x07\x00\x02\x00\x01': [1], + b'\x00\x00\x07\x00\x06\x00\x01\x00\x02\x00\x03': [1, 2, 3], } NETINFO_CELLS = { - '\x00\x00\x08ZZ\xb6\x90\x04\x04\x7f\x00\x00\x01\x01\x04\x04aq\x0f\x02' + ZERO * (FIXED_PAYLOAD_LEN - 17): (datetime.datetime(2018, 1, 14, 1, 46, 56), Address('127.0.0.1'), [Address('97.113.15.2')]), + b'\x00\x00\x08ZZ\xb6\x90\x04\x04\x7f\x00\x00\x01\x01\x04\x04aq\x0f\x02' + ZERO * (FIXED_PAYLOAD_LEN - 17): (datetime.datetime(2018, 1, 14, 1, 46, 56), Address('127.0.0.1'), [Address('97.113.15.2')]), } VPADDING_CELLS = { - '\x00\x00\x80\x00\x00': '', - '\x00\x00\x80\x00\x01\x08': '\x08', - '\x00\x00\x80\x00\x02\x08\x11': '\x08\x11', - '\x00\x00\x80\x01\xfd' + RANDOM_PAYLOAD: RANDOM_PAYLOAD, + b'\x00\x00\x80\x00\x00': b'', + b'\x00\x00\x80\x00\x01\x08': b'\x08', + b'\x00\x00\x80\x00\x02\x08\x11': b'\x08\x11', + b'\x00\x00\x80\x01\xfd' + RANDOM_PAYLOAD: RANDOM_PAYLOAD, } CERTS_CELLS = { - '\x00\x00\x81\x00\x01\x00': [], - '\x00\x00\x81\x00\x04\x01\x01\x00\x00': [Certificate(1, '')], - '\x00\x00\x81\x00\x05\x01\x01\x00\x01\x08': [Certificate(1, '\x08')], + b'\x00\x00\x81\x00\x01\x00': [], + b'\x00\x00\x81\x00\x04\x01\x01\x00\x00': [Certificate(1, b'')], + b'\x00\x00\x81\x00\x05\x01\x01\x00\x01\x08': [Certificate(1, b'\x08')], } AUTH_CHALLENGE_CELLS = { - '\x00\x00\x82\x00&%s\x00\x02\x00\x01\x00\x03' % CHALLENGE: (CHALLENGE, [1, 3]), + b'\x00\x00\x82\x00&%s\x00\x02\x00\x01\x00\x03' % CHALLENGE: (CHALLENGE, [1, 3]), } @@ -100,15 +100,15 @@ class TestCell(unittest.TestCase): self.assertRaises(ValueError, Cell.by_value, None) def test_unpack_not_implemented(self): - self.assertRaisesRegexp(NotImplementedError, 'Unpacking not yet implemented for AUTHORIZE cells', Cell.pop, '\x00\x00\x84\x00\x06\x00\x01\x00\x02\x00\x03', 2) + self.assertRaisesRegexp(NotImplementedError, 'Unpacking not yet implemented for AUTHORIZE cells', Cell.pop, b'\x00\x00\x84\x00\x06\x00\x01\x00\x02\x00\x03', 2) def test_unpack_for_new_link(self): expected_certs = ( - (CertType.LINK, 1, '0\x82\x02F0\x82\x01\xaf'), - (CertType.IDENTITY, 2, '0\x82\x01\xc90\x82\x012'), - (CertType.UNKNOWN, 4, '\x01\x04\x00\x06m\x1f'), - (CertType.UNKNOWN, 5, '\x01\x05\x00\x06m\n\x01'), - (CertType.UNKNOWN, 7, '\x1a\xa5\xb3\xbd\x88\xb1C'), + (CertType.LINK, 1, b'0\x82\x02F0\x82\x01\xaf'), + (CertType.IDENTITY, 2, b'0\x82\x01\xc90\x82\x012'), + (CertType.UNKNOWN, 4, b'\x01\x04\x00\x06m\x1f'), + (CertType.UNKNOWN, 5, b'\x01\x05\x00\x06m\n\x01'), + (CertType.UNKNOWN, 7, b'\x1a\xa5\xb3\xbd\x88\xb1C'), ) content = test_data('new_link_cells') @@ -126,7 +126,7 @@ class TestCell(unittest.TestCase): self.assertTrue(certs_cell.certificates[i].value.startswith(cert_prefix)) auth_challenge_cell, content = Cell.pop(content, 2) - self.assertEqual(AuthChallengeCell([1, 3], '\x89Y\t\x99\xb2\x1e\xd9*V\xb6\x1bn\n\x05\xd8/\xe3QH\x85\x13Z\x17\xfc\x1c\x00{\xa9\xae\x83^K'), auth_challenge_cell) + self.assertEqual(AuthChallengeCell([1, 3], b'\x89Y\t\x99\xb2\x1e\xd9*V\xb6\x1bn\n\x05\xd8/\xe3QH\x85\x13Z\x17\xfc\x1c\x00{\xa9\xae\x83^K'), auth_challenge_cell) netinfo_cell, content = Cell.pop(content, 2) self.assertEqual(NetinfoCell, type(netinfo_cell)) @@ -134,7 +134,7 @@ class TestCell(unittest.TestCase): self.assertEqual(Address('127.0.0.1'), netinfo_cell.receiver_address) self.assertEqual([Address('97.113.15.2')], netinfo_cell.sender_addresses) - self.assertEqual('', content) # check that we've consumed all of the bytes + self.assertEqual(b'', content) # check that we've consumed all of the bytes def test_padding_cell(self): for cell_bytes, payload in PADDING_CELLS.items(): @@ -154,7 +154,7 @@ class TestCell(unittest.TestCase): self.assertEqual(digest, cell.digest) self.assertEqual(stream_id, cell.stream_id) - digest = hashlib.sha1('hi') + digest = hashlib.sha1(b'hi') self.assertEqual(3257622417, RelayCell(5, 'RELAY_BEGIN_DIR', '', digest, 564346860).digest) self.assertEqual(3257622417, RelayCell(5, 'RELAY_BEGIN_DIR', '', digest.digest(), 564346860).digest) self.assertEqual(3257622417, RelayCell(5, 'RELAY_BEGIN_DIR', '', 3257622417, 564346860).digest) @@ -171,7 +171,7 @@ class TestCell(unittest.TestCase): self.assertEqual(reason, cell.reason) self.assertEqual(reason_int, cell.reason_int) - self.assertRaisesRegexp(ValueError, 'Circuit closure reason should be a single byte, but was 2', Cell.pop, '\x80\x00\x00\x00\x04\x01\x01' + ZERO * 507, 5) + self.assertRaisesRegexp(ValueError, 'Circuit closure reason should be a single byte, but was 2', Cell.pop, b'\x80\x00\x00\x00\x04\x01\x01' + ZERO * 507, 5) def test_create_fast_cell(self): for cell_bytes, (circ_id, key_material) in CREATE_FAST_CELLS.items(): @@ -222,12 +222,12 @@ class TestCell(unittest.TestCase): # extra bytes after the last certificate should be ignored - self.assertEqual([Certificate(1, '\x08')], Cell.pop('\x00\x00\x81\x00\x07\x01\x01\x00\x01\x08\x06\x04', 2)[0].certificates) + self.assertEqual([Certificate(1, '\x08')], Cell.pop(b'\x00\x00\x81\x00\x07\x01\x01\x00\x01\x08\x06\x04', 2)[0].certificates) # ... but truncated or missing certificates should error - self.assertRaisesRegexp(ValueError, 'CERTS cell should have a certificate with 3 bytes, but only had 1 remaining', Cell.pop, '\x00\x00\x81\x00\x05\x01\x01\x00\x03\x08', 2) - self.assertRaisesRegexp(ValueError, 'CERTS cell indicates it should have 2 certificates, but only contained 1', Cell.pop, '\x00\x00\x81\x00\x05\x02\x01\x00\x01\x08', 2) + self.assertRaisesRegexp(ValueError, 'CERTS cell should have a certificate with 3 bytes, but only had 1 remaining', Cell.pop, b'\x00\x00\x81\x00\x05\x01\x01\x00\x03\x08', 2) + self.assertRaisesRegexp(ValueError, 'CERTS cell indicates it should have 2 certificates, but only contained 1', Cell.pop, b'\x00\x00\x81\x00\x05\x02\x01\x00\x01\x08', 2) def test_auth_challenge_cell(self): for cell_bytes, (challenge, methods) in AUTH_CHALLENGE_CELLS.items(): @@ -237,5 +237,5 @@ class TestCell(unittest.TestCase): self.assertEqual(challenge, cell.challenge) self.assertEqual(methods, cell.methods) - self.assertRaisesRegexp(ValueError, 'AUTH_CHALLENGE cell should have a payload of 38 bytes, but only had 16', Cell.pop, '\x00\x00\x82\x00&%s\x00\x02\x00\x01\x00\x03' % CHALLENGE[:10], 2) - self.assertRaisesRegexp(ValueError, 'AUTH_CHALLENGE should have 3 methods, but only had 4 bytes for it', Cell.pop, '\x00\x00\x82\x00&%s\x00\x03\x00\x01\x00\x03' % CHALLENGE, 2) + self.assertRaisesRegexp(ValueError, 'AUTH_CHALLENGE cell should have a payload of 38 bytes, but only had 16', Cell.pop, b'\x00\x00\x82\x00&%s\x00\x02\x00\x01\x00\x03' % CHALLENGE[:10], 2) + self.assertRaisesRegexp(ValueError, 'AUTH_CHALLENGE should have 3 methods, but only had 4 bytes for it', Cell.pop, b'\x00\x00\x82\x00&%s\x00\x03\x00\x01\x00\x03' % CHALLENGE, 2) diff --git a/test/unit/client/certificate.py b/test/unit/client/certificate.py index b6782acc..a15779f5 100644 --- a/test/unit/client/certificate.py +++ b/test/unit/client/certificate.py @@ -10,11 +10,11 @@ from stem.client.datatype import CertType, Certificate class TestCertificate(unittest.TestCase): def test_constructor(self): test_data = ( - ((1, '\x7f\x00\x00\x01'), (CertType.LINK, 1, '\x7f\x00\x00\x01')), - ((2, '\x7f\x00\x00\x01'), (CertType.IDENTITY, 2, '\x7f\x00\x00\x01')), - ((3, '\x7f\x00\x00\x01'), (CertType.AUTHENTICATE, 3, '\x7f\x00\x00\x01')), - ((4, '\x7f\x00\x00\x01'), (CertType.UNKNOWN, 4, '\x7f\x00\x00\x01')), - ((CertType.IDENTITY, '\x7f\x00\x00\x01'), (CertType.IDENTITY, 2, '\x7f\x00\x00\x01')), + ((1, b'\x7f\x00\x00\x01'), (CertType.LINK, 1, b'\x7f\x00\x00\x01')), + ((2, b'\x7f\x00\x00\x01'), (CertType.IDENTITY, 2, b'\x7f\x00\x00\x01')), + ((3, b'\x7f\x00\x00\x01'), (CertType.AUTHENTICATE, 3, b'\x7f\x00\x00\x01')), + ((4, b'\x7f\x00\x00\x01'), (CertType.UNKNOWN, 4, b'\x7f\x00\x00\x01')), + ((CertType.IDENTITY, b'\x7f\x00\x00\x01'), (CertType.IDENTITY, 2, b'\x7f\x00\x00\x01')), ) for (cert_type, cert_value), (expected_type, expected_type_int, expected_value) in test_data: @@ -30,10 +30,10 @@ class TestCertificate(unittest.TestCase): self.assertEqual('hello', cert.value) def test_packing(self): - cert, content = Certificate.pop('\x02\x00\x04\x00\x00\x01\x01\x04\x04aq\x0f\x02\x00\x00\x00\x00') - self.assertEqual('\x04\x04aq\x0f\x02\x00\x00\x00\x00', content) + cert, content = Certificate.pop(b'\x02\x00\x04\x00\x00\x01\x01\x04\x04aq\x0f\x02\x00\x00\x00\x00') + self.assertEqual(b'\x04\x04aq\x0f\x02\x00\x00\x00\x00', content) self.assertEqual(CertType.IDENTITY, cert.type) self.assertEqual(2, cert.type_int) - self.assertEqual('\x00\x00\x01\x01', cert.value) - self.assertEqual('\x02\x00\x04\x00\x00\x01\x01', cert.pack()) + self.assertEqual(b'\x00\x00\x01\x01', cert.value) + self.assertEqual(b'\x02\x00\x04\x00\x00\x01\x01', cert.pack()) diff --git a/test/unit/client/kdf.py b/test/unit/client/kdf.py index f3922538..b9fcb9ce 100644 --- a/test/unit/client/kdf.py +++ b/test/unit/client/kdf.py @@ -6,22 +6,22 @@ import unittest from stem.client.datatype import KDF -KEY_1 = '\xec\xec.\xeb7R\xf2\n\xcb\xce\x97\xf4\x86\x82\x19#\x10\x0f\x08\xf0\xa2Z\xdeJ\x8f2\x8cc\xf6\xfa\x0e\t\x83f\xc5\xe2\xb3\x94\xa8\x13' -KEY_2 = '\xe0v\xe4\xfaTB\x91\x1c\x81Gz\xa0\tI\xcb{\xc56\xcfV\xc2\xa0\x19\x9c\x98\x9a\x06\x0e\xc5\xfa\xb0z\x83\xa6\x10\xf6r"<b' +KEY_1 = b'\xec\xec.\xeb7R\xf2\n\xcb\xce\x97\xf4\x86\x82\x19#\x10\x0f\x08\xf0\xa2Z\xdeJ\x8f2\x8cc\xf6\xfa\x0e\t\x83f\xc5\xe2\xb3\x94\xa8\x13' +KEY_2 = b'\xe0v\xe4\xfaTB\x91\x1c\x81Gz\xa0\tI\xcb{\xc56\xcfV\xc2\xa0\x19\x9c\x98\x9a\x06\x0e\xc5\xfa\xb0z\x83\xa6\x10\xf6r"<b' class TestKDF(unittest.TestCase): def test_parsing(self): k1 = KDF.from_value(KEY_1) - self.assertEqual('\xca+\x81\x05\x14\x9d)o\xa6\x82\xe9B\xa8?\xf2\xaf\x85\x1b]6', k1.key_hash) - self.assertEqual('\xac\xcc\xbc\x91\xb1\xaf\xd7\xe0\xe9\x9dF#\xd8\xdbz\xe8\xe6\xca\x83,', k1.forward_digest) - self.assertEqual('*\xe5scX\xbb+\xca \xcb\xa4\xbc\xad\x0f\x95\x0cO\xcc\xac\xf1', k1.backward_digest) - self.assertEqual('\xc3\xbe\xc9\xe1\xf4\x90f\xdai\xf3\xf3\xf5\x14\xb5\xb9\x03', k1.forward_key) - self.assertEqual('U\xaf\x1e\x1b\xb1q||\x86A<_\xf7\xa0%\x86', k1.backward_key) + self.assertEqual(b'\xca+\x81\x05\x14\x9d)o\xa6\x82\xe9B\xa8?\xf2\xaf\x85\x1b]6', k1.key_hash) + self.assertEqual(b'\xac\xcc\xbc\x91\xb1\xaf\xd7\xe0\xe9\x9dF#\xd8\xdbz\xe8\xe6\xca\x83,', k1.forward_digest) + self.assertEqual(b'*\xe5scX\xbb+\xca \xcb\xa4\xbc\xad\x0f\x95\x0cO\xcc\xac\xf1', k1.backward_digest) + self.assertEqual(b'\xc3\xbe\xc9\xe1\xf4\x90f\xdai\xf3\xf3\xf5\x14\xb5\xb9\x03', k1.forward_key) + self.assertEqual(b'U\xaf\x1e\x1b\xb1q||\x86A<_\xf7\xa0%\x86', k1.backward_key) k2 = KDF.from_value(KEY_1) - self.assertEqual('\xca+\x81\x05\x14\x9d)o\xa6\x82\xe9B\xa8?\xf2\xaf\x85\x1b]6', k2.key_hash) - self.assertEqual('\xac\xcc\xbc\x91\xb1\xaf\xd7\xe0\xe9\x9dF#\xd8\xdbz\xe8\xe6\xca\x83,', k2.forward_digest) - self.assertEqual('*\xe5scX\xbb+\xca \xcb\xa4\xbc\xad\x0f\x95\x0cO\xcc\xac\xf1', k2.backward_digest) - self.assertEqual('\xc3\xbe\xc9\xe1\xf4\x90f\xdai\xf3\xf3\xf5\x14\xb5\xb9\x03', k2.forward_key) - self.assertEqual('U\xaf\x1e\x1b\xb1q||\x86A<_\xf7\xa0%\x86', k2.backward_key) + self.assertEqual(b'\xca+\x81\x05\x14\x9d)o\xa6\x82\xe9B\xa8?\xf2\xaf\x85\x1b]6', k2.key_hash) + self.assertEqual(b'\xac\xcc\xbc\x91\xb1\xaf\xd7\xe0\xe9\x9dF#\xd8\xdbz\xe8\xe6\xca\x83,', k2.forward_digest) + self.assertEqual(b'*\xe5scX\xbb+\xca \xcb\xa4\xbc\xad\x0f\x95\x0cO\xcc\xac\xf1', k2.backward_digest) + self.assertEqual(b'\xc3\xbe\xc9\xe1\xf4\x90f\xdai\xf3\xf3\xf5\x14\xb5\xb9\x03', k2.forward_key) + self.assertEqual(b'U\xaf\x1e\x1b\xb1q||\x86A<_\xf7\xa0%\x86', k2.backward_key) diff --git a/test/unit/client/size.py b/test/unit/client/size.py index 59416662..392c77ff 100644 --- a/test/unit/client/size.py +++ b/test/unit/client/size.py @@ -19,10 +19,10 @@ class TestSize(unittest.TestCase): self.assertEqual(8, Size.LONG_LONG.size) def test_pack(self): - self.assertEqual('\x12', Size.CHAR.pack(18)) - self.assertEqual('\x00\x12', Size.SHORT.pack(18)) - self.assertEqual('\x00\x00\x00\x12', Size.LONG.pack(18)) - self.assertEqual('\x00\x00\x00\x00\x00\x00\x00\x12', Size.LONG_LONG.pack(18)) + self.assertEqual(b'\x12', Size.CHAR.pack(18)) + self.assertEqual(b'\x00\x12', Size.SHORT.pack(18)) + self.assertEqual(b'\x00\x00\x00\x12', Size.LONG.pack(18)) + self.assertEqual(b'\x00\x00\x00\x00\x00\x00\x00\x12', Size.LONG_LONG.pack(18)) self.assertRaisesRegexp(ValueError, 'Size.pack encodes an integer, but was a str', Size.CHAR.pack, 'hi') @@ -30,21 +30,21 @@ class TestSize(unittest.TestCase): self.assertRaisesRegexp(ValueError, re.escape("'\\x00\\x12' is the wrong size for a BAD_SIZE field"), bad_size.pack, 18) def test_unpack(self): - self.assertEqual(18, Size.CHAR.unpack('\x12')) - self.assertEqual(18, Size.SHORT.unpack('\x00\x12')) - self.assertEqual(18, Size.LONG.unpack('\x00\x00\x00\x12')) - self.assertEqual(18, Size.LONG_LONG.unpack('\x00\x00\x00\x00\x00\x00\x00\x12')) + self.assertEqual(18, Size.CHAR.unpack(b'\x12')) + self.assertEqual(18, Size.SHORT.unpack(b'\x00\x12')) + self.assertEqual(18, Size.LONG.unpack(b'\x00\x00\x00\x12')) + self.assertEqual(18, Size.LONG_LONG.unpack(b'\x00\x00\x00\x00\x00\x00\x00\x12')) - self.assertEqual(ord('a'), Size.CHAR.unpack('a')) - self.assertEqual(24930, Size.SHORT.unpack('ab')) + self.assertEqual(ord('a'), Size.CHAR.unpack(b'a')) + self.assertEqual(24930, Size.SHORT.unpack(b'ab')) self.assertRaisesRegexp(ValueError, re.escape("'\\x00\\x12' is the wrong size for a CHAR field"), Size.CHAR.unpack, '\x00\x12') def test_pop(self): - self.assertEqual((18, ''), Size.CHAR.pop('\x12')) + self.assertEqual((18, b''), Size.CHAR.pop(b'\x12')) - self.assertEqual((0, '\x12'), Size.CHAR.pop('\x00\x12')) - self.assertEqual((18, ''), Size.SHORT.pop('\x00\x12')) + self.assertEqual((0, b'\x12'), Size.CHAR.pop(b'\x00\x12')) + self.assertEqual((18, b''), Size.SHORT.pop(b'\x00\x12')) self.assertRaisesRegexp(ValueError, "'' is the wrong size for a CHAR field", Size.CHAR.pop, '') self.assertRaisesRegexp(ValueError, re.escape("'\\x12' is the wrong size for a SHORT field"), Size.SHORT.pop, '\x12') diff --git a/test/unit/descriptor/remote.py b/test/unit/descriptor/remote.py index 9409544c..ac150d5c 100644 --- a/test/unit/descriptor/remote.py +++ b/test/unit/descriptor/remote.py @@ -300,17 +300,17 @@ class TestDescriptorDownloader(unittest.TestCase): @patch(URL_OPEN) def test_fallback_directories_from_remote_empty(self, urlopen_mock): - urlopen_mock.return_value = io.BytesIO('') + urlopen_mock.return_value = io.BytesIO(b'') self.assertRaisesRegexp(IOError, 'did not have any content', stem.descriptor.remote.FallbackDirectory.from_remote) @patch(URL_OPEN) def test_fallback_directories_from_remote_no_header(self, urlopen_mock): - urlopen_mock.return_value = io.BytesIO('\n'.join(FALLBACK_DIR_CONTENT.splitlines()[1:])) + urlopen_mock.return_value = io.BytesIO(b'\n'.join(FALLBACK_DIR_CONTENT.splitlines()[1:])) self.assertRaisesRegexp(IOError, 'does not have a type field indicating it is fallback directory metadata', stem.descriptor.remote.FallbackDirectory.from_remote) @patch(URL_OPEN) def test_fallback_directories_from_remote_malformed_header(self, urlopen_mock): - urlopen_mock.return_value = io.BytesIO(FALLBACK_DIR_CONTENT.replace('version=2.0.0', 'version')) + urlopen_mock.return_value = io.BytesIO(FALLBACK_DIR_CONTENT.replace(b'version=2.0.0', b'version')) self.assertRaisesRegexp(IOError, 'Malformed fallback directory header line: /\* version \*/', stem.descriptor.remote.FallbackDirectory.from_remote) def test_fallback_directories_from_str(self): @@ -328,12 +328,12 @@ class TestDescriptorDownloader(unittest.TestCase): def test_fallback_directories_from_str_malformed(self): test_values = { - FALLBACK_ENTRY.replace('id=0756B7CD4DFC8182BE23143FAC0642F515182CEB', ''): 'Malformed fallback address line:', - FALLBACK_ENTRY.replace('5.9.110.236', '5.9.110'): '0756B7CD4DFC8182BE23143FAC0642F515182CEB has an invalid IPv4 address: 5.9.110', - FALLBACK_ENTRY.replace(':9030', ':7814713228'): '0756B7CD4DFC8182BE23143FAC0642F515182CEB has an invalid dir_port: 7814713228', - FALLBACK_ENTRY.replace('orport=9001', 'orport=7814713228'): '0756B7CD4DFC8182BE23143FAC0642F515182CEB has an invalid or_port: 7814713228', - FALLBACK_ENTRY.replace('ipv6=[2a01', 'ipv6=[:::'): '0756B7CD4DFC8182BE23143FAC0642F515182CEB has an invalid IPv6 address: ::::4f8:162:51e2::2', - FALLBACK_ENTRY.replace('nickname=rueckgrat', 'nickname=invalid~nickname'): '0756B7CD4DFC8182BE23143FAC0642F515182CEB has an invalid nickname: invalid~nickname', + FALLBACK_ENTRY.replace(b'id=0756B7CD4DFC8182BE23143FAC0642F515182CEB', b''): 'Malformed fallback address line:', + FALLBACK_ENTRY.replace(b'5.9.110.236', b'5.9.110'): '0756B7CD4DFC8182BE23143FAC0642F515182CEB has an invalid IPv4 address: 5.9.110', + FALLBACK_ENTRY.replace(b':9030', b':7814713228'): '0756B7CD4DFC8182BE23143FAC0642F515182CEB has an invalid dir_port: 7814713228', + FALLBACK_ENTRY.replace(b'orport=9001', b'orport=7814713228'): '0756B7CD4DFC8182BE23143FAC0642F515182CEB has an invalid or_port: 7814713228', + FALLBACK_ENTRY.replace(b'ipv6=[2a01', b'ipv6=[:::'): '0756B7CD4DFC8182BE23143FAC0642F515182CEB has an invalid IPv6 address: ::::4f8:162:51e2::2', + FALLBACK_ENTRY.replace(b'nickname=rueckgrat', b'nickname=invalid~nickname'): '0756B7CD4DFC8182BE23143FAC0642F515182CEB has an invalid nickname: invalid~nickname', } for entry, expected in test_values.items():

1 0

[stem/master] Don't validate crosscert without cryptography module
by atagar＠torproject.org 26 Feb '18

26 Feb '18

commit b4bf0499a4fd048526ebbd89ad5d9c21cec70676 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Feb 25 17:33:38 2018 -0800 Don't validate crosscert without cryptography module Oops, we shouldn't exercise this validation when the cryptography module isn't present. ====================================================================== FAIL: test_cached_descriptor ---------------------------------------------------------------------- Traceback (most recent call last): File "/home/atagar/Desktop/stem/stem/util/test_tools.py", line 150, in <lambda> self.method = lambda test: self.result(test) # method that can be mixed into TestCases File "/home/atagar/Desktop/stem/stem/util/test_tools.py", line 220, in result test.fail(self._result.msg) AssertionError: Traceback (most recent call last): File "/home/atagar/Desktop/stem/stem/util/test_tools.py", line 168, in _wrapper runner(*args) if args else runner() File "/home/atagar/Desktop/stem/test/integ/descriptor/server_descriptor.py", line 34, in test_cached_descriptor for desc in stem.descriptor.parse_file(descriptor_file, 'server-descriptor 1.0', validate = True): File "/home/atagar/Desktop/stem/stem/descriptor/__init__.py", line 274, in parse_file for desc in parse(descriptor_file): File "/home/atagar/Desktop/stem/stem/descriptor/__init__.py", line 321, in _parse_metrics_file for desc in stem.descriptor.server_descriptor._parse_file(descriptor_file, is_bridge = False, validate = validate, **kwargs): File "/home/atagar/Desktop/stem/stem/descriptor/server_descriptor.py", line 221, in _parse_file yield RelayDescriptor(descriptor_text, validate, annotations, **kwargs) File "/home/atagar/Desktop/stem/stem/descriptor/server_descriptor.py", line 833, in __init__ onion_key_crosscert_digest = self._digest_for_signature(self.onion_key, self.onion_key_crosscert) File "/home/atagar/Desktop/stem/stem/descriptor/__init__.py", line 734, in _digest_for_signature raise ValueError('Generating the signed digest requires the cryptography module') ValueError: Generating the signed digest requires the cryptography module --- stem/descriptor/server_descriptor.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stem/descriptor/server_descriptor.py b/stem/descriptor/server_descriptor.py index eef507a5..8aed42c6 100644 --- a/stem/descriptor/server_descriptor.py +++ b/stem/descriptor/server_descriptor.py @@ -829,7 +829,7 @@ class RelayDescriptor(ServerDescriptor): if signed_digest != self.digest(): raise ValueError('Decrypted digest does not match local digest (calculated: %s, local: %s)' % (signed_digest, self.digest())) - if self.onion_key_crosscert: + if self.onion_key_crosscert and stem.prereq.is_crypto_available(): onion_key_crosscert_digest = self._digest_for_signature(self.onion_key, self.onion_key_crosscert) if onion_key_crosscert_digest != self._onion_key_crosscert_digest():

1 0

[doctor/master] Track nyx's mac and debian versions
by atagar＠torproject.org 25 Feb '18

25 Feb '18

commit 9cf2fedfdfe10a13eeb2677a42cbe6549aedc77c Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Feb 24 16:08:59 2018 -0800 Track nyx's mac and debian versions --- package_versions.py | 64 ++++++++++++++++++++++++++++------------------------- 1 file changed, 34 insertions(+), 30 deletions(-) diff --git a/package_versions.py b/package_versions.py index e3ce356..f40a2cb 100755 --- a/package_versions.py +++ b/package_versions.py @@ -43,6 +43,8 @@ PACKAGES = [ Package('netbsd', 'http://pkgsrc.se/net/tor', NETBSD_VERSION), ]), ('nyx', [ + Package('mac', 'https://raw.githubusercontent.com/Homebrew/homebrew-core/master/Formula/nyx…', 'nyx-([0-9\.]+).tar.gz'), + Package('debian', 'https://packages.debian.org/sid/nyx', DEBIAN_VERSION), Package('gentoo', 'https://packages.gentoo.org/packages/net-misc/nyx', None), Package('archlinux', 'https://aur.archlinux.org/packages/nyx/', AUR_VERSION), Package('slackware', 'https://slackbuilds.org/repository/14.2/python/nyx/', 'nyx-([0-9\.]+).tar.gz'), @@ -114,7 +116,7 @@ def wiki_package_versions(): if m: version_entries.append(m.group(1)) - if len(version_entries) != 38: + if len(version_entries) != 40: raise IOError('Table on %s no longer matches what this daemon expects (had %i entries)' % (TRAC_URL, len(version_entries))) return { @@ -129,39 +131,41 @@ def wiki_package_versions(): 'openbsd': version_entries[7], 'netbsd': version_entries[8], }, 'nyx': { - 'fedora': version_entries[9], - 'gentoo': version_entries[10], - 'archlinux': version_entries[11], - 'slackware': version_entries[12], - 'freebsd': version_entries[13], - 'openbsd': version_entries[14], + 'mac': version_entries[9], + 'debian': version_entries[10], + 'fedora': version_entries[11], + 'gentoo': version_entries[12], + 'archlinux': version_entries[13], + 'slackware': version_entries[14], + 'freebsd': version_entries[15], + 'openbsd': version_entries[16], }, 'stem': { - 'debian': version_entries[15], - 'fedora': version_entries[16], - 'gentoo': version_entries[17], - 'archlinux': version_entries[18], - 'slackware': version_entries[19], - 'freebsd': version_entries[20], - 'openbsd': version_entries[21], + 'debian': version_entries[17], + 'fedora': version_entries[18], + 'gentoo': version_entries[19], + 'archlinux': version_entries[20], + 'slackware': version_entries[21], + 'freebsd': version_entries[22], + 'openbsd': version_entries[23], }, 'txtorcon': { - 'debian': version_entries[22], - 'gentoo': version_entries[23], - 'archlinux': version_entries[24], - 'slackware': version_entries[25], - 'freebsd': version_entries[26], + 'debian': version_entries[24], + 'gentoo': version_entries[25], + 'archlinux': version_entries[26], + 'slackware': version_entries[27], + 'freebsd': version_entries[28], }, 'torsocks': { - 'mac': version_entries[27], - 'debian': version_entries[28], - 'fedora': version_entries[29], - 'gentoo': version_entries[30], - 'archlinux': version_entries[31], - 'slackware': version_entries[32], - 'freebsd': version_entries[33], - 'openbsd': version_entries[34], + 'mac': version_entries[29], + 'debian': version_entries[30], + 'fedora': version_entries[31], + 'gentoo': version_entries[32], + 'archlinux': version_entries[33], + 'slackware': version_entries[34], + 'freebsd': version_entries[35], + 'openbsd': version_entries[36], }, 'ooni probe': { - 'mac': version_entries[35], - 'debian': version_entries[36], - 'archlinux': version_entries[37], + 'mac': version_entries[37], + 'debian': version_entries[38], + 'archlinux': version_entries[39], } }

1 0

[tor-browser-build/master] Bug 25020: fix a typo in tbb_version.json filename
by boklm＠torproject.org 24 Feb '18

24 Feb '18

commit e7e4cbd526d767d46fe6f728c99492e7e3d6e76c Author: Nicolas Vigier <boklm(a)torproject.org> Date: Sat Feb 24 21:54:29 2018 +0100 Bug 25020: fix a typo in tbb_version.json filename --- projects/tor-browser/build | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/tor-browser/build b/projects/tor-browser/build index 978d988..c542818 100644 --- a/projects/tor-browser/build +++ b/projects/tor-browser/build @@ -199,7 +199,7 @@ echo "pref(\"general.useragent.locale\", \"en-US\");" >> defaults/preferences/00 zip -Xm omni.ja defaults/preferences/000-tor-browser.js rm -rf defaults # create tbb_version.json file for #25020 -echo '{"version":"[% c("var/torbrowser_version") %]","architecture":"[% c("var/mar_osname") %]","channel":"[% c("var/channel") %]","locale":"en-US"}' > ../tbb_verson.json +echo '{"version":"[% c("var/torbrowser_version") %]","architecture":"[% c("var/mar_osname") %]","channel":"[% c("var/channel") %]","locale":"en-US"}' > ../tbb_version.json popd # Prepare our language packs for using the proper search engines and embed @@ -330,7 +330,7 @@ cp $rootdir/[% c('input_files_by_name/firefox') %]/mar-tools-*.zip "$OUTDIR"/ zip -Xm omni.ja defaults/preferences/000-tor-browser.js rm -rf defaults # create tbb_version.json file for #25020 - echo '{"version":"[% c("var/torbrowser_version") %]","architecture":"[% c("var/mar_osname") %]","channel":"[% c("var/channel") %]","locale":"[% lang %]"}' > ../tbb_verson.json + echo '{"version":"[% c("var/torbrowser_version") %]","architecture":"[% c("var/mar_osname") %]","channel":"[% c("var/channel") %]","locale":"[% lang %]"}' > ../tbb_version.json popd # Set the update.locale (it is used to replace %LOCALE% within

1 0

[webwml/master] Add a couple more python client subtasks
by atagar＠torproject.org 23 Feb '18

23 Feb '18

commit aa5e22128f2b94e23c089e39c9a211ec63159e8d Author: Damian Johnson <atagar(a)torproject.org> Date: Fri Feb 23 14:13:08 2018 -0800 Add a couple more python client subtasks Couple more subtasks, courtesy of Tim. --- getinvolved/en/volunteer.wml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/getinvolved/en/volunteer.wml b/getinvolved/en/volunteer.wml index ff05c1a1..617e5ff5 100644 --- a/getinvolved/en/volunteer.wml +++ b/getinvolved/en/volunteer.wml @@ -754,6 +754,8 @@ This opens interesting opportunities we've never had before such as... <ul> <li>Construct a full three-hop circuit that can make GET requests and DNS lookups. If done right this might allow simple usage of the Tor network without even having Tor installed!</li> <li>Expand <a href="https://stem.torproject.org/tutorials/mirror_mirror_on_the_wall.html#where-…">descriptor downloading</a> to use Tor's ORPort as an optional alternative for the DirPort. Following this we could adjust Tor so <a href="https://trac.torproject.org/projects/tor/ticket/19129">Fallback Directories no longer require a DirPort</a>.</li> + <li>Download hidden service descriptors. Unlike relays, the descriptors for hidden services are only available over the ORPort. Once <a href="https://trac.torproject.org/projects/tor/ticket/17945">ticket 17945</a> is merged v3 HS descriptor downloads will require a multi-hop circuit. This requires an understanding of Tor's <a href="https://gitweb.torproject.org/torspec.git/tree/rend-spec-v3.txt">hidden service</a> specifications, particularly the HSDir hash ring.</li> + <li>Authenticate our ORPort connection, checking that ORPorts we connect to have the right key fingerprint.</li> <li>Add protocol level integration test of Tor's ORPort, for instance exercising edge cases in circuit construction and extension.</li> </ul>

1 0

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

23 Feb '18

commit 945c39f5e8915dfdc744fa93fc271cff43e56c7b Author: Translation commit bot <translation(a)torproject.org> Date: Fri Feb 23 20:17:09 2018 +0000 Update translations for tails-misc_completed --- nl.po | 57 ++++++++++++++++++++++++++++++++++++++++++--------------- 1 file changed, 42 insertions(+), 15 deletions(-) diff --git a/nl.po b/nl.po index 48b9f954b..a651e8252 100644 --- a/nl.po +++ b/nl.po @@ -11,7 +11,7 @@ # Cleveridge <erwin.de.laat(a)cleveridge.org>, 2014 # gjlajfklajdkladj kasldfjaslkf <1bsuaz+3xy1gedeysrhc(a)sharklasers.com>, 2015 # Joost Rijneveld <joost(a)joostrijneveld.nl>, 2014 -# kwadronaut <kwadronaut(a)autistici.org>, 2017 +# kwadronaut <kwadronaut(a)autistici.org>, 2017-2018 # LittleNacho <louisboy(a)msn.com>, 2013 # Mart3000, 2015 # Nathan Follens, 2015 @@ -26,9 +26,9 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-09-13 20:10+0200\n" -"PO-Revision-Date: 2018-02-05 12:39+0000\n" -"Last-Translator: Thomas van Voorst <thomasv.voorst(a)hotmail.com>\n" +"POT-Creation-Date: 2018-02-20 11:29+0100\n" +"PO-Revision-Date: 2018-02-23 20:16+0000\n" +"Last-Translator: kwadronaut <kwadronaut(a)autistici.org>\n" "Language-Team: Dutch (http://www.transifex.com/otf/torproject/language/nl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -119,24 +119,51 @@ msgstr "Gedetailleerde informatie over de versie:\n%s" msgid "not available" msgstr "niet beschikbaar" -#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:147 -#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:162 -#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:166 -msgid "Your additional software" -msgstr "Uw aanvullende software" +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:119 +msgid "Your additional software installation failed" +msgstr "De installatie van uw aanvullende software is mislukt" -#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:148 -#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:167 +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:120 +msgid "" +"The installation failed. Please check your additional software " +"configuration, or read the system log to understand better the problem." +msgstr "De installatie is mislukt. Controleer de configuratie van uw aanvullende software of lees de systeem logs om het probleem beter te begrijpen." + +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:126 +msgid "Your additional software are installed" +msgstr "Uw aanvullende software is geïnstalleerd" + +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:127 +msgid "Your additional software are ready to use." +msgstr "Uw aanvullende software is klaar voor gebruik." + +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:138 +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:157 +msgid "Your additional software upgrade failed" +msgstr "De upgrade van uw aanvullende software is mislukt" + +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:139 +msgid "" +"The check for upgrades failed. This might be due to a network problem. " +"Please check your network connection, try to restart Tails, or read the " +"system log to understand better the problem." +msgstr "De controle voor upgrades is mislukt. Dit kan komen door een netwerkprobleem. Controleer je netwerkverbinding, herstart Tails of lees het systeemlog om het probleem beter te begrijpen." + +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:153 +msgid "Your additional software are up to date" +msgstr "Uw aanvullende software is up-to-date" + +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:154 +msgid "The upgrade was successful." +msgstr "De upgrade is succesvol. " + +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:158 msgid "" "The upgrade failed. This might be due to a network problem. Please check " "your network connection, try to restart Tails, or read the system log to " "understand better the problem." msgstr "De upgrade is mislukt. Dit kan komen door een netwerk probleem. Controleer je netwerkverbinding, herstart Tails of lees het systeemlog om het probleem beter te begrijpen." -#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:163 -msgid "The upgrade was successful." -msgstr "De upgrade is succesvol. " - #: config/chroot_local-includes/usr/local/lib/tails-htp-notify-user:52 msgid "Synchronizing the system's clock" msgstr "Synchroniseren van de systeemklok "

1 0

← Newer
1
2
3
4
5
6
7
8
9
...
158
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits February 2018