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

[tor-messenger-build/master] Create full mar files
by boklm＠torproject.org 04 Nov '16

04 Nov '16

commit a0b2e732c6e9fb7e5ee75bf762df1dd009797b1f Author: Nicolas Vigier <boklm(a)torproject.org> Date: Sat Nov 5 02:09:26 2016 +0100 Create full mar files --- projects/tor-messenger/build | 26 +++++++++++++++++++++----- projects/tor-messenger/build.osx | 16 +++++++++++++--- projects/tor-messenger/config | 5 +++++ 3 files changed, 39 insertions(+), 8 deletions(-) diff --git a/projects/tor-messenger/build b/projects/tor-messenger/build index 688c932..1415f22 100755 --- a/projects/tor-messenger/build +++ b/projects/tor-messenger/build @@ -1,6 +1,10 @@ #!/bin/sh set -e +mkdir -p /var/tmp/dist +7z x -o/var/tmp/dist [% c('input_files_by_name/instantbird') %]/mar-tools-*.zip +MARTOOLS=/var/tmp/dist/mar-tools + [% IF c("var/osx"); INCLUDE build.osx; STOP; @@ -86,10 +90,23 @@ mv Browser/TorBrowser/Data/Browser/profile.default/extensions/tor-browser_en-US/ cp Browser/TorBrowser/Data/Browser/profile.default/extensions/tor-browser_en-US/Browser/TorBrowser/Data/Tor/* Browser/TorBrowser/Data/Tor/ rm -Rf Browser/TorBrowser/Data/Browser/profile.default/extensions/tor-browser_en-US + +# Recreate precomplete file (needs to be accurate for full MAR updates). +cd Browser +rm -f precomplete +python $MARTOOLS/createprecomplete.py +cd .. + cd .. mv bundle tor-messenger -mkdir -p '[% dest_dir _ "/" _ c("filename") %]' +OUTDIR='[% dest_dir _ "/" _ c("filename") %]' +mkdir -p $OUTDIR +MAR_FILE=tor-messenger-[% c("var/mar_osname") %]-[% c("version") %]_en-US.mar +MAR=$MARTOOLS/mar MBSDIFF=$MARTOOLS/mbsdiff[% IF c("var/windows") %].exe[% END %] \ + $MARTOOLS/make_full_update.sh \ + -q $OUTDIR/$MAR_FILE tor-messenger/Browser + [% IF c('var/windows') -%] makensis tor-messenger.nsi @@ -107,12 +124,11 @@ mv tor-messenger-install.exe tor-messenger-install-tmp.exe python pe_checksum_fix.py mv tor-messenger-install-tmp2.exe tor-messenger-install.exe rm tor-messenger-install-tmp.exe -mv tor-messenger-install.exe [% dest_dir _ '/' _ c('filename') _ '/' _ c('var/bundle_filename') %] +mv tor-messenger-install.exe $OUTDIR/[% c('var/bundle_filename') %] [% ELSE -%] [% c('tar', { tar_src => [ 'tor-messenger' ], - tar_args => '-cJf ' _ dest_dir _ '/' _ c('filename') - _ '/' _ c('var/bundle_filename'), + tar_args => '-cJf $OUTDIR/' _ c('var/bundle_filename'), }) %] [% END -%] -mv -f [% c('input_files_by_name/instantbird') %]/mar-tools-*.zip [% dest_dir _ '/' _ c('filename') %] +mv -f [% c('input_files_by_name/instantbird') %]/mar-tools-*.zip $OUTDIR/ diff --git a/projects/tor-messenger/build.osx b/projects/tor-messenger/build.osx index 99cde39..2c65e3f 100755 --- a/projects/tor-messenger/build.osx +++ b/projects/tor-messenger/build.osx @@ -55,6 +55,12 @@ cp $rootdir/background.png .background/ cp $rootdir/DS_Store .DS_Store ln -s /Applications/ . +# Recreate precomplete file (needs to be accurate for full MAR updates). +cd TorMessenger.app/Contents/Resources +rm -f precomplete +python $MARTOOLS/createprecomplete.py +cd ../../.. + find . -executable -exec chmod 755 {} \; find . ! -executable -exec chmod 644 {} \; find . -type f | sed -e 's/^\.\///' | sort | xargs -i echo "{}={}" > ../filelist.txt @@ -62,6 +68,10 @@ find . -type l | sed -e 's/^\.\///' | sort | xargs -i echo "{}={}" >> ../filelis mkisofs -D -V "Tor Messenger" -no-pad -R -apple -o ../TorMessenger-uncompressed.dmg -path-list ../filelist.txt -graft-points -gid 20 -dir-mode 0755 -new-dir-mode 0755 cd .. -mkdir -p '[% dest_dir _ "/" _ c("filename") %]' -dmg dmg TorMessenger-uncompressed.dmg [% dest_dir _ '/' _ c('filename') _ '/' _ c('var/bundle_filename') %] -mv -f [% c('input_files_by_name/instantbird') %]/mar-tools-*.zip [% dest_dir _ '/' _ c('filename') %] +OUTDIR='[% dest_dir _ "/" _ c("filename") %]' +mkdir -p $OUTDIR +dmg dmg TorMessenger-uncompressed.dmg $OUTDIR/[% c('var/bundle_filename') %] +mv -f [% c('input_files_by_name/instantbird') %]/mar-tools-*.zip $OUTDIR +MAR_FILE=tor-messenger-[% c("var/mar_osname") %]-[% c("version") %]_en-US.mar +MAR=$MARTOOLS/mar MBSDIFF=$MARTOOLS/mbsdiff $MARTOOLS/make_full_update.sh \ + -q $OUTDIR/$MAR_FILE dmg/TorMessenger.app diff --git a/projects/tor-messenger/config b/projects/tor-messenger/config index 0b861ce..73d8cfa 100644 --- a/projects/tor-messenger/config +++ b/projects/tor-messenger/config @@ -50,11 +50,13 @@ var: deps: - p7zip-full - bzip2 + - python targets: windows-i686: distribution: Ubuntu-14.10 var: bundle_filename: 'tormessenger-install-[% c("version") %]_en-US.exe' + mar_osname: win32 arch_deps: - nsis - python @@ -64,12 +66,15 @@ targets: distribution: Ubuntu-12.04 var: bundle_filename: 'TorMessenger-[% c("version") %]-osx64_en-US.dmg' + mar_osname: osx64 arch_deps: - genisoimage - bsdtar linux-i686: var: bundle_filename: 'tor-messenger-linux32-[% c("version") %]_en-US.tar.xz' + mar_osname: linux32 linux-x86_64: var: bundle_filename: 'tor-messenger-linux64-[% c("version") %]_en-US.tar.xz' + mar_osname: linux64

1 0

[tor-messenger-build/master] Update rbm
by boklm＠torproject.org 04 Nov '16

04 Nov '16

commit 20547601b68879068d65b14c179c5e189923e1ad Author: Nicolas Vigier <boklm(a)torproject.org> Date: Fri Nov 4 17:45:46 2016 +0100 Update rbm The main change is that it is now possible to have the filename in input_files pointing to a directory. This will allow us to have projects that output multiple files. --- rbm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rbm b/rbm index d50b2a6..64cc0f0 160000 --- a/rbm +++ b/rbm @@ -1 +1 @@ -Subproject commit d50b2a62baaacd5ab7e77ed33b3571edd0ee7830 +Subproject commit 64cc0f085badca40c74288d59698ea3b9e50ce9a

1 0

[tor-messenger-build/master] Create mar-tools zip files
by boklm＠torproject.org 04 Nov '16

04 Nov '16

commit b3ebc0f25959a034b609f6d6ba697da30ee43efa Author: Nicolas Vigier <boklm(a)torproject.org> Date: Sat Nov 5 00:58:46 2016 +0100 Create mar-tools zip files --- projects/instantbird/build | 22 ++++++++++++++++++++++ projects/instantbird/config | 4 ++++ projects/tor-messenger/build | 1 + projects/tor-messenger/build.osx | 1 + 4 files changed, 28 insertions(+) diff --git a/projects/instantbird/build b/projects/instantbird/build index 08b22a5..999c2a0 100644 --- a/projects/instantbird/build +++ b/projects/instantbird/build @@ -66,3 +66,25 @@ echo ac_add_options --with-tor-browser-version='[% c("var/tormessenger_version") mkdir -p [% dest_dir _ '/' _ c('filename') %] mv obj-*/dist/instantbird-*.[% c('var/archive_suffix') %] [% dest_dir _ '/' _ c('filename') %]/instantbird.[% c('var/archive_suffix') %] + +MARTOOLS=/var/tmp/dist/mar-tools +mkdir -p $MARTOOLS +cp -p mozilla/config/createprecomplete.py $MARTOOLS/ +cp -p mozilla/tools/update-packaging/*.sh $MARTOOLS/ +cp -p obj-*/dist/host/bin/mar $MARTOOLS/ +cp -p obj-*/dist/host/bin/mbsdiff $MARTOOLS/ +[% IF c("var/linux") -%] +cp -p obj-*/modules/libmar/tool/signmar $MARTOOLS/ +cp -p obj-*/security/nss/cmd/certutil/certutil $MARTOOLS/ +NSS_LIBS="libfreebl3.so libmozsqlite3.so libnss3.so libnssdbm3.so libnssutil3.so libsmime3.so libsoftokn3.so libssl3.so" +NSPR_LIBS="libnspr4.so libplc4.so libplds4.so" +for LIB in $NSS_LIBS $NSPR_LIBS; do + cp -p obj-*/dist/bin/$LIB $MARTOOLS/ +done +[% END -%] + +cd /var/tmp/dist +[% c('zip', { + zip_src => [ 'mar-tools' ], + zip_args => dest_dir _ '/' _ c('filename') _ '/' _ c('var/martools_filename'), + }) %] diff --git a/projects/instantbird/config b/projects/instantbird/config index e2ee4dd..d105f91 100644 --- a/projects/instantbird/config +++ b/projects/instantbird/config @@ -21,9 +21,11 @@ var: targets: windows-i686: var: + martools_filename: mar-tools-win32.zip archive_suffix: zip linux-x86_64: var: + martools_filename: mar-tools-linux64.zip arch_deps: - libgconf2-dev - libgtk2.0-dev @@ -37,6 +39,7 @@ targets: - libxt-dev linux-i686: var: + martools_filename: mar-tools-linux32.zip arch_deps: - libc6-dev-i386 - ia32-libs @@ -54,6 +57,7 @@ targets: - libxt-dev:i386 osx-x86_64: var: + martools_filename: mar-tools-mac64.zip arch_deps: - rsync - sqlite3 diff --git a/projects/tor-messenger/build b/projects/tor-messenger/build index 23834b2..688c932 100755 --- a/projects/tor-messenger/build +++ b/projects/tor-messenger/build @@ -115,3 +115,4 @@ mv tor-messenger-install.exe [% dest_dir _ '/' _ c('filename') _ '/' _ c('var/bu _ '/' _ c('var/bundle_filename'), }) %] [% END -%] +mv -f [% c('input_files_by_name/instantbird') %]/mar-tools-*.zip [% dest_dir _ '/' _ c('filename') %] diff --git a/projects/tor-messenger/build.osx b/projects/tor-messenger/build.osx index e9d3d07..99cde39 100755 --- a/projects/tor-messenger/build.osx +++ b/projects/tor-messenger/build.osx @@ -64,3 +64,4 @@ mkisofs -D -V "Tor Messenger" -no-pad -R -apple -o ../TorMessenger-uncompressed. cd .. mkdir -p '[% dest_dir _ "/" _ c("filename") %]' dmg dmg TorMessenger-uncompressed.dmg [% dest_dir _ '/' _ c('filename') _ '/' _ c('var/bundle_filename') %] +mv -f [% c('input_files_by_name/instantbird') %]/mar-tools-*.zip [% dest_dir _ '/' _ c('filename') %]

1 0

[tor-messenger-build/master] Make projects/instantbird output to a directory
by boklm＠torproject.org 04 Nov '16

04 Nov '16

commit b677cb75447d7e3823b2bd179e8d6e335e510f8f Author: Nicolas Vigier <boklm(a)torproject.org> Date: Fri Nov 4 20:28:20 2016 +0100 Make projects/instantbird output to a directory --- projects/instantbird/build | 3 ++- projects/instantbird/config | 2 +- projects/tor-messenger/build | 4 ++-- projects/tor-messenger/build.osx | 2 +- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/projects/instantbird/build b/projects/instantbird/build index 9b808bc..08b22a5 100644 --- a/projects/instantbird/build +++ b/projects/instantbird/build @@ -64,4 +64,5 @@ echo ac_add_options --with-tor-browser-version='[% c("var/tormessenger_version") ./mozilla/mach build ./mozilla/mach package -mv obj-*/dist/instantbird-*.[% c('var/archive_suffix') %] [% dest_dir _ '/' _ c('filename') %] +mkdir -p [% dest_dir _ '/' _ c('filename') %] +mv obj-*/dist/instantbird-*.[% c('var/archive_suffix') %] [% dest_dir _ '/' _ c('filename') %]/instantbird.[% c('var/archive_suffix') %] diff --git a/projects/instantbird/config b/projects/instantbird/config index 47014bc..e2ee4dd 100644 --- a/projects/instantbird/config +++ b/projects/instantbird/config @@ -2,7 +2,7 @@ version: '[% c("abbrev") %]' hg_url: https://hg.mozilla.org/releases/comm-esr45/ hg_hash: THUNDERBIRD_45_4_0_RELEASE -filename: "[% project %]-[% c('version') %]-[% c('var/osname') %]-[% c('var/build_id') %].[% c('var/archive_suffix') %]" +filename: "[% project %]-[% c('version') %]-[% c('var/osname') %]-[% c('var/build_id') %]" remote_docker: 1 var: archive_suffix: tar.bz2 diff --git a/projects/tor-messenger/build b/projects/tor-messenger/build index ee6b2f3..23834b2 100755 --- a/projects/tor-messenger/build +++ b/projects/tor-messenger/build @@ -10,11 +10,11 @@ rootdir=$(pwd) mkdir bundle [% IF c("var/windows") -%] -7z x -y -obundle [% c('input_files_by_name/instantbird') %] +7z x -y -obundle [% c('input_files_by_name/instantbird') %]/instantbird.zip mv bundle/instantbird bundle/Browser [% ELSE -%] mkdir bundle/Browser -tar xf [% c('input_files_by_name/instantbird') %] -C bundle/Browser --strip 1 +tar xf [% c('input_files_by_name/instantbird') %]/instantbird.tar.bz2 -C bundle/Browser --strip 1 [% END -%] find bundle/Browser -exec touch -m -t $(date -d @[% c('timestamp') %] +%Y%m%d%H%M) {} \; diff --git a/projects/tor-messenger/build.osx b/projects/tor-messenger/build.osx index 02fa589..e9d3d07 100755 --- a/projects/tor-messenger/build.osx +++ b/projects/tor-messenger/build.osx @@ -1,7 +1,7 @@ #!/bin/sh set -e rootdir=$(pwd) -tar xf [% c('input_files_by_name/instantbird') %] +tar xf [% c('input_files_by_name/instantbird') %]/instantbird.tar.bz2 tar xf [% c('input_files_by_name/libdmg') %] export PATH="$(pwd)/libdmg-hfsplus:$PATH"

1 0

[tor-messenger-build/master] Hmm, --disable-signmar ^ --enable-signmar
by arlo＠torproject.org 04 Nov '16

04 Nov '16

commit f69ce392c274ed19a81a63cce4b946893d2502ff Author: Arlo Breault <arlolra(a)gmail.com> Date: Fri Nov 4 14:10:43 2016 -0700 Hmm, --disable-signmar ^ --enable-signmar --- projects/instantbird/mozconfig-windows-i686 | 1 - 1 file changed, 1 deletion(-) diff --git a/projects/instantbird/mozconfig-windows-i686 b/projects/instantbird/mozconfig-windows-i686 index 7bc0696..71698ec 100644 --- a/projects/instantbird/mozconfig-windows-i686 +++ b/projects/instantbird/mozconfig-windows-i686 @@ -24,7 +24,6 @@ ac_add_options --disable-crashreporter ac_add_options --disable-maintenance-service ac_add_options --disable-webrtc ac_add_options --disable-tests -ac_add_options --disable-signmar ac_add_options --disable-debug ac_add_options --enable-tor-browser-update

1 0

[tor/master] Would you believe me if I said there were more 32-bit and clang warnings?
by nickm＠torproject.org 04 Nov '16

04 Nov '16

commit 0fed324c2c3862b1911a1add352f45c9a21f7a47 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Nov 4 15:47:28 2016 -0400 Would you believe me if I said there were more 32-bit and clang warnings? --- src/test/test_hs_cache.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/test/test_hs_cache.c b/src/test/test_hs_cache.c index 3458191..e7deec2 100644 --- a/src/test/test_hs_cache.c +++ b/src/test/test_hs_cache.c @@ -132,7 +132,7 @@ test_directory(void *arg) { int ret; size_t oom_size; - char *desc1_str; + char *desc1_str=NULL; const char *desc_out; hs_descriptor_t *desc1; @@ -434,7 +434,7 @@ test_hsdir_revision_counter_check(void *arg) tt_assert(received_desc); /* Check that the revision counter is correct */ - tt_int_op(received_desc->plaintext_data.revision_counter, ==, 1312); + tt_u64_op(received_desc->plaintext_data.revision_counter, ==, 1312); hs_descriptor_free(received_desc); received_desc = NULL; @@ -465,7 +465,7 @@ test_hsdir_revision_counter_check(void *arg) tt_assert(received_desc); /* Check that the revision counter is the latest */ - tt_int_op(received_desc->plaintext_data.revision_counter, ==, 1313); + tt_u64_op(received_desc->plaintext_data.revision_counter, ==, 1313); } done:

1 0

[tor/master] Fix some 32-bit warnings and clang warnings
by nickm＠torproject.org 04 Nov '16

04 Nov '16

commit f45a581486197fb71c166f130b9b4cb0ad42ceff Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Nov 4 15:24:30 2016 -0400 Fix some 32-bit warnings and clang warnings --- src/or/hs_descriptor.c | 10 +++++----- src/test/test_hs_descriptor.c | 6 +++--- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/or/hs_descriptor.c b/src/or/hs_descriptor.c index 92e523e..7c5d204 100644 --- a/src/or/hs_descriptor.c +++ b/src/or/hs_descriptor.c @@ -1057,7 +1057,7 @@ encrypted_data_length_is_valid(size_t len) if (len < HS_DESC_ENCRYPTED_MIN_LEN) { log_warn(LD_REND, "Length of descriptor's encrypted data is too small. " "Got %lu but minimum value is %d", - len, HS_DESC_ENCRYPTED_MIN_LEN); + (unsigned long)len, HS_DESC_ENCRYPTED_MIN_LEN); goto err; } @@ -1069,7 +1069,7 @@ encrypted_data_length_is_valid(size_t len) if (len % HS_DESC_PLAINTEXT_PADDING_MULTIPLE) { log_warn(LD_REND, "Length of descriptor's encrypted data is invalid. " "Got %lu which is not a multiple of %d.", - len, HS_DESC_PLAINTEXT_PADDING_MULTIPLE); + (unsigned long) len, HS_DESC_PLAINTEXT_PADDING_MULTIPLE); goto err; } @@ -1121,7 +1121,7 @@ desc_decrypt_data_v3(const hs_descriptor_t *desc, char **decrypted_out) if (desc_mac_size != DIGEST256_LEN) { log_warn(LD_REND, "Service descriptor MAC length of encrypted data " "is invalid (%lu, expected %u)", - desc_mac_size, DIGEST256_LEN); + (unsigned long) desc_mac_size, DIGEST256_LEN); goto err; } } @@ -1419,7 +1419,7 @@ desc_sig_is_valid(const char *b64_sig, const ed25519_keypair_t *signing_kp, if (strlen(b64_sig) != ED25519_SIG_BASE64_LEN) { log_warn(LD_REND, "Service descriptor has an invalid signature length." "Exptected %d but got %lu", - ED25519_SIG_BASE64_LEN, strlen(b64_sig)); + ED25519_SIG_BASE64_LEN, (unsigned long) strlen(b64_sig)); goto err; } @@ -1733,7 +1733,7 @@ hs_desc_decode_plaintext(const char *encoded, encoded_len = strlen(encoded); if (encoded_len >= HS_DESC_MAX_LEN) { log_warn(LD_REND, "Service descriptor is too big (%lu bytes)", - encoded_len); + (unsigned long) encoded_len); goto err; } diff --git a/src/test/test_hs_descriptor.c b/src/test/test_hs_descriptor.c index 8377a45..6c88cc1 100644 --- a/src/test/test_hs_descriptor.c +++ b/src/test/test_hs_descriptor.c @@ -142,7 +142,7 @@ helper_compare_hs_desc(const hs_descriptor_t *desc1, tt_mem_op(desc1->plaintext_data.blinded_kp.pubkey.pubkey, OP_EQ, desc2->plaintext_data.blinded_kp.pubkey.pubkey, ED25519_PUBKEY_LEN); - tt_uint_op(desc1->plaintext_data.revision_counter, ==, + tt_u64_op(desc1->plaintext_data.revision_counter, ==, desc2->plaintext_data.revision_counter); /* NOTE: We can't compare the encrypted blob because when encoding the @@ -812,7 +812,7 @@ test_decode_intro_point(void *arg) desc_intro_point_free(ip); } -const char encrypted_desc_portion[] = "create2-formats 2\n" +static const char encrypted_desc_portion[] = "create2-formats 2\n" "authentication-required ed25519\n" "introduction-point AQAGAQIDBCMp\n" "auth-key\n" @@ -1056,7 +1056,7 @@ static void test_desc_signature(void *arg) { int ret; - char *data, *desc; + char *data = NULL, *desc = NULL; char sig_b64[ED25519_SIG_BASE64_LEN + 1]; ed25519_keypair_t kp; ed25519_signature_t sig;

1 0

[tor/master] test: Add prop224 directory fetch/upload unit tests
by nickm＠torproject.org 04 Nov '16

04 Nov '16

commit a8efd087bdd937027713217d74e1cfd40fba4961 Author: George Kadianakis <desnacked(a)riseup.net> Date: Thu Aug 25 11:11:23 2016 -0400 test: Add prop224 directory fetch/upload unit tests Signed-off-by: David Goulet <dgoulet(a)torproject.org> Signed-off-by: George Kadianakis <desnacked(a)riseup.net> --- src/or/directory.c | 2 +- src/or/directory.h | 2 + src/test/test_dir_handle_get.c | 13 --- src/test/test_helpers.c | 13 +++ src/test/test_helpers.h | 4 + src/test/test_hs_cache.c | 189 +++++++++++++++++++++++++++++++++++++++++ 6 files changed, 209 insertions(+), 14 deletions(-) diff --git a/src/or/directory.c b/src/or/directory.c index f72bc55..8afb241 100644 --- a/src/or/directory.c +++ b/src/or/directory.c @@ -3532,7 +3532,7 @@ parse_hs_version_from_post(const char *url, const char *prefix, /* Handle the POST request for a hidden service descripror. The request is in * url, the body of the request is in body. Return 200 on success * else return 400 indicating a bad request. */ -static int +STATIC int handle_post_hs_descriptor(const char *url, const char *body) { int version; diff --git a/src/or/directory.h b/src/or/directory.h index 2fe42f2..210d623 100644 --- a/src/or/directory.h +++ b/src/or/directory.h @@ -157,6 +157,8 @@ STATIC int download_status_schedule_get_delay(download_status_t *dls, int min_delay, int max_delay, time_t now); +STATIC int handle_post_hs_descriptor(const char *url, const char *body); + STATIC char* authdir_type_to_string(dirinfo_type_t auth); STATIC const char * dir_conn_purpose_to_string(int purpose); STATIC int should_use_directory_guards(const or_options_t *options); diff --git a/src/test/test_dir_handle_get.c b/src/test/test_dir_handle_get.c index 3282037..f00570c 100644 --- a/src/test/test_dir_handle_get.c +++ b/src/test/test_dir_handle_get.c @@ -50,19 +50,6 @@ ENABLE_GCC_WARNING(overlength-strings) #define NS_MODULE dir_handle_get -static void -connection_write_to_buf_mock(const char *string, size_t len, - connection_t *conn, int zlib) -{ - (void) zlib; - - tor_assert(string); - tor_assert(conn); - - write_to_buf(string, len, conn->outbuf); -} - -#define GET(path) "GET " path " HTTP/1.0\r\n\r\n" #define NOT_FOUND "HTTP/1.0 404 Not found\r\n\r\n" #define BAD_REQUEST "HTTP/1.0 400 Bad request\r\n\r\n" #define SERVER_BUSY "HTTP/1.0 503 Directory busy, try again later\r\n\r\n" diff --git a/src/test/test_helpers.c b/src/test/test_helpers.c index ae9fc7a..130ec43 100644 --- a/src/test/test_helpers.c +++ b/src/test/test_helpers.c @@ -12,6 +12,7 @@ #include "routerlist.h" #include "nodelist.h" +#include "buffers.h" #include "test.h" #include "test_helpers.h" @@ -92,3 +93,15 @@ helper_setup_fake_routerlist(void) UNMOCK(router_descriptor_is_older_than); } +void +connection_write_to_buf_mock(const char *string, size_t len, + connection_t *conn, int zlib) +{ + (void) zlib; + + tor_assert(string); + tor_assert(conn); + + write_to_buf(string, len, conn->outbuf); +} + diff --git a/src/test/test_helpers.h b/src/test/test_helpers.h index 684375e..b77a459 100644 --- a/src/test/test_helpers.h +++ b/src/test/test_helpers.h @@ -11,6 +11,10 @@ const char *get_yesterday_date_str(void); void helper_setup_fake_routerlist(void); +#define GET(path) "GET " path " HTTP/1.0\r\n\r\n" +void connection_write_to_buf_mock(const char *string, size_t len, + connection_t *conn, int zlib); + extern const char TEST_DESCRIPTORS[]; #endif diff --git a/src/test/test_hs_cache.c b/src/test/test_hs_cache.c index ee20225..ab4d2b9 100644 --- a/src/test/test_hs_cache.c +++ b/src/test/test_hs_cache.c @@ -11,6 +11,10 @@ #include "ed25519_cert.h" #include "hs_cache.h" #include "rendcache.h" +#include "directory.h" +#include "connection.h" + +#include "test_helpers.h" #include "test.h" /* Build an intro point using a blinded key and an address. */ @@ -282,12 +286,197 @@ test_clean_as_dir(void *arg) tor_free(desc1_str); } +/* Test helper: Fetch an HS descriptor from an HSDir (for the hidden service + with blinded_key. Return the received descriptor string. */ +static char * +helper_fetch_desc_from_hsdir(const ed25519_public_key_t *blinded_key) +{ + int retval; + + char *received_desc = NULL; + char *hsdir_query_str = NULL; + + /* The dir conn we are going to simulate */ + dir_connection_t *conn = NULL; + tor_addr_t mock_tor_addr; + + /* First extract the blinded public key that we are going to use in our + query, and then build the actual query string. */ + { + char hsdir_cache_key[ED25519_BASE64_LEN+1]; + + retval = ed25519_public_to_base64(hsdir_cache_key, + blinded_key); + tt_int_op(retval, ==, 0); + tor_asprintf(&hsdir_query_str, GET("/tor/hs/3/%s"), hsdir_cache_key); + } + + /* Simulate an HTTP GET request to the HSDir */ + conn = dir_connection_new(tor_addr_family(&mock_tor_addr)); + TO_CONN(conn)->linked = 1;/* Pretend the conn is encrypted :) */ + retval = directory_handle_command_get(conn, hsdir_query_str, + NULL, 0); + tt_int_op(retval, OP_EQ, 0); + + /* Read the descriptor that the HSDir just served us */ + { + char *headers = NULL; + size_t body_used = 0; + + fetch_from_buf_http(TO_CONN(conn)->outbuf, &headers, MAX_HEADERS_SIZE, + &received_desc, &body_used, 10000, 0); + } + + done: + tor_free(hsdir_query_str); + + return received_desc; +} + +/* Publish a descriptor to the HSDir, then fetch it. Check that the received + descriptor matches the published one. */ +static void +test_upload_and_download_hs_desc(void *arg) +{ + int retval; + hs_descriptor_t *published_desc; + + char *published_desc_str = NULL; + char *received_desc_str = NULL; + + (void) arg; + + /* Initialize HSDir cache subsystem */ + init_test(); + + /* Generate a valid descriptor with normal values. */ + { + published_desc = helper_build_hs_desc(42, 3 * 60 * 60, NULL); + tt_assert(published_desc); + retval = hs_desc_encode_descriptor(published_desc, &published_desc_str); + tt_int_op(retval, OP_EQ, 0); + } + + /* Publish descriptor to the HSDir */ + { + retval = handle_post_hs_descriptor("/tor/hs/3/publish",published_desc_str); + tt_int_op(retval, ==, 200); + } + + /* Simulate a fetch of the previously published descriptor */ + { + const ed25519_public_key_t *blinded_key; + blinded_key = &published_desc->plaintext_data.blinded_kp.pubkey; + received_desc_str = helper_fetch_desc_from_hsdir(blinded_key); + } + + /* Verify we received the exact same descriptor we published earlier */ + tt_str_op(received_desc_str, OP_EQ, published_desc_str); + + done: + tor_free(received_desc_str); + tor_free(published_desc_str); +} + +/* Test that HSDirs reject outdated descriptors based on their revision + * counter. Also test that HSDirs correctly replace old descriptors with newer + * descriptors. */ +static void +test_hsdir_revision_counter_check(void *arg) +{ + int retval; + + hs_descriptor_t *published_desc; + char *published_desc_str = NULL; + + char *received_desc_str = NULL; + hs_descriptor_t *received_desc = NULL; + + (void) arg; + + /* Initialize HSDir cache subsystem */ + init_test(); + + /* Generate a valid descriptor with normal values. */ + { + published_desc = helper_build_hs_desc(1312, 3 * 60 * 60, NULL); + tt_assert(published_desc); + retval = hs_desc_encode_descriptor(published_desc, &published_desc_str); + tt_int_op(retval, OP_EQ, 0); + } + + /* Publish descriptor to the HSDir */ + { + retval = handle_post_hs_descriptor("/tor/hs/3/publish",published_desc_str); + tt_int_op(retval, ==, 200); + } + + /* Try publishing again with the same revision counter: Should fail. */ + { + retval = handle_post_hs_descriptor("/tor/hs/3/publish",published_desc_str); + tt_int_op(retval, ==, 400); + } + + /* Fetch the published descriptor and validate the revision counter. */ + { + const ed25519_public_key_t *blinded_key; + + blinded_key = &published_desc->plaintext_data.blinded_kp.pubkey; + received_desc_str = helper_fetch_desc_from_hsdir(blinded_key); + + retval = hs_desc_decode_descriptor(received_desc_str,NULL, &received_desc); + tt_int_op(retval, ==, 0); + tt_assert(received_desc); + + /* Check that the revision counter is correct */ + tt_int_op(received_desc->plaintext_data.revision_counter, ==, 1312); + } + + /* Increment the revision counter and try again. Should work. */ + { + published_desc->plaintext_data.revision_counter = 1313; + tor_free(published_desc_str); + retval = hs_desc_encode_descriptor(published_desc, &published_desc_str); + tt_int_op(retval, OP_EQ, 0); + + retval = handle_post_hs_descriptor("/tor/hs/3/publish",published_desc_str); + tt_int_op(retval, ==, 200); + } + + /* Again, fetch the published descriptor and perform the revision counter + validation. The revision counter must have changed. */ + { + const ed25519_public_key_t *blinded_key; + + blinded_key = &published_desc->plaintext_data.blinded_kp.pubkey; + received_desc_str = helper_fetch_desc_from_hsdir(blinded_key); + + retval = hs_desc_decode_descriptor(received_desc_str,NULL, &received_desc); + tt_int_op(retval, ==, 0); + tt_assert(received_desc); + + /* Check that the revision counter is the latest */ + tt_int_op(received_desc->plaintext_data.revision_counter, ==, 1313); + } + + done: + hs_descriptor_free(published_desc); + hs_descriptor_free(received_desc); + tor_free(received_desc_str); + tor_free(published_desc_str); +} + struct testcase_t hs_cache[] = { /* Encoding tests. */ { "directory", test_directory, TT_FORK, NULL, NULL }, { "clean_as_dir", test_clean_as_dir, TT_FORK, NULL, NULL }, + { "hsdir_revision_counter_check", test_hsdir_revision_counter_check, TT_FORK, + NULL, NULL }, + { "upload_and_download_hs_desc", test_upload_and_download_hs_desc, TT_FORK, + NULL, NULL }, END_OF_TESTCASES }; +

1 0

[tor/master] prop224: Directory support for v3 descriptor fetch
by nickm＠torproject.org 04 Nov '16

04 Nov '16

commit f59990f24ddf3e5c7cdeb82c9e8cf16c7dcce56b Author: George Kadianakis <desnacked(a)riseup.net> Date: Thu Aug 25 11:04:59 2016 -0400 prop224: Directory support for v3 descriptor fetch Signed-off-by: David Goulet <dgoulet(a)torproject.org> Signed-off-by: George Kadianakis <desnacked(a)riseup.net> --- src/or/directory.c | 51 +++++++++++++++++++++++++++++++++++++++++++++++---- src/or/directory.h | 10 +++++++++- 2 files changed, 56 insertions(+), 5 deletions(-) diff --git a/src/or/directory.c b/src/or/directory.c index 8abdc45..f72bc55 100644 --- a/src/or/directory.c +++ b/src/or/directory.c @@ -3,6 +3,8 @@ * Copyright (c) 2007-2016, The Tor Project, Inc. */ /* See LICENSE for licensing information */ +#define DIRECTORY_PRIVATE + #include "or.h" #include "backtrace.h" #include "buffers.h" @@ -2770,8 +2772,8 @@ static int handle_get_descriptor(dir_connection_t *conn, const get_handler_args_t *args); static int handle_get_keys(dir_connection_t *conn, const get_handler_args_t *args); -static int handle_get_rendezvous2(dir_connection_t *conn, - const get_handler_args_t *args); +static int handle_get_hs_descriptor_v2(dir_connection_t *conn, + const get_handler_args_t *args); static int handle_get_robots(dir_connection_t *conn, const get_handler_args_t *args); static int handle_get_networkstatus_bridges(dir_connection_t *conn, @@ -2787,7 +2789,8 @@ static const url_table_ent_t url_table[] = { { "/tor/server/", 1, handle_get_descriptor }, { "/tor/extra/", 1, handle_get_descriptor }, { "/tor/keys/", 1, handle_get_keys }, - { "/tor/rendezvous2/", 1, handle_get_rendezvous2 }, + { "/tor/rendezvous2/", 1, handle_get_hs_descriptor_v2 }, + { "/tor/hs/3/", 1, handle_get_hs_descriptor_v3 }, { "/tor/robots.txt", 0, handle_get_robots }, { "/tor/networkstatus-bridges", 0, handle_get_networkstatus_bridges }, { NULL, 0, NULL }, @@ -3355,7 +3358,8 @@ handle_get_keys(dir_connection_t *conn, const get_handler_args_t *args) /** Helper function for GET /tor/rendezvous2/ */ static int -handle_get_rendezvous2(dir_connection_t *conn, const get_handler_args_t *args) +handle_get_hs_descriptor_v2(dir_connection_t *conn, + const get_handler_args_t *args) { const char *url = args->url; if (connection_dir_is_encrypted(conn)) { @@ -3389,6 +3393,45 @@ handle_get_rendezvous2(dir_connection_t *conn, const get_handler_args_t *args) return 0; } +/** Helper function for GET /tor/hs/3/<z>. Only for version 3. + */ +STATIC int +handle_get_hs_descriptor_v3(dir_connection_t *conn, + const get_handler_args_t *args) +{ + int retval; + char *desc_str = NULL; + const char *pubkey_str = NULL; + const char *url = args->url; + + /* Reject unencrypted dir connections */ + if (!connection_dir_is_encrypted(conn)) { + write_http_status_line(conn, 404, "Not found"); + goto done; + } + + /* After the path prefix follows the base64 encoded blinded pubkey which we + * use to get the descriptor from the cache. Skip the prefix and get the + * pubkey. */ + tor_assert(!strcmpstart(url, "/tor/hs/3/")); + pubkey_str = url + strlen("/tor/hs/3/"); + retval = hs_cache_lookup_as_dir(HS_VERSION_THREE, + pubkey_str, &desc_str); + if (retval < 0) { + write_http_status_line(conn, 404, "Not found"); + goto done; + } + + /* Found requested descriptor! Pass it to this nice client. */ + write_http_response_header(conn, strlen(desc_str), 0, 0); + connection_write_to_buf(desc_str, strlen(desc_str), TO_CONN(conn)); + + done: + tor_free(desc_str); + + return 0; +} + /** Helper function for GET /tor/networkstatus-bridges */ static int diff --git a/src/or/directory.h b/src/or/directory.h index a6c33d7..2fe42f2 100644 --- a/src/or/directory.h +++ b/src/or/directory.h @@ -134,8 +134,16 @@ time_t download_status_get_next_attempt_at(const download_status_t *dls); int purpose_needs_anonymity(uint8_t dir_purpose, uint8_t router_purpose); +#ifdef DIRECTORY_PRIVATE + +struct get_handler_args_t; +STATIC int handle_get_hs_descriptor_v3(dir_connection_t *conn, + const struct get_handler_args_t *args); + +#endif + #ifdef TOR_UNIT_TESTS -/* Used only by directory.c and test_dir.c */ +/* Used only by test_dir.c */ STATIC int parse_http_url(const char *headers, char **url); STATIC dirinfo_type_t dir_fetch_type(int dir_purpose, int router_purpose,

1 0

[tor/master] prop224: Add a cache free all function
by nickm＠torproject.org 04 Nov '16

04 Nov '16

commit 1eed6edf36d57c5f80a13a6884afda798fa2abcd Author: David Goulet <dgoulet(a)torproject.org> Date: Fri Sep 16 16:39:01 2016 -0400 prop224: Add a cache free all function Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- src/or/hs_cache.c | 16 ++++++++++++++++ src/or/hs_cache.h | 1 + src/or/main.c | 1 + 3 files changed, 18 insertions(+) diff --git a/src/or/hs_cache.c b/src/or/hs_cache.c index ec98b47..868f936 100644 --- a/src/or/hs_cache.c +++ b/src/or/hs_cache.c @@ -56,6 +56,15 @@ cache_dir_desc_free(hs_cache_dir_descriptor_t *desc) tor_free(desc); } +/* Helper function: Use by the free all function using the digest256map + * interface to cache entries. */ +static void +cache_dir_desc_free_(void *ptr) +{ + hs_cache_dir_descriptor_t *desc = ptr; + cache_dir_desc_free(desc); +} + /* Create a new directory cache descriptor object from a encoded descriptor. * On success, return the heap-allocated cache object, otherwise return NULL if * we can't decode the descriptor. */ @@ -366,3 +375,10 @@ hs_cache_init(void) hs_cache_v3_dir = digest256map_new(); } +/* Cleanup the hidden service cache subsystem. */ +void +hs_cache_free_all(void) +{ + tor_assert(hs_cache_v3_dir); + digest256map_free(hs_cache_v3_dir, cache_dir_desc_free_); +} diff --git a/src/or/hs_cache.h b/src/or/hs_cache.h index 88f84c1..01abb80 100644 --- a/src/or/hs_cache.h +++ b/src/or/hs_cache.h @@ -40,6 +40,7 @@ typedef struct hs_cache_dir_descriptor_t { /* Public API */ void hs_cache_init(void); +void hs_cache_free_all(void); void hs_cache_clean_as_dir(time_t now); size_t hs_cache_handle_oom(time_t now, size_t min_remove_bytes); diff --git a/src/or/main.c b/src/or/main.c index 9defdf0..6876236 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -2958,6 +2958,7 @@ tor_free_all(int postfork) rend_service_free_all(); rend_cache_free_all(); rend_service_authorization_free_all(); + hs_cache_free_all(); rep_hist_free_all(); dns_free_all(); clear_pending_onions();

1 0