tor-commits April 2018

tor-commits@lists.torproject.org

17 participants
1638 discussions

[translation/mat-gui_completed] Update translations for mat-gui_completed
by translation＠torproject.org 16 Apr '18

16 Apr '18

commit 4231c30be8c8c6687642574ff26ce20ea18d24a6 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Apr 16 10:46:19 2018 +0000 Update translations for mat-gui_completed --- de.po | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/de.po b/de.po index f1160107b..4b01daaac 100644 --- a/de.po +++ b/de.po @@ -10,6 +10,7 @@ # rike, 2014 # Sacro <Scion(a)T-Online.de>, 2013 # Sacro <Scion(a)T-Online.de>, 2013 +# spriver, 2018 # Thilo N, 2016 # Tobias Bannert <tobannert(a)gmail.com>, 2014 # rike, 2014-2015 @@ -18,8 +19,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-02-10 23:06+0100\n" -"PO-Revision-Date: 2018-04-12 19:01+0000\n" -"Last-Translator: Adam Lynn <adam(a)opentechfund.org>\n" +"PO-Revision-Date: 2018-04-16 10:34+0000\n" +"Last-Translator: spriver\n" "Language-Team: German (http://www.transifex.com/otf/torproject/language/de/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -83,11 +84,11 @@ msgstr "Größe und Qualität der erstellten PDF-Datei verringern" #: mat-gui:238 msgid "Remove unsupported file from archives" -msgstr "Entferne nicht unterstützte Datei aus dem Archiv" +msgstr "Entferne nicht unterstützte Datei aus den Archiven" #: mat-gui:241 msgid "Remove non-supported (and so non-anonymised) file from output archive" -msgstr "Entferne nicht unterstützte (und somit nicht anonymisierte) Dateien aus dem Ausgabearchiv" +msgstr "Entferne nicht unterstützte (und somit nicht anonymisierte) Datei aus dem Ausgabearchiv" #: mat-gui:280 msgid "Unknown"

1 0

[translation/mat-gui] Update translations for mat-gui
by translation＠torproject.org 16 Apr '18

16 Apr '18

commit b6b0b9597669802e6571e148d82a3a71d2875f14 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Apr 16 10:46:14 2018 +0000 Update translations for mat-gui --- de.po | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/de.po b/de.po index f1160107b..4b01daaac 100644 --- a/de.po +++ b/de.po @@ -10,6 +10,7 @@ # rike, 2014 # Sacro <Scion(a)T-Online.de>, 2013 # Sacro <Scion(a)T-Online.de>, 2013 +# spriver, 2018 # Thilo N, 2016 # Tobias Bannert <tobannert(a)gmail.com>, 2014 # rike, 2014-2015 @@ -18,8 +19,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-02-10 23:06+0100\n" -"PO-Revision-Date: 2018-04-12 19:01+0000\n" -"Last-Translator: Adam Lynn <adam(a)opentechfund.org>\n" +"PO-Revision-Date: 2018-04-16 10:34+0000\n" +"Last-Translator: spriver\n" "Language-Team: German (http://www.transifex.com/otf/torproject/language/de/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -83,11 +84,11 @@ msgstr "Größe und Qualität der erstellten PDF-Datei verringern" #: mat-gui:238 msgid "Remove unsupported file from archives" -msgstr "Entferne nicht unterstützte Datei aus dem Archiv" +msgstr "Entferne nicht unterstützte Datei aus den Archiven" #: mat-gui:241 msgid "Remove non-supported (and so non-anonymised) file from output archive" -msgstr "Entferne nicht unterstützte (und somit nicht anonymisierte) Dateien aus dem Ausgabearchiv" +msgstr "Entferne nicht unterstützte (und somit nicht anonymisierte) Datei aus dem Ausgabearchiv" #: mat-gui:280 msgid "Unknown"

1 0

[translation/tails-iuk_completed] Update translations for tails-iuk_completed
by translation＠torproject.org 16 Apr '18

16 Apr '18

commit 694ad74cdbec6b2ab3d36c0c9618528d8f8d4dc9 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Apr 16 10:17:30 2018 +0000 Update translations for tails-iuk_completed --- de.po | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/de.po b/de.po index 48d2e2d42..5e45282ad 100644 --- a/de.po +++ b/de.po @@ -8,6 +8,7 @@ # max weber, 2015 # noble <noble(a)posteo.de>, 2013 # rike, 2014 +# spriver, 2018 # sycamoreone <sycamoreone(a)riseup.net>, 2014 # Tobias Bannert <tobannert(a)gmail.com>, 2013-2014 # Knight222 <tobias(a)tobiassachs.de>, 2014 @@ -18,9 +19,9 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: Tails developers <tails(a)boum.org>\n" -"POT-Creation-Date: 2017-04-18 12:13+0200\n" -"PO-Revision-Date: 2017-09-23 19:27+0000\n" -"Last-Translator: 2Pacalypse <kingmichele99(a)gmail.com>\n" +"POT-Creation-Date: 2018-03-01 21:30+0100\n" +"PO-Revision-Date: 2018-04-16 10:10+0000\n" +"Last-Translator: spriver\n" "Language-Team: German (http://www.transifex.com/otf/torproject/language/de/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -33,7 +34,7 @@ msgstr "" msgid "" "For debugging information, execute the following command: sudo tails-" "debugging-info" -msgstr "Führen Sie folgenden Befehl für Informationen zur Fehlerdiagnose aus: sudo tails-debugging-info" +msgstr "Führen Sie folgenden Befehl für Informationen zur Fehlerdiagnose aus: sudo tails-debugging-info" #: ../lib/Tails/IUK/Frontend.pm:217 msgid "Error while checking for upgrades" @@ -190,11 +191,11 @@ msgid "" "Could not choose a download server.\n" "\n" "This should not happen. Please report a bug." -msgstr "Wir konnten leider keinen geeigneten Download Server finden/b>\n\nDas sollte eigentlich nicht passieren. Senden sie uns bitte diesen Fehler." +msgstr "Es konnte kein geeigneter Download-Server gefunden werden.\n\nDies sollte eigentlich nicht passieren. Senden sie uns bitte einen Fehlerbericht." #: ../lib/Tails/IUK/Frontend.pm:591 msgid "Error while choosing a download server" -msgstr "Fehler beim auswählen eines Download Servers" +msgstr "Fehler beim Auswählen eines Download-Servers" #: ../lib/Tails/IUK/Frontend.pm:608 msgid ""

1 0

[translation/tails-iuk] Update translations for tails-iuk
by translation＠torproject.org 16 Apr '18

16 Apr '18

commit 1f00f79d5483f2ef181df7c5a5f962aa1ab6acde Author: Translation commit bot <translation(a)torproject.org> Date: Mon Apr 16 10:17:26 2018 +0000 Update translations for tails-iuk --- de.po | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/de.po b/de.po index 48d2e2d42..5e45282ad 100644 --- a/de.po +++ b/de.po @@ -8,6 +8,7 @@ # max weber, 2015 # noble <noble(a)posteo.de>, 2013 # rike, 2014 +# spriver, 2018 # sycamoreone <sycamoreone(a)riseup.net>, 2014 # Tobias Bannert <tobannert(a)gmail.com>, 2013-2014 # Knight222 <tobias(a)tobiassachs.de>, 2014 @@ -18,9 +19,9 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: Tails developers <tails(a)boum.org>\n" -"POT-Creation-Date: 2017-04-18 12:13+0200\n" -"PO-Revision-Date: 2017-09-23 19:27+0000\n" -"Last-Translator: 2Pacalypse <kingmichele99(a)gmail.com>\n" +"POT-Creation-Date: 2018-03-01 21:30+0100\n" +"PO-Revision-Date: 2018-04-16 10:10+0000\n" +"Last-Translator: spriver\n" "Language-Team: German (http://www.transifex.com/otf/torproject/language/de/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -33,7 +34,7 @@ msgstr "" msgid "" "For debugging information, execute the following command: sudo tails-" "debugging-info" -msgstr "Führen Sie folgenden Befehl für Informationen zur Fehlerdiagnose aus: sudo tails-debugging-info" +msgstr "Führen Sie folgenden Befehl für Informationen zur Fehlerdiagnose aus: sudo tails-debugging-info" #: ../lib/Tails/IUK/Frontend.pm:217 msgid "Error while checking for upgrades" @@ -190,11 +191,11 @@ msgid "" "Could not choose a download server.\n" "\n" "This should not happen. Please report a bug." -msgstr "Wir konnten leider keinen geeigneten Download Server finden/b>\n\nDas sollte eigentlich nicht passieren. Senden sie uns bitte diesen Fehler." +msgstr "Es konnte kein geeigneter Download-Server gefunden werden.\n\nDies sollte eigentlich nicht passieren. Senden sie uns bitte einen Fehlerbericht." #: ../lib/Tails/IUK/Frontend.pm:591 msgid "Error while choosing a download server" -msgstr "Fehler beim auswählen eines Download Servers" +msgstr "Fehler beim Auswählen eines Download-Servers" #: ../lib/Tails/IUK/Frontend.pm:608 msgid ""

1 0

[translation/tails-misc] Update translations for tails-misc
by translation＠torproject.org 16 Apr '18

16 Apr '18

commit 233234c6887ebb318cdc69642c7ba690752c3f50 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Apr 16 10:16:40 2018 +0000 Update translations for tails-misc --- hi.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hi.po b/hi.po index aaf23f705..f06a53b11 100644 --- a/hi.po +++ b/hi.po @@ -9,8 +9,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2018-03-12 19:03+0100\n" -"PO-Revision-Date: 2018-04-12 19:07+0000\n" -"Last-Translator: Paras Kharbanda <paraskharbanda123(a)gmail.com>\n" +"PO-Revision-Date: 2018-04-16 10:02+0000\n" +"Last-Translator: U.M.K. Dikshit <dikshitrocks93(a)gmail.com>\n" "Language-Team: Hindi (http://www.transifex.com/otf/torproject/language/hi/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n"

1 0

[translation/liveusb-creator_completed] Update translations for liveusb-creator_completed
by translation＠torproject.org 16 Apr '18

16 Apr '18

commit 2d636e68d3074d69e588bf9547771c7292d0454f Author: Translation commit bot <translation(a)torproject.org> Date: Mon Apr 16 10:15:46 2018 +0000 Update translations for liveusb-creator_completed --- de/de.po | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/de/de.po b/de/de.po index 326060d04..30f7829de 100644 --- a/de/de.po +++ b/de/de.po @@ -45,7 +45,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2017-11-10 15:57+0100\n" -"PO-Revision-Date: 2018-04-16 09:45+0000\n" +"PO-Revision-Date: 2018-04-16 09:53+0000\n" "Last-Translator: spriver\n" "Language-Team: German (http://www.transifex.com/otf/torproject/language/de/)\n" "MIME-Version: 1.0\n" @@ -308,7 +308,7 @@ msgstr "Kann nicht gefunden werden" msgid "" "Make sure to extract the entire tails-installer zip file before running this" " program." -msgstr "Stellen Sie sicher, dass die gesamte ZIP-Datei des tails-Installationsprogrammes extrahiert wurde, bevor Sie dieses Programm ausführen." +msgstr "Stellen Sie sicher, dass die gesamte ZIP-Datei des tails-installer extrahiert wurde, bevor Sie dieses Programm ausführen." #: ../tails_installer/gui.py:69 #, python-format @@ -437,7 +437,7 @@ msgid "" "\n" "\n" "The persistent storage on this USB stick will be preserved." -msgstr "\n\nDer dauerhafte Speicher auf diesem USB-Stick bleibt erhalten." +msgstr "\n\nDer beständige Speicher auf diesem USB-Stick bleibt erhalten." #: ../tails_installer/gui.py:731 #, python-format @@ -475,7 +475,7 @@ msgstr "%(filename)s ausgewählt" #: ../tails_installer/source.py:28 msgid "Unable to find LiveOS on ISO" -msgstr "Kein LiveOS auf der ISO gefunden." +msgstr "Kein LiveOS auf der ISO gefunden" #: ../tails_installer/source.py:34 #, python-format @@ -526,7 +526,7 @@ msgstr "Aktuelles Tails klonen" #: ../data/tails-installer.ui.h:3 msgid "Use a downloaded Tails ISO image" -msgstr "Heruntergeladenes Tails-ISO-Abbild verwenden" +msgstr "Heruntergeladenes Tails-ISO-Image verwenden" #: ../data/tails-installer.ui.h:4 msgid "Select a distribution to download:"

1 0

[translation/liveusb-creator] Update translations for liveusb-creator
by translation＠torproject.org 16 Apr '18

16 Apr '18

commit cd7634e7714a45afa88d5b62b0467ef8728b8703 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Apr 16 10:15:42 2018 +0000 Update translations for liveusb-creator --- de/de.po | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/de/de.po b/de/de.po index 326060d04..30f7829de 100644 --- a/de/de.po +++ b/de/de.po @@ -45,7 +45,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2017-11-10 15:57+0100\n" -"PO-Revision-Date: 2018-04-16 09:45+0000\n" +"PO-Revision-Date: 2018-04-16 09:53+0000\n" "Last-Translator: spriver\n" "Language-Team: German (http://www.transifex.com/otf/torproject/language/de/)\n" "MIME-Version: 1.0\n" @@ -308,7 +308,7 @@ msgstr "Kann nicht gefunden werden" msgid "" "Make sure to extract the entire tails-installer zip file before running this" " program." -msgstr "Stellen Sie sicher, dass die gesamte ZIP-Datei des tails-Installationsprogrammes extrahiert wurde, bevor Sie dieses Programm ausführen." +msgstr "Stellen Sie sicher, dass die gesamte ZIP-Datei des tails-installer extrahiert wurde, bevor Sie dieses Programm ausführen." #: ../tails_installer/gui.py:69 #, python-format @@ -437,7 +437,7 @@ msgid "" "\n" "\n" "The persistent storage on this USB stick will be preserved." -msgstr "\n\nDer dauerhafte Speicher auf diesem USB-Stick bleibt erhalten." +msgstr "\n\nDer beständige Speicher auf diesem USB-Stick bleibt erhalten." #: ../tails_installer/gui.py:731 #, python-format @@ -475,7 +475,7 @@ msgstr "%(filename)s ausgewählt" #: ../tails_installer/source.py:28 msgid "Unable to find LiveOS on ISO" -msgstr "Kein LiveOS auf der ISO gefunden." +msgstr "Kein LiveOS auf der ISO gefunden" #: ../tails_installer/source.py:34 #, python-format @@ -526,7 +526,7 @@ msgstr "Aktuelles Tails klonen" #: ../data/tails-installer.ui.h:3 msgid "Use a downloaded Tails ISO image" -msgstr "Heruntergeladenes Tails-ISO-Abbild verwenden" +msgstr "Heruntergeladenes Tails-ISO-Image verwenden" #: ../data/tails-installer.ui.h:4 msgid "Select a distribution to download:"

1 0

[metrics-lib/master] Clarify parameter description in DescriptorParser's javadoc.
by karsten＠torproject.org 16 Apr '18

16 Apr '18

commit 42daf8e5e12f99ab78c2dd53b4cfe729e8171ded Author: iwakeh <iwakeh(a)torproject.org> Date: Tue Mar 27 07:25:36 2018 +0000 Clarify parameter description in DescriptorParser's javadoc. Also rename parameter for clarity and apply the name change to the implementation. --- .../torproject/descriptor/DescriptorParser.java | 9 ++-- .../descriptor/impl/DescriptorParserImpl.java | 52 +++++++++++----------- 2 files changed, 31 insertions(+), 30 deletions(-) diff --git a/src/main/java/org/torproject/descriptor/DescriptorParser.java b/src/main/java/org/torproject/descriptor/DescriptorParser.java index d530a2b..064e3ab 100644 --- a/src/main/java/org/torproject/descriptor/DescriptorParser.java +++ b/src/main/java/org/torproject/descriptor/DescriptorParser.java @@ -28,9 +28,10 @@ public interface DescriptorParser { * * @param rawDescriptorBytes Raw descriptor bytes containing one or more * descriptors - * @param descriptorFile Optional descriptor file reference included in - * parsed/unparseable descriptors - * @param fileName Descriptor file name used for parsing the descriptor + * @param sourceFile Optional descriptor source file reference, e.g., the name + * of a tar file that contains descriptors, included in parsed/unparseable + * descriptors. + * @param fileName Proper file name for the descriptor used as a parser hint, * publication time of some descriptor types * * @return Parsed/unparseable descriptors @@ -38,5 +39,5 @@ public interface DescriptorParser { * @since 1.9.0 */ public Iterable<Descriptor> parseDescriptors(byte[] rawDescriptorBytes, - File descriptorFile, String fileName); + File sourceFile, String fileName); } diff --git a/src/main/java/org/torproject/descriptor/impl/DescriptorParserImpl.java b/src/main/java/org/torproject/descriptor/impl/DescriptorParserImpl.java index f244abb..be9041f 100644 --- a/src/main/java/org/torproject/descriptor/impl/DescriptorParserImpl.java +++ b/src/main/java/org/torproject/descriptor/impl/DescriptorParserImpl.java @@ -28,21 +28,21 @@ public class DescriptorParserImpl implements DescriptorParser { @Override public Iterable<Descriptor> parseDescriptors(byte[] rawDescriptorBytes, - File descriptorFile, String fileName) { + File sourceFile, String fileName) { try { return this.detectTypeAndParseDescriptors(rawDescriptorBytes, - descriptorFile, fileName); + sourceFile, fileName); } catch (DescriptorParseException e) { - log.debug("Cannot parse descriptor file ’{}’.", descriptorFile, e); + log.debug("Cannot parse descriptor file ’{}’.", sourceFile, e); List<Descriptor> parsedDescriptors = new ArrayList<>(); parsedDescriptors.add(new UnparseableDescriptorImpl(rawDescriptorBytes, - new int[] { 0, rawDescriptorBytes.length }, descriptorFile, e)); + new int[] { 0, rawDescriptorBytes.length }, sourceFile, e)); return parsedDescriptors; } } private List<Descriptor> detectTypeAndParseDescriptors( - byte[] rawDescriptorBytes, File descriptorFile, String fileName) + byte[] rawDescriptorBytes, File sourceFile, String fileName) throws DescriptorParseException { byte[] first100Chars = new byte[Math.min(100, rawDescriptorBytes.length)]; @@ -58,7 +58,7 @@ public class DescriptorParserImpl implements DescriptorParser { NL + Key.NETWORK_STATUS_VERSION.keyword + SP + "3")) && firstLines.contains( NL + Key.VOTE_STATUS.keyword + SP + "consensus" + NL))) { - return this.parseOneOrMoreDescriptors(rawDescriptorBytes, descriptorFile, + return this.parseOneOrMoreDescriptors(rawDescriptorBytes, sourceFile, Key.NETWORK_STATUS_VERSION, RelayNetworkStatusConsensusImpl.class); } else if (firstLines.startsWith("@type network-status-vote-3 1.") || ((firstLines.startsWith( @@ -67,52 +67,52 @@ public class DescriptorParserImpl implements DescriptorParser { NL + Key.NETWORK_STATUS_VERSION.keyword + SP + "3" + NL)) && firstLines.contains( NL + Key.VOTE_STATUS.keyword + SP + "vote" + NL))) { - return this.parseOneOrMoreDescriptors(rawDescriptorBytes, descriptorFile, + return this.parseOneOrMoreDescriptors(rawDescriptorBytes, sourceFile, Key.NETWORK_STATUS_VERSION, RelayNetworkStatusVoteImpl.class); } else if (firstLines.startsWith("@type bridge-network-status 1.") || firstLines.startsWith(Key.R.keyword + SP)) { List<Descriptor> parsedDescriptors = new ArrayList<>(); parsedDescriptors.add(new BridgeNetworkStatusImpl( rawDescriptorBytes, new int[] { 0, rawDescriptorBytes.length }, - descriptorFile, fileName)); + sourceFile, fileName)); return parsedDescriptors; } else if (firstLines.startsWith("@type bridge-server-descriptor 1.")) { - return this.parseOneOrMoreDescriptors(rawDescriptorBytes, descriptorFile, + return this.parseOneOrMoreDescriptors(rawDescriptorBytes, sourceFile, Key.ROUTER, BridgeServerDescriptorImpl.class); } else if (firstLines.startsWith("@type server-descriptor 1.") || firstLines.startsWith(Key.ROUTER.keyword + SP) || firstLines.contains(NL + Key.ROUTER.keyword + SP)) { - return this.parseOneOrMoreDescriptors(rawDescriptorBytes, descriptorFile, + return this.parseOneOrMoreDescriptors(rawDescriptorBytes, sourceFile, Key.ROUTER, RelayServerDescriptorImpl.class); } else if (firstLines.startsWith("@type bridge-extra-info 1.")) { - return this.parseOneOrMoreDescriptors(rawDescriptorBytes, descriptorFile, + return this.parseOneOrMoreDescriptors(rawDescriptorBytes, sourceFile, Key.EXTRA_INFO, BridgeExtraInfoDescriptorImpl.class); } else if (firstLines.startsWith("@type extra-info 1.") || firstLines.startsWith(Key.EXTRA_INFO.keyword + SP) || firstLines.contains(NL + Key.EXTRA_INFO.keyword + SP)) { - return this.parseOneOrMoreDescriptors(rawDescriptorBytes, descriptorFile, + return this.parseOneOrMoreDescriptors(rawDescriptorBytes, sourceFile, Key.EXTRA_INFO, RelayExtraInfoDescriptorImpl.class); } else if (firstLines.startsWith("@type microdescriptor 1.") || firstLines.startsWith(Key.ONION_KEY.keyword + NL) || firstLines.contains(NL + Key.ONION_KEY.keyword + NL)) { - return this.parseOneOrMoreDescriptors(rawDescriptorBytes, descriptorFile, + return this.parseOneOrMoreDescriptors(rawDescriptorBytes, sourceFile, Key.ONION_KEY, MicrodescriptorImpl.class); } else if (firstLines.startsWith("@type bridge-pool-assignment 1.") || firstLines.startsWith(Key.BRIDGE_POOL_ASSIGNMENT.keyword + SP) || firstLines.contains(NL + Key.BRIDGE_POOL_ASSIGNMENT.keyword + SP)) { - return this.parseOneOrMoreDescriptors(rawDescriptorBytes, descriptorFile, + return this.parseOneOrMoreDescriptors(rawDescriptorBytes, sourceFile, Key.BRIDGE_POOL_ASSIGNMENT, BridgePoolAssignmentImpl.class); } else if (firstLines.startsWith("@type dir-key-certificate-3 1.") || firstLines.startsWith(Key.DIR_KEY_CERTIFICATE_VERSION.keyword + SP) || firstLines.contains( NL + Key.DIR_KEY_CERTIFICATE_VERSION.keyword + SP)) { - return this.parseOneOrMoreDescriptors(rawDescriptorBytes, descriptorFile, + return this.parseOneOrMoreDescriptors(rawDescriptorBytes, sourceFile, Key.DIR_KEY_CERTIFICATE_VERSION, DirectoryKeyCertificateImpl.class); } else if (firstLines.startsWith("@type tordnsel 1.") || firstLines.startsWith("ExitNode" + SP) || firstLines.contains(NL + "ExitNode" + SP)) { List<Descriptor> parsedDescriptors = new ArrayList<>(); - parsedDescriptors.add(new ExitListImpl(rawDescriptorBytes, descriptorFile, + parsedDescriptors.add(new ExitListImpl(rawDescriptorBytes, sourceFile, fileName)); return parsedDescriptors; } else if (firstLines.startsWith("@type network-status-2 1.") @@ -120,18 +120,18 @@ public class DescriptorParserImpl implements DescriptorParser { Key.NETWORK_STATUS_VERSION.keyword + SP + "2" + NL) || firstLines.contains( NL + Key.NETWORK_STATUS_VERSION.keyword + SP + "2" + NL)) { - return this.parseOneOrMoreDescriptors(rawDescriptorBytes, descriptorFile, + return this.parseOneOrMoreDescriptors(rawDescriptorBytes, sourceFile, Key.NETWORK_STATUS_VERSION, RelayNetworkStatusImpl.class); } else if (firstLines.startsWith("@type directory 1.") || firstLines.startsWith(Key.SIGNED_DIRECTORY.keyword + NL) || firstLines.contains(NL + Key.SIGNED_DIRECTORY.keyword + NL)) { - return this.parseOneOrMoreDescriptors(rawDescriptorBytes, descriptorFile, + return this.parseOneOrMoreDescriptors(rawDescriptorBytes, sourceFile, Key.SIGNED_DIRECTORY, RelayDirectoryImpl.class); } else if (firstLines.startsWith("@type torperf 1.")) { return TorperfResultImpl.parseTorperfResults(rawDescriptorBytes, - descriptorFile); - } else if (descriptorFile.getName().contains(LogDescriptorImpl.MARKER)) { - return LogDescriptorImpl.parse(rawDescriptorBytes, descriptorFile); + sourceFile); + } else if (sourceFile.getName().contains(LogDescriptorImpl.MARKER)) { + return LogDescriptorImpl.parse(rawDescriptorBytes, sourceFile); } else { throw new DescriptorParseException("Could not detect descriptor " + "type in descriptor starting with '" + firstLines + "'."); @@ -139,7 +139,7 @@ public class DescriptorParserImpl implements DescriptorParser { } private List<Descriptor> parseOneOrMoreDescriptors(byte[] rawDescriptorBytes, - File descriptorFile, Key key, + File sourceFile, Key key, Class<? extends DescriptorImpl> descriptorClass) throws DescriptorParseException { List<Descriptor> parsedDescriptors = new ArrayList<>(); @@ -192,10 +192,10 @@ public class DescriptorParserImpl implements DescriptorParser { endDescriptor - startAnnotations }; try { parsedDescriptors.add(this.parseOneDescriptor(rawDescriptorBytes, - offsetAndLength, descriptorFile, constructor)); + offsetAndLength, sourceFile, constructor)); } catch (DescriptorParseException e) { parsedDescriptors.add(new UnparseableDescriptorImpl( - rawDescriptorBytes, offsetAndLength, descriptorFile, e)); + rawDescriptorBytes, offsetAndLength, sourceFile, e)); } startAnnotations = endDescriptor; } @@ -203,12 +203,12 @@ public class DescriptorParserImpl implements DescriptorParser { } Descriptor parseOneDescriptor(byte[] rawDescriptorBytes, - int[] offsetAndLength, File descriptorFile, + int[] offsetAndLength, File sourceFile, Constructor<? extends DescriptorImpl> constructor) throws DescriptorParseException { try { return constructor.newInstance(rawDescriptorBytes, offsetAndLength, - descriptorFile); + sourceFile); } catch (InvocationTargetException e) { if (null != e.getCause() && e.getCause() instanceof DescriptorParseException) {

1 0

[onionoo/master] Provide utf-characters instead of escape strings.
by karsten＠torproject.org 16 Apr '18

16 Apr '18

commit 947ce706bb46c5d7e5c4cd2b0716a2458b4af86b Author: iwakeh <iwakeh(a)torproject.org> Date: Fri Apr 6 09:53:35 2018 +0000 Provide utf-characters instead of escape strings. Also adapt tests to check the new functionality. Implements task-25740. --- CHANGELOG.md | 6 +++++ .../torproject/onionoo/util/FormattingUtils.java | 6 +++-- src/test/resources/lines-for-escape-tests.txt | 26 +++++++++++++--------- 3 files changed, 26 insertions(+), 12 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b903acc..692a417 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +# Changes in version 6.0-1.13.0 - 2018-04-?? + + * Minor changes + - Turn valid utf-8 escape sequences into utf-8 characters. + + # Changes in version 5.2-1.12.0 - 2018-04-06 * Medium changes diff --git a/src/main/java/org/torproject/onionoo/util/FormattingUtils.java b/src/main/java/org/torproject/onionoo/util/FormattingUtils.java index 3d16f5a..558477d 100644 --- a/src/main/java/org/torproject/onionoo/util/FormattingUtils.java +++ b/src/main/java/org/torproject/onionoo/util/FormattingUtils.java @@ -3,6 +3,8 @@ package org.torproject.onionoo.util; +import static org.apache.commons.lang3.StringEscapeUtils.unescapeJava; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -58,8 +60,8 @@ public class FormattingUtils { StringBuffer sb = new StringBuffer(); Matcher mat = escapePattern.matcher(text); while (mat.find()) { - String unescaped = mat.group(1); - mat.appendReplacement(sb, unescaped); + String unescaped = mat.group(1).substring(1); + mat.appendReplacement(sb, unescapeJava(unescaped)); } mat.appendTail(sb); return sb.toString(); diff --git a/src/test/resources/lines-for-escape-tests.txt b/src/test/resources/lines-for-escape-tests.txt index 4fb5895..b08b723 100644 --- a/src/test/resources/lines-for-escape-tests.txt +++ b/src/test/resources/lines-for-escape-tests.txt @@ -2,15 +2,21 @@ abc abc -\\\\u -\\\\u +\\\\u00bb \\\\u \\\\u00ab +» \\\\u « Haha/\\\\(a)/\\\\live/\\\\./\\\\co/\\\\./\\\uk Haha/\\\\(a)/\\\\live/\\\\./\\\\co/\\\\./\\\uk -\\\\u20ac -\\u20ac -\\\\u0024 -\\u0024 -some \\\\u20ac other string \\\\u0024 to unescape -some \\u20ac other string \\u0024 to unescape -abcd efg\\\\u0024xyz\\\\uxxxx -abcd efg\\u0024xyz\\\\uxxxx +Euro \\\\u20ac +Euro € +Dollar \\\\u0024 +Dollar $ +Pound \\\\u00a3 +Pound £ +Yen \\\\u00a5 +Yen ¥ +\\\\u00a1some \\\\u00dE other string \\\\u00e7 to unescape! +¡some Þ other string ç to unescape! +abcd efg cent \\\\u00a2xyz\\\\uxxxx +abcd efg cent ¢xyz\\\\uxxxx +Telef\\\\u00F4nica +Telefônica

1 0

[tor-browser/tor-browser-52.7.3esr-8.0-1] Bug 20283: Tor Browser should run without a `/proc` filesystem.
by gk＠torproject.org 16 Apr '18

16 Apr '18

commit 90e16dd25b6eb199c016fc8b5e9478a3454d36e1 Author: Richard Pospesel <richard(a)torproject.org> Date: Mon Apr 9 11:40:32 2018 -0700 Bug 20283: Tor Browser should run without a `/proc` filesystem. Firefox uses the current stack frame address and the stack size as a sort of heuristic for various things in the javascript engine. The js::GetNativeStackBaseImpl() function is used to get the base stack address (ie the address from which the stack grows, so this can be either the first or last memory address of the stack memory space depending on the CPU architecture). On Linux, this function is implemented using the pthreads APIs. For non-main threads, the queried thread info is stored in memory. The main thread does not have this information on hand, so it gets the stack memory range via the /proc/self/maps file ( see glibc's pthread_get_attr_np.c ). Fortunately (per discussions with the firefox devs in #jsapi) the base address only needs to be approximation. In reality, environment variables, args, and other things are stored in space between the end/beginning of the mapped stack memory and the 'top' of the stack space used by stack frames. We can get the top of this usable stack from __libc_stack_end, which is a void* set by glibc during program initialization. Non-main threads still get their stack-base through the usual pthreads APIs. This patch integrates the latest jsnativestack.cpp from mozilla- central, and creates a specific implementation of js::GetNativeStackBaseImpl() for non-android Linux using the described __libc_stack_end read. --- js/src/jsnativestack.cpp | 88 +++++++++++++++++++++++++++++------------------- 1 file changed, 54 insertions(+), 34 deletions(-) diff --git a/js/src/jsnativestack.cpp b/js/src/jsnativestack.cpp index 05928ea3dff3..0f4dae156c2b 100644 --- a/js/src/jsnativestack.cpp +++ b/js/src/jsnativestack.cpp @@ -8,22 +8,17 @@ #ifdef XP_WIN # include "jswin.h" - #elif defined(XP_DARWIN) || defined(DARWIN) || defined(XP_UNIX) # include <pthread.h> - # if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__DragonFly__) # include <pthread_np.h> # endif - -# if defined(ANDROID) +# if defined(ANDROID) && !defined(__aarch64__) # include <sys/types.h> # include <unistd.h> # endif - #else # error "Unsupported platform" - #endif #if defined(XP_WIN) @@ -31,32 +26,8 @@ void* js::GetNativeStackBaseImpl() { -# if defined(_M_IX86) && defined(_MSC_VER) - /* - * offset 0x18 from the FS segment register gives a pointer to - * the thread information block for the current thread - */ - NT_TIB* pTib; - __asm { - MOV EAX, FS:[18h] - MOV pTib, EAX - } - return static_cast<void*>(pTib->StackBase); - -# elif defined(_M_X64) - PNT_TIB64 pTib = reinterpret_cast<PNT_TIB64>(NtCurrentTeb()); - return reinterpret_cast<void*>(pTib->StackBase); - -# elif defined(_M_ARM) PNT_TIB pTib = reinterpret_cast<PNT_TIB>(NtCurrentTeb()); return static_cast<void*>(pTib->StackBase); - -# elif defined(_WIN32) && defined(__GNUC__) - NT_TIB* pTib; - asm ("movl %%fs:0x18, %0\n" : "=r" (pTib)); - return static_cast<void*>(pTib->StackBase); - -# endif } #elif defined(SOLARIS) @@ -88,6 +59,55 @@ js::GetNativeStackBaseImpl() context.uc_stack.ss_size; } +#elif defined(XP_LINUX) && !defined(ANDROID) + +# include <dlfcn.h> +# include <sys/syscall.h> +static pid_t +gettid() +{ + return syscall(__NR_gettid); +} + +void* +js::GetNativeStackBaseImpl() +{ + // main thread, get stack base from __libc_stack_end rather than pthread APIs + // to avoid filesystem calls /proc/self/maps + if(gettid() == getpid()) { + void** pLibcStackEnd = (void**)dlsym(RTLD_DEFAULT, "__libc_stack_end"); + // if __libc_stack_end is not found, architecture specific frame pointer hopping will need + // to be implemented + MOZ_ASSERT(pLibcStackEnd); + void* stackBase = *pLibcStackEnd; + MOZ_ASSERT(stackBase); + // we don't need to fix stackBase, as it already roughly points to beginning of the stack + return stackBase; + } + // non-main threads have the required info stored in memory, no filesystem calls are made + else { + pthread_t thread = pthread_self(); + pthread_attr_t sattr; + pthread_attr_init(&sattr); + pthread_getattr_np(thread, &sattr); + // stackBase will be the lowest address on all architectures + void* stackBase = nullptr; + size_t stackSize = 0; + int rc = pthread_attr_getstack(&sattr, &stackBase, &stackSize); + if(rc) { + MOZ_CRASH(); + } + MOZ_ASSERT(stackBase); + pthread_attr_destroy(&sattr); + +# if JS_STACK_GROWTH_DIRECTION > 0 + return stackBase; +# else + return static_cast<char*>(stackBase) + stackSize; +# endif + } +} + #else /* XP_UNIX */ void* @@ -120,11 +140,11 @@ js::GetNativeStackBaseImpl() rc = pthread_stackseg_np(pthread_self(), &ss); stackBase = (void*)((size_t) ss.ss_sp - ss.ss_size); stackSize = ss.ss_size; -# elif defined(ANDROID) +# elif defined(ANDROID) && !defined(__aarch64__) if (gettid() == getpid()) { - // bionic's pthread_attr_getstack doesn't tell the truth for the main - // thread (see bug 846670). So we scan /proc/self/maps to find the - // segment which contains the stack. + // bionic's pthread_attr_getstack prior to API 21 doesn't tell the truth + // for the main thread (see bug 846670). So we scan /proc/self/maps to + // find the segment which contains the stack. rc = -1; // Put the string on the stack, otherwise there is the danger that it

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits April 2018