September 2017 - tor-commits - lists.torproject.org

[exonerator/master] Take out ORDER BY statements.
by karsten＠torproject.org 15 Sep '17

15 Sep '17

commit 92cbc074b9bee07d4b3243070788187080dccd05 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Tue Sep 5 15:21:25 2017 +0200 Take out ORDER BY statements. We don't expect results to be in order, and taking out ORDER BY statements means we don't need to worry about replacing numbers with names for better readability. --- src/main/resources/db/exonerator.sql | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/main/resources/db/exonerator.sql b/src/main/resources/db/exonerator.sql index 85d5d01..233b43c 100755 --- a/src/main/resources/db/exonerator.sql +++ b/src/main/resources/db/exonerator.sql @@ -256,8 +256,7 @@ CREATE OR REPLACE FUNCTION search_by_address24_date ( || '''::DATE + 1 AND statusentry.validafter >= exitlistentry.scanned AND statusentry.validafter - exitlistentry.scanned <= - ''1 day''::INTERVAL - ORDER BY 2, 3, 4'; + ''1 day''::INTERVAL'; END; $$ LANGUAGE plpgsql; @@ -291,8 +290,7 @@ CREATE OR REPLACE FUNCTION search_by_address48_date ( FROM statusentry WHERE oraddress48 = ''' || select_address48 || ''' AND DATE(validafter) >= ''' || select_date || '''::DATE - 1 - AND DATE(validafter) <= ''' || select_date || '''::DATE + 1 - ORDER BY 2, 3'; + AND DATE(validafter) <= ''' || select_date || '''::DATE + 1'; END; $$ LANGUAGE plpgsql;

1 0

[exonerator/master] Start using a query response object.
by karsten＠torproject.org 15 Sep '17

15 Sep '17

commit b68c556e1743420c1f12a33d5f727f3972f9bb45 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Wed Aug 16 11:28:59 2017 +0200 Start using a query response object. This is another prerequisite for changing queries towards making a single query per request (#16596) and towards splitting up ExoneraTor into front-end and back-end. --- .../torproject/exonerator/ExoneraTorServlet.java | 207 ++++++++++++--------- .../org/torproject/exonerator/QueryResponse.java | 63 +++++++ 2 files changed, 186 insertions(+), 84 deletions(-) diff --git a/src/main/java/org/torproject/exonerator/ExoneraTorServlet.java b/src/main/java/org/torproject/exonerator/ExoneraTorServlet.java index ca5d34b..b7d0497 100644 --- a/src/main/java/org/torproject/exonerator/ExoneraTorServlet.java +++ b/src/main/java/org/torproject/exonerator/ExoneraTorServlet.java @@ -105,89 +105,41 @@ public class ExoneraTorServlet extends HttpServlet { /* Step 2: Query the database. */ - /* Query the following data. */ boolean successfullyConnectedToDatabase = false; String firstDate = null; String lastDate = null; boolean noRelevantConsensuses = true; - List<String[]> statusEntries = null; + List<String[]> statusEntries = new ArrayList<>(); List<String> addressesInSameNetwork = null; /* Only query the database if we received valid user input. */ if (null != relayIp && !relayIp.isEmpty() && null != timestampStr && !timestampStr.isEmpty()) { - - /* Open a database connection that we'll use to handle the whole - * request. */ - long requestedConnection = System.currentTimeMillis(); - Connection conn = this.connectToDatabase(); - if (null != conn) { + QueryResponse queryResponse = this.queryDatabase(relayIp, timestampStr); + if (null != queryResponse) { successfullyConnectedToDatabase = true; - - /* Look up first and last date in the database. */ - long[] firstAndLastDates = this.queryFirstAndLastDatesFromDatabase( - conn); - if (null != firstAndLastDates) { - SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd"); - dateFormat.setTimeZone(TimeZone.getTimeZone("UTC")); - firstDate = dateFormat.format(firstAndLastDates[0]); - lastDate = dateFormat.format(firstAndLastDates[1]); - - /* Consider all consensuses published on or within a day of the given - * date. */ - long timestamp = 0L; - if (timestampStr != null && timestampStr.length() > 0) { - try { - timestamp = dateFormat.parse(timestampParameter).getTime(); - } catch (ParseException e) { - /* Already checked in parseTimestamp(). */ - } - } - long timestampFrom = timestamp - 24L * 60L * 60L * 1000L; - long timestampTo = timestamp + 2 * 24L * 60L * 60L * 1000L - 1L; - SimpleDateFormat validAfterTimeFormat = new SimpleDateFormat( - "yyyy-MM-dd HH:mm:ss"); - validAfterTimeFormat.setTimeZone(TimeZone.getTimeZone("UTC")); - String fromValidAfter = validAfterTimeFormat.format(timestampFrom); - String toValidAfter = validAfterTimeFormat.format(timestampTo); - SortedSet<Long> relevantConsensuses - = this.queryKnownConsensusValidAfterTimes(conn, - fromValidAfter, toValidAfter); - if (null != relevantConsensuses && !relevantConsensuses.isEmpty()) { - noRelevantConsensuses = false; - - /* Search for status entries with the given IP address as onion - * routing address, plus status entries of relays having an exit - * list entry with the given IP address as exit address. */ - statusEntries = this.queryStatusEntries(conn, relayIp, - timestamp, validAfterTimeFormat); - - /* If we didn't find anything, run another query to find out if - * there are relays running on other IP addresses in the same /24 or - * /48 network and tell the user about it. */ - if (statusEntries.isEmpty()) { - addressesInSameNetwork = new ArrayList<>(); - if (!relayIp.contains(":")) { - String address24 = this.convertIpV4ToHex(relayIp) - .substring(0, 6); - if (address24 != null) { - addressesInSameNetwork = this.queryAddressesInSame24(conn, - address24, timestamp); - } - } else { - String address48 = this.convertIpV6ToHex(relayIp) - .substring(0, 12); - if (address48 != null) { - addressesInSameNetwork = this.queryAddressesInSame48(conn, - address48, timestamp); - } - } + firstDate = queryResponse.firstDateInDatabase; + lastDate = queryResponse.lastDateInDatabase; + if (null != queryResponse.relevantStatuses + && queryResponse.relevantStatuses) { + noRelevantConsensuses = false; + } + if (null != queryResponse.matches) { + for (QueryResponse.Match match : queryResponse.matches) { + StringBuilder sb = new StringBuilder(); + int writtenAddresses = 0; + for (String address : match.addresses) { + sb.append((writtenAddresses++ > 0 ? ", " : "") + address); } + String[] statusEntry = new String[]{match.timestamp, + sb.toString(), match.fingerprint, match.nickname, + null == match.exit ? "U" : (match.exit ? "Y" : "N")}; + statusEntries.add(statusEntry); } } - - /* Close the database connection. */ - this.closeDatabaseConnection(conn, requestedConnection); + if (null != queryResponse.nearbyAddresses) { + addressesInSameNetwork = Arrays.asList(queryResponse.nearbyAddresses); + } } } @@ -411,6 +363,94 @@ public class ExoneraTorServlet extends HttpServlet { /* Helper methods for querying the database. */ + private QueryResponse queryDatabase(String relayIp, String timestampStr) { + + QueryResponse response = null; + SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd"); + dateFormat.setTimeZone(TimeZone.getTimeZone("UTC")); + SimpleDateFormat validAfterTimeFormat = new SimpleDateFormat( + "yyyy-MM-dd HH:mm:ss"); + validAfterTimeFormat.setTimeZone(TimeZone.getTimeZone("UTC")); + long timestamp = 0L; + if (timestampStr != null && timestampStr.length() > 0) { + try { + timestamp = dateFormat.parse(timestampStr).getTime(); + } catch (ParseException e) { + /* Already checked in parseTimestamp(). */ + } + } + + /* Only query the database if we received valid user input. */ + if (!"".equals(relayIp) && !"".equals(timestampStr)) { + + /* Open a database connection that we'll use to handle the whole + * request. */ + long requestedConnection = System.currentTimeMillis(); + Connection conn = this.connectToDatabase(); + if (null != conn) { + + response = new QueryResponse(); + response.queryAddress = relayIp; + response.queryDate = timestampStr; + + /* Look up first and last date in the database. */ + long[] firstAndLastDates = this.queryFirstAndLastDatesFromDatabase( + conn); + if (null != firstAndLastDates) { + response.firstDateInDatabase = dateFormat.format( + firstAndLastDates[0]); + response.lastDateInDatabase = dateFormat.format(firstAndLastDates[1]); + + /* Consider all consensuses published on or within a day of the given + * date. */ + long timestampFrom = timestamp - 24L * 60L * 60L * 1000L; + long timestampTo = timestamp + 2 * 24L * 60L * 60L * 1000L - 1L; + String fromValidAfter = validAfterTimeFormat.format(timestampFrom); + String toValidAfter = validAfterTimeFormat.format(timestampTo); + SortedSet<Long> relevantConsensuses = + this.queryKnownConsensusValidAfterTimes(conn, fromValidAfter, + toValidAfter); + if (null != relevantConsensuses && !relevantConsensuses.isEmpty()) { + response.relevantStatuses = true; + + /* Search for status entries with the given IP address as onion + * routing address, plus status entries of relays having an exit + * list entry with the given IP address as exit address. */ + List<QueryResponse.Match> matches = this.queryStatusEntries(conn, + relayIp, timestamp, validAfterTimeFormat); + if (!matches.isEmpty()) { + response.matches = matches.toArray(new QueryResponse.Match[0]); + + /* If we didn't find anything, run another query to find out if + * there are relays running on other IP addresses in the same /24 or + * /48 network and tell the user about it. */ + } else { + if (!relayIp.contains(":")) { + String address24 = this.convertIpV4ToHex(relayIp) + .substring(0, 6); + if (address24 != null) { + response.nearbyAddresses = this.queryAddressesInSame24(conn, + address24, timestamp).toArray(new String[0]); + } + } else { + String address48 = this.convertIpV6ToHex(relayIp) + .substring(0, 12); + if (address48 != null) { + response.nearbyAddresses = this.queryAddressesInSame48(conn, + address48, timestamp).toArray(new String[0]); + } + } + } + } + } + + /* Close the database connection. */ + this.closeDatabaseConnection(conn, requestedConnection); + } + } + return response; + } + private Connection connectToDatabase() { Connection conn = null; try { @@ -468,10 +508,10 @@ public class ExoneraTorServlet extends HttpServlet { return relevantConsensuses; } - private List<String[]> queryStatusEntries(Connection conn, + private List<QueryResponse.Match> queryStatusEntries(Connection conn, String relayIp, long timestamp, SimpleDateFormat validAfterTimeFormat) { - List<String[]> statusEntries = new ArrayList<>(); + List<QueryResponse.Match> matches = new ArrayList<>(); String addressHex = !relayIp.contains(":") ? this.convertIpV4ToHex(relayIp) : this.convertIpV6ToHex(relayIp); if (addressHex == null) { @@ -496,7 +536,7 @@ public class ExoneraTorServlet extends HttpServlet { SortedSet<String> addresses = new TreeSet<>(); SortedSet<String> addressesHex = new TreeSet<>(); String nickname = null; - String exit = "U"; + Boolean exit = null; for (String line : new String(rawstatusentry).split("\n")) { if (line.startsWith("r ")) { String[] parts = line.split(" "); @@ -512,7 +552,7 @@ public class ExoneraTorServlet extends HttpServlet { : this.convertIpV6ToHex(address); addressesHex.add(orAddressHex); } else if (line.startsWith("p ")) { - exit = line.equals("p reject 1-65535") ? "N" : "Y"; + exit = !line.equals("p reject 1-65535"); } } String exitaddress = rs.getString(4); @@ -523,25 +563,24 @@ public class ExoneraTorServlet extends HttpServlet { if (!addressesHex.contains(addressHex)) { continue; } - StringBuilder sb = new StringBuilder(); - int writtenAddresses = 0; - for (String address : addresses) { - sb.append((writtenAddresses++ > 0 ? ", " : "") + address); - } long validafter = rs.getTimestamp(2, utcCalendar).getTime(); String validAfterString = validAfterTimeFormat.format(validafter); String fingerprint = rs.getString(3).toUpperCase(); - String[] statusEntry = new String[] { validAfterString, - sb.toString(), fingerprint, nickname, exit }; - statusEntries.add(statusEntry); + QueryResponse.Match match = new QueryResponse.Match(); + match.timestamp = validAfterString; + match.addresses = addresses.toArray(new String[0]); + match.fingerprint = fingerprint; + match.nickname = nickname; + match.exit = exit; + matches.add(match); } rs.close(); cs.close(); } catch (SQLException e) { /* Nothing found. */ - statusEntries = null; + matches.clear(); } - return statusEntries; + return matches; } private List<String> queryAddressesInSame24(Connection conn, diff --git a/src/main/java/org/torproject/exonerator/QueryResponse.java b/src/main/java/org/torproject/exonerator/QueryResponse.java new file mode 100644 index 0000000..d86efb0 --- /dev/null +++ b/src/main/java/org/torproject/exonerator/QueryResponse.java @@ -0,0 +1,63 @@ +/* Copyright 2017 The Tor Project + * See LICENSE for licensing information */ + +package org.torproject.exonerator; + +import com.google.gson.annotations.SerializedName; + +/** Query response from the ExoneraTor database. */ +public class QueryResponse { + + /** Query IP address passed in the request; never <code>null</code>. */ + @SerializedName("query_address") + String queryAddress; + + /** Query date passed in the request; never <code>null</code>. */ + @SerializedName("query_date") + String queryDate; + + /** ISO-formatted valid-after time of the first status contained in the + * database; only <code>null</code> if the database is empty. */ + @SerializedName("first_date_in_database") + String firstDateInDatabase; + + /** ISO-formatted valid-after time of the last status contained in the + * database; only <code>null</code> if the database is empty. */ + @SerializedName("last_date_in_database") + String lastDateInDatabase; + + /** Whether there is at least one relevant status in the database on or within + * a day of the requested date; <code>null</code> if the database is empty. */ + @SerializedName("relevant_statuses") + Boolean relevantStatuses; + + /** All matches for the given IP address and date; <code>null</code> if there + * were no matches at all. */ + Match[] matches; + + /** Match details. */ + static class Match { + + /** ISO-formatted valid-after time of the status containing the match. */ + String timestamp; + + /** All known IP addresses of the relay at the time. */ + String[] addresses; + + /** Relay fingerprint. */ + String fingerprint; + + /** Relay nickname. */ + String nickname; + + /** Whether this relay permitted exiting or not; <code>null</code> if + * unknown. */ + Boolean exit; + } + + /** All known IP addresses in the same /24 or /48 network; <code>null</code> + * if there were direct matches for the given IP address. */ + @SerializedName("nearby_addresses") + String[] nearbyAddresses; +} +

1 0

[exonerator/master] Adapt .gitignore to actual project structure.
by karsten＠torproject.org 15 Sep '17

15 Sep '17

commit 1a06302ed43deaafcd8b1b5d4510d4b729224c02 Author: iwakeh <iwakeh(a)torproject.org> Date: Tue Sep 5 13:21:26 2017 +0000 Adapt .gitignore to actual project structure. --- .gitignore | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index a5ee085..e93ccb8 100644 --- a/.gitignore +++ b/.gitignore @@ -2,15 +2,14 @@ .classpath .project -# Generated web archive -exonerator.war +# Generated stuff +generated/ -# Compiled class files -classes/ - -# Possibly modified config file -etc/context.xml +# library folder +lib/ # Copied and possibly modified config file config +# other +*~

1 0

[exonerator/master] Prepare for 1.0.0 release.
by karsten＠torproject.org 15 Sep '17

15 Sep '17

commit d234fb70a4560746a895f9e7b30a477d8b72227e Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Fri Sep 15 14:12:51 2017 +0200 Prepare for 1.0.0 release. --- CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md new file mode 100644 index 0000000..e36c3bd --- /dev/null +++ b/CHANGELOG.md @@ -0,0 +1,6 @@ +# Changes in version 1.0.0 - 2017-09-15 + + * Major changes + - This is the initial release after over seven years of + development. +

1 0

[exonerator/master] Streamline logging.
by karsten＠torproject.org 15 Sep '17

15 Sep '17

commit 7985986113f6422e7154e53ca0b4ebecca13b6c1 Author: iwakeh <iwakeh(a)torproject.org> Date: Tue Sep 5 13:21:29 2017 +0000 Streamline logging. slf4j and logback were already used in ExoneraTor. This commit makes all classes use slf4j and replaced j.u.l and System.{err,out} logging. --- build.xml | 1 + .../exonerator/ExoneraTorDatabaseImporter.java | 48 ++++++++++++---------- .../torproject/exonerator/ExoneraTorServlet.java | 10 +++-- .../org/torproject/exonerator/QueryResponse.java | 27 ++++++------ .../org/torproject/exonerator/QueryServlet.java | 34 ++++++--------- 5 files changed, 60 insertions(+), 60 deletions(-) diff --git a/build.xml b/build.xml index 2dc70f0..68d5c98 100644 --- a/build.xml +++ b/build.xml @@ -158,6 +158,7 @@ <include name="commons-lang-2.6.jar"/> <include name="gson-2.4.jar" /> <include name="postgresql-9.4.1212.jar"/> + <include name="slf4j-api-1.7.22.jar"/> </lib> <classes dir="${classes}"/> <zipfileset dir="${resources}" diff --git a/src/main/java/org/torproject/exonerator/ExoneraTorDatabaseImporter.java b/src/main/java/org/torproject/exonerator/ExoneraTorDatabaseImporter.java index a36e242..155506c 100644 --- a/src/main/java/org/torproject/exonerator/ExoneraTorDatabaseImporter.java +++ b/src/main/java/org/torproject/exonerator/ExoneraTorDatabaseImporter.java @@ -14,6 +14,9 @@ import org.torproject.descriptor.RelayNetworkStatusConsensus; import org.apache.commons.codec.binary.Hex; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import java.io.BufferedReader; import java.io.BufferedWriter; import java.io.File; @@ -39,6 +42,9 @@ import java.util.TreeMap; /* Import Tor descriptors into the ExoneraTor database. */ public class ExoneraTorDatabaseImporter { + private static Logger logger + = LoggerFactory.getLogger(ExoneraTorDatabaseImporter.class); + /** Main function controlling the parsing process. */ public static void main(String[] args) { readConfiguration(); @@ -63,7 +69,7 @@ public class ExoneraTorDatabaseImporter { private static void readConfiguration() { File configFile = new File("config"); if (!configFile.exists()) { - System.err.println("Could not find config file. Exiting."); + logger.error("Could not find config file. Exiting."); System.exit(1); } String line = null; @@ -82,7 +88,7 @@ public class ExoneraTorDatabaseImporter { } br.close(); } catch (IOException e) { - System.err.println("Could not parse config file. Exiting."); + logger.error("Could not parse config file. Exiting.", e); System.exit(1); } } @@ -95,7 +101,7 @@ public class ExoneraTorDatabaseImporter { try { connection = DriverManager.getConnection(jdbcString); } catch (SQLException e) { - System.out.println("Could not connect to database. Exiting."); + logger.error("Could not connect to database. Exiting.", e); System.exit(1); } } @@ -113,8 +119,8 @@ public class ExoneraTorDatabaseImporter { insertExitlistentryStatement = connection.prepareCall( "{call insert_exitlistentry(?, ?, ?, ?, ?)}"); } catch (SQLException e) { - System.out.println("Could not prepare callable statements to " - + "import data into the database. Exiting."); + logger.warn("Could not prepare callable statements to " + + "import data into the database. Exiting.", e); System.exit(1); } } @@ -130,12 +136,12 @@ public class ExoneraTorDatabaseImporter { br.close(); if (System.currentTimeMillis() - runStarted < 6L * 60L * 60L * 1000L) { - System.out.println("File 'exonerator-lock' is less than 6 " + logger.warn("File 'exonerator-lock' is less than 6 " + "hours old. Exiting."); System.exit(1); } else { - System.out.println("File 'exonerator-lock' is at least 6 hours " - + "old. Overwriting and executing anyway."); + logger.warn("File 'exonerator-lock' is at least 6 hours old." + + " Overwriting and executing anyway."); } } BufferedWriter bw = new BufferedWriter(new FileWriter( @@ -143,8 +149,7 @@ public class ExoneraTorDatabaseImporter { bw.append(String.valueOf(System.currentTimeMillis()) + "\n"); bw.close(); } catch (IOException e) { - System.out.println("Could not create 'exonerator-lock' file. " - + "Exiting."); + logger.warn("Could not create 'exonerator-lock' file. Exiting."); System.exit(1); } } @@ -179,9 +184,9 @@ public class ExoneraTorDatabaseImporter { lineNumber++; String[] parts = line.split(","); if (parts.length != 2) { - System.out.println("File 'stats/exonerator-import-history' " - + "contains a corrupt entry in line " + lineNumber - + ". Ignoring parse history file entirely."); + logger.warn("File 'stats/exonerator-import-history' " + + "contains a corrupt entry in line {}. " + + "Ignoring parse history file entirely.", lineNumber); lastImportHistory.clear(); br.close(); return; @@ -192,7 +197,7 @@ public class ExoneraTorDatabaseImporter { } br.close(); } catch (IOException e) { - System.out.println("Could not read import history. Ignoring."); + logger.warn("Could not read import history. Ignoring.", e); lastImportHistory.clear(); } } @@ -306,8 +311,8 @@ public class ExoneraTorDatabaseImporter { insertStatusentryStatement.setString(6, orAddress.replaceAll("[\\[\\]]", "")); } else { - System.err.println("Could not import status entry with IPv6 " - + "address '" + orAddress + "'. Exiting."); + logger.error("Could not import status entry with IPv6 " + + "address '{}'. Exiting.", orAddress); System.exit(1); } } @@ -315,7 +320,7 @@ public class ExoneraTorDatabaseImporter { insertStatusentryStatement.execute(); } } catch (SQLException e) { - System.out.println("Could not import status entry. Exiting."); + logger.error("Could not import status entry. Exiting.", e); System.exit(1); } } @@ -360,7 +365,7 @@ public class ExoneraTorDatabaseImporter { insertExitlistentryStatement.setBytes(5, rawExitlistentry); insertExitlistentryStatement.execute(); } catch (SQLException e) { - System.out.println("Could not import exit list entry. Exiting."); + logger.error("Could not import exit list entry. Exiting.", e); System.exit(1); } } @@ -379,8 +384,8 @@ public class ExoneraTorDatabaseImporter { } bw.close(); } catch (IOException e) { - System.out.println("File 'stats/exonerator-import-history' could " - + "not be written. Ignoring."); + logger.warn("File 'stats/exonerator-import-history' could " + + "not be written. Ignoring.", e); } } @@ -389,8 +394,7 @@ public class ExoneraTorDatabaseImporter { try { connection.close(); } catch (SQLException e) { - System.out.println("Could not close database connection. " - + "Ignoring."); + logger.warn("Could not close database connection. Ignoring.", e); } } diff --git a/src/main/java/org/torproject/exonerator/ExoneraTorServlet.java b/src/main/java/org/torproject/exonerator/ExoneraTorServlet.java index 8e88882..e5dac24 100644 --- a/src/main/java/org/torproject/exonerator/ExoneraTorServlet.java +++ b/src/main/java/org/torproject/exonerator/ExoneraTorServlet.java @@ -5,6 +5,9 @@ package org.torproject.exonerator; import org.apache.commons.lang.StringEscapeUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import java.io.IOException; import java.io.InputStream; import java.io.InputStreamReader; @@ -23,7 +26,6 @@ import java.util.ResourceBundle; import java.util.SortedMap; import java.util.TimeZone; import java.util.TreeMap; -import java.util.logging.Logger; import java.util.regex.Pattern; import javax.servlet.ServletConfig; @@ -48,7 +50,7 @@ public class ExoneraTorServlet extends HttpServlet { @Override public void init(ServletConfig config) throws ServletException { super.init(config); - this.logger = Logger.getLogger(ExoneraTorServlet.class.toString()); + this.logger = LoggerFactory.getLogger(ExoneraTorServlet.class); this.availableLanguageNames = new TreeMap<>(); for (String locale : this.availableLanguages) { ResourceBundle rb = ResourceBundle.getBundle("ExoneraTor", @@ -307,7 +309,7 @@ public class ExoneraTorServlet extends HttpServlet { } catch (IOException e) { /* No result from backend, so that we don't have a query response to * process further. */ - logger.severe("Backend query failed: " + e.getMessage()); + logger.error("Backend query failed.", e); } return null; } @@ -584,7 +586,7 @@ public class ExoneraTorServlet extends HttpServlet { content = rb.getString("technicaldetails.exit.no"); break; default: // should never happen - logger.warning("Unknown content: " + content); + logger.warn("Unknown content: '{}'.", content); } } out.print(" <td" + attributes + ">" + content + "</td>"); diff --git a/src/main/java/org/torproject/exonerator/QueryResponse.java b/src/main/java/org/torproject/exonerator/QueryResponse.java index 8053e94..b172b7d 100644 --- a/src/main/java/org/torproject/exonerator/QueryResponse.java +++ b/src/main/java/org/torproject/exonerator/QueryResponse.java @@ -7,28 +7,30 @@ import com.google.gson.Gson; import com.google.gson.annotations.Expose; import com.google.gson.annotations.SerializedName; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import java.io.IOException; import java.io.Reader; import java.util.Objects; -import java.util.logging.Logger; /** Query response from the ExoneraTor database. */ public class QueryResponse { @Expose(serialize = false, deserialize = false) - private static Logger logger = Logger.getLogger(QueryResponse.class.toString()); + private static Logger logger = LoggerFactory.getLogger(QueryResponse.class); - /* Actual response format version implemented by this class. */ + /* Actual version implemented by this class. */ @Expose(serialize = false, deserialize = false) private static final String VERSION = "1.0"; /* Don't accept query responses with versions lower than this. */ @Expose(serialize = false, deserialize = false) - private static final String FIRST_RECOGNIZED_VERSION = "1.0"; + private static final String FIRSTRECOGNIZEDVERSION = "1.0"; /* Don't accept query responses with this version or higher. */ @Expose(serialize = false, deserialize = false) - private static final String FIRST_UNRECOGNIZED_VERSION = "2.0"; + private static final String FIRSTUNRECOGNIZEDVERSION = "2.0"; /** Version of this response format. */ @Expose @@ -96,20 +98,19 @@ public class QueryResponse { try { QueryResponse response = gson.fromJson(reader, QueryResponse.class); if (null == response || null == response.version) { - logger.warning("Response is either empty or does not contain " + logger.warn("Response is either empty or does not contain " + "version information."); return null; - } else if (response.version.compareTo(FIRST_RECOGNIZED_VERSION) < 0 - || response.version.compareTo(FIRST_UNRECOGNIZED_VERSION) >= 0) { - logger.warning("Response has either an older or a newer version (" - + response.version + ") than we can handle (" - + FIRST_RECOGNIZED_VERSION + " <= x < " + FIRST_UNRECOGNIZED_VERSION - + ")."); + } else if (response.version.compareTo(FIRSTRECOGNIZEDVERSION) < 0 + || response.version.compareTo(FIRSTUNRECOGNIZEDVERSION) >= 0) { + logger.error("Response has version {}, which is not in the range " + + "of versions we can handle: {} <= x < {}).", response.version, + FIRSTRECOGNIZEDVERSION, FIRSTUNRECOGNIZEDVERSION); return null; } return response; } catch (RuntimeException e) { - logger.severe("JSON decoding failed: " + e.getMessage()); + logger.error("JSON decoding failed.", e); } return null; } diff --git a/src/main/java/org/torproject/exonerator/QueryServlet.java b/src/main/java/org/torproject/exonerator/QueryServlet.java index 74be053..893a7b9 100644 --- a/src/main/java/org/torproject/exonerator/QueryServlet.java +++ b/src/main/java/org/torproject/exonerator/QueryServlet.java @@ -3,9 +3,11 @@ package org.torproject.exonerator; -import com.google.gson.Gson; import org.apache.commons.codec.binary.Hex; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import java.io.IOException; import java.sql.CallableStatement; import java.sql.Connection; @@ -19,8 +21,6 @@ import java.util.List; import java.util.SortedSet; import java.util.TimeZone; import java.util.TreeSet; -import java.util.logging.Level; -import java.util.logging.Logger; import java.util.regex.Pattern; import javax.naming.Context; @@ -44,9 +44,7 @@ public class QueryServlet extends HttpServlet { @Override public void init() { - - /* Initialize logger. */ - this.logger = Logger.getLogger(QueryServlet.class.toString()); + this.logger = LoggerFactory.getLogger(QueryServlet.class); /* Look up data source. */ try { @@ -54,7 +52,7 @@ public class QueryServlet extends HttpServlet { this.ds = (DataSource) cxt.lookup("java:comp/env/jdbc/exonerator"); this.logger.info("Successfully looked up data source."); } catch (NamingException e) { - this.logger.log(Level.WARNING, "Could not look up data source", e); + this.logger.warn("Could not look up data source", e); } } @@ -96,17 +94,12 @@ public class QueryServlet extends HttpServlet { if (null == queryResponse) { response.sendError(HttpServletResponse.SC_INTERNAL_SERVER_ERROR, "Database error."); - return; + } else { + /* Write the response. */ + response.setContentType("application/json"); + response.setCharacterEncoding("utf-8"); + response.getWriter().write(QueryResponse.toJson(queryResponse)); } - - /* Format the query response. */ - Gson gson = new Gson(); - String formattedResponse = gson.toJson(queryResponse); - - /* Write the response. */ - response.setContentType("application/json"); - response.setCharacterEncoding("utf-8"); - response.getWriter().write(formattedResponse); } /* Helper methods for handling the request. */ @@ -314,12 +307,11 @@ public class QueryServlet extends HttpServlet { rs.close(); cs.close(); conn.close(); - this.logger.info("Returned a database connection to the pool " - + "after " + (System.currentTimeMillis() - - requestedConnection) + " millis."); + this.logger.info("Returned a database connection to the pool after {}" + + " millis.", System.currentTimeMillis() - requestedConnection); } catch (SQLException e) { /* Nothing found. */ - this.logger.log(Level.WARNING, "Database error: " + e.getMessage(), e); + this.logger.warn("Database error. Returning 'null'.", e); return null; }

1 0

[exonerator/master] Add tests and adapt build.xml to run these.
by karsten＠torproject.org 15 Sep '17

15 Sep '17

commit 6f2f34b1c87682b5fa1234b410a6920e550d8189 Author: iwakeh <iwakeh(a)torproject.org> Date: Tue Sep 5 13:21:28 2017 +0000 Add tests and adapt build.xml to run these. Also added test sources to checkstyle target. --- build.xml | 71 ++++++++++-- .../exonerator/ExoneraTorServletTest.java | 68 ++++++++++++ .../torproject/exonerator/QueryResponseTest.java | 122 +++++++++++++++++++++ 3 files changed, 250 insertions(+), 11 deletions(-) diff --git a/build.xml b/build.xml index 4e05077..2dc70f0 100644 --- a/build.xml +++ b/build.xml @@ -6,27 +6,46 @@ <property name="webapp" value="src/main/webapp"/> <property name="generated" value="generated/"/> <property name="classes" value="${generated}/classes"/> + <property name="testclasses" value="${generated}/testclasses/"/> <property name="dist" value="${generated}/dist"/> <property name="testresources" value="src/test/resources/"/> + <property name="testsources" value="src/test/java"/> + <property name="testresult" value="${generated}/test-results"/> <property name="libs" value="lib"/> <property name="webxmlfile" value="src/main/webapp/web.xml"/> <property name="warfile" value="${dist}/exonerator.war"/> <property name="source-and-target-java-version" value="1.7" /> <property name="metricslibversion" value="2.0.0" /> + <patternset id="runtime" > + <include name="metrics-lib-${metricslibversion}.jar"/> + <include name="commons-compress-1.13.jar"/> + <include name="commons-codec-1.10.jar"/> + <include name="commons-lang-2.6.jar"/> + <include name="gson-2.4.jar" /> + <include name="postgresql-9.4.1212.jar"/> + <include name="servlet-api-3.0.jar"/> + <include name="logback-core-1.1.9.jar" /> + <include name="logback-classic-1.1.9.jar" /> + <include name="slf4j-api-1.7.22.jar"/> + <include name="xz-1.6.jar"/> + </patternset> <path id="classpath"> <pathelement path="${classes}"/> <fileset dir="${libs}"> - <include name="metrics-lib-${metricslibversion}.jar"/> - <include name="commons-compress-1.13.jar"/> - <include name="commons-codec-1.10.jar"/> - <include name="commons-lang-2.6.jar"/> - <include name="gson-2.4.jar" /> - <include name="postgresql-9.4.1212.jar"/> - <include name="servlet-api-3.0.jar"/> - <include name="logback-core-1.1.9.jar" /> - <include name="logback-classic-1.1.9.jar" /> - <include name="slf4j-api-1.7.22.jar"/> - <include name="xz-1.6.jar"/> + <patternset refid="runtime" /> + </fileset> + </path> + <path id="test.classpath"> + <pathelement path="${classes}"/> + <pathelement path="${resources}"/> + <pathelement path="${testclasses}"/> + <pathelement path="${testresources}"/> + <fileset dir="${libs}"> + <patternset refid="runtime" /> + </fileset> + <fileset dir="${libs}"> + <include name="junit4-4.12.jar"/> + <include name="hamcrest-all-1.3.jar"/> </fileset> </path> <path id="checkstyle.classpath" > @@ -44,6 +63,7 @@ <target name="init"> <copy file="${resources}/config" tofile="${basedir}/config"/> <mkdir dir="${classes}"/> + <mkdir dir="${testclasses}"/> <mkdir dir="${dist}"/> </target> @@ -62,6 +82,33 @@ </javac> </target> + <target name="testcompile" depends="init"> + <javac destdir="${testclasses}" + srcdir="${testsources}" + source="${source-and-target-java-version}" + target="${source-and-target-java-version}" + debug="true" + deprecation="true" + optimize="false" + failonerror="true" + includeantruntime="false"> + <classpath refid="test.classpath"/> + </javac> + </target> + + <target name="test" depends="compile,testcompile"> + <junit fork="true" + haltonfailure="true" + printsummary="on"> + <classpath refid="test.classpath"/> + <formatter type="plain" usefile="false"/> + <batchtest> + <fileset dir="${testclasses}" + includes="**/*Test.class"/> + </batchtest> + </junit> + </target> +  <target name="run" depends="compile"> <java fork="true" @@ -78,6 +125,8 @@ <checkstyle config="${testresources}/metrics_checks.xml"> <fileset dir="${sources}" includes="**/*.java" /> + <fileset dir="${testsources}" + includes="**/*.java" /> <classpath> <path refid="classpath" /> <path refid="checkstyle.classpath" /> diff --git a/src/test/java/org/torproject/exonerator/ExoneraTorServletTest.java b/src/test/java/org/torproject/exonerator/ExoneraTorServletTest.java new file mode 100644 index 0000000..b2e3ed4 --- /dev/null +++ b/src/test/java/org/torproject/exonerator/ExoneraTorServletTest.java @@ -0,0 +1,68 @@ +/* Copyright 2017 The Tor Project + * See LICENSE for licensing information */ + +package org.torproject.exonerator; + +import static org.junit.Assert.assertEquals; + +import org.junit.Test; + +import java.util.Arrays; +import java.util.Collection; + +public class ExoneraTorServletTest { + + private static final String[][] ipTestData + = { // input, output + {"86.95.81.23", "86.95.81.23"}, + {"786.95.81.23", null}, + {"86.95.81.2334", null}, + {null, ""}, + {"", ""}, + {"[2a01:4f8:190:514a::2]", "2a01:4f8:190:514a::2"}, + {"2a01:4f8:1234:0:5678:0:9abc:d", "2a01:4f8:1234:0:5678:0:9abc:d"}, + {"2a01:4f8:1234:0:5678:0:9abc:u", null}, + {"2a01:4f8::0:9abc:d", "2a01:4f8::0:9abc:d"}, + {"2A01:4F8::0:9ABC:D", "2a01:4f8::0:9abc:d"}, + {"2a01:4f8:::0:9abc:d", null}, + {"[[2a01:4f8:190:514a::2]]", null}, + {"2a01:4f8:190:514a::2", "2a01:4f8:190:514a::2"} + }; + + @Test + public void testIpParsing() { + for (String[] data : ipTestData) { + assertEquals(data[1], ExoneraTorServlet.parseIpParameter(data[0])); + } + } + + private static final String[][] timestampTestData + = { // input, output + {"2000- 10-10", "2000-10-10"}, + {"2010-12-16 +0001", "2010-12-16"}, + {"2010-12-16 CEST", "2010-12-16"}, + {"2010-12-16abcd", "2010-12-16"}, + {"2010-12-16", "2010-12-16"}, + {"2000-10-10 12:10:00", "2000-10-10"}, + {"2000-10-10 1210-04-05", "2000-10-10"}, + {"20.10.16", null}, + {null, ""}, + {"", ""}, + {"2010-12 16", null}, + {"2010-\t12-\t16", "2010-12-16"}, + {"2010- 12- \t16", "2010-12-16"}, + {"2003-12-\t16", "2003-12-16"}, + {"2004-10-10\t", "2004-10-10"}, + {"\n2005-10-10\t\t", "2005-10-10"}, + {" 2001-10-10 ", "2001-10-10"} + }; + + @Test + public void testTimestampParsing() { + for (String[] data : timestampTestData) { + assertEquals(data[1], ExoneraTorServlet.parseTimestampParameter(data[0])); + } + } + +} + diff --git a/src/test/java/org/torproject/exonerator/QueryResponseTest.java b/src/test/java/org/torproject/exonerator/QueryResponseTest.java new file mode 100644 index 0000000..8c79949 --- /dev/null +++ b/src/test/java/org/torproject/exonerator/QueryResponseTest.java @@ -0,0 +1,122 @@ +/* Copyright 2017 The Tor Project + * See LICENSE for licensing information */ + +package org.torproject.exonerator; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; + +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.Parameterized; +import org.junit.runners.Parameterized.Parameters; + +import java.io.StringReader; +import java.util.Arrays; +import java.util.Collection; + +(a)RunWith(Parameterized.class) +public class QueryResponseTest { + + /** Test data structure: QueryResponse, JSON string. */ + @Parameters + public static Collection<Object[]> testData() { + return Arrays.asList(new Object[][] { + {null, + "{\"version\":\"0.3\"," + + "\"query_address\":\"12.13.14.15\"," + + "\"query_date\":\"2016-12-12\"," + + "\"first_date_in_database\":\"2016-01-01\"," + + "\"last_date_in_database\":\"2016-12-31\"," + + "\"relevant_statuses\":true,\"matches\":[{\"timestamp\":\"2016-12-03\"," + + "\"addresses\":[\"12.13.14.15\"," + + "\"12.13.14.16\"],\"fingerprint\":\"fingerprint-not-checked\"," + + "\"nickname\":\"some name\"," + + "\"exit\":true},{\"timestamp\":\"2012-12-03\"," + + "\"addresses\":[\"12.13.20.15\"," + + "\"12.13.20.16\"],\"fingerprint\":\"fingerprint2-not-checked\"," + + "\"nickname\":\"some name2\"," + + "\"exit\":false}],\"nearby_addresses\":[\"12.13.14.15\"," + + "\"12.13.14.16\"]}"}, + {new QueryResponse("1.1", null, null, null, + null, false, null, null), + "{\"version\":\"1.1\",\"relevant_statuses\":false}"}, + {new QueryResponse("1.0", "12.13.14.15", "2016-12-12", "2016-01-01", + "2016-12-31", true, + new QueryResponse.Match[]{new QueryResponse.Match("2016-12-03", + new String[] {"12.13.14.15", "12.13.14.16"}, + "fingerprint-not-checked", "some name", true), + new QueryResponse.Match("2012-12-03", + new String[] {"12.13.20.15", "12.13.20.16"}, + "fingerprint2-not-checked", "some name2", false)}, + new String[] {"12.13.14.15", "12.13.14.16"}), + "{\"version\":\"1.0\"," + + "\"query_address\":\"12.13.14.15\"," + + "\"query_date\":\"2016-12-12\"," + + "\"first_date_in_database\":\"2016-01-01\"," + + "\"last_date_in_database\":\"2016-12-31\"," + + "\"relevant_statuses\":true,\"matches\":[{\"timestamp\":\"2016-12-03\"," + + "\"addresses\":[\"12.13.14.15\"," + + "\"12.13.14.16\"],\"fingerprint\":\"fingerprint-not-checked\"," + + "\"nickname\":\"some name\"," + + "\"exit\":true},{\"timestamp\":\"2012-12-03\"," + + "\"addresses\":[\"12.13.20.15\"," + + "\"12.13.20.16\"],\"fingerprint\":\"fingerprint2-not-checked\"," + + "\"nickname\":\"some name2\"," + + "\"exit\":false}],\"nearby_addresses\":[\"12.13.14.15\"," + + "\"12.13.14.16\"]}"}, + {new QueryResponse("1.0", "12.13.14.15", "2016-12-12", "2016-01-01", + "2016-12-31", false, + new QueryResponse.Match[]{new QueryResponse.Match("2016-12-03", + new String[] {"12.13.14.15", "12.13.14.16"}, + "fingerprint-not-checked", "some name", null), + new QueryResponse.Match("2012-12-03", + new String[] {"12.13.20.15", "12.13.20.16"}, + "fingerprint2-not-checked", "some name2", true)}, + new String[] {"12.13.14.15", "12.13.14.16"}), + "{\"version\":\"1.0\"," + + "\"query_address\":\"12.13.14.15\"," + + "\"query_date\":\"2016-12-12\"," + + "\"first_date_in_database\":\"2016-01-01\"," + + "\"last_date_in_database\":\"2016-12-31\"," + + "\"relevant_statuses\":false,\"matches\":[{\"timestamp\":\"2016-12-03\"," + + "\"addresses\":[\"12.13.14.15\"," + + "\"12.13.14.16\"],\"fingerprint\":\"fingerprint-not-checked\"," + + "\"nickname\":\"some name\"},{\"timestamp\":\"2012-12-03\"," + + "\"addresses\":[\"12.13.20.15\"," + + "\"12.13.20.16\"],\"fingerprint\":\"fingerprint2-not-checked\"," + + "\"nickname\":\"some name2\"," + + "\"exit\":true}],\"nearby_addresses\":[\"12.13.14.15\"," + + "\"12.13.14.16\"]}"} + }); + } + + private QueryResponse queryResponse; + private String json; + + public QueryResponseTest(QueryResponse qr, String json) { + this.queryResponse = qr; + this.json = json; + } + + @Test + public void testJsonReading() { + if (null == this.queryResponse) { + assertNull(QueryResponse.fromJson(new StringReader(this.json))); + } else { + assertEquals(json, + QueryResponse.toJson(QueryResponse.fromJson(new StringReader(this.json)))); + } + } + + @Test + public void testJsonWriting() { + if (null == this.queryResponse) { + return; + } + assertEquals(json, QueryResponse.toJson(this.queryResponse)); + } + +} +

1 0

[exonerator/master] Use a constant for milliseconds in a day.
by karsten＠torproject.org 15 Sep '17

15 Sep '17

commit c3749fb4e0092db33fccaab4352d78fa3d1b4783 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Tue Sep 5 15:18:54 2017 +0200 Use a constant for milliseconds in a day. --- src/main/java/org/torproject/exonerator/QueryServlet.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/torproject/exonerator/QueryServlet.java b/src/main/java/org/torproject/exonerator/QueryServlet.java index 903c9d2..74be053 100644 --- a/src/main/java/org/torproject/exonerator/QueryServlet.java +++ b/src/main/java/org/torproject/exonerator/QueryServlet.java @@ -40,6 +40,8 @@ public class QueryServlet extends HttpServlet { private DataSource ds; + private static final long MILLISECONDS_IN_A_DAY = 24L * 60L * 60L * 1000L; + @Override public void init() { @@ -329,8 +331,8 @@ public class QueryServlet extends HttpServlet { response.firstDateInDatabase = dateFormat.format(allValidAfters.first()); response.lastDateInDatabase = dateFormat.format(allValidAfters.last()); response.relevantStatuses = false; - long timestampFrom = timestamp - 24L * 60L * 60L * 1000L; - long timestampTo = timestamp + 2 * 24L * 60L * 60L * 1000L - 1L; + long timestampFrom = timestamp - MILLISECONDS_IN_A_DAY; + long timestampTo = timestamp + 2 * MILLISECONDS_IN_A_DAY - 1L; for (long validAfter : allValidAfters) { if (validAfter >= timestampFrom && validAfter <= timestampTo) { response.relevantStatuses = true;

1 0

[translation/tails-misc_completed] Update translations for tails-misc_completed
by translation＠torproject.org 15 Sep '17

15 Sep '17

commit cdaa861d1c563367a8812415baae3a596a0cd71c Author: Translation commit bot <translation(a)torproject.org> Date: Fri Sep 15 12:16:41 2017 +0000 Update translations for tails-misc_completed --- ru.po | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/ru.po b/ru.po index aaf34cfa2..2b285b107 100644 --- a/ru.po +++ b/ru.po @@ -18,6 +18,7 @@ # Oul Gocke <beandonlybe(a)yandex.ru>, 2013-2014 # Sergey Briskin, 2015 # tetyana muirhead, 2015 +# Timofey Lisunov <solokot(a)gmail.com>, 2017 # Valid Olov, 2013 # Wagan Sarukhanov <wagan.sarukhanov(a)gmail.com>, 2015 # Uho Lot <yavinav(a)gmail.com>, 2016 @@ -26,9 +27,9 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-06-05 11:57+0200\n" -"PO-Revision-Date: 2017-09-11 09:46+0000\n" -"Last-Translator: Andrey\n" +"POT-Creation-Date: 2017-09-13 20:10+0200\n" +"PO-Revision-Date: 2017-09-15 11:47+0000\n" +"Last-Translator: Timofey Lisunov <solokot(a)gmail.com>\n" "Language-Team: Russian (http://www.transifex.com/otf/torproject/language/ru/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -203,7 +204,7 @@ msgid "" "\n" "Or do a manual upgrade.\n" "See https://tails.boum.org/doc/first_steps/upgrade#manual" -msgstr "<b>Недостаточно памяти для проверки обновлений.</b>\n\nУбедитесь, что конфигурация компьютера соответствует требованиям Tails:\nfile:///usr/share/doc/tails/website/doc/about/requirements.en.html\n\nПопробуйте перезапустить Tails, и ещё раз попытайтесь проверить наличие обновлений. Вы также можете произвести обновление в ручном режиме — см.: https://tails.boum.org/doc/first_steps/upgrade#manual" +msgstr "<b>Недостаточно памяти для проверки обновлений.</b>\n\nУбедитесь, что конфигурация компьютера соответствует требованиям Tails:\nfile:///usr/share/doc/tails/website/doc/about/requirements.en.html\n\nПопробуйте перезапустить Tails, и еще раз попытайтесь проверить наличие обновлений. Вы также можете произвести обновление в ручном режиме — см.: https://tails.boum.org/doc/first_steps/upgrade#manual" #: config/chroot_local-includes/usr/local/lib/tails-virt-notify-user:71 msgid "Warning: virtual machine detected!" @@ -237,7 +238,7 @@ msgstr "Tor не готов" #: config/chroot_local-includes/usr/local/bin/tor-browser:44 msgid "Tor is not ready. Start Tor Browser anyway?" -msgstr "Tor не готов. Всё равно запустить Tor Browser?" +msgstr "Tor не готов. Все равно запустить Tor Browser?" #: config/chroot_local-includes/usr/local/bin/tor-browser:45 msgid "Start Tor Browser" @@ -264,7 +265,7 @@ msgstr "Запускается небезопасный браузер…" #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:52 msgid "This may take a while, so please be patient." -msgstr "Это займёт некоторое время. Пожалуйста, потерпите." +msgstr "Это займет некоторое время. Пожалуйста, потерпите." #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:57 msgid "Shutting down the Unsafe Browser..." @@ -274,7 +275,7 @@ msgstr "Отключение небезопасного браузера…" msgid "" "This may take a while, and you may not restart the Unsafe Browser until it " "is properly shut down." -msgstr "Это займёт некоторое время. Вы не сможете перезапустить небезопасный браузер прежде, чем будут корректно завершены процедуры его выгрузки из системы." +msgstr "Это займет некоторое время. Вы не сможете перезапустить небезопасный браузер прежде, чем будут корректно завершены процедуры его выгрузки из системы." #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:70 msgid "Failed to restart Tor." @@ -351,3 +352,7 @@ msgstr "Небезопасный браузер" #: ../config/chroot_local-includes/usr/share/desktop-directories/Tails.directory.in.h:2 msgid "Tails specific tools" msgstr "Специальные инструменты Tails" + +#: ../config/chroot_local-includes/usr/share/polkit-1/actions/org.boum.tails.root-terminal.policy.in.h:1 +msgid "To start a Root Terminal, you need to authenticate." +msgstr "Чтобы запустить root-терминал, необходимо пройти аутентификацию."

1 0

[translation/tails-misc] Update translations for tails-misc
by translation＠torproject.org 15 Sep '17

15 Sep '17

commit 0a16208d00c8298c96ad412d4895e92331ae5098 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Sep 15 12:16:36 2017 +0000 Update translations for tails-misc --- ru.po | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/ru.po b/ru.po index 800398bee..2b285b107 100644 --- a/ru.po +++ b/ru.po @@ -18,6 +18,7 @@ # Oul Gocke <beandonlybe(a)yandex.ru>, 2013-2014 # Sergey Briskin, 2015 # tetyana muirhead, 2015 +# Timofey Lisunov <solokot(a)gmail.com>, 2017 # Valid Olov, 2013 # Wagan Sarukhanov <wagan.sarukhanov(a)gmail.com>, 2015 # Uho Lot <yavinav(a)gmail.com>, 2016 @@ -27,8 +28,8 @@ 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: 2017-09-14 13:15+0000\n" -"Last-Translator: carolyn <carolyn(a)anhalt.org>\n" +"PO-Revision-Date: 2017-09-15 11:47+0000\n" +"Last-Translator: Timofey Lisunov <solokot(a)gmail.com>\n" "Language-Team: Russian (http://www.transifex.com/otf/torproject/language/ru/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -354,4 +355,4 @@ msgstr "Специальные инструменты Tails" #: ../config/chroot_local-includes/usr/share/polkit-1/actions/org.boum.tails.root-terminal.policy.in.h:1 msgid "To start a Root Terminal, you need to authenticate." -msgstr "" +msgstr "Чтобы запустить root-терминал, необходимо пройти аутентификацию."

1 0

[tor/master] prop224: Add changes file for prop224
by nickm＠torproject.org 15 Sep '17

15 Sep '17

commit 88c58078fa41cf8a5c915a18f10e714174cd90c7 Author: George Kadianakis <desnacked(a)riseup.net> Date: Fri Sep 15 13:23:48 2017 +0300 prop224: Add changes file for prop224 --- changes/prop224 | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/changes/prop224 b/changes/prop224 new file mode 100644 index 000000000..9401ff783 --- /dev/null +++ b/changes/prop224 @@ -0,0 +1,36 @@ + o Major features (next-generation onion services): + - Tor now supports the next-generation onion services protocol for clients + and services! As part of this release, the core of proposal 224 has been + implemented and is available for experimentation and testing by our + users. This newer version of onion services (v3) features various + improvements over the legacy system: + a) Better crypto (replaced SHA1/DH/RSA1024 with SHA3/ed25519/curve25519) + b) Improved directory protocol leaking less to directory servers. + c) Improved directory protocol with smaller surface for targeted attacks. + d) Better onion address security against impersonation. + e) More extensible introduction/rendezvous protocol. + f) A cleaner and more modular codebase. + + Furthermore, as part of this update, onion addresses increase in length + and are now 56 characters long: + 4acth47i6kxnvkewtm6q7ib2s3ufpo5sqbsnzjpbi7utijcltosqemad.onion + + In the future, we will be releasing more options and features but we + first need a testing period, so that the current codebase matures and + becomes more robust. Here are some of the features we have planned: + 1) Offline keys for onion services + 2) Advanced client authorization for onion services + 3) Improved guard algorithm for onion services + 4) Next-gen onion service statistics + + Please see our proposal for more details: + https://gitweb.torproject.org/torspec.git/tree/proposals/224-rend-spec-ng.t… + + The default version for onion services remains v2 (the legacy system) + until this new codebase gets tested and hardened. + + Service operators who want to experiment with the new system can use the + 'HiddenServiceVersion 3' torrc directive along with the regular onion + service configuration options. + + We will publish a blog post about this new feature soon! Enjoy!

1 0