- tor-commits - lists.torproject.org

[tor/master] When ReloadTorrcOnSIGHUP=1, do non-reload activities anyway
by nickm＠torproject.org 16 May '12

16 May '12

commit b41dd8069f25ef6f6fdb22088291e23e0442476e Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Apr 11 14:47:42 2012 -0400 When ReloadTorrcOnSIGHUP=1, do non-reload activities anyway Previously, we skipped everything that got invoked from options_init_from_torrc. But some of the stuff in options_act_reversible and options_act is actually important, like reopening the logs. Now, a SIGHUP always makes the effects of an options_set() happen, even though the options haven't changed. Fix for bug 5095; bugfix on 0.2.1.9-alpha, which introduced __ReloadTorrcOnSIGHUP. --- changes/bug5095 | 4 ++++ src/or/config.c | 6 ++++-- src/or/main.c | 8 ++++++++ 3 files changed, 16 insertions(+), 2 deletions(-) diff --git a/changes/bug5095 b/changes/bug5095 new file mode 100644 index 0000000..81801ec --- /dev/null +++ b/changes/bug5095 @@ -0,0 +1,4 @@ + o Minor bugfixes: + - When we receive a SIGHUP and the controller-use __ReloadTorrcOnSIGHUP + option is set to 0, perform other actions that SIGHUP usually causes + (like reopening the logs). Fixes bug 5095; bugfix on 0.2.1.9-alpha. diff --git a/src/or/config.c b/src/or/config.c index dcc57f8..27aa8a2 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -748,7 +748,7 @@ set_options(or_options_t *new_val, char **msg) } /* Issues a CONF_CHANGED event to notify controller of the change. If Tor is * just starting up then the old_options will be undefined. */ - if (old_options) { + if (old_options && old_options != global_options) { elements = smartlist_new(); for (i=0; options_format.vars[i].name; ++i) { const config_var_t *var = &options_format.vars[i]; @@ -774,7 +774,9 @@ set_options(or_options_t *new_val, char **msg) control_event_conf_changed(elements); smartlist_free(elements); } - config_free(&options_format, old_options); + + if (old_options != global_options) + config_free(&options_format, old_options); return 0; } diff --git a/src/or/main.c b/src/or/main.c index 9022f2e..8308b3a 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -1773,8 +1773,16 @@ do_hup(void) } options = get_options(); /* they have changed now */ } else { + char *msg = NULL; log_notice(LD_GENERAL, "Not reloading config file: the controller told " "us not to."); + /* Make stuff get rescanned, reloaded, etc. */ + if (set_options((or_options_t*)options, &msg) < 0) { + if (!msg) + msg = tor_strdup("Unknown error"); + log_warn(LD_GENERAL, "Unable to re-set previous options: %s", msg); + tor_free(msg); + } } if (authdir_mode_handles_descs(options, -1)) { /* reload the approved-routers file */

1 0

[tor/master] Merge branch 'bug5095_squashed'
by nickm＠torproject.org 16 May '12

16 May '12

commit 891cf72f7103bc5b4de26ac974c0fd42a9d3c88f Merge: d9ceab5 b41dd80 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed May 16 10:36:30 2012 -0400 Merge branch 'bug5095_squashed' changes/bug5095 | 4 ++++ src/or/config.c | 6 ++++-- src/or/main.c | 8 ++++++++ 3 files changed, 16 insertions(+), 2 deletions(-)

1 0

[tor/master] Fix some remaining nmake/msvc build issues
by nickm＠torproject.org 16 May '12

16 May '12

commit d9ceab5bc3611fa6ed4e2f58d38ff26860eeeb3c Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed May 16 10:08:24 2012 -0400 Fix some remaining nmake/msvc build issues --- src/test/Makefile.nmake | 20 ++++++++++++++++++++ src/test/test.c | 3 +++ src/test/test_util.c | 3 +++ src/tools/Makefile.nmake | 19 +++++++++++++++++++ 4 files changed, 45 insertions(+), 0 deletions(-) diff --git a/src/test/Makefile.nmake b/src/test/Makefile.nmake new file mode 100644 index 0000000..aec477c --- /dev/null +++ b/src/test/Makefile.nmake @@ -0,0 +1,20 @@ +all: test.exe + +CFLAGS = /I ..\win32 /I ..\..\..\build-alpha\include /I ..\common /I ..\or + +LIBS = ..\..\..\build-alpha\lib\libevent.lib \ + ..\..\..\build-alpha\lib\libcrypto.lib \ + ..\..\..\build-alpha\lib\libssl.lib \ + ..\..\..\build-alpha\lib\libz.lib \ + ..\or\libtor.lib \ + ws2_32.lib advapi32.lib shell32.lib + +TEST_OBJECTS = test.obj test_addr.obj test_containers.obj \ + test_crypto.obj test_data.obj test_dir.obj test_microdesc.obj \ + test_pt.obj test_util.obj test_config.obj tinytest.obj + +test.exe: $(TEST_OBJECTS) + $(CC) $(CFLAGS) $(LIBS) ..\common\*.lib $(TEST_OBJECTS) + +clean: + del $(TEST_OBJECTS) *.lib test.exe diff --git a/src/test/test.c b/src/test/test.c index 7f196aa..c2dba92 100644 --- a/src/test/test.c +++ b/src/test/test.c @@ -71,6 +71,9 @@ int have_failed = 0; /** Temporary directory (set up by setup_directory) under which we store all * our files during testing. */ static char temp_dir[256]; +#ifdef _WIN32 +#define pid_t unsigned +#endif static pid_t temp_dir_setup_in_pid = 0; /** Select and create the temporary directory we'll use to run our unit tests. diff --git a/src/test/test_util.c b/src/test/test_util.c index b5b40bb..d9fc6a3 100644 --- a/src/test/test_util.c +++ b/src/test/test_util.c @@ -2263,6 +2263,9 @@ test_util_spawn_background_ok(void *ptr) static void test_util_spawn_background_fail(void *ptr) { +#ifndef BUILDDIR +#define BUILDDIR "." +#endif const char *argv[] = {BUILDDIR "/src/test/no-such-file", "--test", NULL}; const char *expected_err = ""; char expected_out[1024]; diff --git a/src/tools/Makefile.nmake b/src/tools/Makefile.nmake new file mode 100644 index 0000000..a30a28b --- /dev/null +++ b/src/tools/Makefile.nmake @@ -0,0 +1,19 @@ +all: tor-resolve.exe tor-gencert.exe + +CFLAGS = /I ..\win32 /I ..\..\..\build-alpha\include /I ..\common /I ..\or + +LIBS = ..\..\..\build-alpha\lib\libevent.lib \ + ..\..\..\build-alpha\lib\libcrypto.lib \ + ..\..\..\build-alpha\lib\libssl.lib \ + ..\..\..\build-alpha\lib\libz.lib \ + ws2_32.lib advapi32.lib shell32.lib + + +tor-gencert.exe: tor-gencert.obj + $(CC) $(CFLAGS) $(LIBS) ..\common\*.lib tor-gencert.obj + +tor-resolve.exe: tor-resolve.obj + $(CC) $(CFLAGS) $(LIBS) ..\common\*.lib tor-resolve.obj + +clean: + del *.obj *.lib *.exe

1 0

[tor/master] Merge branch 'win32_winnt'
by nickm＠torproject.org 16 May '12

16 May '12

commit d5ccaa6e2b8c73a1d9d43b82c782c7b10557fe5c Merge: 1150b6b 21e3261 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed May 16 09:56:49 2012 -0400 Merge branch 'win32_winnt' changes/bug5861 | 4 ++++ configure.in | 6 ++---- src/common/aes.c | 5 +---- src/common/compat.h | 5 +---- src/common/crypto.c | 5 +---- src/common/tortls.c | 5 +---- src/or/or.h | 5 +---- 7 files changed, 11 insertions(+), 24 deletions(-)

1 0

[tor/master] Remove all instances of WIN32_WINNT (without leading _)
by nickm＠torproject.org 16 May '12

16 May '12

commit 9ffccb3f49e1c73b34c0bd41fd3bc7116afab4b7 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon May 14 13:36:52 2012 -0400 Remove all instances of WIN32_WINNT (without leading _) We started adding it in 59e2c77824840f back in 2004, 8 years and 3 days ago. It's time to deprogram ourselves from this cargo cult. --- configure.in | 2 -- src/common/aes.c | 3 --- src/common/compat.h | 3 --- src/common/crypto.c | 3 --- src/common/tortls.c | 3 --- src/or/or.h | 3 --- 6 files changed, 0 insertions(+), 17 deletions(-) diff --git a/configure.in b/configure.in index f4e0fea..92b7acb 100644 --- a/configure.in +++ b/configure.in @@ -796,7 +796,6 @@ AC_CHECK_TYPES([struct in6_addr, struct sockaddr_in6, sa_family_t], , , #include <sys/socket.h> #endif #ifdef _WIN32 -#define WIN32_WINNT 0x400 #define _WIN32_WINNT 0x400 #define WIN32_LEAN_AND_MEAN #if defined(_MSC_VER) && (_MSC_VER < 1300) @@ -821,7 +820,6 @@ AC_CHECK_MEMBERS([struct in6_addr.s6_addr32, struct in6_addr.s6_addr16, struct s #include <sys/socket.h> #endif #ifdef _WIN32 -#define WIN32_WINNT 0x400 #define _WIN32_WINNT 0x400 #define WIN32_LEAN_AND_MEAN #if defined(_MSC_VER) && (_MSC_VER < 1300) diff --git a/src/common/aes.c b/src/common/aes.c index a9a0188..692f1bc 100644 --- a/src/common/aes.c +++ b/src/common/aes.c @@ -12,9 +12,6 @@ #include "orconfig.h" #ifdef _WIN32 /*wrkard for dtls1.h >= 0.9.8m of "#include <winsock.h>"*/ - #ifndef WIN32_WINNT - #define WIN32_WINNT 0x400 - #endif #ifndef _WIN32_WINNT #define _WIN32_WINNT 0x400 #endif diff --git a/src/common/compat.h b/src/common/compat.h index 65e6cb4..f17aa05 100644 --- a/src/common/compat.h +++ b/src/common/compat.h @@ -9,9 +9,6 @@ #include "orconfig.h" #include "torint.h" #ifdef _WIN32 -#ifndef WIN32_WINNT -#define WIN32_WINNT 0x400 -#endif #ifndef _WIN32_WINNT #define _WIN32_WINNT 0x400 #endif diff --git a/src/common/crypto.c b/src/common/crypto.c index e37b282..8b1c9a6 100644 --- a/src/common/crypto.c +++ b/src/common/crypto.c @@ -13,9 +13,6 @@ #include "orconfig.h" #ifdef _WIN32 -#ifndef WIN32_WINNT -#define WIN32_WINNT 0x400 -#endif #ifndef _WIN32_WINNT #define _WIN32_WINNT 0x400 #endif diff --git a/src/common/tortls.c b/src/common/tortls.c index 12d982d..180efa6 100644 --- a/src/common/tortls.c +++ b/src/common/tortls.c @@ -22,9 +22,6 @@ #include <assert.h> #ifdef _WIN32 /*wrkard for dtls1.h >= 0.9.8m of "#include <winsock.h>"*/ - #ifndef WIN32_WINNT - #define WIN32_WINNT 0x400 - #endif #ifndef _WIN32_WINNT #define _WIN32_WINNT 0x400 #endif diff --git a/src/or/or.h b/src/or/or.h index b8fee64..ad0ac6d 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -23,9 +23,6 @@ #endif #ifdef _WIN32 -#ifndef WIN32_WINNT -#define WIN32_WINNT 0x400 -#endif #ifndef _WIN32_WINNT #define _WIN32_WINNT 0x400 #endif

1 0

[tor/master] Bump _WIN32_WINNT to 0x0501 throughout the code
by nickm＠torproject.org 16 May '12

16 May '12

commit 21e32619146db4602bc35acd0f237a91b43fd754 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon May 14 13:46:37 2012 -0400 Bump _WIN32_WINNT to 0x0501 throughout the code This tells the windows headers to give us definitions that didn't exist before XP -- like the ones that we need for IPv6 support. See bug #5861. We didn't run into this issue with mingw, since mingw doesn't respect _WIN32_WINNT as well as it should for some of its definitions. --- changes/bug5861 | 4 ++++ configure.in | 4 ++-- src/common/aes.c | 2 +- src/common/compat.h | 2 +- src/common/crypto.c | 2 +- src/common/tortls.c | 2 +- src/or/or.h | 2 +- 7 files changed, 11 insertions(+), 7 deletions(-) diff --git a/changes/bug5861 b/changes/bug5861 new file mode 100644 index 0000000..74a1dfb --- /dev/null +++ b/changes/bug5861 @@ -0,0 +1,4 @@ + o Minor bugfixes: + - Set _WIN32_WINNT to 0x0501 consistently throughout the code, so + that IPv6 stuff will compile on MSVC, and compilation issues + will be easier to track down. Fix for bug 5861. diff --git a/configure.in b/configure.in index 92b7acb..43c9bb2 100644 --- a/configure.in +++ b/configure.in @@ -796,7 +796,7 @@ AC_CHECK_TYPES([struct in6_addr, struct sockaddr_in6, sa_family_t], , , #include <sys/socket.h> #endif #ifdef _WIN32 -#define _WIN32_WINNT 0x400 +#define _WIN32_WINNT 0x0501 #define WIN32_LEAN_AND_MEAN #if defined(_MSC_VER) && (_MSC_VER < 1300) #include <winsock.h> @@ -820,7 +820,7 @@ AC_CHECK_MEMBERS([struct in6_addr.s6_addr32, struct in6_addr.s6_addr16, struct s #include <sys/socket.h> #endif #ifdef _WIN32 -#define _WIN32_WINNT 0x400 +#define _WIN32_WINNT 0x0501 #define WIN32_LEAN_AND_MEAN #if defined(_MSC_VER) && (_MSC_VER < 1300) #include <winsock.h> diff --git a/src/common/aes.c b/src/common/aes.c index 692f1bc..1cb6b86 100644 --- a/src/common/aes.c +++ b/src/common/aes.c @@ -13,7 +13,7 @@ #ifdef _WIN32 /*wrkard for dtls1.h >= 0.9.8m of "#include <winsock.h>"*/ #ifndef _WIN32_WINNT - #define _WIN32_WINNT 0x400 + #define _WIN32_WINNT 0x0501 #endif #define WIN32_LEAN_AND_MEAN #if defined(_MSC_VER) && (_MSC_VER < 1300) diff --git a/src/common/compat.h b/src/common/compat.h index f17aa05..b0ef63b 100644 --- a/src/common/compat.h +++ b/src/common/compat.h @@ -10,7 +10,7 @@ #include "torint.h" #ifdef _WIN32 #ifndef _WIN32_WINNT -#define _WIN32_WINNT 0x400 +#define _WIN32_WINNT 0x0501 #endif #define WIN32_LEAN_AND_MEAN #if defined(_MSC_VER) && (_MSC_VER < 1300) diff --git a/src/common/crypto.c b/src/common/crypto.c index 8b1c9a6..f82598f 100644 --- a/src/common/crypto.c +++ b/src/common/crypto.c @@ -14,7 +14,7 @@ #ifdef _WIN32 #ifndef _WIN32_WINNT -#define _WIN32_WINNT 0x400 +#define _WIN32_WINNT 0x0501 #endif #define WIN32_LEAN_AND_MEAN #include <windows.h> diff --git a/src/common/tortls.c b/src/common/tortls.c index 180efa6..1120f3e 100644 --- a/src/common/tortls.c +++ b/src/common/tortls.c @@ -23,7 +23,7 @@ #include <assert.h> #ifdef _WIN32 /*wrkard for dtls1.h >= 0.9.8m of "#include <winsock.h>"*/ #ifndef _WIN32_WINNT - #define _WIN32_WINNT 0x400 + #define _WIN32_WINNT 0x0501 #endif #define WIN32_LEAN_AND_MEAN #if defined(_MSC_VER) && (_MSC_VER < 1300) diff --git a/src/or/or.h b/src/or/or.h index ad0ac6d..76681c9 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -24,7 +24,7 @@ #ifdef _WIN32 #ifndef _WIN32_WINNT -#define _WIN32_WINNT 0x400 +#define _WIN32_WINNT 0x0501 #endif #define WIN32_LEAN_AND_MEAN #endif

1 0

[metrics-web/master] Current relay descriptor files now contain annotations.
by karsten＠torproject.org 16 May '12

16 May '12

commit 3fb4ba292e4095e6f42130ffb39510cd61a7cac8 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Wed May 16 13:23:49 2012 +0200 Current relay descriptor files now contain annotations. --- web/WEB-INF/formats.jsp | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/web/WEB-INF/formats.jsp b/web/WEB-INF/formats.jsp index 1dd1d31..1dab18f 100644 --- a/web/WEB-INF/formats.jsp +++ b/web/WEB-INF/formats.jsp @@ -74,13 +74,13 @@ are recent: <ul> -<li><tt>@type server-descriptor 1.0</tt></li> -<li><tt>@type extra-info 1.0</tt></li> +<li><tt>@type server-descriptor 1.0</tt></li> +<li><tt>@type extra-info 1.0</tt></li> <li><tt>@type directory 1.0</tt></li> <li><tt>@type network-status-2 1.0</tt></li> -<li><tt>@type network-status-consensus-3 -1.0</tt></li> -<li><tt>@type network-status-vote-3 1.0</tt></li> +<li><tt>@type dir-key-certificate-3 1.0</tt></li> +<li><tt>@type network-status-consensus-3 1.0</tt></li> +<li><tt>@type network-status-vote-3 1.0</tt></li> <li><tt>@type bridge-network-status 1.0</tt></li> <li><tt>@type bridge-server-descriptor 1.0</tt></li>

1 0

[metrics-web/master] Tarballs aren't signed for quite a while now.
by karsten＠torproject.org 16 May '12

16 May '12

commit 0011f9870bbc082299cb3798b41b5c7db02a1995 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Wed May 16 13:24:57 2012 +0200 Tarballs aren't signed for quite a while now. --- web/WEB-INF/data.jsp | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/web/WEB-INF/data.jsp b/web/WEB-INF/data.jsp index 3b3155b..6768169 100644 --- a/web/WEB-INF/data.jsp +++ b/web/WEB-INF/data.jsp @@ -19,9 +19,7 @@ gathered data available to the public. This approach enables privacy researchers to perform their own analyses using real data on the Tor network, and it acts as a safeguard to not gather data - that are too sensitive to publish. All signatures can be - <a href="https://www.torproject.org/docs/verifying-signatures">verified</a> - using Karsten's PGP key (0xF7C11265). The following data are + that are too sensitive to publish. The following data are available (see the <a href="tools.html">Tools</a> section for details on processing the files): <ul>

1 0

[metrics-db/master] Remove binaries.
by karsten＠torproject.org 16 May '12

16 May '12

commit bba639f85240d21987a35718975b61e1e841962e Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Fri May 11 15:45:55 2012 +0200 Remove binaries. Don't tell Sebastian, or he'll do his I-told-you-so dance... --- .gitignore | 3 +++ lib/commons-codec-1.4.jar | Bin 58160 -> 0 bytes lib/commons-compress-1.0.jar | Bin 143847 -> 0 bytes lib/junit-4.8.2.jar | Bin 237344 -> 0 bytes 4 files changed, 3 insertions(+), 0 deletions(-) diff --git a/.gitignore b/.gitignore index e119284..8c9553c 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,6 @@ +# .jar files +lib/*.jar + # Input directories for descriptors to parse archives/ bridges/ diff --git a/lib/commons-codec-1.4.jar b/lib/commons-codec-1.4.jar deleted file mode 100644 index 458d432..0000000 Binary files a/lib/commons-codec-1.4.jar and /dev/null differ diff --git a/lib/commons-compress-1.0.jar b/lib/commons-compress-1.0.jar deleted file mode 100644 index 78d832c..0000000 Binary files a/lib/commons-compress-1.0.jar and /dev/null differ diff --git a/lib/junit-4.8.2.jar b/lib/junit-4.8.2.jar deleted file mode 100644 index 5b4bb84..0000000 Binary files a/lib/junit-4.8.2.jar and /dev/null differ

1 0

[metrics-db/master] Fix Eclipse warnings and update license to 2012.
by karsten＠torproject.org 16 May '12

16 May '12

commit 107d40e9c46b29a3d674ac99bf0715a296062cac Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Fri May 11 15:34:38 2012 +0200 Fix Eclipse warnings and update license to 2012. Eclipse warnings include import * and unused code. --- LICENSE | 2 +- src/org/torproject/ernie/db/ArchiveReader.java | 24 +++++++++-- src/org/torproject/ernie/db/ArchiveWriter.java | 24 +++++++++--- .../ernie/db/BridgeDescriptorParser.java | 19 +++------ .../ernie/db/BridgePoolAssignmentsProcessor.java | 32 +++++++++++---- .../torproject/ernie/db/BridgeSnapshotReader.java | 31 ++++++++++---- .../ernie/db/CachedRelayDescriptorReader.java | 28 ++++++++++--- src/org/torproject/ernie/db/Configuration.java | 21 +++++++--- .../torproject/ernie/db/ExitListDownloader.java | 22 ++++++++--- src/org/torproject/ernie/db/GetTorDownloader.java | 20 +++++++-- src/org/torproject/ernie/db/LockFile.java | 11 ++++- .../torproject/ernie/db/LoggingConfiguration.java | 16 ++++++-- src/org/torproject/ernie/db/Main.java | 8 ++-- .../ernie/db/RelayDescriptorDownloader.java | 41 ++++++++++++++------ .../torproject/ernie/db/RelayDescriptorParser.java | 32 ++++++++------- src/org/torproject/ernie/db/RsyncDataProvider.java | 13 +++++- .../ernie/db/SanitizedBridgesWriter.java | 5 +-- src/org/torproject/ernie/db/TorperfDownloader.java | 18 +++++++-- .../org/torproject/ernie/db/ArchiveReaderTest.java | 11 ++--- .../org/torproject/ernie/db/ArchiveWriterTest.java | 17 +------- .../ernie/db/BridgeSnapshotReaderTest.java | 11 ++--- .../ernie/db/CachedRelayDescriptorReaderTest.java | 13 +++--- .../ernie/db/SanitizedBridgesWriterTest.java | 11 ++--- 23 files changed, 275 insertions(+), 155 deletions(-) diff --git a/LICENSE b/LICENSE index 9d632a3..55fcf4a 100644 --- a/LICENSE +++ b/LICENSE @@ -1,4 +1,4 @@ -Copyright 2010 The Tor Project +Copyright 2010--2012 The Tor Project Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are diff --git a/src/org/torproject/ernie/db/ArchiveReader.java b/src/org/torproject/ernie/db/ArchiveReader.java index edf04c3..06abf6c 100644 --- a/src/org/torproject/ernie/db/ArchiveReader.java +++ b/src/org/torproject/ernie/db/ArchiveReader.java @@ -1,11 +1,25 @@ -/* Copyright 2010 The Tor Project +/* Copyright 2010--2012 The Tor Project * See LICENSE for licensing information */ package org.torproject.ernie.db; -import java.io.*; -import java.util.*; -import java.util.logging.*; -import org.apache.commons.compress.compressors.bzip2.*; +import java.io.BufferedInputStream; +import java.io.BufferedReader; +import java.io.BufferedWriter; +import java.io.ByteArrayOutputStream; +import java.io.File; +import java.io.FileInputStream; +import java.io.FileReader; +import java.io.FileWriter; +import java.io.IOException; +import java.util.ArrayList; +import java.util.List; +import java.util.SortedSet; +import java.util.Stack; +import java.util.TreeSet; +import java.util.logging.Level; +import java.util.logging.Logger; + +import org.apache.commons.compress.compressors.bzip2.BZip2CompressorInputStream; /** * Read in all files in a given directory and pass buffered readers of diff --git a/src/org/torproject/ernie/db/ArchiveWriter.java b/src/org/torproject/ernie/db/ArchiveWriter.java index 0cc983a..1d37edc 100644 --- a/src/org/torproject/ernie/db/ArchiveWriter.java +++ b/src/org/torproject/ernie/db/ArchiveWriter.java @@ -1,13 +1,25 @@ -/* Copyright 2010 The Tor Project +/* Copyright 2010--2012 The Tor Project * See LICENSE for licensing information */ package org.torproject.ernie.db; -import java.io.*; -import java.text.*; -import java.util.*; -import java.util.logging.*; -import org.apache.commons.codec.binary.*; +import java.io.BufferedOutputStream; +import java.io.BufferedReader; +import java.io.File; +import java.io.FileOutputStream; +import java.io.FileReader; +import java.io.IOException; +import java.text.ParseException; +import java.text.SimpleDateFormat; +import java.util.Date; +import java.util.SortedSet; +import java.util.Stack; +import java.util.TimeZone; +import java.util.TreeSet; +import java.util.logging.Level; +import java.util.logging.Logger; +import org.apache.commons.codec.binary.Base64; +import org.apache.commons.codec.binary.Hex; import org.torproject.descriptor.DescriptorParser; import org.torproject.descriptor.DescriptorSourceFactory; import org.torproject.descriptor.impl.DescriptorParseException; diff --git a/src/org/torproject/ernie/db/BridgeDescriptorParser.java b/src/org/torproject/ernie/db/BridgeDescriptorParser.java index 95071a3..0be62f7 100644 --- a/src/org/torproject/ernie/db/BridgeDescriptorParser.java +++ b/src/org/torproject/ernie/db/BridgeDescriptorParser.java @@ -1,12 +1,12 @@ -/* Copyright 2010 The Tor Project +/* Copyright 2010--2012 The Tor Project * See LICENSE for licensing information */ package org.torproject.ernie.db; -import java.io.*; -import java.text.*; -import java.util.*; -import java.util.logging.*; -import org.apache.commons.codec.digest.*; +import java.io.BufferedReader; +import java.io.IOException; +import java.io.StringReader; +import java.util.logging.Level; +import java.util.logging.Logger; public class BridgeDescriptorParser { private SanitizedBridgesWriter sbw; @@ -20,7 +20,6 @@ public class BridgeDescriptorParser { try { BufferedReader br = new BufferedReader(new StringReader( new String(allData, "US-ASCII"))); - boolean skip = false; String line = br.readLine(); if (line == null) { return; @@ -32,12 +31,6 @@ public class BridgeDescriptorParser { this.sbw.sanitizeAndStoreNetworkStatus(allData, dateTime); } } - int runningBridges = 0; - while ((line = br.readLine()) != null) { - if (line.startsWith("s ") && line.contains(" Running")) { - runningBridges++; - } - } } else if (line.startsWith("router ")) { if (this.sbw != null) { if (sanitized) { diff --git a/src/org/torproject/ernie/db/BridgePoolAssignmentsProcessor.java b/src/org/torproject/ernie/db/BridgePoolAssignmentsProcessor.java index d2e64ec..c07b786 100644 --- a/src/org/torproject/ernie/db/BridgePoolAssignmentsProcessor.java +++ b/src/org/torproject/ernie/db/BridgePoolAssignmentsProcessor.java @@ -1,14 +1,30 @@ -/* Copyright 2011 The Tor Project +/* Copyright 2011--2012 The Tor Project * See LICENSE for licensing information */ package org.torproject.ernie.db; -import java.io.*; -import java.text.*; -import java.util.*; -import java.util.logging.*; -import org.apache.commons.codec.*; -import org.apache.commons.codec.binary.*; -import org.apache.commons.codec.digest.*; +import java.io.BufferedReader; +import java.io.BufferedWriter; +import java.io.File; +import java.io.FileInputStream; +import java.io.FileReader; +import java.io.FileWriter; +import java.io.IOException; +import java.io.InputStreamReader; +import java.text.ParseException; +import java.text.SimpleDateFormat; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; +import java.util.SortedSet; +import java.util.Stack; +import java.util.TimeZone; +import java.util.TreeSet; +import java.util.logging.Level; +import java.util.logging.Logger; + +import org.apache.commons.codec.DecoderException; +import org.apache.commons.codec.binary.Hex; +import org.apache.commons.codec.digest.DigestUtils; import org.apache.commons.compress.compressors.gzip.GzipCompressorInputStream; public class BridgePoolAssignmentsProcessor { diff --git a/src/org/torproject/ernie/db/BridgeSnapshotReader.java b/src/org/torproject/ernie/db/BridgeSnapshotReader.java index 310029a..1683b58 100644 --- a/src/org/torproject/ernie/db/BridgeSnapshotReader.java +++ b/src/org/torproject/ernie/db/BridgeSnapshotReader.java @@ -1,16 +1,29 @@ -/* Copyright 2010 The Tor Project +/* Copyright 2010--2012 The Tor Project * See LICENSE for licensing information */ package org.torproject.ernie.db; -import java.io.*; -import java.util.*; -import java.util.logging.*; +import java.io.BufferedInputStream; +import java.io.BufferedReader; +import java.io.BufferedWriter; +import java.io.ByteArrayOutputStream; +import java.io.File; +import java.io.FileInputStream; +import java.io.FileReader; +import java.io.FileWriter; +import java.io.IOException; +import java.io.StringReader; +import java.util.HashSet; +import java.util.Set; +import java.util.SortedSet; +import java.util.Stack; +import java.util.TreeSet; +import java.util.logging.Level; +import java.util.logging.Logger; -import org.apache.commons.codec.binary.*; -import org.apache.commons.codec.digest.*; - -import org.apache.commons.compress.compressors.gzip.*; -import org.apache.commons.compress.archivers.tar.*; +import org.apache.commons.codec.binary.Hex; +import org.apache.commons.codec.digest.DigestUtils; +import org.apache.commons.compress.archivers.tar.TarArchiveInputStream; +import org.apache.commons.compress.compressors.gzip.GzipCompressorInputStream; /** * Reads the half-hourly snapshots of bridge descriptors from Tonga. diff --git a/src/org/torproject/ernie/db/CachedRelayDescriptorReader.java b/src/org/torproject/ernie/db/CachedRelayDescriptorReader.java index 29390b7..4da3e44 100644 --- a/src/org/torproject/ernie/db/CachedRelayDescriptorReader.java +++ b/src/org/torproject/ernie/db/CachedRelayDescriptorReader.java @@ -1,14 +1,28 @@ -/* Copyright 2010 The Tor Project +/* Copyright 2010--2012 The Tor Project * See LICENSE for licensing information */ package org.torproject.ernie.db; -import java.io.*; -import java.text.*; -import java.util.*; -import java.util.logging.*; +import java.io.BufferedInputStream; +import java.io.BufferedReader; +import java.io.BufferedWriter; +import java.io.ByteArrayOutputStream; +import java.io.File; +import java.io.FileInputStream; +import java.io.FileReader; +import java.io.FileWriter; +import java.io.IOException; +import java.io.StringReader; +import java.text.ParseException; +import java.text.SimpleDateFormat; +import java.util.HashSet; +import java.util.List; +import java.util.Set; +import java.util.TimeZone; +import java.util.logging.Level; +import java.util.logging.Logger; -import org.apache.commons.codec.binary.*; -import org.apache.commons.codec.digest.*; +import org.apache.commons.codec.binary.Hex; +import org.apache.commons.codec.digest.DigestUtils; /** * Parses all descriptors in local directory cacheddesc/ and sorts them diff --git a/src/org/torproject/ernie/db/Configuration.java b/src/org/torproject/ernie/db/Configuration.java index 71c9cad..6ab9f44 100644 --- a/src/org/torproject/ernie/db/Configuration.java +++ b/src/org/torproject/ernie/db/Configuration.java @@ -1,11 +1,20 @@ -/* Copyright 2010 The Tor Project +/* Copyright 2010--2012 The Tor Project * See LICENSE for licensing information */ package org.torproject.ernie.db; -import java.io.*; -import java.net.*; -import java.util.*; -import java.util.logging.*; +import java.io.BufferedReader; +import java.io.File; +import java.io.FileReader; +import java.io.IOException; +import java.net.MalformedURLException; +import java.net.URL; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; +import java.util.SortedMap; +import java.util.TreeMap; +import java.util.logging.Level; +import java.util.logging.Logger; /** * Initialize configuration with hard-coded defaults, overwrite with @@ -21,8 +30,6 @@ public class Configuration { private boolean importDirectoryArchives = false; private String directoryArchivesDirectory = "archives/"; private boolean keepDirectoryArchiveImportHistory = false; - private String relayDescriptorDatabaseJdbc = - "jdbc:postgresql://localhost/tordir?user=ernie&password=password"; private boolean writeSanitizedBridges = false; private boolean replaceIPAddressesWithHashes = false; private long limitBridgeDescriptorMappings = -1L; diff --git a/src/org/torproject/ernie/db/ExitListDownloader.java b/src/org/torproject/ernie/db/ExitListDownloader.java index 888aa65..82bde11 100644 --- a/src/org/torproject/ernie/db/ExitListDownloader.java +++ b/src/org/torproject/ernie/db/ExitListDownloader.java @@ -1,12 +1,22 @@ -/* Copyright 2010 The Tor Project +/* Copyright 2010--2012 The Tor Project * See LICENSE for licensing information */ package org.torproject.ernie.db; -import java.io.*; -import java.net.*; -import java.text.*; -import java.util.*; -import java.util.logging.*; +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.text.SimpleDateFormat; +import java.util.Date; +import java.util.SortedSet; +import java.util.Stack; +import java.util.TimeZone; +import java.util.TreeSet; +import java.util.logging.Level; +import java.util.logging.Logger; public class ExitListDownloader { public ExitListDownloader() { diff --git a/src/org/torproject/ernie/db/GetTorDownloader.java b/src/org/torproject/ernie/db/GetTorDownloader.java index 91e9f5f..dfcdc16 100644 --- a/src/org/torproject/ernie/db/GetTorDownloader.java +++ b/src/org/torproject/ernie/db/GetTorDownloader.java @@ -1,11 +1,21 @@ -/* Copyright 2010 The Tor Project +/* Copyright 2010--2012 The Tor Project * See LICENSE for licensing information */ package org.torproject.ernie.db; -import java.io.*; -import java.net.*; -import java.util.*; -import java.util.logging.*; +import java.io.BufferedInputStream; +import java.io.BufferedReader; +import java.io.BufferedWriter; +import java.io.File; +import java.io.FileReader; +import java.io.FileWriter; +import java.io.IOException; +import java.io.StringReader; +import java.net.HttpURLConnection; +import java.net.URL; +import java.util.SortedMap; +import java.util.TreeMap; +import java.util.logging.Level; +import java.util.logging.Logger; public class GetTorDownloader { diff --git a/src/org/torproject/ernie/db/LockFile.java b/src/org/torproject/ernie/db/LockFile.java index c5e75b0..3255620 100644 --- a/src/org/torproject/ernie/db/LockFile.java +++ b/src/org/torproject/ernie/db/LockFile.java @@ -1,9 +1,14 @@ -/* Copyright 2010 The Tor Project +/* Copyright 2010--2012 The Tor Project * See LICENSE for licensing information */ package org.torproject.ernie.db; -import java.io.*; -import java.util.logging.*; +import java.io.BufferedReader; +import java.io.BufferedWriter; +import java.io.File; +import java.io.FileReader; +import java.io.FileWriter; +import java.io.IOException; +import java.util.logging.Logger; public class LockFile { diff --git a/src/org/torproject/ernie/db/LoggingConfiguration.java b/src/org/torproject/ernie/db/LoggingConfiguration.java index 1112748..644a462 100644 --- a/src/org/torproject/ernie/db/LoggingConfiguration.java +++ b/src/org/torproject/ernie/db/LoggingConfiguration.java @@ -1,12 +1,20 @@ -/* Copyright 2010 The Tor Project +/* Copyright 2010--2012 The Tor Project * See LICENSE for licensing information */ package org.torproject.ernie.db; -import java.io.*; -import java.text.*; +import java.io.BufferedWriter; +import java.io.FileWriter; +import java.io.IOException; +import java.text.SimpleDateFormat; import java.util.Date; import java.util.TimeZone; -import java.util.logging.*; +import java.util.logging.ConsoleHandler; +import java.util.logging.FileHandler; +import java.util.logging.Formatter; +import java.util.logging.Handler; +import java.util.logging.Level; +import java.util.logging.LogRecord; +import java.util.logging.Logger; /** * Initialize logging configuration. * diff --git a/src/org/torproject/ernie/db/Main.java b/src/org/torproject/ernie/db/Main.java index a5b5080..e44eac0 100644 --- a/src/org/torproject/ernie/db/Main.java +++ b/src/org/torproject/ernie/db/Main.java @@ -1,10 +1,10 @@ -/* Copyright 2010 The Tor Project +/* Copyright 2010--2012 The Tor Project * See LICENSE for licensing information */ package org.torproject.ernie.db; -import java.io.*; -import java.util.*; -import java.util.logging.*; +import java.io.File; +import java.util.List; +import java.util.logging.Logger; /** * Coordinate downloading and parsing of descriptors and extraction of diff --git a/src/org/torproject/ernie/db/RelayDescriptorDownloader.java b/src/org/torproject/ernie/db/RelayDescriptorDownloader.java index 4b5d729..f7e9468 100644 --- a/src/org/torproject/ernie/db/RelayDescriptorDownloader.java +++ b/src/org/torproject/ernie/db/RelayDescriptorDownloader.java @@ -1,16 +1,35 @@ -/* Copyright 2010 The Tor Project +/* Copyright 2010--2012 The Tor Project * See LICENSE for licensing information */ package org.torproject.ernie.db; -import java.io.*; -import java.net.*; -import java.text.*; -import java.util.*; -import java.util.logging.*; -import java.util.zip.*; - -import org.apache.commons.codec.digest.*; -import org.apache.commons.codec.binary.*; +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.io.UnsupportedEncodingException; +import java.net.HttpURLConnection; +import java.net.URL; +import java.text.SimpleDateFormat; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.SortedMap; +import java.util.SortedSet; +import java.util.TimeZone; +import java.util.TreeMap; +import java.util.TreeSet; +import java.util.logging.Level; +import java.util.logging.Logger; +import java.util.zip.InflaterInputStream; /** * Downloads relay descriptors from the directory authorities via HTTP. @@ -677,8 +696,6 @@ public class RelayDescriptorDownloader { end += endToken.length(); byte[] descBytes = new byte[end - start]; System.arraycopy(allData, start, descBytes, 0, end - start); - String digest = Hex.encodeHexString(DigestUtils.sha( - descBytes)); this.rdp.parse(descBytes); receivedDescriptors++; } diff --git a/src/org/torproject/ernie/db/RelayDescriptorParser.java b/src/org/torproject/ernie/db/RelayDescriptorParser.java index 3fdd3d8..f3e90f2 100644 --- a/src/org/torproject/ernie/db/RelayDescriptorParser.java +++ b/src/org/torproject/ernie/db/RelayDescriptorParser.java @@ -1,13 +1,21 @@ -/* Copyright 2010 The Tor Project +/* Copyright 2010--2012 The Tor Project * See LICENSE for licensing information */ package org.torproject.ernie.db; -import java.io.*; -import java.text.*; -import java.util.*; -import java.util.logging.*; -import org.apache.commons.codec.digest.*; -import org.apache.commons.codec.binary.*; +import java.io.BufferedReader; +import java.io.IOException; +import java.io.StringReader; +import java.text.ParseException; +import java.text.SimpleDateFormat; +import java.util.SortedSet; +import java.util.TimeZone; +import java.util.TreeSet; +import java.util.logging.Level; +import java.util.logging.Logger; + +import org.apache.commons.codec.binary.Base64; +import org.apache.commons.codec.binary.Hex; +import org.apache.commons.codec.digest.DigestUtils; /** * Parses relay descriptors including network status consensuses and @@ -168,13 +176,8 @@ public class RelayDescriptorParser { } } } else if (line.startsWith("router ")) { - String publishedLine = null, publishedTime = null, - extraInfoDigest = null, relayIdentifier = null; - String[] parts = line.split(" "); - String nickname = parts[1]; - String address = parts[2]; - int orPort = Integer.parseInt(parts[3]); - int dirPort = Integer.parseInt(parts[4]); + String publishedTime = null, extraInfoDigest = null, + relayIdentifier = null; long published = -1L; while ((line = br.readLine()) != null) { if (line.startsWith("published ")) { @@ -213,7 +216,6 @@ public class RelayDescriptorParser { } else if (line.startsWith("extra-info ")) { String publishedTime = null, relayIdentifier = line.split(" ")[2]; long published = -1L; - boolean skip = false; while ((line = br.readLine()) != null) { if (line.startsWith("published ")) { publishedTime = line.substring("published ".length()); diff --git a/src/org/torproject/ernie/db/RsyncDataProvider.java b/src/org/torproject/ernie/db/RsyncDataProvider.java index 6c0feae..19cf9a4 100644 --- a/src/org/torproject/ernie/db/RsyncDataProvider.java +++ b/src/org/torproject/ernie/db/RsyncDataProvider.java @@ -2,9 +2,16 @@ * See LICENSE for licensing information */ package org.torproject.ernie.db; -import java.io.*; -import java.util.*; -import java.util.logging.*; +import java.io.BufferedInputStream; +import java.io.File; +import java.io.FileInputStream; +import java.io.FileOutputStream; +import java.io.IOException; +import java.util.Arrays; +import java.util.HashSet; +import java.util.Set; +import java.util.Stack; +import java.util.logging.Logger; /** * Copy files published in the last 3 days to a local directory that can diff --git a/src/org/torproject/ernie/db/SanitizedBridgesWriter.java b/src/org/torproject/ernie/db/SanitizedBridgesWriter.java index 7710b82..ff53cf0 100644 --- a/src/org/torproject/ernie/db/SanitizedBridgesWriter.java +++ b/src/org/torproject/ernie/db/SanitizedBridgesWriter.java @@ -1,4 +1,4 @@ -/* Copyright 2010 The Tor Project +/* Copyright 2010--2012 The Tor Project * See LICENSE for licensing information */ package org.torproject.ernie.db; @@ -164,8 +164,6 @@ public class SanitizedBridgesWriter { */ private File sanitizedBridgesDirectory; - private File statsDirectory; - private boolean replaceIPAddressesWithHashes; private boolean persistenceProblemWithSecrets; @@ -194,7 +192,6 @@ public class SanitizedBridgesWriter { /* Memorize argument values. */ this.sanitizedBridgesDirectory = sanitizedBridgesDirectory; - this.statsDirectory = statsDirectory; this.replaceIPAddressesWithHashes = replaceIPAddressesWithHashes; /* Initialize logger. */ diff --git a/src/org/torproject/ernie/db/TorperfDownloader.java b/src/org/torproject/ernie/db/TorperfDownloader.java index 48a6ef8..8ee0fe9 100644 --- a/src/org/torproject/ernie/db/TorperfDownloader.java +++ b/src/org/torproject/ernie/db/TorperfDownloader.java @@ -2,10 +2,20 @@ * See LICENSE for licensing information */ package org.torproject.ernie.db; -import java.io.*; -import java.net.*; -import java.util.*; -import java.util.logging.*; +import java.io.BufferedReader; +import java.io.BufferedWriter; +import java.io.File; +import java.io.FileReader; +import java.io.FileWriter; +import java.io.IOException; +import java.io.InputStreamReader; +import java.net.HttpURLConnection; +import java.net.URL; +import java.util.List; +import java.util.Map; +import java.util.SortedMap; +import java.util.logging.Level; +import java.util.logging.Logger; /* Download possibly truncated Torperf .data and .extradata files from * configured sources and append them to the files we already have. */ diff --git a/test/org/torproject/ernie/db/ArchiveReaderTest.java b/test/org/torproject/ernie/db/ArchiveReaderTest.java index 5779865..cb3dea7 100644 --- a/test/org/torproject/ernie/db/ArchiveReaderTest.java +++ b/test/org/torproject/ernie/db/ArchiveReaderTest.java @@ -2,13 +2,12 @@ * See LICENSE for licensing information */ package org.torproject.ernie.db; -import org.torproject.ernie.db.*; +import java.io.File; -import java.io.*; - -import org.junit.*; -import org.junit.rules.*; -import static org.junit.Assert.*; +import org.junit.Before; +import org.junit.Rule; +import org.junit.Test; +import org.junit.rules.TemporaryFolder; public class ArchiveReaderTest { diff --git a/test/org/torproject/ernie/db/ArchiveWriterTest.java b/test/org/torproject/ernie/db/ArchiveWriterTest.java index 3ae9abc..2a18e74 100644 --- a/test/org/torproject/ernie/db/ArchiveWriterTest.java +++ b/test/org/torproject/ernie/db/ArchiveWriterTest.java @@ -2,26 +2,15 @@ * See LICENSE for licensing information */ package org.torproject.ernie.db; -import org.torproject.ernie.db.*; - -import java.io.*; - -import org.junit.*; -import org.junit.rules.*; -import static org.junit.Assert.*; +import org.junit.Rule; +import org.junit.Test; +import org.junit.rules.TemporaryFolder; public class ArchiveWriterTest { - private File tempArchivesDirectory; - @Rule public TemporaryFolder folder = new TemporaryFolder(); - @Before - public void createTempDirectories() { - this.tempArchivesDirectory = folder.newFolder("archives"); - } - @Test(expected = IllegalArgumentException.class) public void testArchivesDirectoryNull() { new ArchiveWriter(null); diff --git a/test/org/torproject/ernie/db/BridgeSnapshotReaderTest.java b/test/org/torproject/ernie/db/BridgeSnapshotReaderTest.java index 622462c..f1ad03b 100644 --- a/test/org/torproject/ernie/db/BridgeSnapshotReaderTest.java +++ b/test/org/torproject/ernie/db/BridgeSnapshotReaderTest.java @@ -2,13 +2,12 @@ * See LICENSE for licensing information */ package org.torproject.ernie.db; -import org.torproject.ernie.db.*; +import java.io.File; -import java.io.*; - -import org.junit.*; -import org.junit.rules.*; -import static org.junit.Assert.*; +import org.junit.Before; +import org.junit.Rule; +import org.junit.Test; +import org.junit.rules.TemporaryFolder; public class BridgeSnapshotReaderTest { diff --git a/test/org/torproject/ernie/db/CachedRelayDescriptorReaderTest.java b/test/org/torproject/ernie/db/CachedRelayDescriptorReaderTest.java index b856fb0..f101249 100644 --- a/test/org/torproject/ernie/db/CachedRelayDescriptorReaderTest.java +++ b/test/org/torproject/ernie/db/CachedRelayDescriptorReaderTest.java @@ -2,14 +2,13 @@ * See LICENSE for licensing information */ package org.torproject.ernie.db; -import org.torproject.ernie.db.*; +import java.io.File; +import java.util.ArrayList; -import java.io.*; -import java.util.*; - -import org.junit.*; -import org.junit.rules.*; -import static org.junit.Assert.*; +import org.junit.Before; +import org.junit.Rule; +import org.junit.Test; +import org.junit.rules.TemporaryFolder; public class CachedRelayDescriptorReaderTest { diff --git a/test/org/torproject/ernie/db/SanitizedBridgesWriterTest.java b/test/org/torproject/ernie/db/SanitizedBridgesWriterTest.java index dd05870..f8b4cdd 100644 --- a/test/org/torproject/ernie/db/SanitizedBridgesWriterTest.java +++ b/test/org/torproject/ernie/db/SanitizedBridgesWriterTest.java @@ -2,13 +2,12 @@ * See LICENSE for licensing information */ package org.torproject.ernie.db; -import org.torproject.ernie.db.*; +import java.io.File; -import java.io.*; - -import org.junit.*; -import org.junit.rules.*; -import static org.junit.Assert.*; +import org.junit.Before; +import org.junit.Rule; +import org.junit.Test; +import org.junit.rules.TemporaryFolder; public class SanitizedBridgesWriterTest {

1 0