tor-commits October 2013

tor-commits@lists.torproject.org

17 participants
1284 discussions

[translation/liveusb-creator] Update translations for liveusb-creator
by translation＠torproject.org 12 Oct '13

12 Oct '13

commit b95cf319069fbea906574a5e6b70c39599ee7697 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Oct 12 08:15:54 2013 +0000 Update translations for liveusb-creator --- ms_MY/ms_MY.po | 65 ++++++++++++++++++++++++++++---------------------------- 1 file changed, 33 insertions(+), 32 deletions(-) diff --git a/ms_MY/ms_MY.po b/ms_MY/ms_MY.po index 48b26b8..6fc73bc 100644 --- a/ms_MY/ms_MY.po +++ b/ms_MY/ms_MY.po @@ -3,13 +3,14 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# shahril <mohd_shahril_96(a)yahoo.com>, 2013 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2013-09-09 11:21+0200\n" -"PO-Revision-Date: 2013-09-09 09:44+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" +"PO-Revision-Date: 2013-10-12 08:00+0000\n" +"Last-Translator: shahril <mohd_shahril_96(a)yahoo.com>\n" "Language-Team: Malay (Malaysia) (http://www.transifex.com/projects/p/torproject/language/ms_MY/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -25,7 +26,7 @@ msgstr "" #: ../liveusb/gui.py:776 #, python-format msgid "%(filename)s selected" -msgstr "" +msgstr "%(filename)s dipilih" #: ../liveusb/creator.py:1004 #, python-format @@ -133,16 +134,16 @@ msgstr "" #: ../liveusb/gui.py:750 msgid "Download complete!" -msgstr "" +msgstr "Muat turun berjaya!" #: ../liveusb/gui.py:754 msgid "Download failed: " -msgstr "" +msgstr "Muat turun gagal:" #: ../liveusb/gui.py:88 #, python-format msgid "Downloading %s..." -msgstr "" +msgstr "Memuat turun %s..." #: ../liveusb/creator.py:1102 msgid "Drive is a loopback, skipping MBR reset" @@ -161,7 +162,7 @@ msgstr "" msgid "" "Error: Cannot set the label or obtain the UUID of your device. Unable to " "continue." -msgstr "" +msgstr "Ralat: Tidak dapat menetapkan label atau mendapatkan UUID peranti anda. Tidak dapat meneruskan." #: ../liveusb/creator.py:376 msgid "" @@ -180,11 +181,11 @@ msgstr "" #: ../liveusb/creator.py:140 msgid "ISO MD5 checksum passed" -msgstr "" +msgstr "ISO MD5 checksum diluluskan" #: ../liveusb/creator.py:138 msgid "ISO MD5 checksum verification failed" -msgstr "" +msgstr "ISO MD5 checksum pengesahan gagal" #: ../liveusb/dialog.py:156 msgid "" @@ -194,16 +195,16 @@ msgstr "" #: ../liveusb/gui.py:619 msgid "Installation complete!" -msgstr "" +msgstr "Pemasangan selesai!" #: ../liveusb/gui.py:279 #, python-format msgid "Installation complete! (%s)" -msgstr "" +msgstr "Pemasangan berjaya! (%s)" #: ../liveusb/gui.py:620 msgid "Installation was completed. Press OK to close this program." -msgstr "" +msgstr "Pemasangan telah selesai. Tekan OK untuk menutup program ini." #: ../liveusb/creator.py:900 ../liveusb/creator.py:1223 msgid "Installing bootloader..." @@ -211,7 +212,7 @@ msgstr "" #: ../liveusb/gui.py:284 msgid "LiveUSB creation failed!" -msgstr "" +msgstr "Penciptaan LiveUSB gagal!" #: ../liveusb/creator.py:1318 msgid "" @@ -236,7 +237,7 @@ msgstr "Seterusnya" #: ../liveusb/gui.py:562 #, python-format msgid "No free space on device %(device)s" -msgstr "" +msgstr "Tiada ruang bebas pada peranti %(device)s" #: ../liveusb/creator.py:797 msgid "No mount points found" @@ -251,7 +252,7 @@ msgstr "" #: ../liveusb/gui.py:543 msgid "Partition is FAT16; Restricting overlay size to 2G" -msgstr "" +msgstr "Partition adalah FAT16, saiz lapisan menyekat untuk 2G" #: ../liveusb/gui.py:539 msgid "Partition is FAT32; Restricting overlay size to 4G" @@ -264,7 +265,7 @@ msgstr "" #: ../liveusb/gui.py:610 msgid "Persistent Storage" -msgstr "" +msgstr "Simpanan Berterusan" #: ../liveusb/dialog.py:161 msgid "Persistent Storage (0 MB)" @@ -272,7 +273,7 @@ msgstr "" #: ../liveusb/gui.py:679 ../liveusb/gui.py:696 msgid "Press 'Next' if you wish to continue." -msgstr "" +msgstr "Tekan 'Seterusnya' jika anda ingin untuk meneruskan." #: ../liveusb/gui.py:456 msgid "Refreshing releases..." @@ -298,7 +299,7 @@ msgstr "" #: ../liveusb/gui.py:761 msgid "Select Live ISO" -msgstr "" +msgstr "Pilih Live ISO" #: ../liveusb/creator.py:182 msgid "Setting up OLPC boot file..." @@ -314,7 +315,7 @@ msgstr "" #: ../liveusb/creator.py:131 msgid "" "Source type does not support verification of ISO MD5 checksum, skipping" -msgstr "" +msgstr "Jenis sumber tidak menyokong pengesahan ISO MD5 checksum, melangkau" #: ../liveusb/creator.py:1130 msgid "Synchronizing data on disk..." @@ -328,7 +329,7 @@ msgstr "" msgid "" "The Master Boot Record on your device is blank. Pressing 'Create Live USB' " "again will reset the MBR on this device." -msgstr "" +msgstr "Rekod Master Boot pada peranti anda adalah kosong. Menekan 'Buat Live USB' sekali lagi akan menetapkan semula MBR pada peranti ini." #: ../liveusb/gui.py:764 msgid "" @@ -391,7 +392,7 @@ msgstr "" #: ../liveusb/gui.py:418 msgid "Unable to find any USB drive" -msgstr "" +msgstr "Tidak dapat mencari mana-mana pemacu USB" #: ../liveusb/creator.py:1184 msgid "Unable to find any removable device" @@ -408,7 +409,7 @@ msgstr "" #: ../liveusb/gui.py:671 msgid "Unable to mount device" -msgstr "" +msgstr "Tidak dapat melancarkan peranti" #: ../liveusb/creator.py:785 #, python-format @@ -434,7 +435,7 @@ msgstr "" msgid "" "Unable to use the selected file. You may have better luck if you move your " "ISO to the root of your drive (ie: C:\\)" -msgstr "" +msgstr "Tidak dapat menggunakan fail yang dipilih. Anda mungkin mempunyai nasib yang lebih baik jika anda pindahkan ISO anda ke direktori cakera keras anda (iaitu: C:\\)" #: ../liveusb/creator.py:692 #, python-format @@ -457,7 +458,7 @@ msgstr "" #: ../liveusb/gui.py:84 #, python-format msgid "Unknown release: %s" -msgstr "" +msgstr "Versi tidak diketahui : %s" #: ../liveusb/creator.py:822 #, python-format @@ -498,7 +499,7 @@ msgstr "" #: ../liveusb/creator.py:133 msgid "Verifying ISO MD5 checksum" -msgstr "" +msgstr "Mengesahkan ISO MD5 checksum" #: ../liveusb/creator.py:356 msgid "Verifying SHA1 checksum of LiveCD image..." @@ -514,26 +515,26 @@ msgstr "" #: ../liveusb/gui.py:677 msgid "Warning: All data on the selected drive will be lost." -msgstr "" +msgstr "Amaran: Semua data pada cakera yang dipilih akan hilang." #: ../liveusb/gui.py:694 msgid "" "Warning: Creating a new persistent overlay will delete your existing one." -msgstr "" +msgstr "Amaran: Mewujudkan lapisan berterusan baru akan memadam fail yang sedia ada." #: ../liveusb/gui.py:657 msgid "" "Warning: The Master Boot Record on your device does not match your system's " "syslinux MBR. If you have trouble booting this stick, try running the " "liveusb-creator with the --reset-mbr option." -msgstr "" +msgstr "Amaran: Rekod Master Boot pada peranti anda tidak sepadan dengan sistem anda syslinux MBR. Jika anda mempunyai masalah boot pagi peranti USB ini, cuba jalankan liveusb-creator dengan tetapan --reset-mbr." #: ../liveusb/gui.py:392 msgid "" "Warning: This tool needs to be run as an Administrator. To do this, right " "click on the icon and open the Properties. Under the Compatibility tab, " "check the \"Run this program as an administrator\" box." -msgstr "" +msgstr "Amaran: Alat ini perlu dijalankan sebagai Administrator. Untuk melakukan ini, klik kanan pada ikon dan membuka Properties. Di bawah tab Compatibility, klik pada kotak \"Run this program as an administrator\"." #: ../liveusb/creator.py:152 #, python-format @@ -548,17 +549,17 @@ msgstr "" #: ../liveusb/gui.py:755 msgid "You can try again to resume your download" -msgstr "" +msgstr "Anda boleh mencuba lagi untuk meneruskan muat turun" #: ../liveusb/creator.py:92 msgid "You must run this application as root" -msgstr "" +msgstr "Anda mesti menjalankan aplikasi ini sebagai root" #: ../liveusb/gui.py:691 msgid "" "Your device already contains a LiveOS.\n" "If you continue, this will be overwritten." -msgstr "" +msgstr "Peranti anda sudah mengandungi LiveOS.\nJika anda terus, ini akan ditulis ganti." #: ../liveusb/dialog.py:155 msgid "or"

1 0

[torbutton/master] Add changelog entries and bump version number for 1.6.3.
by mikeperry＠torproject.org 11 Oct '13

11 Oct '13

commit b1b117a31c7e5eeff4c1c9fa4c22327692d077f6 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Fri Oct 11 15:26:46 2013 -0700 Add changelog entries and bump version number for 1.6.3. --- src/CHANGELOG | 5 +++++ src/install.rdf | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/CHANGELOG b/src/CHANGELOG index a9eeff6..3d031c6 100644 --- a/src/CHANGELOG +++ b/src/CHANGELOG @@ -1,3 +1,8 @@ +1.6.3: + 11 Oct 2013: + * Bug 9224: Support multiple Tor socks ports for about:tor status check + * Bug 9587: Add TBB version number to about:tor + 1.6.2.1: 23 Sep 2013: * Bug 8839: Switch about:tor search link to unfiltered startpage link diff --git a/src/install.rdf b/src/install.rdf index 550c3b7..ed20e28 100644 --- a/src/install.rdf +++ b/src/install.rdf @@ -6,7 +6,7 @@ <em:name>Torbutton</em:name> <em:creator>Mike Perry</em:creator> <em:id>torbutton(a)torproject.org</em:id> - <em:version>1.6.2.1</em:version> + <em:version>1.6.3</em:version> <em:homepageURL>https://www.torproject.org/projects/torbrowser.html.en</em:homepageURL> <em:optionsURL>chrome://torbutton/content/preferences.xul</em:optionsURL> <em:iconURL>chrome://torbutton/skin/tor.png</em:iconURL>

1 0

[translation/torcheck_completed] Update translations for torcheck_completed
by translation＠torproject.org 11 Oct '13

11 Oct '13

commit 01d7f3e522bc70a7b12df8bd655dea7948213c18 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Oct 11 22:15:50 2013 +0000 Update translations for torcheck_completed --- zh_CN/torcheck.po | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/zh_CN/torcheck.po b/zh_CN/torcheck.po index a0a4e40..05c81d9 100644 --- a/zh_CN/torcheck.po +++ b/zh_CN/torcheck.po @@ -1,18 +1,19 @@ # TorCheck gettext template -# Copyright (C) 2008-2012 The Tor Project, Inc +# Copyright (C) 2008-2013 The Tor Project, Inc # # Translators: # simabull tsai, 2013 # simabull tsai, 2013 -# Kevin Chen <szescxz(a)126.com>, 2011 +# kwh <14alpaca(a)gmail.com>, 2013 +# Kevin Chen, 2011 # xtoaster <zhazhenzhong(a)gmail.com>, 2012 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2012-02-16 20:28+PDT\n" -"PO-Revision-Date: 2013-05-20 07:23+0000\n" -"Last-Translator: simabull tsai\n" +"PO-Revision-Date: 2013-10-11 22:00+0000\n" +"Last-Translator: kwh <14alpaca(a)gmail.com>\n" "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/torproject/language/zh_CN/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -21,8 +22,8 @@ msgstr "" "Language: zh_CN\n" "Plural-Forms: nplurals=1; plural=0;\n" -msgid "Congratulations. Your browser is configured to use Tor." -msgstr "祝贺。你的浏览器已配置为使用 Tor 网络了。" +msgid "Congratulations. This browser is configured to use Tor." +msgstr "恭喜您。这个浏览器已经在使用Tor。" msgid "" "Please refer to the <a href=\"https://www.torproject.org/\">Tor website</a> " @@ -58,3 +59,12 @@ msgstr "因发生临时服务故障，无法确定你的来源 IP 地址是否 msgid "Your IP address appears to be: " msgstr "你的 IP 地址显示为：" + +msgid "Are you using Tor?" +msgstr "你是否正在使用Tor?" + +msgid "This page is also available in the following languages:" +msgstr "该页面在以下语言中同样可用：" + +msgid "For more information about this exit relay, see:" +msgstr "想了解关于更多的信息关于这个退出节点，请看："

1 0

[translation/torcheck] Update translations for torcheck
by translation＠torproject.org 11 Oct '13

11 Oct '13

commit 8c97e6f22b1758450024fb8b74d461e28965caf1 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Oct 11 22:15:46 2013 +0000 Update translations for torcheck --- zh_CN/torcheck.po | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/zh_CN/torcheck.po b/zh_CN/torcheck.po index dead69f..05c81d9 100644 --- a/zh_CN/torcheck.po +++ b/zh_CN/torcheck.po @@ -4,6 +4,7 @@ # Translators: # simabull tsai, 2013 # simabull tsai, 2013 +# kwh <14alpaca(a)gmail.com>, 2013 # Kevin Chen, 2011 # xtoaster <zhazhenzhong(a)gmail.com>, 2012 msgid "" @@ -11,8 +12,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2012-02-16 20:28+PDT\n" -"PO-Revision-Date: 2013-10-03 09:07+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" +"PO-Revision-Date: 2013-10-11 22:00+0000\n" +"Last-Translator: kwh <14alpaca(a)gmail.com>\n" "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/torproject/language/zh_CN/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -22,7 +23,7 @@ msgstr "" "Plural-Forms: nplurals=1; plural=0;\n" msgid "Congratulations. This browser is configured to use Tor." -msgstr "" +msgstr "恭喜您。这个浏览器已经在使用Tor。" msgid "" "Please refer to the <a href=\"https://www.torproject.org/\">Tor website</a> " @@ -60,10 +61,10 @@ msgid "Your IP address appears to be: " msgstr "你的 IP 地址显示为：" msgid "Are you using Tor?" -msgstr "" +msgstr "你是否正在使用Tor?" msgid "This page is also available in the following languages:" -msgstr "" +msgstr "该页面在以下语言中同样可用：" msgid "For more information about this exit relay, see:" -msgstr "" +msgstr "想了解关于更多的信息关于这个退出节点，请看："

1 0

[tor/master] Fix out-of-tree "make check-local"
by nickm＠torproject.org 11 Oct '13

11 Oct '13

commit d5f050111ecd93c6ddb80be79ff9d636f40d5ed7 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Oct 11 13:42:27 2013 -0400 Fix out-of-tree "make check-local" --- src/test/include.am | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/test/include.am b/src/test/include.am index c452d26..41e1153 100644 --- a/src/test/include.am +++ b/src/test/include.am @@ -87,9 +87,9 @@ endif check-local: $(NTOR_TEST_DEPS) $(CMDLINE_TEST_TOR) if USEPYTHON - $(PYTHON) src/test/test_cmdline_args.py $(CMDLINE_TEST_TOR) "${top_srcdir}" + $(PYTHON) $(top_srcdir)/src/test/test_cmdline_args.py $(CMDLINE_TEST_TOR) "${top_srcdir}" if CURVE25519_ENABLED - $(PYTHON) src/test/ntor_ref.py test-tor - $(PYTHON) src/test/ntor_ref.py self-test + $(PYTHON) $(top_srcdir)/src/test/ntor_ref.py test-tor + $(PYTHON) $(top_srcdir)/src/test/ntor_ref.py self-test endif endif

1 0

[tor/master] When python is available, run the commandline unit tests from "make check"
by nickm＠torproject.org 11 Oct '13

11 Oct '13

commit 187398318ef9b8b66e0f19ef031a847e8824e1d1 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Oct 11 13:05:58 2013 -0400 When python is available, run the commandline unit tests from "make check" --- changes/python-tests | 4 ++++ configure.ac | 7 +++++++ src/test/include.am | 7 ++++++- 3 files changed, 17 insertions(+), 1 deletion(-) diff --git a/changes/python-tests b/changes/python-tests new file mode 100644 index 0000000..4373e31 --- /dev/null +++ b/changes/python-tests @@ -0,0 +1,4 @@ + o Minor features: + - "make check" now runs extra tests beyond the unit test scripts if + Python is installed. + diff --git a/configure.ac b/configure.ac index 926b53d..77767c5 100644 --- a/configure.ac +++ b/configure.ac @@ -183,6 +183,13 @@ AM_CONDITIONAL(NAT_PMP, test x$natpmp = xtrue) AM_CONDITIONAL(MINIUPNPC, test x$upnp = xtrue) AM_PROG_CC_C_O +AC_ARG_VAR(PYTHON) +AC_CHECK_PROGS(PYTHON, [python python2 python3]) +if test "x$PYTHON" = "x"; then + AC_MSG_WARN([Python unavailable; some tests will not be run.]) +fi +AM_CONDITIONAL(USEPYTHON, [test "x$PYTHON" != "x"]) + ifdef([AC_C_FLEXIBLE_ARRAY_MEMBER], [ AC_C_FLEXIBLE_ARRAY_MEMBER ], [ diff --git a/src/test/include.am b/src/test/include.am index 54adc40..ed0ef04 100644 --- a/src/test/include.am +++ b/src/test/include.am @@ -1,4 +1,4 @@ -TESTS+= src/test/test +TESTS += src/test/test noinst_PROGRAMS+= src/test/bench if UNITTESTS_ENABLED @@ -77,3 +77,8 @@ src_test_test_ntor_cl_AM_CPPFLAGS = \ endif +check-local: +if USEPYTHON + $(PYTHON) src/test/test_cmdline_args.py +endif +

1 0

[tor/master] When possible, run the ntor python integration tests too
by nickm＠torproject.org 11 Oct '13

11 Oct '13

commit f308adf8382bc7e61ea05a172057260cf8be9a6b Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Oct 11 13:21:42 2013 -0400 When possible, run the ntor python integration tests too --- src/test/include.am | 17 ++++++++++++++--- src/test/ntor_ref.py | 16 +++++++++++++--- src/test/test_cmdline_args.py | 15 ++++++++++++--- 3 files changed, 39 insertions(+), 9 deletions(-) diff --git a/src/test/include.am b/src/test/include.am index ed0ef04..c452d26 100644 --- a/src/test/include.am +++ b/src/test/include.am @@ -74,11 +74,22 @@ src_test_test_ntor_cl_LDADD = src/or/libtor.a src/common/libor.a \ @TOR_OPENSSL_LIBS@ @TOR_LIB_WS32@ @TOR_LIB_GDI@ @CURVE25519_LIBS@ src_test_test_ntor_cl_AM_CPPFLAGS = \ -I"$(top_srcdir)/src/or" +NTOR_TEST_DEPS=src/test/test-ntor-cl +else +NTOR_TEST_DEPS= +endif +if COVERAGE_ENABLED +CMDLINE_TEST_TOR = ./src/or/tor-cov +else +CMDLINE_TEST_TOR = ./src/or/tor endif -check-local: +check-local: $(NTOR_TEST_DEPS) $(CMDLINE_TEST_TOR) if USEPYTHON - $(PYTHON) src/test/test_cmdline_args.py + $(PYTHON) src/test/test_cmdline_args.py $(CMDLINE_TEST_TOR) "${top_srcdir}" +if CURVE25519_ENABLED + $(PYTHON) src/test/ntor_ref.py test-tor + $(PYTHON) src/test/ntor_ref.py self-test +endif endif - diff --git a/src/test/ntor_ref.py b/src/test/ntor_ref.py old mode 100644 new mode 100755 index ade468d..2a5f984 --- a/src/test/ntor_ref.py +++ b/src/test/ntor_ref.py @@ -1,3 +1,4 @@ +#!/usr/bin/python # Copyright 2012-2013, The Tor Project, Inc # See LICENSE for licensing information @@ -27,7 +28,13 @@ commands: """ import binascii -import curve25519 +try: + import curve25519 +except ImportError: + curve25519 = None + print "SKIPPING: No Python curve25519 module installed" + import sys + sys.exit(0) import hashlib import hmac import subprocess @@ -286,6 +293,7 @@ def demo(node_id="iToldYouAboutStairs.", server_key=PrivateKey()): assert len(skeys) == 72 assert len(ckeys) == 72 assert skeys == ckeys + print "OK" # ====================================================================== def timing(): @@ -368,13 +376,15 @@ def test_tor(): assert c_keys == s_keys assert len(c_keys) == 90 - print "We just interoperated." + print "OK" # ====================================================================== if __name__ == '__main__': import sys - if sys.argv[1] == 'gen_kdf_vectors': + if len(sys.argv) < 2: + print __doc__ + elif sys.argv[1] == 'gen_kdf_vectors': kdf_vectors() elif sys.argv[1] == 'timing': timing() diff --git a/src/test/test_cmdline_args.py b/src/test/test_cmdline_args.py index 5767a82..1b0963f 100755 --- a/src/test/test_cmdline_args.py +++ b/src/test/test_cmdline_args.py @@ -6,11 +6,20 @@ import os import re import shutil import subprocess +import sys import tempfile import unittest -TOR = "./src/or/tor-cov" -TOPDIR = "." +TOR = "./src/or/tor" +TOP_SRCDIR = "." + +if len(sys.argv) > 1: + TOR = sys.argv[1] + del sys.argv[1] + +if len(sys.argv) > 1: + TOP_SRCDIR = sys.argv[1] + del sys.argv[1] class UnexpectedSuccess(Exception): pass @@ -110,7 +119,7 @@ class CmdlineTests(unittest.TestCase): self.assertEquals(hashlib.sha1(inp).digest(), hashed) def test_digests(self): - main_c = os.path.join(TOPDIR, "src", "or", "main.c") + main_c = os.path.join(TOP_SRCDIR, "src", "or", "main.c") if os.stat(TOR).st_mtime < os.stat(main_c).st_mtime: self.skipTest(TOR+" not up to date")

1 0

[tor/master] Merge branch 'bug1376'
by nickm＠torproject.org 11 Oct '13

11 Oct '13

commit 0546edde66b3ca3dfbbd51f95b906d9e8f4f1459 Merge: 6f9584b 7ef9ecf Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Oct 11 12:51:15 2013 -0400 Merge branch 'bug1376' changes/bug1376 | 4 ++ src/common/util.c | 14 +++++-- src/common/util.h | 2 +- src/or/dirvote.c | 2 +- src/or/routerlist.c | 4 +- src/test/test_util.c | 107 ++++++++++++++++++++++++++++++++++++++++++++++++++ 6 files changed, 126 insertions(+), 7 deletions(-)

1 0

[tor/master] Added no_tempfile parameter to write_chunks_to_file to do non-atomic writes. Implements #1376.
by nickm＠torproject.org 11 Oct '13

11 Oct '13

commit 1bdb391ed0df979bc29ed1b62e7c0f3c9494a8d7 Author: Kevin Butler <haqkrs(a)gmail.com> Date: Sun Sep 1 00:24:07 2013 +0100 Added no_tempfile parameter to write_chunks_to_file to do non-atomic writes. Implements #1376. --- changes/bug1376 | 2 ++ src/common/util.c | 13 ++++++++++--- src/common/util.h | 2 +- src/or/dirvote.c | 2 +- src/or/routerlist.c | 4 ++-- 5 files changed, 16 insertions(+), 7 deletions(-) diff --git a/changes/bug1376 b/changes/bug1376 new file mode 100644 index 0000000..631f2af --- /dev/null +++ b/changes/bug1376 @@ -0,0 +1,2 @@ + o Minor bugfixes: + - Added additional argument to write_chunks_to_file to optionally skip using a temp file to do non-atomic writes. Implements ticket #1376. \ No newline at end of file diff --git a/src/common/util.c b/src/common/util.c index 6e14a58..4e84d94 100644 --- a/src/common/util.c +++ b/src/common/util.c @@ -2190,12 +2190,19 @@ write_chunks_to_file_impl(const char *fname, const smartlist_t *chunks, return -1; } -/** Given a smartlist of sized_chunk_t, write them atomically to a file - * fname, overwriting or creating the file as necessary. */ +/** Given a smartlist of sized_chunk_t, write them to a file + * fname, overwriting or creating the file as necessary. + * If no_tempfile is 0 then the file will be written + * atomically. */ int -write_chunks_to_file(const char *fname, const smartlist_t *chunks, int bin) +write_chunks_to_file(const char *fname, const smartlist_t *chunks, int bin, int no_tempfile) { int flags = OPEN_FLAGS_REPLACE|(bin?O_BINARY:O_TEXT); + + if (no_tempfile) { + // O_APPEND stops write_chunks_to_file from using tempfiles + flags |= O_APPEND; + } return write_chunks_to_file_impl(fname, chunks, flags); } diff --git a/src/common/util.h b/src/common/util.h index 090243e..24428ad 100644 --- a/src/common/util.h +++ b/src/common/util.h @@ -365,7 +365,7 @@ typedef struct sized_chunk_t { size_t len; } sized_chunk_t; int write_chunks_to_file(const char *fname, const struct smartlist_t *chunks, - int bin); + int bin, int no_tempfile); int append_bytes_to_file(const char *fname, const char *str, size_t len, int bin); int write_bytes_to_new_file(const char *fname, const char *str, size_t len, diff --git a/src/or/dirvote.c b/src/or/dirvote.c index 12ceba8..456a033 100644 --- a/src/or/dirvote.c +++ b/src/or/dirvote.c @@ -3143,7 +3143,7 @@ dirvote_compute_consensuses(void) }); votefile = get_datadir_fname("v3-status-votes"); - write_chunks_to_file(votefile, votestrings, 0); + write_chunks_to_file(votefile, votestrings, 0, 0); tor_free(votefile); SMARTLIST_FOREACH(votestrings, sized_chunk_t *, c, tor_free(c)); smartlist_free(votestrings); diff --git a/src/or/routerlist.c b/src/or/routerlist.c index 46da17e..3e8b9fb 100644 --- a/src/or/routerlist.c +++ b/src/or/routerlist.c @@ -428,7 +428,7 @@ trusted_dirs_flush_certs_to_disk(void) } DIGESTMAP_FOREACH_END; filename = get_datadir_fname("cached-certs"); - if (write_chunks_to_file(filename, chunks, 0)) { + if (write_chunks_to_file(filename, chunks, 0, 0)) { log_warn(LD_FS, "Error writing certificates to disk."); } tor_free(filename); @@ -1048,7 +1048,7 @@ router_rebuild_store(int flags, desc_store_t *store) smartlist_add(chunk_list, c); } SMARTLIST_FOREACH_END(sd); - if (write_chunks_to_file(fname_tmp, chunk_list, 1)<0) { + if (write_chunks_to_file(fname_tmp, chunk_list, 1, 1)<0) { log_warn(LD_FS, "Error writing router store to disk."); goto done; }

1 0

[tor/master] Added test for new write_chunks_to_file behaviour in #1376.
by nickm＠torproject.org 11 Oct '13

11 Oct '13

commit 0f070e7858d4270983141a701116de9353fb3fb6 Author: Kevin Butler <haqkrs(a)gmail.com> Date: Wed Sep 4 23:25:41 2013 +0100 Added test for new write_chunks_to_file behaviour in #1376. --- src/common/util.c | 5 ++- src/test/test_util.c | 116 ++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 119 insertions(+), 2 deletions(-) diff --git a/src/common/util.c b/src/common/util.c index 4e84d94..695d048 100644 --- a/src/common/util.c +++ b/src/common/util.c @@ -2191,11 +2191,12 @@ write_chunks_to_file_impl(const char *fname, const smartlist_t *chunks, } /** Given a smartlist of sized_chunk_t, write them to a file - * fname, overwriting or creating the file as necessary. + * fname, overwriting or creating the file as necessary. * If no_tempfile is 0 then the file will be written * atomically. */ int -write_chunks_to_file(const char *fname, const smartlist_t *chunks, int bin, int no_tempfile) +write_chunks_to_file(const char *fname, const smartlist_t *chunks, int bin, + int no_tempfile) { int flags = OPEN_FLAGS_REPLACE|(bin?O_BINARY:O_TEXT); diff --git a/src/test/test_util.c b/src/test/test_util.c index 05d28d7..6f2bddd 100644 --- a/src/test/test_util.c +++ b/src/test/test_util.c @@ -102,6 +102,121 @@ test_util_read_file_eof_zero_bytes(void *arg) test_util_read_until_eof_impl("tor_test_fifo_empty", 0, 10000); } +/* Test the basic expected behaviour for write_chunks_to_file. +* NOTE: This will need to be updated if we ever change the tempfile location +* or extension */ +static void +test_util_write_chunks_to_file(void *arg) +{ + char *fname; + char *tempname; + char *str; + char *data_str; + char *temp_str; + int r; + int fd = -1; + size_t sz = 999999; + (void)arg; + + /* These should be two different sizes to ensure the data is different + * between the data file and the temp file's 'known string' */ + int temp_str_len = 1024; + int data_str_len = 512; + temp_str = tor_malloc(temp_str_len); + data_str = tor_malloc(data_str_len); + crypto_rand(temp_str, temp_str_len); + crypto_rand(data_str, data_str_len); + tt_assert(temp_str != NULL); + tt_assert(data_str != NULL); + + // Ensure it can write multiple chunks + smartlist_t *chunks = smartlist_new(); + sized_chunk_t c = {data_str, data_str_len/2}; + sized_chunk_t c2 = {data_str + data_str_len/2, data_str_len/2}; + smartlist_add(chunks, &c); + smartlist_add(chunks, &c2); + + /* + * Check if it writes using a tempfile + */ + fname = tor_strdup("tor_test_write_chunks_to_file_with_tempfile"); + tor_asprintf(&tempname, "%s.tmp", fname); + + // write a known string to a file where the tempfile will be + r = write_bytes_to_file(tempname, temp_str, temp_str_len, 1); + tt_int_op(r, ==, 0); + + // call write_chunks_to_file + r = write_chunks_to_file(fname, chunks, 1, 0); + tt_int_op(r, ==, 0); + + // assert the file has been written (expected size) + fd = open(fname, O_RDONLY|O_BINARY); + tt_int_op(fd, >=, 0); + str = read_file_to_str_until_eof(fd, data_str_len*2, &sz); + tt_assert(str != NULL); + tt_int_op(sz, ==, data_str_len); + test_mem_op(data_str, ==, str, sz); + tor_free(str); + close(fd); + + // assert that the tempfile is removed (should not leave artifacts) + fd = open(tempname, O_RDONLY|O_BINARY); + tt_int_op(fd, <, 0); // This might be untrue + str = read_file_to_str_until_eof(fd, temp_str_len*2, &sz); + tt_assert(str == NULL); + + // Remove old testfile for second test + r = unlink(fname); + tt_int_op(r, ==, 0); + tor_free(fname); + tor_free(tempname); + + /* + * Check if it skips using a tempfile with flags + */ + fname = tor_strdup("tor_test_write_chunks_to_file_with_no_tempfile"); + tor_asprintf(&tempname, "%s.tmp", fname); + + // write a known string to a file where the tempfile will be + r = write_bytes_to_file(tempname, temp_str, temp_str_len, 1); + tt_int_op(r, ==, 0); + + // call write_chunks_to_file with no_tempfile = true + r = write_chunks_to_file(fname, chunks, 1, 1); + tt_int_op(r, ==, 0); + + // assert the file has been written (expected size) + fd = open(fname, O_RDONLY|O_BINARY); + tt_int_op(fd, >=, 0); + str = read_file_to_str_until_eof(fd, data_str_len*2, &sz); + tt_assert(str != NULL); + tt_int_op(sz, ==, data_str_len); + test_mem_op(data_str, ==, str, sz); + tor_free(str); + close(fd); + + // assert the tempfile still contains the known string + fd = open(tempname, O_RDONLY|O_BINARY); + tt_int_op(fd, >=, 0); // This might be untrue + str = read_file_to_str_until_eof(fd, temp_str_len*2, &sz); + tt_assert(str != NULL); + tt_int_op(sz, ==, temp_str_len); + test_mem_op(temp_str, ==, str, sz); + + done: + unlink(fname); + unlink(tempname); + smartlist_free(chunks); + tor_free(fname); + tor_free(tempname); + tor_free(str); + tor_free(data_str); + tor_free(temp_str); + if (fd >= 0) + close(fd); +} + static void test_util_time(void) { @@ -3502,6 +3617,7 @@ struct testcase_t util_tests[] = { UTIL_TEST(read_file_eof_tiny_limit, 0), UTIL_TEST(read_file_eof_two_loops, 0), UTIL_TEST(read_file_eof_zero_bytes, 0), + UTIL_TEST(write_chunks_to_file, 0), UTIL_TEST(mathlog, 0), UTIL_TEST(weak_random, 0), UTIL_TEST(socket, TT_FORK),

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits October 2013