November 2014 - tor-commits - lists.torproject.org

[onionoo/master] Update INSTALL.
by karsten＠torproject.org 04 Nov '14

04 Nov '14

commit 4b3da5a0866068c51b8cbd83d9f642d986cec15c Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Tue Nov 4 11:40:37 2014 +0100 Update INSTALL. - We recently switched from Java 6 to Java 7. - The list of dependent .jar files is inaccurate, direct people to build.xml or vagrant/bootstrap.sh instead. - We don't need the external rsync command to fetch files from CollecTor anymore. --- INSTALL | 33 ++++++--------------------------- 1 file changed, 6 insertions(+), 27 deletions(-) diff --git a/INSTALL b/INSTALL index 5bc8c62..ff638d1 100644 --- a/INSTALL +++ b/INSTALL @@ -11,11 +11,11 @@ $ git clone https://git.torproject.org/onionoo.git /srv/onionoo/ $ cd /srv/onionoo -Install Java 1.6 or higher, ant 1.8 or higher, and Tomcat 6 +Install Java 1.7 or higher, ant 1.8 or higher, and Tomcat 6 ----------------------------------------------------------- $ javac -version -javac 1.6.0_26 +javac 1.7.0_65 $ ant -version Apache Ant version 1.8.0 compiled on March 11 2010 @@ -24,15 +24,10 @@ Apache Ant version 1.8.0 compiled on March 11 2010 Provide required .jar files --------------------------- -Download or build the following .jar files and put them in the lib/ -directory: - -- Apache Commons Codec 1.4 -- Apache Commons Compress 1.4.1 -- Apache Commons Lang 2.6 -- Servlet API, e.g., from Tomcat 6 -- Tor Metrics Descriptor Library, metrics-lib -- Gson 2.2.3 +Download .jar files listed in the build.xml classpath. Onionoo usually +uses Debian stable provided libraries; see vagrant/bootstrap.sh for Debian +package names. If you download .jar files elsewhere, please edit the +corresponding paths in build.xml. Attempt to compile the Java sources to make sure that everything works correctly: @@ -68,22 +63,6 @@ Change back to the root working directory: $ cd ../ -Test the rsync of descriptors from metrics.torproject.org ---------------------------------------------------------- - -Run the initial rsync: - -$ rsync -arz metrics.torproject.org::metrics-recent in - -The result should be around 1G of data in the in/ directory, as of January -2012. - -(If you want to pre-populate bandwidth and weights data with archived -data, download the tarballs from https://metrics.torproject.org/data.html -and process them one after the other. There is no requirement to process -data in any given order.) - - Test the hourly data processing process ---------------------------------------

1 0

[translation/tails-misc] Update translations for tails-misc
by translation＠torproject.org 04 Nov '14

04 Nov '14

commit e903ed267560855ad014130e99f30441660d06b0 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Nov 4 10:45:40 2014 +0000 Update translations for tails-misc --- lt.po | 53 +++++++++++++++++++++++++++-------------------------- 1 file changed, 27 insertions(+), 26 deletions(-) diff --git a/lt.po b/lt.po index 030535b..6cda902 100644 --- a/lt.po +++ b/lt.po @@ -3,13 +3,14 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# Gediminas Golcevas <>, 2014 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-10-10 13:00+0200\n" -"PO-Revision-Date: 2014-10-11 08:52+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" +"POT-Creation-Date: 2014-10-15 17:57+0200\n" +"PO-Revision-Date: 2014-11-04 10:37+0000\n" +"Last-Translator: Gediminas Golcevas <>\n" "Language-Team: Lithuanian (http://www.transifex.com/projects/p/torproject/language/lt/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -122,11 +123,11 @@ msgstr "" #: config/chroot_local-includes/usr/local/bin/gpgApplet:487 msgid "Select recipients:" -msgstr "" +msgstr "Pasirinkite gavėjus:" #: config/chroot_local-includes/usr/local/bin/gpgApplet:495 msgid "Hide recipients" -msgstr "" +msgstr "Paslėpti gavėjus" #: config/chroot_local-includes/usr/local/bin/gpgApplet:498 msgid "" @@ -140,11 +141,11 @@ msgstr "" #: config/chroot_local-includes/usr/local/bin/gpgApplet:508 msgid "Choose keys" -msgstr "" +msgstr "Pasirinkite raktus" #: config/chroot_local-includes/usr/local/bin/gpgApplet:548 msgid "Do you trust these keys?" -msgstr "" +msgstr "Ar pasitikite šiais raktais?" #: config/chroot_local-includes/usr/local/bin/gpgApplet:551 msgid "The following selected key is not fully trusted:" @@ -162,7 +163,7 @@ msgstr[2] "" #: config/chroot_local-includes/usr/local/bin/gpgApplet:582 msgid "No keys selected" -msgstr "" +msgstr "Nepasirinktas nei vienas raktas" #: config/chroot_local-includes/usr/local/bin/gpgApplet:584 msgid "" @@ -230,7 +231,7 @@ msgstr "" #: config/chroot_local-includes/usr/local/bin/tails-about:27 #: ../config/chroot_local-includes/usr/share/applications/tails-about.desktop.in.h:1 msgid "About Tails" -msgstr "" +msgstr "Apie Tails" #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:118 #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:124 @@ -304,12 +305,12 @@ msgid "" msgstr "" #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:19 -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:60 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:62 msgid "error:" msgstr "" #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:20 -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:61 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:63 msgid "Error" msgstr "Klaida" @@ -359,63 +360,63 @@ msgstr "" msgid "Cancel" msgstr "Atšaukti" -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:71 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:73 msgid "Do you really want to launch the Unsafe Browser?" msgstr "" -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:73 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:75 msgid "" "Network activity within the Unsafe Browser is <b>not anonymous</b>. Only use" " the Unsafe Browser if necessary, for example if you have to login or " "register to activate your Internet connection." msgstr "" -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:74 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:76 msgid "_Launch" msgstr "" -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:75 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:77 msgid "_Exit" msgstr "" -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:85 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:87 msgid "Starting the Unsafe Browser..." msgstr "" -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:86 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:88 msgid "This may take a while, so please be patient." msgstr "" -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:104 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:106 msgid "Failed to setup chroot." msgstr "" -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:184 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:180 #: ../config/chroot_local-includes/usr/share/applications/unsafe-browser.desktop.in.h:1 msgid "Unsafe Browser" -msgstr "" +msgstr "Nesaugi naršyklė" -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:240 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:236 msgid "Shutting down the Unsafe Browser..." -msgstr "" +msgstr "Nesaugi naršyklė išjungiama" -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:241 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:237 msgid "" "This may take a while, and you may not restart the Unsafe Browser until it " "is properly shut down." msgstr "" -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:253 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:249 msgid "Failed to restart Tor." msgstr "" -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:261 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:257 msgid "" "Another Unsafe Browser is currently running, or being cleaned up. Please " "retry in a while." msgstr "" -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:274 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:270 msgid "" "No DNS server was obtained through DHCP or manually configured in " "NetworkManager."

1 0

[translation/tor-launcher-network-settings] Update translations for tor-launcher-network-settings
by translation＠torproject.org 04 Nov '14

04 Nov '14

commit 61900c54075a649f9b57cd97b4875e7307a08adf Author: Translation commit bot <translation(a)torproject.org> Date: Tue Nov 4 10:45:35 2014 +0000 Update translations for tor-launcher-network-settings --- lt/network-settings.dtd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lt/network-settings.dtd b/lt/network-settings.dtd index 94d685b..3b50645 100644 --- a/lt/network-settings.dtd +++ b/lt/network-settings.dtd @@ -1,4 +1,4 @@ -<!ENTITY torsettings.dialog.title "Tor Network Settings"> +<!ENTITY torsettings.dialog.title "Tor tinklo parametrai">  @@ -7,7 +7,7 @@ <!ENTITY torSettings.yes "Taip"> <!ENTITY torSettings.no "Ne"> -<!ENTITY torSettings.firstQuestion "Which of the following best describes your situation?"> +<!ENTITY torSettings.firstQuestion "Kuris iš žemiau pateiktų apibrėžimų labiausiai atspindi Jūsų padėtį?"> <!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied."> <!ENTITY torSettings.configurePrompt2 "I need to configure bridge or proxy settings."> <!ENTITY torSettings.configure "Configure">

1 0

[onionoo/master] Take out unused attribute to save memory.
by karsten＠torproject.org 04 Nov '14

04 Nov '14

commit fdb3f8e62135f721b83204963c0ec6ca2c7f3801 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Sat Oct 25 14:55:36 2014 +0200 Take out unused attribute to save memory. --- .../java/org/torproject/onionoo/docs/NodeStatus.java | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/src/main/java/org/torproject/onionoo/docs/NodeStatus.java b/src/main/java/org/torproject/onionoo/docs/NodeStatus.java index 0df8847..1660383 100644 --- a/src/main/java/org/torproject/onionoo/docs/NodeStatus.java +++ b/src/main/java/org/torproject/onionoo/docs/NodeStatus.java @@ -12,9 +12,6 @@ import java.util.SortedSet; import java.util.TreeMap; import java.util.TreeSet; -import org.apache.commons.codec.DecoderException; -import org.apache.commons.codec.binary.Hex; -import org.apache.commons.codec.digest.DigestUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -35,11 +32,6 @@ public class NodeStatus extends Document { return this.fingerprint; } - private String hashedFingerprint; - public String getHashedFingerprint() { - return this.hashedFingerprint; - } - private String nickname; public String getNickname() { return this.nickname; @@ -319,13 +311,6 @@ public class NodeStatus extends Document { this.isRelay = isRelay; this.nickname = nickname; this.fingerprint = fingerprint; - try { - this.hashedFingerprint = DigestUtils.shaHex(Hex.decodeHex( - this.fingerprint.toCharArray())).toUpperCase(); - } catch (DecoderException e) { - throw new IllegalArgumentException("Fingerprint '" + fingerprint - + "' is not a valid fingerprint.", e); - } this.address = address; this.exitAddresses = new TreeSet<String>(); if (exitAddresses != null) {

1 0

[onionoo/master] Store relay flags more efficiently.
by karsten＠torproject.org 04 Nov '14

04 Nov '14

commit 76ccc930042e9b2ed729be62039c31ffb4ae5468 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Sat Oct 25 15:08:12 2014 +0200 Store relay flags more efficiently. Closely related to metrics-lib commit be359c8. --- .../org/torproject/onionoo/docs/NodeStatus.java | 33 +++++++++++++++++--- 1 file changed, 29 insertions(+), 4 deletions(-) diff --git a/src/main/java/org/torproject/onionoo/docs/NodeStatus.java b/src/main/java/org/torproject/onionoo/docs/NodeStatus.java index 1660383..7f635b6 100644 --- a/src/main/java/org/torproject/onionoo/docs/NodeStatus.java +++ b/src/main/java/org/torproject/onionoo/docs/NodeStatus.java @@ -3,7 +3,9 @@ package org.torproject.onionoo.docs; import java.util.Arrays; +import java.util.BitSet; import java.util.Collections; +import java.util.HashMap; import java.util.HashSet; import java.util.Map; import java.util.Set; @@ -157,9 +159,32 @@ public class NodeStatus extends Document { return this.dirPort; } - private SortedSet<String> relayFlags; + private static Map<String, Integer> relayFlagIndexes = + new HashMap<String, Integer>(); + private static Map<Integer, String> relayFlagStrings = + new HashMap<Integer, String>(); + + private BitSet relayFlags; + public void setRelayFlags(SortedSet<String> relayFlags) { + BitSet newRelayFlags = new BitSet(relayFlagIndexes.size()); + for (String relayFlag : relayFlags) { + if (!relayFlagIndexes.containsKey(relayFlag)) { + relayFlagStrings.put(relayFlagIndexes.size(), relayFlag); + relayFlagIndexes.put(relayFlag, relayFlagIndexes.size()); + } + newRelayFlags.set(relayFlagIndexes.get(relayFlag)); + } + this.relayFlags = newRelayFlags; + } public SortedSet<String> getRelayFlags() { - return this.relayFlags; + SortedSet<String> result = new TreeSet<String>(); + if (this.relayFlags != null) { + for (int i = this.relayFlags.nextSetBit(0); i >= 0; + i = this.relayFlags.nextSetBit(i + 1)) { + result.add(relayFlagStrings.get(i)); + } + } + return result; } private long consensusWeight; @@ -327,7 +352,7 @@ public class NodeStatus extends Document { this.lastSeenMillis = lastSeenMillis; this.orPort = orPort; this.dirPort = dirPort; - this.relayFlags = relayFlags; + this.setRelayFlags(relayFlags); this.consensusWeight = consensusWeight; this.countryCode = countryCode; this.hostName = hostName; @@ -527,7 +552,7 @@ public class NodeStatus extends Document { sb.append("\t" + this.orPort); sb.append("\t" + this.dirPort + "\t"); written = 0; - for (String relayFlag : this.relayFlags) { + for (String relayFlag : this.getRelayFlags()) { sb.append((written++ > 0 ? "," : "") + relayFlag); } if (this.isRelay) {

1 0

[onionoo/master] Store family fingerprints more efficiently.
by karsten＠torproject.org 04 Nov '14

04 Nov '14

commit b1750dc6a0bb3b4016214c44291da318e74b76d9 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Sat Oct 25 15:42:04 2014 +0200 Store family fingerprints more efficiently. --- .../org/torproject/onionoo/docs/NodeStatus.java | 32 ++++++++++++++++---- 1 file changed, 26 insertions(+), 6 deletions(-) diff --git a/src/main/java/org/torproject/onionoo/docs/NodeStatus.java b/src/main/java/org/torproject/onionoo/docs/NodeStatus.java index 7f635b6..3a93030 100644 --- a/src/main/java/org/torproject/onionoo/docs/NodeStatus.java +++ b/src/main/java/org/torproject/onionoo/docs/NodeStatus.java @@ -4,6 +4,7 @@ package org.torproject.onionoo.docs; import java.util.Arrays; import java.util.BitSet; +import java.util.Collection; import java.util.Collections; import java.util.HashMap; import java.util.HashSet; @@ -316,13 +317,33 @@ public class NodeStatus extends Document { return this.recommendedVersion; } - private SortedSet<String> familyFingerprints; + private String[] familyFingerprints; public void setFamilyFingerprints( SortedSet<String> familyFingerprints) { - this.familyFingerprints = familyFingerprints; + this.familyFingerprints = collectionToStringArray(familyFingerprints); } public SortedSet<String> getFamilyFingerprints() { - return this.familyFingerprints; + return stringArrayToSortedSet(this.familyFingerprints); + } + + private static String[] collectionToStringArray( + Collection<String> collection) { + String[] stringArray = null; + if (collection != null && !collection.isEmpty()) { + stringArray = new String[collection.size()]; + int i = 0; + for (String string : collection) { + stringArray[i++] = string; + } + } + return stringArray; + } + private SortedSet<String> stringArrayToSortedSet(String[] stringArray) { + SortedSet<String> sortedSet = new TreeSet<String>(); + if (stringArray != null) { + sortedSet.addAll(Arrays.asList(stringArray)); + } + return sortedSet; } public NodeStatus(boolean isRelay, String nickname, String fingerprint, @@ -372,7 +393,7 @@ public class NodeStatus extends Document { this.aSNumber = aSNumber; this.contact = contact; this.recommendedVersion = recommendedVersion; - this.familyFingerprints = familyFingerprints; + this.setFamilyFingerprints(familyFingerprints); } public static NodeStatus fromString(String documentString) { @@ -580,8 +601,7 @@ public class NodeStatus extends Document { sb.append("\t" + (this.contact != null ? this.contact : "")); sb.append("\t" + (this.recommendedVersion == null ? "null" : this.recommendedVersion ? "true" : "false")); - if (this.familyFingerprints == null || - this.familyFingerprints.isEmpty()) { + if (this.familyFingerprints == null) { sb.append("\tnull"); } else { sb.append("\t");

1 0

[onionoo/master] Avoid String.replaceAll() because of memory issues.
by karsten＠torproject.org 04 Nov '14

04 Nov '14

commit f660e24be80b2efed1423b9ebf912377ccea49d5 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Mon Oct 27 09:06:30 2014 +0100 Avoid String.replaceAll() because of memory issues. From a quick look at the sources it seems that they're using String.indexOf() to find patterns rather than regular expressions which is what String.replaceAll() uses. --- .../java/org/torproject/onionoo/docs/DetailsDocument.java | 9 +++++---- src/main/java/org/torproject/onionoo/docs/DetailsStatus.java | 9 +++++---- src/main/java/org/torproject/onionoo/docs/DocumentStore.java | 5 +++-- 3 files changed, 13 insertions(+), 10 deletions(-) diff --git a/src/main/java/org/torproject/onionoo/docs/DetailsDocument.java b/src/main/java/org/torproject/onionoo/docs/DetailsDocument.java index bda9865..7d351ee 100644 --- a/src/main/java/org/torproject/onionoo/docs/DetailsDocument.java +++ b/src/main/java/org/torproject/onionoo/docs/DetailsDocument.java @@ -6,6 +6,7 @@ import java.util.List; import java.util.Map; import org.apache.commons.lang.StringEscapeUtils; +import org.apache.commons.lang.StringUtils; public class DetailsDocument extends Document { @@ -18,12 +19,12 @@ public class DetailsDocument extends Document { * we'll have to do is to change back the '\\' that Gson writes for the * '\'. */ private static String escapeJSON(String s) { - return s == null ? null : - StringEscapeUtils.escapeJavaScript(s).replaceAll("\\\\'", "'"); + return StringUtils.replaceEach(StringEscapeUtils.escapeJavaScript(s), + new String[] { "\\\\'" }, new String[] { "'" }); } private static String unescapeJSON(String s) { - return s == null ? null : - StringEscapeUtils.unescapeJavaScript(s.replaceAll("'", "\\'")); + return StringEscapeUtils.unescapeJavaScript(StringUtils.replaceEach(s, + new String[] { "'" }, new String[] { "\\'" })); } private String nickname; diff --git a/src/main/java/org/torproject/onionoo/docs/DetailsStatus.java b/src/main/java/org/torproject/onionoo/docs/DetailsStatus.java index 6fe0d80..6d987df 100644 --- a/src/main/java/org/torproject/onionoo/docs/DetailsStatus.java +++ b/src/main/java/org/torproject/onionoo/docs/DetailsStatus.java @@ -6,6 +6,7 @@ import java.util.List; import java.util.Map; import org.apache.commons.lang.StringEscapeUtils; +import org.apache.commons.lang.StringUtils; public class DetailsStatus extends Document { @@ -18,12 +19,12 @@ public class DetailsStatus extends Document { * we'll have to do is to change back the '\\' that Gson writes for the * '\'. */ private static String escapeJSON(String s) { - return s == null ? null : - StringEscapeUtils.escapeJavaScript(s).replaceAll("\\\\'", "'"); + return StringUtils.replaceEach(StringEscapeUtils.escapeJavaScript(s), + new String[] { "\\\\'" }, new String[] { "'" }); } private static String unescapeJSON(String s) { - return s == null ? null : - StringEscapeUtils.unescapeJavaScript(s.replaceAll("'", "\\'")); + return StringEscapeUtils.unescapeJavaScript(StringUtils.replaceEach(s, + new String[] { "'" }, new String[] { "\\'" })); } private String desc_published; diff --git a/src/main/java/org/torproject/onionoo/docs/DocumentStore.java b/src/main/java/org/torproject/onionoo/docs/DocumentStore.java index e3261e4..9a808ac 100644 --- a/src/main/java/org/torproject/onionoo/docs/DocumentStore.java +++ b/src/main/java/org/torproject/onionoo/docs/DocumentStore.java @@ -21,6 +21,7 @@ import java.util.Stack; import java.util.TreeMap; import java.util.TreeSet; +import org.apache.commons.lang.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.torproject.onionoo.util.FormattingUtils; @@ -275,8 +276,8 @@ public class DocumentStore { * objects are escaped JSON, e.g., \u00F2. When Gson serlializes * this string, it escapes the \ to \\, hence writes \\u00F2. We * need to undo this and change \\u00F2 back to \u00F2. */ - documentString = gson.toJson(document).replaceAll("\\\\\\\\u", - "\\\\u"); + documentString = StringUtils.replace(gson.toJson(document), + "\\\\\\\\u", "\\\\u"); /* Existing details statuses don't contain opening and closing curly * brackets, so we should remove them from new details statuses, * too. */

1 0

[onionoo/master] Switch to Apache Commons Lang 3.
by karsten＠torproject.org 04 Nov '14

04 Nov '14

commit ec95efe6aa1e67b6d8b969edcd1e65ff6f3076d7 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Wed Oct 29 11:54:49 2014 +0100 Switch to Apache Commons Lang 3. Suggested by iwakeh to overcome memory problems with StringEscaleUtils in Apache Commons Lang 2. --- build.xml | 4 ++-- src/main/java/org/torproject/onionoo/docs/DetailsDocument.java | 8 ++++---- src/main/java/org/torproject/onionoo/docs/DetailsStatus.java | 8 ++++---- src/main/java/org/torproject/onionoo/docs/DocumentStore.java | 2 +- vagrant/bootstrap.sh | 2 +- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/build.xml b/build.xml index d6e1278..8f71f4d 100644 --- a/build.xml +++ b/build.xml @@ -18,7 +18,7 @@ <fileset dir="/usr/share/java"> <include name="commons-codec-1.6.jar"/> <include name="commons-compress-1.4.1.jar"/> - <include name="commons-lang-2.6.jar"/> + <include name="commons-lang3-3.1.jar"/> <include name="gson-2.1.jar"/> <include name="junit4-4.10.jar"/> <include name="servlet-api-3.0.jar"/> @@ -101,7 +101,7 @@ <include name="logback-core-1.0.4.jar"/> <include name="commons-codec-1.6.jar"/> <include name="commons-compress-1.4.1.jar"/> - <include name="commons-lang-2.6.jar"/> + <include name="commons-lang3-3.1.jar"/> <include name="gson-2.1.jar"/> </lib> <classes dir="${classes}"/> diff --git a/src/main/java/org/torproject/onionoo/docs/DetailsDocument.java b/src/main/java/org/torproject/onionoo/docs/DetailsDocument.java index 7d351ee..620e908 100644 --- a/src/main/java/org/torproject/onionoo/docs/DetailsDocument.java +++ b/src/main/java/org/torproject/onionoo/docs/DetailsDocument.java @@ -5,8 +5,8 @@ package org.torproject.onionoo.docs; import java.util.List; import java.util.Map; -import org.apache.commons.lang.StringEscapeUtils; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringEscapeUtils; +import org.apache.commons.lang3.StringUtils; public class DetailsDocument extends Document { @@ -19,11 +19,11 @@ public class DetailsDocument extends Document { * we'll have to do is to change back the '\\' that Gson writes for the * '\'. */ private static String escapeJSON(String s) { - return StringUtils.replaceEach(StringEscapeUtils.escapeJavaScript(s), + return StringUtils.replaceEach(StringEscapeUtils.escapeEcmaScript(s), new String[] { "\\\\'" }, new String[] { "'" }); } private static String unescapeJSON(String s) { - return StringEscapeUtils.unescapeJavaScript(StringUtils.replaceEach(s, + return StringEscapeUtils.unescapeEcmaScript(StringUtils.replaceEach(s, new String[] { "'" }, new String[] { "\\'" })); } diff --git a/src/main/java/org/torproject/onionoo/docs/DetailsStatus.java b/src/main/java/org/torproject/onionoo/docs/DetailsStatus.java index 6d987df..42c835f 100644 --- a/src/main/java/org/torproject/onionoo/docs/DetailsStatus.java +++ b/src/main/java/org/torproject/onionoo/docs/DetailsStatus.java @@ -5,8 +5,8 @@ package org.torproject.onionoo.docs; import java.util.List; import java.util.Map; -import org.apache.commons.lang.StringEscapeUtils; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringEscapeUtils; +import org.apache.commons.lang3.StringUtils; public class DetailsStatus extends Document { @@ -19,11 +19,11 @@ public class DetailsStatus extends Document { * we'll have to do is to change back the '\\' that Gson writes for the * '\'. */ private static String escapeJSON(String s) { - return StringUtils.replaceEach(StringEscapeUtils.escapeJavaScript(s), + return StringUtils.replaceEach(StringEscapeUtils.escapeEcmaScript(s), new String[] { "\\\\'" }, new String[] { "'" }); } private static String unescapeJSON(String s) { - return StringEscapeUtils.unescapeJavaScript(StringUtils.replaceEach(s, + return StringEscapeUtils.unescapeEcmaScript(StringUtils.replaceEach(s, new String[] { "'" }, new String[] { "\\'" })); } diff --git a/src/main/java/org/torproject/onionoo/docs/DocumentStore.java b/src/main/java/org/torproject/onionoo/docs/DocumentStore.java index 9a808ac..393904b 100644 --- a/src/main/java/org/torproject/onionoo/docs/DocumentStore.java +++ b/src/main/java/org/torproject/onionoo/docs/DocumentStore.java @@ -21,7 +21,7 @@ import java.util.Stack; import java.util.TreeMap; import java.util.TreeSet; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.torproject.onionoo.util.FormattingUtils; diff --git a/vagrant/bootstrap.sh b/vagrant/bootstrap.sh index 280f08b..08d0ac5 100644 --- a/vagrant/bootstrap.sh +++ b/vagrant/bootstrap.sh @@ -12,7 +12,7 @@ apt-get purge -y openjdk-6-jdk default-jre echo "Installing required packages." apt-get install -y openjdk-7-jdk apt-get install -y libcommons-codec-java libcommons-compress-java \ -libcommons-lang-java libgoogle-gson-java junit4 libservlet3.0-java \ +libcommons-lang3-java libgoogle-gson-java junit4 libservlet3.0-java \ ant tomcat6 libslf4j-java liblogback-java unzip echo "Setting up paths and creating symbolic links."

1 0

[tor-browser-bundle/maint-4.0] Use the new security.ssl.disable_session_identifiers pref.
by gk＠torproject.org 04 Nov '14

04 Nov '14

commit 110ff7e7077c9311c33cdacb472a45fbbf490559 Author: David Fifield <david(a)bamsoftware.com> Date: Sun Oct 26 19:06:17 2014 +0000 Use the new security.ssl.disable_session_identifiers pref. This is to reenable the TLS session tickets that are disabled by Tor Browser, so the TLS client hello matches that of stock Firefox. https://trac.torproject.org/projects/tor/ticket/13442#comment:1 https://trac.torproject.org/projects/tor/ticket/11183#comment:9 The previously used pref security.enable_tls_session_tickets has been removed and replaced by security.ssl.disable_session_identifiers. https://bugzilla.mozilla.org/show_bug.cgi?id=917049 https://bugzilla.mozilla.org/show_bug.cgi?id=967977 https://trac.torproject.org/projects/tor/ticket/10822 https://gitweb.torproject.org/tor-browser.git/commitdiff/5524ae43780e473831… --- Bundle-Data/PTConfigs/meek-http-helper-user.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Bundle-Data/PTConfigs/meek-http-helper-user.js b/Bundle-Data/PTConfigs/meek-http-helper-user.js index cddc237..eb94d1d 100644 --- a/Bundle-Data/PTConfigs/meek-http-helper-user.js +++ b/Bundle-Data/PTConfigs/meek-http-helper-user.js @@ -6,8 +6,8 @@ user_pref("browser.dom.window.dump.enabled", true); // Enable TLS session tickets (disabled by default in Tor Browser). Otherwise // there is a missing TLS extension. -// https://trac.torproject.org/projects/tor/ticket/11183#comment:9 -user_pref("security.enable_tls_session_tickets", true); +// https://trac.torproject.org/projects/tor/ticket/13442#comment:1 +user_pref("security.ssl.disable_session_identifiers", false); // Disable safe mode. In case of a crash, we don't want to prompt for a // safe-mode browser that has extensions disabled and no proxy.

1 0

[tor/master] Introducing helper function to validate DNS name strings.
by nickm＠torproject.org 04 Nov '14

04 Nov '14

commit 1ea9a6fd72b66ec634446cbd2119641a5ed1e703 Author: rl1987 <rl1987(a)sdf.lonestar.org> Date: Sun Oct 12 19:33:08 2014 +0300 Introducing helper function to validate DNS name strings. --- src/common/util.c | 36 ++++++++++++++++++++++++++++++++++++ src/common/util.h | 1 + src/test/test_util.c | 31 +++++++++++++++++++++++++++++++ 3 files changed, 68 insertions(+) diff --git a/src/common/util.c b/src/common/util.c index f4d293c..606b9e1 100644 --- a/src/common/util.c +++ b/src/common/util.c @@ -957,6 +957,42 @@ string_is_key_value(int severity, const char *string) return 1; } +/** Return true iff <b>string</b> is valid DNS name, as defined in + * RFC 1035 Section 2.3.1. + */ +int +string_is_valid_hostname(const char *string) +{ + int result = 1; + smartlist_t *components; + + components = smartlist_new(); + + smartlist_split_string(components,string,".",0,0); + + SMARTLIST_FOREACH_BEGIN(components, char *, c) { + if (c[0] == '-') { + result = 0; + break; + } + + do { + if ((*c >= 'a' && *c <= 'z') || + (*c >= 'A' && *c <= 'Z') || + (*c >= '0' && *c <= '9') || + (*c == '-')) + c++; + else + result = 0; + } while (result && *c); + + } SMARTLIST_FOREACH_END(c); + + smartlist_free(components); + + return result; +} + /** Return true iff the DIGEST256_LEN bytes in digest are all zero. */ int tor_digest256_is_zero(const char *digest) diff --git a/src/common/util.h b/src/common/util.h index 61bb05f..2634adc 100644 --- a/src/common/util.h +++ b/src/common/util.h @@ -227,6 +227,7 @@ const char *find_str_at_start_of_line(const char *haystack, const char *needle); int string_is_C_identifier(const char *string); int string_is_key_value(int severity, const char *string); +int string_is_valid_hostname(const char *string); int tor_mem_is_zero(const char *mem, size_t len); int tor_digest_is_zero(const char *digest); diff --git a/src/test/test_util.c b/src/test/test_util.c index c67aa71..fb3ce7d 100644 --- a/src/test/test_util.c +++ b/src/test/test_util.c @@ -4122,6 +4122,36 @@ test_util_max_mem(void *arg) ; } +static void +test_util_hostname_validation(void *arg) +{ + (void)arg; + + // Lets try valid hostnames first. + tt_assert(string_is_valid_hostname("torproject.org")); + tt_assert(string_is_valid_hostname("ocw.mit.edu")); + tt_assert(string_is_valid_hostname("i.4cdn.org")); + tt_assert(string_is_valid_hostname("stanford.edu")); + tt_assert(string_is_valid_hostname("multiple-words-with-hypens.jp")); + + // Subdomain name cannot start with '-'. + tt_assert(!string_is_valid_hostname("-torproject.org")); + tt_assert(!string_is_valid_hostname("subdomain.-domain.org")); + tt_assert(!string_is_valid_hostname("-subdomain.domain.org")); + + // Hostnames cannot contain non-alphanumeric characters. + tt_assert(!string_is_valid_hostname("%%domain.\\org.")); + tt_assert(!string_is_valid_hostname("***x.net")); + tt_assert(!string_is_valid_hostname("___abc.org")); + tt_assert(!string_is_valid_hostname("\xff\xffxyz.org")); + tt_assert(!string_is_valid_hostname("word1 word2.net")); + + // XXX: do we allow single-label DNS names? + + done: + return; +} + struct testcase_t util_tests[] = { UTIL_LEGACY(time), UTIL_TEST(parse_http_time, 0), @@ -4194,6 +4224,7 @@ struct testcase_t util_tests[] = { { "socketpair_ersatz", test_util_socketpair, TT_FORK, &socketpair_setup, (void*)"1" }, UTIL_TEST(max_mem, 0), + UTIL_TEST(hostname_validation, 0), END_OF_TESTCASES };

1 0