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

[translation/https_everywhere] https://gitweb.torproject.org/translation.git/commit/?h=https_everywhere
by translation＠torproject.org 27 Sep '19

27 Sep '19

commit c59ed2b2289abf6fdbac2a8e220734c00ef74223 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Sep 27 08:45:59 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=https_everywhere --- nl/ssl-observatory.dtd | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/nl/ssl-observatory.dtd b/nl/ssl-observatory.dtd index eedcff251..c68e5cf43 100644 --- a/nl/ssl-observatory.dtd +++ b/nl/ssl-observatory.dtd @@ -55,7 +55,7 @@ zeer ingrijpend bedrijfsnetwerk gebruikt:"> <!ENTITY ssl-observatory.prefs.explanation "HTTPS Everywhere kan het SSL-observatorium van EFF gebruiken. Dit doet twee dingen: ten eerste verstuurt het kopieën van HTTPS-certificaten naar het observatorium om ons -te helpen man-in-het-midden-aanvallen te detecteren en de veiligheid van het web te +te helpen man-in-the-middle-aanvallen te detecteren en de veiligheid van het web te verbeteren; ten tweede kunnen we u hierdoor waarschuwen over onveilige verbindingen en aanvallen op uw browser."> @@ -66,8 +66,8 @@ Mouseover the options for further details:">--> <!ENTITY ssl-observatory.prefs.explanation2 -"Als u bijvoorbeeld https://www.voorbeeld.nl bezoekt, geeft het door het -observatorium ontvangen certificaat aan dat iemand www.voorbeeld.nl bezocht, +"Als u bijvoorbeeld https://www.something.com bezoekt, geeft het door het +observatorium ontvangen certificaat aan dat iemand www.something.com bezocht, maar niet wie de website bezocht of welke specifieke pagina de bezoeker bekeek. Houd de muis boven de opties voor meer details:">

1 0

[collector/master] Create utility class for downloading from HTTP servers
by karsten＠torproject.org 27 Sep '19

27 Sep '19

commit dc3a2e4aea03ca44be033dafc3dcc3d7e0d5c07f Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Thu Sep 26 11:48:18 2019 +0200 Create utility class for downloading from HTTP servers Also skip two tests in ConfigurationTest that together take 53 seconds which has the effect that we don't run tests very often. Implements #31599. --- CHANGELOG.md | 6 + src/build | 2 +- .../metrics/collector/downloader/Downloader.java | 62 ++++++++++ .../collector/exitlists/ExitListDownloader.java | 33 ++--- .../collector/onionperf/OnionPerfDownloader.java | 23 +++- .../relaydescs/RelayDescriptorDownloader.java | 32 +---- .../snowflake/SnowflakeStatsDownloader.java | 56 ++------- .../metrics/collector/conf/ConfigurationTest.java | 3 + .../collector/downloader/DownloaderTest.java | 134 +++++++++++++++++++++ 9 files changed, 250 insertions(+), 101 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e30b086..6e72f02 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +# Changes in version 1.12.0 - 2019-??-?? + + * Medium changes + - Require Mockito 1.10.19 as dependency for running tests. + + # Changes in version 1.11.1 - 2019-09-19 * Minor changes diff --git a/src/build b/src/build index 07c2a00..62a964a 160000 --- a/src/build +++ b/src/build @@ -1 +1 @@ -Subproject commit 07c2a00c27f0d536223f8b5a61fc91e60eb524d4 +Subproject commit 62a964a7702086ca6ba0e2307809d4f983163b47 diff --git a/src/main/java/org/torproject/metrics/collector/downloader/Downloader.java b/src/main/java/org/torproject/metrics/collector/downloader/Downloader.java new file mode 100644 index 0000000..a1f3852 --- /dev/null +++ b/src/main/java/org/torproject/metrics/collector/downloader/Downloader.java @@ -0,0 +1,62 @@ +/* Copyright 2019 The Tor Project + * See LICENSE for licensing information */ + +package org.torproject.metrics.collector.downloader; + +import java.io.BufferedInputStream; +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.net.HttpURLConnection; +import java.net.URL; +import java.util.zip.InflaterInputStream; + +/** + * Utility class for downloading resources from HTTP servers. + */ +public class Downloader { + + /** + * Download the given URL from an HTTP server and return downloaded bytes. + * + * @param url URL to download. + * @return Downloaded bytes, or {@code null} if the resource was not found. + * @throws IOException Thrown if anything goes wrong while downloading. + */ + public static byte[] downloadFromHttpServer(URL url) throws IOException { + return Downloader.downloadFromHttpServer(url, false); + } + + /** + * Download the given URL from an HTTP server, possibly inflate the response, + * and return downloaded bytes. + * + * @param url URL to download. + * @param isDeflated Whether the response is deflated. + * @return Downloaded bytes, or {@code null} if the resource was not found. + * @throws IOException Thrown if anything goes wrong while downloading. + */ + public static byte[] downloadFromHttpServer(URL url, boolean isDeflated) + throws IOException { + ByteArrayOutputStream downloadedBytes = new ByteArrayOutputStream(); + HttpURLConnection huc = (HttpURLConnection) url.openConnection(); + huc.setRequestMethod("GET"); + huc.setReadTimeout(5000); + huc.connect(); + int response = huc.getResponseCode(); + if (response != 200) { + return null; + } + try (BufferedInputStream in = isDeflated + ? new BufferedInputStream(new InflaterInputStream( + huc.getInputStream())) + : new BufferedInputStream(huc.getInputStream())) { + int len; + byte[] data = new byte[1024]; + while ((len = in.read(data, 0, 1024)) >= 0) { + downloadedBytes.write(data, 0, len); + } + } + return downloadedBytes.toByteArray(); + } +} + diff --git a/src/main/java/org/torproject/metrics/collector/exitlists/ExitListDownloader.java b/src/main/java/org/torproject/metrics/collector/exitlists/ExitListDownloader.java index 66fc1a7..b4bee15 100644 --- a/src/main/java/org/torproject/metrics/collector/exitlists/ExitListDownloader.java +++ b/src/main/java/org/torproject/metrics/collector/exitlists/ExitListDownloader.java @@ -12,16 +12,15 @@ import org.torproject.metrics.collector.conf.Configuration; import org.torproject.metrics.collector.conf.ConfigurationException; import org.torproject.metrics.collector.conf.Key; import org.torproject.metrics.collector.cron.CollecTorMain; +import org.torproject.metrics.collector.downloader.Downloader; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.io.BufferedInputStream; import java.io.BufferedWriter; import java.io.File; import java.io.FileWriter; import java.io.IOException; -import java.net.HttpURLConnection; import java.net.URL; import java.nio.file.Paths; import java.text.SimpleDateFormat; @@ -77,32 +76,18 @@ public class ExitListDownloader extends CollecTorMain { sb.append("Downloaded ").append(dateTimeFormat.format(downloadedDate)) .append("\n"); URL url = config.getUrl(Key.ExitlistUrl); - try { - HttpURLConnection huc = (HttpURLConnection) url.openConnection(); - huc.setRequestMethod("GET"); - huc.setReadTimeout(5000); - huc.connect(); - int response = huc.getResponseCode(); - if (response != 200) { - logger.warn("Could not download exit list. Response code {}", - response); - return; - } - try (BufferedInputStream in = new BufferedInputStream( - huc.getInputStream())) { - int len; - byte[] data = new byte[1024]; - while ((len = in.read(data, 0, 1024)) >= 0) { - sb.append(new String(data, 0, len)); - } - } - downloadedExitList = sb.toString(); - logger.debug("Finished downloading exit list."); + byte[] downloadedBytes; + try { + downloadedBytes = Downloader.downloadFromHttpServer(url); } catch (IOException e) { logger.warn("Failed downloading exit list", e); return; } - if (downloadedExitList == null) { + if (null != downloadedBytes) { + sb.append(new String(downloadedBytes)); + downloadedExitList = sb.toString(); + logger.debug("Finished downloading exit list."); + } else { logger.warn("Failed downloading exit list."); return; } diff --git a/src/main/java/org/torproject/metrics/collector/onionperf/OnionPerfDownloader.java b/src/main/java/org/torproject/metrics/collector/onionperf/OnionPerfDownloader.java index ca307a5..b106be7 100644 --- a/src/main/java/org/torproject/metrics/collector/onionperf/OnionPerfDownloader.java +++ b/src/main/java/org/torproject/metrics/collector/onionperf/OnionPerfDownloader.java @@ -11,6 +11,7 @@ import org.torproject.metrics.collector.conf.Configuration; import org.torproject.metrics.collector.conf.ConfigurationException; import org.torproject.metrics.collector.conf.Key; import org.torproject.metrics.collector.cron.CollecTorMain; +import org.torproject.metrics.collector.downloader.Downloader; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -21,7 +22,6 @@ import java.io.File; import java.io.FileReader; import java.io.FileWriter; import java.io.IOException; -import java.io.InputStream; import java.io.InputStreamReader; import java.net.MalformedURLException; import java.net.URL; @@ -200,12 +200,25 @@ public class OnionPerfDownloader extends CollecTorMain { /* Download file contents to temporary file. */ File tempFile = new File(this.recentDirectory, "." + tpfFileName); + byte[] downloadedBytes; + try { + downloadedBytes = Downloader.downloadFromHttpServer( + new URL(baseUrl + tpfFileName)); + } catch (IOException e) { + logger.warn("Unable to download '{}{}'. Skipping.", baseUrl, tpfFileName, + e); + return; + } + if (null == downloadedBytes) { + logger.warn("Unable to download '{}{}'. Skipping.", baseUrl, tpfFileName); + return; + } tempFile.getParentFile().mkdirs(); - try (InputStream is = new URL(baseUrl + tpfFileName).openStream()) { - Files.copy(is, tempFile.toPath(), StandardCopyOption.REPLACE_EXISTING); + try { + Files.write(tempFile.toPath(), downloadedBytes); } catch (IOException e) { - logger.warn("Unable to download '{}{}' to temporary file '{}'. " - + "Skipping.", baseUrl, tpfFileName, tempFile, e); + logger.warn("Unable to write previously downloaded '{}{}' to temporary " + + "file '{}'. Skipping.", baseUrl, tpfFileName, tempFile, e); return; } diff --git a/src/main/java/org/torproject/metrics/collector/relaydescs/RelayDescriptorDownloader.java b/src/main/java/org/torproject/metrics/collector/relaydescs/RelayDescriptorDownloader.java index f1179d8..3337633 100644 --- a/src/main/java/org/torproject/metrics/collector/relaydescs/RelayDescriptorDownloader.java +++ b/src/main/java/org/torproject/metrics/collector/relaydescs/RelayDescriptorDownloader.java @@ -3,20 +3,19 @@ package org.torproject.metrics.collector.relaydescs; +import org.torproject.metrics.collector.downloader.Downloader; + import org.apache.commons.codec.binary.Base64; import org.apache.commons.codec.digest.DigestUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.io.BufferedInputStream; import java.io.BufferedReader; import java.io.BufferedWriter; -import java.io.ByteArrayOutputStream; import java.io.File; import java.io.FileReader; import java.io.FileWriter; import java.io.IOException; -import java.net.HttpURLConnection; import java.net.URL; import java.nio.charset.StandardCharsets; import java.text.ParseException; @@ -33,7 +32,6 @@ import java.util.SortedSet; import java.util.TimeZone; import java.util.TreeMap; import java.util.TreeSet; -import java.util.zip.InflaterInputStream; /** * Downloads relay descriptors from the directory authorities via HTTP. @@ -875,29 +873,11 @@ public class RelayDescriptorDownloader { String fullUrl = "http://" + authority + resource + (isCompressed ? ".z" : ""); URL url = new URL(fullUrl); - HttpURLConnection huc = (HttpURLConnection) url.openConnection(); - huc.setRequestMethod("GET"); - huc.setReadTimeout(5000); - huc.connect(); - int response = huc.getResponseCode(); - if (response == 200) { - try (BufferedInputStream in - = isCompressed ? new BufferedInputStream(new InflaterInputStream( - huc.getInputStream())) - : new BufferedInputStream(huc.getInputStream())) { - ByteArrayOutputStream baos = new ByteArrayOutputStream(); - int len; - byte[] data = new byte[1024]; - while ((len = in.read(data, 0, 1024)) >= 0) { - baos.write(data, 0, len); - } - allData = baos.toByteArray(); - } - } - logger.debug("Downloaded {} -> {} ({} bytes)", fullUrl, response, - allData == null ? 0 : allData.length); + allData = Downloader.downloadFromHttpServer(url, isCompressed); int receivedDescriptors = 0; - if (allData != null) { + logger.debug("Downloaded {} -> ({} bytes)", fullUrl, + allData == null ? 0 : allData.length); + if (null != allData) { if (resource.startsWith("/tor/status-vote/")) { this.rdp.parse(allData, null); receivedDescriptors = 1; diff --git a/src/main/java/org/torproject/metrics/collector/snowflake/SnowflakeStatsDownloader.java b/src/main/java/org/torproject/metrics/collector/snowflake/SnowflakeStatsDownloader.java index 4f7994e..cb5f0cc 100644 --- a/src/main/java/org/torproject/metrics/collector/snowflake/SnowflakeStatsDownloader.java +++ b/src/main/java/org/torproject/metrics/collector/snowflake/SnowflakeStatsDownloader.java @@ -12,18 +12,16 @@ import org.torproject.metrics.collector.conf.Configuration; import org.torproject.metrics.collector.conf.ConfigurationException; import org.torproject.metrics.collector.conf.Key; import org.torproject.metrics.collector.cron.CollecTorMain; +import org.torproject.metrics.collector.downloader.Downloader; import org.torproject.metrics.collector.persist.SnowflakeStatsPersistence; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.io.BufferedInputStream; -import java.io.ByteArrayOutputStream; import java.io.File; import java.io.FileOutputStream; import java.io.IOException; import java.io.OutputStream; -import java.net.HttpURLConnection; import java.net.URL; import java.time.LocalDateTime; import java.util.Arrays; @@ -60,9 +58,15 @@ public class SnowflakeStatsDownloader extends CollecTorMain { this.recentPathName = config.getPath(Key.RecentPath).toString(); logger.debug("Downloading snowflake stats..."); URL url = config.getUrl(Key.SnowflakeStatsUrl); - ByteArrayOutputStream downloadedSnowflakeStats - = this.downloadFromHttpServer(url); - if (null == downloadedSnowflakeStats) { + byte[] downloadedBytes; + try { + downloadedBytes = Downloader.downloadFromHttpServer(url); + } catch (IOException e) { + logger.warn("Failed downloading {}.", url, e); + return; + } + if (null == downloadedBytes) { + logger.warn("Could not download {}.", url); return; } logger.debug("Finished downloading {}.", url); @@ -72,7 +76,7 @@ public class SnowflakeStatsDownloader extends CollecTorMain { SortedSet<LocalDateTime> snowflakeStatsEnds = new TreeSet<>(); String outputPathName = config.getPath(Key.OutputPath).toString(); for (Descriptor descriptor : descriptorParser.parseDescriptors( - downloadedSnowflakeStats.toByteArray(), null, null)) { + downloadedBytes, null, null)) { if (descriptor instanceof SnowflakeStats) { SnowflakeStats snowflakeStats = (SnowflakeStats) descriptor; LocalDateTime snowflakeStatsEnd = snowflakeStats.snowflakeStatsEnd(); @@ -106,44 +110,6 @@ public class SnowflakeStatsDownloader extends CollecTorMain { } /** - * Download the given URL from an HTTP server and return a stream with - * downloaded bytes. - * - * If anything goes wrong while downloading, log a warning and return - * {@code null}. - * - * @param url URL to download. - * @return Stream with downloaded bytes, or {@code null} if an error has - * occurred. - */ - private ByteArrayOutputStream downloadFromHttpServer(URL url) { - ByteArrayOutputStream downloadedBytes = new ByteArrayOutputStream(); - try { - HttpURLConnection huc = (HttpURLConnection) url.openConnection(); - huc.setRequestMethod("GET"); - huc.setReadTimeout(5000); - huc.connect(); - int response = huc.getResponseCode(); - if (response != 200) { - logger.warn("Could not download {}. Response code {}", url, response); - return null; - } - try (BufferedInputStream in = new BufferedInputStream( - huc.getInputStream())) { - int len; - byte[] data = new byte[1024]; - while ((len = in.read(data, 0, 1024)) >= 0) { - downloadedBytes.write(data, 0, len); - } - } - } catch (IOException e) { - logger.warn("Failed downloading {}.", url, e); - return null; - } - return downloadedBytes; - } - - /** * Write the given byte array(s) to the given file. * * If the file already exists, it is overwritten. If the parent directory diff --git a/src/test/java/org/torproject/metrics/collector/conf/ConfigurationTest.java b/src/test/java/org/torproject/metrics/collector/conf/ConfigurationTest.java index 201d541..67a9082 100644 --- a/src/test/java/org/torproject/metrics/collector/conf/ConfigurationTest.java +++ b/src/test/java/org/torproject/metrics/collector/conf/ConfigurationTest.java @@ -12,6 +12,7 @@ import org.torproject.metrics.collector.MainTest; import org.torproject.metrics.collector.cron.CollecTorMain; import org.torproject.metrics.collector.cron.Dummy; +import org.junit.Ignore; import org.junit.Rule; import org.junit.Test; import org.junit.rules.TemporaryFolder; @@ -127,6 +128,7 @@ public class ConfigurationTest { } } + @Ignore("This test takes 40 seconds, which is too long.") @Test() public void testUrlArrayValues() throws Exception { URL[] array = new URL[randomSource.nextInt(30) + 1]; @@ -180,6 +182,7 @@ public class ConfigurationTest { conf.setWatchableSourceAndLoad(Paths.get("/tmp/phantom.path")); } + @Ignore("This test takes 13 seconds, which is too long.") @Test() public void testConfigChange() throws Exception { Configuration conf = new Configuration(); diff --git a/src/test/java/org/torproject/metrics/collector/downloader/DownloaderTest.java b/src/test/java/org/torproject/metrics/collector/downloader/DownloaderTest.java new file mode 100644 index 0000000..19db782 --- /dev/null +++ b/src/test/java/org/torproject/metrics/collector/downloader/DownloaderTest.java @@ -0,0 +1,134 @@ +/* Copyright 2019 The Tor Project + * See LICENSE for licensing information */ + +package org.torproject.metrics.collector.downloader; + +import static org.junit.Assert.assertArrayEquals; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.fail; +import static org.mockito.BDDMockito.given; +import static org.mockito.Mockito.mock; + +import org.junit.Before; +import org.junit.BeforeClass; +import org.junit.Test; + +import java.io.ByteArrayInputStream; +import java.io.IOException; +import java.net.HttpURLConnection; +import java.net.SocketTimeoutException; +import java.net.URL; +import java.net.URLConnection; +import java.net.URLStreamHandler; +import java.net.URLStreamHandlerFactory; +import java.util.HashMap; +import java.util.Map; + +/** + * Test class for {@link Downloader}. + * + * This test class is heavily based on the blog post + * <a href="https://claritysoftware.co.uk/mocking-javas-url-with-mockito/">"How + * to mock the Java URL class with Mockito"</a> by nathan from March 10, + * 2017. + */ +public class DownloaderTest { + + /** + * Custom {@link URLStreamHandler} that allows us to control the + * {@link URLConnection URLConnections} that are returned by {@link URL URLs} + * in the code under test. + */ + private static class HttpUrlStreamHandler extends URLStreamHandler { + + private Map<URL, URLConnection> connections = new HashMap(); + + @Override + protected URLConnection openConnection(URL url) throws IOException { + return connections.get(url); + } + + private void resetConnections() { + connections = new HashMap(); + } + + private HttpUrlStreamHandler addConnection(URL url, + URLConnection urlConnection) { + connections.put(url, urlConnection); + return this; + } + } + + private static HttpUrlStreamHandler httpUrlStreamHandler; + + /** + * Set up our own stream handler for all tests in this class. + */ + @BeforeClass + public static void setupUrlStreamHandlerFactory() { + URLStreamHandlerFactory urlStreamHandlerFactory + = mock(URLStreamHandlerFactory.class); + URL.setURLStreamHandlerFactory(urlStreamHandlerFactory); + httpUrlStreamHandler = new HttpUrlStreamHandler(); + given(urlStreamHandlerFactory.createURLStreamHandler("http")) + .willReturn(httpUrlStreamHandler); + } + + /** + * Clear any connections from previously run tests. + */ + @Before + public void reset() { + httpUrlStreamHandler.resetConnections(); + } + + @Test + public void testExistingResource() throws Exception { + URL requestedUrl = new URL("http://example.org/exists"); + byte[] expectedDownloadedBytes = "content".getBytes(); + HttpURLConnection urlConnection = mock(HttpURLConnection.class); + httpUrlStreamHandler.addConnection(requestedUrl, urlConnection); + given(urlConnection.getResponseCode()).willReturn(200); + given(urlConnection.getInputStream()).willReturn( + new ByteArrayInputStream(expectedDownloadedBytes)); + byte[] downloadedBytes = Downloader.downloadFromHttpServer(requestedUrl); + assertArrayEquals(expectedDownloadedBytes, downloadedBytes); + } + + @Test + public void testNonExistingResource() throws Exception { + URL requestedUrl = new URL("http://example.org/notfound"); + HttpURLConnection urlConnection = mock(HttpURLConnection.class); + httpUrlStreamHandler.addConnection(requestedUrl, urlConnection); + given(urlConnection.getResponseCode()).willReturn(404); + byte[] downloadedBytes = Downloader.downloadFromHttpServer(requestedUrl); + assertNull(downloadedBytes); + } + + @Test + public void testEmptyResource() throws Exception { + URL requestedUrl = new URL("http://example.org/empty"); + byte[] expectedDownloadedBytes = new byte[0]; + HttpURLConnection urlConnection = mock(HttpURLConnection.class); + httpUrlStreamHandler.addConnection(requestedUrl, urlConnection); + given(urlConnection.getResponseCode()).willReturn(200); + given(urlConnection.getInputStream()).willReturn( + new ByteArrayInputStream(expectedDownloadedBytes)); + byte[] downloadedBytes = Downloader.downloadFromHttpServer(requestedUrl); + assertEquals(0, downloadedBytes.length); + } + + @Test(expected = SocketTimeoutException.class) + public void testTimeout() throws Exception { + URL requestedUrl = new URL("http://example.org/timeout"); + SocketTimeoutException expectedException = new SocketTimeoutException(); + HttpURLConnection urlConnection = mock(HttpURLConnection.class); + httpUrlStreamHandler.addConnection(requestedUrl, urlConnection); + given(urlConnection.getResponseCode()).willReturn(200); + given(urlConnection.getInputStream()).willThrow(expectedException); + Downloader.downloadFromHttpServer(requestedUrl); + fail("Should have thrown a SocketTimeoutException."); + } +} +

1 0

[metrics-base/master] Add Mockito as dependency.
by karsten＠torproject.org 27 Sep '19

27 Sep '19

commit 62a964a7702086ca6ba0e2307809d4f983163b47 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Fri Sep 27 10:30:02 2019 +0200 Add Mockito as dependency. Required for #31599, but likely useful for other purposes as well. --- java/base.xml | 2 ++ java/ivy.xml | 1 + java/junittest.policy | 3 +++ 3 files changed, 6 insertions(+) diff --git a/java/base.xml b/java/base.xml index 4ce1660..6cb1693 100644 --- a/java/base.xml +++ b/java/base.xml @@ -51,6 +51,8 @@ <include name="hamcrest-all-1.3.jar"/> <include name="logback-core-1.1.9.jar" /> <include name="logback-classic-1.1.9.jar" /> + <include name="mockito-core-1.10.19.jar" /> + <include name="objenesis-2.1.jar" /> </fileset> </path> diff --git a/java/ivy.xml b/java/ivy.xml index 2860b74..19b2f4b 100644 --- a/java/ivy.xml +++ b/java/ivy.xml @@ -18,6 +18,7 @@  <dependency org="junit" name="junit" rev="4.12" /> <dependency org="org.hamcrest" name="hamcrest-all" rev="1.3" /> + <dependency org="org.mockito" name="mockito-core" rev="1.10.19"/>  <dependency org="com.puppycrawl.tools" name="checkstyle" rev="6.17" /> diff --git a/java/junittest.policy b/java/junittest.policy index e2f4a26..eb3ea91 100644 --- a/java/junittest.policy +++ b/java/junittest.policy @@ -14,4 +14,7 @@ grant { permission java.lang.RuntimePermission "accessClassInPackage.sun.reflect"; permission java.lang.RuntimePermission "accessClassInPackage.sun.net.www.protocol.http"; permission java.lang.RuntimePermission "accessClassInPackage.sun.net.www.http"; + permission java.lang.RuntimePermission "getProtectionDomain"; + permission java.lang.RuntimePermission "reflectionFactoryAccess"; + permission java.lang.RuntimePermission "setFactory"; };

1 0

[onionoo/master] Use metrics-base ant task to fetch metrics-lib.
by karsten＠torproject.org 27 Sep '19

27 Sep '19

commit bbc5c16d7b748ab05707a31779849f216a89f1b5 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Fri Sep 27 10:06:13 2019 +0200 Use metrics-base ant task to fetch metrics-lib. Implements part of #31649. --- .gitlab-ci.yml | 7 +------ src/build | 2 +- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b67b5a4..897c9da 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,6 +1,5 @@ variables: GIT_STRATEGY: clone - METRICS_LIB_VERSION: "2.6.2" JAVA_TOOL_OPTIONS: "-Dfile.encoding=UTF-8" stages: @@ -15,11 +14,7 @@ test: - git submodule init - git submodule update - mkdir lib - - mkdir tmp - - pushd tmp - - curl https://dist.torproject.org/metrics-lib/$METRICS_LIB_VERSION/metrics-lib-$M… | tar xzf - - - popd - - mv tmp/metrics-lib-$METRICS_LIB_VERSION/generated/dist/metrics-lib-$METRICS_LIB_VERSION-thin.jar lib + - ant fetch-metrics-lib - ant -lib /usr/share/java resolve - ant test - ant checks diff --git a/src/build b/src/build index 75cda35..07c2a00 160000 --- a/src/build +++ b/src/build @@ -1 +1 @@ -Subproject commit 75cda35ba7375ab0f5b12fa214620c3a29917097 +Subproject commit 07c2a00c27f0d536223f8b5a61fc91e60eb524d4

1 0

[exonerator/master] Use metrics-base ant task to fetch metrics-lib.
by karsten＠torproject.org 27 Sep '19

27 Sep '19

commit bc0c4db8ad9048d8f826b781274055ab9d475e9a Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Fri Sep 27 10:06:08 2019 +0200 Use metrics-base ant task to fetch metrics-lib. Implements part of #31649. --- .gitlab-ci.yml | 7 +------ src/build | 2 +- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b67b5a4..897c9da 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,6 +1,5 @@ variables: GIT_STRATEGY: clone - METRICS_LIB_VERSION: "2.6.2" JAVA_TOOL_OPTIONS: "-Dfile.encoding=UTF-8" stages: @@ -15,11 +14,7 @@ test: - git submodule init - git submodule update - mkdir lib - - mkdir tmp - - pushd tmp - - curl https://dist.torproject.org/metrics-lib/$METRICS_LIB_VERSION/metrics-lib-$M… | tar xzf - - - popd - - mv tmp/metrics-lib-$METRICS_LIB_VERSION/generated/dist/metrics-lib-$METRICS_LIB_VERSION-thin.jar lib + - ant fetch-metrics-lib - ant -lib /usr/share/java resolve - ant test - ant checks diff --git a/src/build b/src/build index 0674958..07c2a00 160000 --- a/src/build +++ b/src/build @@ -1 +1 @@ -Subproject commit 0674958512c705255d4ec4631d3280068ce0a7af +Subproject commit 07c2a00c27f0d536223f8b5a61fc91e60eb524d4

1 0

[collector/master] Use metrics-base ant task to fetch metrics-lib.
by karsten＠torproject.org 27 Sep '19

27 Sep '19

commit de03530b98bd66eee404e4483d930baf62a8f3e1 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Fri Sep 27 10:05:35 2019 +0200 Use metrics-base ant task to fetch metrics-lib. Implements part of #31649. --- .gitlab-ci.yml | 7 +------ src/build | 2 +- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 5bd5623..897c9da 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,6 +1,5 @@ variables: GIT_STRATEGY: clone - METRICS_LIB_VERSION: "2.7.0" JAVA_TOOL_OPTIONS: "-Dfile.encoding=UTF-8" stages: @@ -15,11 +14,7 @@ test: - git submodule init - git submodule update - mkdir lib - - mkdir tmp - - pushd tmp - - curl https://dist.torproject.org/metrics-lib/$METRICS_LIB_VERSION/metrics-lib-$M… | tar xzf - - - popd - - mv tmp/metrics-lib-$METRICS_LIB_VERSION/generated/dist/metrics-lib-$METRICS_LIB_VERSION-thin.jar lib + - ant fetch-metrics-lib - ant -lib /usr/share/java resolve - ant test - ant checks diff --git a/src/build b/src/build index 0674958..07c2a00 160000 --- a/src/build +++ b/src/build @@ -1 +1 @@ -Subproject commit 0674958512c705255d4ec4631d3280068ce0a7af +Subproject commit 07c2a00c27f0d536223f8b5a61fc91e60eb524d4

1 0

[metrics-web/master] Use ant tasks to fetch metrics dependencies.
by karsten＠torproject.org 27 Sep '19

27 Sep '19

commit c30b25acbd32c5c6ff7c23c47062caf131d4a783 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Mon Sep 23 15:28:41 2019 +0200 Use ant tasks to fetch metrics dependencies. Implements part of #31649. --- .gitlab-ci.yml | 11 ++--------- build.xml | 14 ++++++++++++++ src/build | 2 +- src/submods/metrics-lib | 2 +- 4 files changed, 18 insertions(+), 11 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d10fcb8..ba2f6c1 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,7 +1,5 @@ variables: GIT_STRATEGY: clone - METRICS_LIB_VERSION: "2.6.2" - EXONERATOR_VERSION: "4.1.0" JAVA_TOOL_OPTIONS: "-Dfile.encoding=UTF-8" stages: @@ -16,13 +14,8 @@ test: - git submodule init - git submodule update - mkdir lib - - mkdir tmp - - pushd tmp - - curl https://dist.torproject.org/metrics-lib/$METRICS_LIB_VERSION/metrics-lib-$M… | tar xzf - - - curl https://dist.torproject.org/exonerator/$EXONERATOR_VERSION/exonerator-$EXON… | tar xzf - - - popd - - mv tmp/metrics-lib-$METRICS_LIB_VERSION/generated/dist/metrics-lib-$METRICS_LIB_VERSION-thin.jar lib - - mv tmp/exonerator-$EXONERATOR_VERSION/generated/dist/exonerator-$EXONERATOR_VERSION-thin.jar lib + - ant fetch-metrics-lib + - ant fetch-exonerator - ant -lib /usr/share/java resolve - ant test - ant checks diff --git a/build.xml b/build.xml index 3e8048f..959d069 100644 --- a/build.xml +++ b/build.xml @@ -308,6 +308,20 @@ </exec> </target> + <target name="fetch-exonerator" depends="init" + description="Fetch ExoneraTor from dist.torproject.org"> + <mkdir dir="${downloadedlibs}"/> + <get src="https://dist.torproject.org/exonerator/${exoneratorversion}/exonerator-${ex…" + dest="${downloadedlibs}"/> + <untar src="${downloadedlibs}/exonerator-${exoneratorversion}.tar.gz" + dest="${libs}" compression="gzip"> + <patternset> + <include name="**/exonerator-${exoneratorversion}-thin.jar"/> + </patternset> + <mapper type="flatten"/> + </untar> + </target> +  diff --git a/src/build b/src/build index 0674958..07c2a00 160000 --- a/src/build +++ b/src/build @@ -1 +1 @@ -Subproject commit 0674958512c705255d4ec4631d3280068ce0a7af +Subproject commit 07c2a00c27f0d536223f8b5a61fc91e60eb524d4 diff --git a/src/submods/metrics-lib b/src/submods/metrics-lib index c324d11..c1581dd 160000 --- a/src/submods/metrics-lib +++ b/src/submods/metrics-lib @@ -1 +1 @@ -Subproject commit c324d11035059bd9677af120dc6471aebebf980a +Subproject commit c1581dd8ca26798dc90ea2189ca41636b50e1e0d

1 0

[metrics-lib/master] Upgrade to latest metrics-base.
by karsten＠torproject.org 27 Sep '19

27 Sep '19

commit c1581dd8ca26798dc90ea2189ca41636b50e1e0d Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Fri Sep 27 08:58:47 2019 +0200 Upgrade to latest metrics-base. --- src/build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/build b/src/build index 0674958..07c2a00 160000 --- a/src/build +++ b/src/build @@ -1 +1 @@ -Subproject commit 0674958512c705255d4ec4631d3280068ce0a7af +Subproject commit 07c2a00c27f0d536223f8b5a61fc91e60eb524d4

1 0

[metrics-base/master] Add ant task to fetch metrics-lib from dist.
by karsten＠torproject.org 27 Sep '19

27 Sep '19

commit 07c2a00c27f0d536223f8b5a61fc91e60eb524d4 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Mon Sep 23 15:27:32 2019 +0200 Add ant task to fetch metrics-lib from dist. Implements part of #31649. --- java/base.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/java/base.xml b/java/base.xml index 8342e91..4ce1660 100644 --- a/java/base.xml +++ b/java/base.xml @@ -28,6 +28,7 @@ <property name="emptymanifest" value="${generated}/emptymanifest" /> <property name="javadocstyle" value="${basedir}/src/build/java/stylesheet.css" /> <property name="javadocicon" value="${basedir}/src/build/java/tor-onion.png" /> + <property name="downloadedlibs" value="${generated}/downloaded-libs" />  <path id="classpath"> @@ -99,6 +100,7 @@ <mkdir dir="${docs}"/> <mkdir dir="${testresult}"/> <mkdir dir="${dist}"/> + <mkdir dir="${libs}"/> <manifest file="${emptymanifest}" /> </target> @@ -109,6 +111,20 @@ <ivy:report todir="${generated}/ivy" /> </target> + <target name="fetch-metrics-lib" depends="init" + description="Fetch metrics-lib from dist.torproject.org"> + <mkdir dir="${downloadedlibs}"/> + <get src="https://dist.torproject.org/metrics-lib/${metricslibversion}/metrics-lib-${…" + dest="${downloadedlibs}"/> + <untar src="${downloadedlibs}/metrics-lib-${metricslibversion}.tar.gz" + dest="${libs}" compression="gzip"> + <patternset> + <include name="**/metrics-lib-${metricslibversion}-thin.jar"/> + </patternset> + <mapper type="flatten"/> + </untar> + </target> + <target name="compile" depends="init"> <javac destdir="${classes}"

1 0

[translation/support-portal] https://gitweb.torproject.org/translation.git/commit/?h=support-portal
by translation＠torproject.org 27 Sep '19

27 Sep '19

commit 67e794afcc8862d7e32c4a2002c48f6128d9e8ff Author: Translation commit bot <translation(a)torproject.org> Date: Fri Sep 27 05:54:27 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=support-portal --- contents+it.po | 6 +++--- contents+tr.po | 25 +++++++++++++++++++------ 2 files changed, 22 insertions(+), 9 deletions(-) diff --git a/contents+it.po b/contents+it.po index 97bc792ff..571159767 100644 --- a/contents+it.po +++ b/contents+it.po @@ -7,12 +7,12 @@ # mattia_b89 <mattia.b89(a)gmail.com>, 2019 # Emma Peel, 2019 # Giandomenico Lombardi <transifex.com(a)l1t.it>, 2019 -# Gabriele <gabboxl0(a)gmail.com>, 2019 # Hiro 7 <hiro(a)torproject.org>, 2019 # fabio carletti <fabiocarlettiryuw(a)gmail.com>, 2019 # Davide Sant <spuuu(a)outlook.it>, 2019 # Random_R, 2019 # erinm, 2019 +# Gabriele <gabboxl0(a)gmail.com>, 2019 # msgid "" msgstr "" @@ -20,7 +20,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2019-09-26 17:56+CET\n" "PO-Revision-Date: 2018-10-02 22:41+0000\n" -"Last-Translator: erinm, 2019\n" +"Last-Translator: Gabriele <gabboxl0(a)gmail.com>, 2019\n" "Language-Team: Italian (https://www.transifex.com/otf/teams/1519/it/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -97,7 +97,7 @@ msgstr "" #: https//support.torproject.org/apt/ (content/apt/contents+en.lrtopic.title) msgid "Debian Repository" -msgstr "" +msgstr "Repository Debian" #: https//support.torproject.org/faq/faq-1/ #: (content/faq/faq-1/contents+en.lrquestion.title) diff --git a/contents+tr.po b/contents+tr.po index 554bd3f85..aa2365f7d 100644 --- a/contents+tr.po +++ b/contents+tr.po @@ -1,9 +1,9 @@ # Translators: # ilkeryus <ilkeryus(a)gmail.com>, 2019 # Emma Peel, 2019 -# Kaya Zeren <kayazeren(a)gmail.com>, 2019 # erinm, 2019 # Cenk Yıldızlı <goncagul(a)national.shitposting.agency>, 2019 +# Kaya Zeren <kayazeren(a)gmail.com>, 2019 # msgid "" msgstr "" @@ -11,7 +11,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2019-09-26 17:56+CET\n" "PO-Revision-Date: 2018-10-02 22:41+0000\n" -"Last-Translator: Cenk Yıldızlı <goncagul(a)national.shitposting.agency>, 2019\n" +"Last-Translator: Kaya Zeren <kayazeren(a)gmail.com>, 2019\n" "Language-Team: Turkish (https://www.transifex.com/otf/teams/1519/tr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -88,7 +88,7 @@ msgstr "" #: https//support.torproject.org/apt/ (content/apt/contents+en.lrtopic.title) msgid "Debian Repository" -msgstr "" +msgstr "Debian Deposu" #: https//support.torproject.org/faq/faq-1/ #: (content/faq/faq-1/contents+en.lrquestion.title) @@ -423,12 +423,12 @@ msgstr "" #: https//support.torproject.org/about/backdoor/ #: (content/about/backdoor/contents+en.lrquestion.title) msgid "Is there a backdoor in Tor?" -msgstr "" +msgstr "Tor üzerinde bir arka kapı var mı?" #: https//support.torproject.org/about/backdoor/ #: (content/about/backdoor/contents+en.lrquestion.description) msgid "There is absolutely no backdoor in Tor." -msgstr "" +msgstr "Tor üzerinde kesinlikle bir arka kapı bulunmaz." #: https//support.torproject.org/about/backdoor/ #: (content/about/backdoor/contents+en.lrquestion.description) @@ -6152,6 +6152,12 @@ msgid "" "[traffic](#traffic) and hide it by bouncing through a series of computers " "around the world." msgstr "" +"[Orbot](https://play.google.com/store/apps/details?id=org.torproject.android)" +" aygıtınızdaki diğer uygulamaların İnternet bağlantısının daha güvenli " +"olmasını sağlamak amacıyla Guardian Project tarafından geliştirilmiş " +"ücretsiz bir [uygulamadır](#app). Orbot, İnternet [trafiğinizi](#traffic) " +"Dünya üzerine yayılmış [Tor](#tor-/-tor-network/-core-tor) ağında bulunan " +"çeşitli bilgisayarlar üzerinden geçirerek [şifreler](#encryption) ve gizler." #: https//support.torproject.org/misc/glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) @@ -6161,7 +6167,7 @@ msgstr "### Orfox" #: https//support.torproject.org/misc/glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) msgid "Orfox is no longer maintained or supported." -msgstr "" +msgstr "Orfox artık geliştirilmiyor ve desteklenmiyor." #: https//support.torproject.org/misc/glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) @@ -6170,6 +6176,10 @@ msgid "" "Browser for Android](https://www.torproject.org/download/#android) " "[app](#app) developed by the Tor Project." msgstr "" +"Web sitelerine Tor üzerinden erişmek için Tor Projesi tarafından " +"geliştirilen [Android için Tor " +"Browser](https://www.torproject.org/download/#android) [uygulamasını](#app) " +"kullanabilirsiniz." #: https//support.torproject.org/misc/glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) @@ -7426,6 +7436,9 @@ msgid "" "You can read all about that on our [Trademark faq " "page](https://www.torproject.org/about/trademark/)." msgstr "" +"[Marka ile ilgili sık sorulan " +"sorular](https://www.torproject.org/about/trademark/) bölümüne " +"bakabilirsiniz." #: https//support.torproject.org/misc/misc-9/ #: (content/misc/misc-9/contents+en.lrquestion.title)

1 0