April 2014 - tor-commits - lists.torproject.org

[translation/tails-persistence-setup_completed] Update translations for tails-persistence-setup_completed
by translation＠torproject.org 19 Apr '14

19 Apr '14

commit a820b72380398e5dce5540052831dedb1a0070a5 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Apr 19 18:45:25 2014 +0000 Update translations for tails-persistence-setup_completed --- zh_CN/zh_CN.po | 51 ++++++++++++++++++++++++++------------------------- 1 file changed, 26 insertions(+), 25 deletions(-) diff --git a/zh_CN/zh_CN.po b/zh_CN/zh_CN.po index e67425d..d0cc768 100644 --- a/zh_CN/zh_CN.po +++ b/zh_CN/zh_CN.po @@ -6,13 +6,14 @@ # simabull tsai, 2013 # simabull tsai, 2013 # SanyaChang <408070986(a)qq.com>, 2013 +# Y.F Yang <yfdyh000(a)gmail.com>, 2014 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: Tails developers <tails(a)boum.org>\n" -"POT-Creation-Date: 2013-11-07 16:37+0100\n" -"PO-Revision-Date: 2013-11-15 09:19+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" +"POT-Creation-Date: 2014-04-16 21:26+0200\n" +"PO-Revision-Date: 2014-04-19 18:38+0000\n" +"Last-Translator: Y.F Yang <yfdyh000(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" @@ -121,67 +122,67 @@ msgstr "连入 $HOME 的符号链接，'.'开头目录中的所有文件和文 msgid "Setup Tails persistent volume" msgstr "设置 Tails 持久卷" -#: ../lib/Tails/Persistence/Setup.pm:331 +#: ../lib/Tails/Persistence/Setup.pm:337 #, perl-format msgid "Device %s already has a persistent volume." msgstr "设备 %s 中已经存在持久卷。" -#: ../lib/Tails/Persistence/Setup.pm:339 +#: ../lib/Tails/Persistence/Setup.pm:345 #, perl-format msgid "Device %s has not enough unallocated space." msgstr "设置 %s 空闲空间不足。" -#: ../lib/Tails/Persistence/Setup.pm:347 ../lib/Tails/Persistence/Setup.pm:361 +#: ../lib/Tails/Persistence/Setup.pm:353 ../lib/Tails/Persistence/Setup.pm:367 #, perl-format msgid "Device %s has no persistent volume." msgstr "设备 %s 中不存在持久卷。" -#: ../lib/Tails/Persistence/Setup.pm:353 +#: ../lib/Tails/Persistence/Setup.pm:359 msgid "" "Cannot delete the persistent volume while in use. You should restart Tails " "without persistence." msgstr "持久卷使用中，无法删除。您需要以 Live 模式重启 Tails 。" -#: ../lib/Tails/Persistence/Setup.pm:372 +#: ../lib/Tails/Persistence/Setup.pm:378 msgid "Persistence volume is not unlocked." msgstr "持久卷未锁定。" -#: ../lib/Tails/Persistence/Setup.pm:377 +#: ../lib/Tails/Persistence/Setup.pm:383 msgid "Persistence volume is not mounted." msgstr "持久卷未挂载。" -#: ../lib/Tails/Persistence/Setup.pm:382 +#: ../lib/Tails/Persistence/Setup.pm:388 msgid "Persistence volume is not readable. Permissions or ownership problems?" msgstr "从持久卷中读取失败。文件权限或文件所有者有误？" -#: ../lib/Tails/Persistence/Setup.pm:387 +#: ../lib/Tails/Persistence/Setup.pm:393 msgid "Persistence volume is not writable. Maybe it was mounted read-only?" msgstr "向持久卷中写入失败。可能已以只读模式挂载？" -#: ../lib/Tails/Persistence/Setup.pm:396 +#: ../lib/Tails/Persistence/Setup.pm:402 #, perl-format msgid "Tails is running from non-USB / non-SDIO device %s." msgstr "Tails 正在非USB/非SDIO设备上运行%s." -#: ../lib/Tails/Persistence/Setup.pm:402 +#: ../lib/Tails/Persistence/Setup.pm:408 #, perl-format msgid "Device %s is optical." msgstr "设备 %s 为光盘设备。" -#: ../lib/Tails/Persistence/Setup.pm:409 +#: ../lib/Tails/Persistence/Setup.pm:415 #, perl-format -msgid "Device %s was not created using Tails USB installer." -msgstr "设备 %s 是不 Tails USB 安装程序生成的。" +msgid "Device %s was not created using Tails Installer." +msgstr "设备 %s 未使用 Tails 安装器创建。" -#: ../lib/Tails/Persistence/Setup.pm:444 +#: ../lib/Tails/Persistence/Setup.pm:450 msgid "Error" msgstr "错误" -#: ../lib/Tails/Persistence/Setup.pm:680 +#: ../lib/Tails/Persistence/Setup.pm:670 msgid "Persistence wizard - Finished" msgstr "持久存储向导 - 完成" -#: ../lib/Tails/Persistence/Setup.pm:683 +#: ../lib/Tails/Persistence/Setup.pm:673 msgid "" "Any changes you have made will only take effect after restarting Tails.\n" "\n" @@ -290,28 +291,28 @@ msgstr "正在保存..." msgid "Saving persistence configuration..." msgstr "正在保存持久存储配置..." -#: ../lib/Tails/Persistence/Step/Delete.pm:40 +#: ../lib/Tails/Persistence/Step/Delete.pm:41 msgid "Persistence wizard - Persistent volume deletion" msgstr "持久存储向导 - 删除持久卷" -#: ../lib/Tails/Persistence/Step/Delete.pm:43 +#: ../lib/Tails/Persistence/Step/Delete.pm:44 msgid "Your persistent data will be deleted." msgstr "您的存储于持久卷中的数据将被删除。" -#: ../lib/Tails/Persistence/Step/Delete.pm:47 +#: ../lib/Tails/Persistence/Step/Delete.pm:48 #, perl-format msgid "" "The persistent volume %s (%s), on the %s %s device, will be deleted." msgstr "持久卷 %s (%s) 将被删除，此卷位于设备 %s %s 上。" -#: ../lib/Tails/Persistence/Step/Delete.pm:53 +#: ../lib/Tails/Persistence/Step/Delete.pm:54 msgid "Delete" msgstr "删除" -#: ../lib/Tails/Persistence/Step/Delete.pm:91 +#: ../lib/Tails/Persistence/Step/Delete.pm:101 msgid "Deleting..." msgstr "正在删除..." -#: ../lib/Tails/Persistence/Step/Delete.pm:94 +#: ../lib/Tails/Persistence/Step/Delete.pm:104 msgid "Deleting the persistent volume..." msgstr "正在删除持久卷..."

1 0

[translation/tails-persistence-setup] Update translations for tails-persistence-setup
by translation＠torproject.org 19 Apr '14

19 Apr '14

commit 70636d3b31ece264ef4cece6c9bdb38c1bdac394 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Apr 19 18:45:21 2014 +0000 Update translations for tails-persistence-setup --- zh_CN/zh_CN.po | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/zh_CN/zh_CN.po b/zh_CN/zh_CN.po index ca7826b..d0cc768 100644 --- a/zh_CN/zh_CN.po +++ b/zh_CN/zh_CN.po @@ -6,13 +6,14 @@ # simabull tsai, 2013 # simabull tsai, 2013 # SanyaChang <408070986(a)qq.com>, 2013 +# Y.F Yang <yfdyh000(a)gmail.com>, 2014 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: Tails developers <tails(a)boum.org>\n" "POT-Creation-Date: 2014-04-16 21:26+0200\n" -"PO-Revision-Date: 2014-04-17 09:09+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" +"PO-Revision-Date: 2014-04-19 18:38+0000\n" +"Last-Translator: Y.F Yang <yfdyh000(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" @@ -171,7 +172,7 @@ msgstr "设备 %s 为光盘设备。" #: ../lib/Tails/Persistence/Setup.pm:415 #, perl-format msgid "Device %s was not created using Tails Installer." -msgstr "" +msgstr "设备 %s 未使用 Tails 安装器创建。" #: ../lib/Tails/Persistence/Setup.pm:450 msgid "Error"

1 0

r26719: {website} There's a simpler way to run Tor Browser in Ubuntu. (website/trunk/docs/en)
by Matt Pagan 19 Apr '14

19 Apr '14

Author: mttp Date: 2014-04-19 18:43:28 +0000 (Sat, 19 Apr 2014) New Revision: 26719 Modified: website/trunk/docs/en/faq.wml Log: There's a simpler way to run Tor Browser in Ubuntu. Modified: website/trunk/docs/en/faq.wml =================================================================== --- website/trunk/docs/en/faq.wml 2014-04-19 02:19:51 UTC (rev 26718) +++ website/trunk/docs/en/faq.wml 2014-04-19 18:43:28 UTC (rev 26719) @@ -1190,9 +1190,12 @@ <h3><a class="anchor" href="#Ubuntu"> I'm using Ubuntu and I can't start Tor Browser.</a></h3> -Ubuntu prevents its users from executing shell scripts by clicking them, -even when the file permissions are set correctly. For now you need to -start the Tor Browser from the command line by running +You'll need to tell Ubuntu that you want the ability to execute shell scripts +from the graphical interface. Open "Files" (Unity's explorer), open +Preferences-> Behavior Tab -> Check "Run executable text files when they are +opened" then OK. + +You can also start the Tor Browser from the command line by running <pre>./start-tor-browser</pre> from inside the Tor Browser directory.

1 0

[translation/liveusb-creator_completed] Update translations for liveusb-creator_completed
by translation＠torproject.org 19 Apr '14

19 Apr '14

commit 9c2489cc9178b1a2c6fb9fe831daf6bd84fcfca2 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Apr 19 17:45:24 2014 +0000 Update translations for liveusb-creator_completed --- fr/fr.po | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/fr/fr.po b/fr/fr.po index e6583b6..f75a8b2 100644 --- a/fr/fr.po +++ b/fr/fr.po @@ -3,6 +3,7 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# bassmax, 2014 # chioubaca <chioubaca(a)gmail.com>, 2014 # arpalord <arpalord(a)gmail.com>, 2012 # Charles-Antoine Couret, 2009 @@ -18,9 +19,9 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-03-06 18:42+0100\n" -"PO-Revision-Date: 2014-03-07 09:20+0000\n" -"Last-Translator: chioubaca <chioubaca(a)gmail.com>\n" +"POT-Creation-Date: 2014-04-16 21:40+0200\n" +"PO-Revision-Date: 2014-04-19 17:25+0000\n" +"Last-Translator: bassmax\n" "Language-Team: French (http://www.transifex.com/projects/p/torproject/language/fr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -552,7 +553,7 @@ 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 "Attention : cet outil doit être lancé en tant qu'Administrateur. Pour cela, clic-droit sur l'icône et ouvrez les Propriétés. Dans l'onglet Compatibilité, cochez la case \"Lancer ce programme en tant qu'Administrateur\"." +msgstr "Attention : cet outil doit être exécuté en tant qu'Administrateur. Pour cela, clic-droit sur l'icône et ouvrez les Propriétés. Dans l'onglet Compatibilité, cochez la case \"Exécuter ce programme en tant qu'Administrateur\"." #: ../liveusb/creator.py:152 #, python-format

1 0

[translation/liveusb-creator] Update translations for liveusb-creator
by translation＠torproject.org 19 Apr '14

19 Apr '14

commit 29dbf9e91c397944229dcfec24e851be81201d88 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Apr 19 17:45:18 2014 +0000 Update translations for liveusb-creator --- fr/fr.po | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/fr/fr.po b/fr/fr.po index e6583b6..f75a8b2 100644 --- a/fr/fr.po +++ b/fr/fr.po @@ -3,6 +3,7 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# bassmax, 2014 # chioubaca <chioubaca(a)gmail.com>, 2014 # arpalord <arpalord(a)gmail.com>, 2012 # Charles-Antoine Couret, 2009 @@ -18,9 +19,9 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-03-06 18:42+0100\n" -"PO-Revision-Date: 2014-03-07 09:20+0000\n" -"Last-Translator: chioubaca <chioubaca(a)gmail.com>\n" +"POT-Creation-Date: 2014-04-16 21:40+0200\n" +"PO-Revision-Date: 2014-04-19 17:25+0000\n" +"Last-Translator: bassmax\n" "Language-Team: French (http://www.transifex.com/projects/p/torproject/language/fr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -552,7 +553,7 @@ 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 "Attention : cet outil doit être lancé en tant qu'Administrateur. Pour cela, clic-droit sur l'icône et ouvrez les Propriétés. Dans l'onglet Compatibilité, cochez la case \"Lancer ce programme en tant qu'Administrateur\"." +msgstr "Attention : cet outil doit être exécuté en tant qu'Administrateur. Pour cela, clic-droit sur l'icône et ouvrez les Propriétés. Dans l'onglet Compatibilité, cochez la case \"Exécuter ce programme en tant qu'Administrateur\"." #: ../liveusb/creator.py:152 #, python-format

1 0

[bridgedb/master] Actually, let's call it 0.2.0. Threading and UI changed enough, right?
by isis＠torproject.org 19 Apr '14

19 Apr '14

commit 073d5c895477fd6985e51013167de636adc10868 Author: Isis Lovecruft <isis(a)torproject.org> Date: Sat Apr 19 16:50:40 2014 +0000 Actually, let's call it 0.2.0. Threading and UI changed enough, right? --- CHANGELOG | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG b/CHANGELOG index 1db9dc5..f640282 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,4 +1,4 @@ -Changes in version 0.1.7 - +Changes in version 0.2.0 - 2014-04-19 * FIXES #5232 Perform long running and blocking transactions in background threads. Primarily this moves bridge descriptor reparsing into another thread, which significantly increases

1 0

[bridgedb/master] Merge branch 'release-0.2.0'
by isis＠torproject.org 19 Apr '14

19 Apr '14

commit 10dd8522d76dbb020438fc59ca50fe71830aecdf Merge: f266f32 073d5c8 Author: Isis Lovecruft <isis(a)torproject.org> Date: Sat Apr 19 16:57:44 2014 +0000 Merge branch 'release-0.2.0' .travis.yml | 2 +- CHANGELOG | 269 +++++++---- bridgedb.conf | 24 +- doc/sphinx/source/bridgedb.Util.rst | 6 +- doc/sphinx/source/bridgedb.captcha.rst | 2 + doc/sphinx/source/bridgedb.rst | 5 +- doc/sphinx/source/bridgedb.safelog.rst | 9 + doc/sphinx/source/bridgedb.txrecaptcha.rst | 9 + doc/sphinx/source/conf.py | 5 +- doc/sphinx/source/gen_bridge_descriptors.rst | 7 - lib/bridgedb/Bridges.py | 93 ++-- lib/bridgedb/Bucket.py | 104 ++--- lib/bridgedb/Dist.py | 271 ++++------- lib/bridgedb/EmailServer.py | 476 +++++++++----------- lib/bridgedb/HTTPServer.py | 183 +++----- lib/bridgedb/I18n.py | 6 +- lib/bridgedb/Main.py | 280 ++++++------ lib/bridgedb/Stability.py | 204 ++++----- lib/bridgedb/Storage.py | 158 ++++++- lib/bridgedb/Tests.py | 13 +- lib/bridgedb/Util.py | 12 - lib/bridgedb/__init__.py | 2 - lib/bridgedb/_langs.py | 2 + lib/bridgedb/captcha.py | 24 +- lib/bridgedb/crypto.py | 179 ++++++++ lib/bridgedb/parse/addr.py | 185 +++++++- lib/bridgedb/runner.py | 19 +- lib/bridgedb/safelog.py | 197 ++++++++ lib/bridgedb/templates/assets/bootstrap.min.css | 9 - lib/bridgedb/templates/assets/bridgedb.png | Bin 0 -> 2946 bytes .../templates/assets/css/bootstrap.min.css | 7 + lib/bridgedb/templates/assets/css/custom.css | 122 +++++ .../templates/assets/css/font-awesome-ie7.min.css | 384 ++++++++++++++++ .../templates/assets/css/font-awesome.min.css | 403 +++++++++++++++++ lib/bridgedb/templates/assets/css/main.css | 24 + lib/bridgedb/templates/assets/custom.css | 104 ----- .../templates/assets/font/fontawesome-webfont.eot | Bin 0 -> 37405 bytes .../templates/assets/font/fontawesome-webfont.svg | 399 ++++++++++++++++ .../templates/assets/font/fontawesome-webfont.ttf | Bin 0 -> 79076 bytes .../templates/assets/font/fontawesome-webfont.woff | Bin 0 -> 43572 bytes lib/bridgedb/templates/assets/font/lato-bold.woff | Bin 0 -> 46160 bytes .../templates/assets/font/lato-italic.woff | Bin 0 -> 47168 bytes .../templates/assets/font/lato-regular.woff | Bin 0 -> 46108 bytes lib/bridgedb/templates/assets/tor-roots-blue.svg | 95 ++++ lib/bridgedb/templates/base.html | 76 ++-- lib/bridgedb/templates/bridges.html | 89 +++- lib/bridgedb/templates/captcha.html | 71 ++- lib/bridgedb/templates/howto.html | 47 ++ lib/bridgedb/templates/index.html | 33 +- lib/bridgedb/templates/options.html | 198 ++++++-- lib/bridgedb/templates/static/bridgedb.asc | 274 +++++++++++ lib/bridgedb/test/test_EmailServer.py | 250 +++++++++- lib/bridgedb/test/test_HTTPServer.py | 104 +++-- lib/bridgedb/test/test_Storage.py | 56 +++ lib/bridgedb/test/test_bridgedb.py | 41 +- lib/bridgedb/test/test_captcha.py | 104 ++++- lib/bridgedb/test/test_safelog.py | 336 ++++++++++++++ lib/bridgedb/test/test_translations.py | 78 ++++ lib/bridgedb/translations.py | 122 +++++ lib/bridgedb/util.py | 207 +++++++++ setup.py | 10 +- 61 files changed, 5050 insertions(+), 1339 deletions(-)

1 0

[bridgedb/master] Add bridgedb.safelog sources to Sphinx build configs.
by isis＠torproject.org 19 Apr '14

19 Apr '14

commit 6a0ed07abf32366642badd9c32c0b0a55fd37688 Author: Isis Lovecruft <isis(a)torproject.org> Date: Mon Apr 7 12:16:21 2014 +0000 Add bridgedb.safelog sources to Sphinx build configs. --- doc/sphinx/source/bridgedb.rst | 1 + doc/sphinx/source/bridgedb.safelog.rst | 9 +++++++++ doc/sphinx/source/conf.py | 1 + 3 files changed, 11 insertions(+) diff --git a/doc/sphinx/source/bridgedb.rst b/doc/sphinx/source/bridgedb.rst index 86e5abf..ac143cd 100644 --- a/doc/sphinx/source/bridgedb.rst +++ b/doc/sphinx/source/bridgedb.rst @@ -18,6 +18,7 @@ bridgedb bridgedb.parse bridgedb.persistent bridgedb.runner + bridgedb.safelog bridgedb.Stability bridgedb.Storage bridgedb.Tests diff --git a/doc/sphinx/source/bridgedb.safelog.rst b/doc/sphinx/source/bridgedb.safelog.rst new file mode 100644 index 0000000..f6f3d50 --- /dev/null +++ b/doc/sphinx/source/bridgedb.safelog.rst @@ -0,0 +1,9 @@ +.. _safelog: + +bridgedb.safelog +---------------- + +.. automodule:: bridgedb.safelog + :members: + :undoc-members: + :show-inheritance: diff --git a/doc/sphinx/source/conf.py b/doc/sphinx/source/conf.py index 2f05ca7..9ab7b73 100644 --- a/doc/sphinx/source/conf.py +++ b/doc/sphinx/source/conf.py @@ -39,6 +39,7 @@ import bridgedb.I18n import bridgedb.Main import bridgedb.persistent import bridgedb.runner +import bridgedb.safelog import bridgedb.Stability import bridgedb.Storage import bridgedb.test

1 0

[bridgedb/master] Move manual safelog setting and functions to bridgedb.safelog module.
by isis＠torproject.org 19 Apr '14

19 Apr '14

commit b5734531a5d1e8789638a7c1d8cb45e8650fd3af Author: Isis Lovecruft <isis(a)torproject.org> Date: Mon Apr 7 11:23:47 2014 +0000 Move manual safelog setting and functions to bridgedb.safelog module. * MOVE util.safe_logging → safelog.safe_logging. * MOVE util.set_safe_logging → safelog.setSafeLogging * MOVE util.logSafely → safelog.logSafely * REMOVE manual calls to `logSafely()` for values which are automatically scrubbed. --- lib/bridgedb/Bridges.py | 10 +++++----- lib/bridgedb/Dist.py | 23 +++++++++++------------ lib/bridgedb/EmailServer.py | 24 ++++++++++++------------ lib/bridgedb/HTTPServer.py | 15 +++++++-------- lib/bridgedb/Main.py | 17 +++++++++-------- lib/bridgedb/safelog.py | 1 + lib/bridgedb/util.py | 9 --------- 7 files changed, 45 insertions(+), 54 deletions(-) diff --git a/lib/bridgedb/Bridges.py b/lib/bridgedb/Bridges.py index a60ff85..3ed1eff 100644 --- a/lib/bridgedb/Bridges.py +++ b/lib/bridgedb/Bridges.py @@ -23,10 +23,10 @@ import random import bridgedb.Storage import bridgedb.Bucket -from bridgedb import util from bridgedb.crypto import getHMACFunc from bridgedb.parse import addr from bridgedb.parse import networkstatus +from bridgedb.safelog import logSafely try: from cStringIO import StringIO @@ -1035,7 +1035,7 @@ class BridgeRing(BridgeHolder): else: logging.debug( "Got duplicate bridge %r in main hashring for position %r." - % (util.logSafely(k.encode('hex')), pos.encode('hex'))) + % (logSafely(k.encode('hex')), pos.encode('hex'))) keys = keys[:N] keys.sort() @@ -1280,12 +1280,12 @@ class FilteredBridgeSplitter(BridgeHolder): if not bridge.running: logging.warn( "Skipping hashring insertion for non-running bridge: '%s'" - % util.logSafely(bridge.fingerprint)) + % logSafely(bridge.fingerprint)) return index = 0 logging.debug("Inserting %s into splitter" - % (util.logSafely(bridge.fingerprint))) + % (logSafely(bridge.fingerprint))) for old_bridge in self.bridges[:]: if bridge.fingerprint == old_bridge.fingerprint: self.bridges[index] = bridge @@ -1297,7 +1297,7 @@ class FilteredBridgeSplitter(BridgeHolder): if filterFn(bridge): subring.insert(bridge) logging.debug("Inserted bridge '%s' into '%s' sub hashring" - % (util.logSafely(bridge.fingerprint), ringname)) + % (logSafely(bridge.fingerprint), ringname)) def extractFilterNames(self, ringname): """Get the names of the filters applied to a particular sub hashring. diff --git a/lib/bridgedb/Dist.py b/lib/bridgedb/Dist.py index c6e8756..38ca36d 100644 --- a/lib/bridgedb/Dist.py +++ b/lib/bridgedb/Dist.py @@ -22,13 +22,13 @@ from ipaddr import IPAddress import bridgedb.Bridges import bridgedb.Storage -from bridgedb import util from bridgedb.crypto import getHMAC from bridgedb.crypto import getHMACFunc from bridgedb.Filters import filterAssignBridgesToRing from bridgedb.Filters import filterBridgesByRules from bridgedb.Filters import filterBridgesByIP4 from bridgedb.Filters import filterBridgesByIP6 +from bridgedb.safelog import logSafely def uniformMap(ip): @@ -237,7 +237,7 @@ class IPBasedDistributor(Distributor): for an example of how this is used. """ logging.info("Attempting to return %d bridges to client %s..." - % (N, util.logSafely(ip))) + % (N, ip)) if not bridgeFilterRules: bridgeFilterRules=[] @@ -253,7 +253,7 @@ class IPBasedDistributor(Distributor): area = self.areaMapper(ip) logging.debug("IP mapped to area:\t%s" - % util.logSafely("{0}.0/24".format(area))) + % logSafely("{0}.0/24".format(area))) key1 = '' pos = 0 @@ -269,7 +269,7 @@ class IPBasedDistributor(Distributor): len(self.categories), n) bridgeFilterRules.append(g) - logging.info("category<%s>%s", epoch, util.logSafely(area)) + logging.info("category<%s>%s", epoch, logSafely(area)) pos = self.areaOrderHmac("category<%s>%s" % (epoch, area)) key1 = getHMAC(self.splitter.key, "Order-Bridges-In-Ring-%d" % n) @@ -477,8 +477,9 @@ class EmailBasedDistributor(Distributor): try: emailaddress = normalizeEmail(emailaddress, self.domainmap, self.domainrules) - except BadEmail: - return [] #XXXX log the exception + except BadEmail as err: + logging.warn(err) + return [] if emailaddress is None: return [] #XXXX raise an exception. @@ -487,19 +488,17 @@ class EmailBasedDistributor(Distributor): lastSaw = db.getEmailTime(emailaddress) logging.info("Attempting to return for %d bridges for %s..." - % (N, util.logSafely(emailaddress))) + % (N, emailaddress)) if lastSaw is not None and lastSaw + MAX_EMAIL_RATE >= now: logging.info("Client %s sent duplicate request within %d seconds." - % (util.logSafely(emailaddress), MAX_EMAIL_RATE)) + % (emailaddress, MAX_EMAIL_RATE)) if wasWarned: logging.info( "Client was already warned about duplicate requests.") - raise IgnoreEmail("Client was warned", - util.logSafely(emailaddress)) + raise IgnoreEmail("Client was warned", emailaddress) else: - logging.info("Sending duplicate request warning to %s..." - % util.logSafely(emailaddress)) + logging.info("Sending duplicate request warning.") db.setWarnedEmail(emailaddress, True, now) db.commit() diff --git a/lib/bridgedb/EmailServer.py b/lib/bridgedb/EmailServer.py index 599b446..f9f43bb 100644 --- a/lib/bridgedb/EmailServer.py +++ b/lib/bridgedb/EmailServer.py @@ -26,10 +26,10 @@ from twisted.mail import smtp from zope.interface import implements -import bridgedb.util as util from bridgedb.Dist import BadEmail, TooSoonEmail, IgnoreEmail from bridgedb import Dist from bridgedb import I18n +from bridgedb import safelog from bridgedb.Filters import filterBridgesByIP6 from bridgedb.Filters import filterBridgesByIP4 from bridgedb.Filters import filterBridgesByTransport @@ -104,13 +104,13 @@ def getMailResponse(lines, ctx): return None, None if not addrdomain: - logging.info("Couldn't parse domain from %r", util.logSafely(clientAddr)) + logging.info("Couldn't parse domain from %r" % clientAddr) if addrdomain and ctx.cfg.EMAIL_DOMAIN_MAP: addrdomain = ctx.cfg.EMAIL_DOMAIN_MAP.get(addrdomain, addrdomain) if addrdomain not in ctx.cfg.EMAIL_DOMAINS: - logging.info("Unrecognized email domain %r", util.logSafely(addrdomain)) + logging.warn("Unrecognized email domain %r", addrdomain) return None, None rules = ctx.cfg.EMAIL_DOMAIN_RULES.get(addrdomain, []) @@ -188,7 +188,7 @@ def getMailResponse(lines, ctx): # Handle rate limited email except TooSoonEmail as err: logging.info("Got a mail too frequently; warning '%s': %s." - % (util.logSafely(clientAddr), err)) + % (clientAddr, err)) # Compose a warning email # MAX_EMAIL_RATE is in seconds, convert to hours @@ -198,12 +198,12 @@ def getMailResponse(lines, ctx): except IgnoreEmail as err: logging.info("Got a mail too frequently; ignoring '%s': %s." - % (util.logSafely(clientAddr), err)) + % (clientAddr, err)) return None, None except BadEmail as err: logging.info("Got a mail from a bad email address '%s': %s." - % (util.logSafely(clientAddr), err)) + % (clientAddr, err)) return None, None if bridges: @@ -273,8 +273,8 @@ def replyToMail(lines, ctx): sendToUser, response = getMailResponse(lines, ctx) if response is None: - logging.debug("getMailResponse() said not to reply to %s, so I won't." - % util.logSafely(sendToUser)) + logging.debug("We don't really feel like talking to %s right now." + % sendToUser) return response.seek(0) @@ -283,7 +283,7 @@ def replyToMail(lines, ctx): factory = smtp.SMTPSenderFactory(ctx.smtpFromAddr, sendToUser, response, d, retries=0, timeout=30) d.addErrback(_ebReplyToMailFailure) - logging.info("Sending reply to %r", util.logSafely(sendToUser)) + logging.info("Sending reply to %s" % sendToUser) reactor.connectTCP(ctx.smtpServer, ctx.smtpPort, factory) return d @@ -355,7 +355,7 @@ class MailMessage(object): def lineReceived(self, line): """Called when we get another line of an incoming message.""" self.nBytes += len(line) - if not util.safe_logging: + if not safelog.safe_logging: logging.debug("> %s", line.rstrip("\r\n")) if self.nBytes > self.ctx.maximumSize: self.ignoring = True @@ -467,11 +467,11 @@ def composeEmail(fromAddr, clientAddr, subject, body, msgID=False, # Only log the email text (including all headers) if SAFE_LOGGING is # disabled: - if not util.safe_logging: + if not safelog.safe_logging: mail.seek(0) logging.debug("Email contents:\n%s" % mail.read()) else: - logging.debug("Email text for %r created." % util.logSafely(clientAddr)) + logging.debug("Email text for %r created." % clientAddr) mail.seek(0) return clientAddr, mail diff --git a/lib/bridgedb/HTTPServer.py b/lib/bridgedb/HTTPServer.py index 06ae2ed..f460ac9 100644 --- a/lib/bridgedb/HTTPServer.py +++ b/lib/bridgedb/HTTPServer.py @@ -36,12 +36,12 @@ import bridgedb.I18n as I18n from bridgedb import captcha from bridgedb import crypto from bridgedb import txrecaptcha -from bridgedb import util from bridgedb.Filters import filterBridgesByIP4 from bridgedb.Filters import filterBridgesByIP6 from bridgedb.Filters import filterBridgesByTransport from bridgedb.Filters import filterBridgesByNotBlockedIn from bridgedb.parse import headers +from bridgedb.safelog import logSafely @@ -289,8 +289,8 @@ class GimpCaptchaProtectedResource(CaptchaProtectedResource): clientHMACKey = crypto.getHMAC(self.hmacKey, clientIP) valid = captcha.GimpCaptcha.check(challenge, solution, self.secretKey, clientHMACKey) - logging.debug("%sorrect captcha from %r: %r." % ( - "C" if valid else "Inc", util.logSafely(clientIP), solution)) + logging.debug("%sorrect captcha from %r: %r." + % ("C" if valid else "Inc", clientIP, solution)) return valid @@ -466,7 +466,7 @@ class ReCaptchaProtectedResource(CaptchaProtectedResource): remoteIP = self.getRemoteIP() logging.debug("Captcha from %r. Parameters: %r" - % (util.logSafely(clientIP), request.args)) + % (clientIP, request.args)) def checkResponse(solution, request): """Check the :class:`txrecaptcha.RecaptchaResponse`. @@ -481,12 +481,11 @@ class ReCaptchaProtectedResource(CaptchaProtectedResource): # require networking (as well as automated CAPTCHA # breaking). Hence, the 'no cover' pragma. if solution.is_valid: # pragma: no cover - logging.info("Valid CAPTCHA solution from %r." - % util.logSafely(clientIP)) + logging.info("Valid CAPTCHA solution from %r." % clientIP) return (True, request) else: logging.info("Invalid CAPTCHA solution from %r: %r" - % (util.logSafely(clientIP), solution.error_code)) + % (clientIP, solution.error_code)) return (False, request) d = txrecaptcha.submit(challenge, response, self.recaptchaPrivKey, @@ -672,7 +671,7 @@ class WebResourceBridges(resource.Resource): unblocked = False logging.info("Replying to web request from %s. Parameters were %r" - % (util.logSafely(ip), request.args)) + % (ip, request.args)) rules = [] bridgeLines = None diff --git a/lib/bridgedb/Main.py b/lib/bridgedb/Main.py index 379c775..e29e991 100644 --- a/lib/bridgedb/Main.py +++ b/lib/bridgedb/Main.py @@ -20,6 +20,7 @@ from twisted.internet import reactor from bridgedb import crypto from bridgedb import persistent +from bridgedb import safelog from bridgedb import util from bridgedb.parse import options @@ -40,7 +41,7 @@ def configureLogging(cfg): logfile = getattr(cfg, 'LOGFILE', "") logfile_count = getattr(cfg, 'LOGFILE_COUNT', 5) logfile_rotate_size = getattr(cfg, 'LOGFILE_ROTATE_SIZE', 10000000) - util.set_safe_logging(safelogging) + safelog.setSafeLogging(safelogging) logging.getLogger().setLevel(level) if logfile: @@ -238,9 +239,9 @@ def loadConfig(configFile=None, configCls=None): .. _faster: http://lucumr.pocoo.org/2011/2/1/exec-in-python/ :ivar boolean itsSafeToUseLogging: This is called in :func:`startup` - before :func:`configureLogging`. When called from ``startup``, the - ``configCls`` parameter is not given, because that is the first time - that a :class:`Conf` is created. If a :class:`logging.Logger` is + before :func:`safelog.configureLogging`. When called from ``startup``, + the ``configCls`` parameter is not given, because that is the first + time that a :class:`Conf` is created. If a :class:`logging.Logger` is created in this function, then logging will not be correctly configured, therefore, if the ``configCls`` parameter is not given, then it's the first time this function has been called and it is @@ -456,10 +457,10 @@ def startup(options): # Set up logging as early as possible. We cannot import from the bridgedb # package any of our modules which import :mod:`logging` and start using - # it, at least, not until :func:`configureLogging` is called. Otherwise a - # default handler that logs to the console will be created by the imported - # module, and all further calls to :func:`logging.basicConfig` will be - # ignored. + # it, at least, not until :func:`safelog.configureLogging` is + # called. Otherwise a default handler that logs to the console will be + # created by the imported module, and all further calls to + # :func:`logging.basicConfig` will be ignored. configureLogging(config) if options['dump-bridges'] or (options.subCommand is not None): diff --git a/lib/bridgedb/safelog.py b/lib/bridgedb/safelog.py index dac65f8..eb6810b 100644 --- a/lib/bridgedb/safelog.py +++ b/lib/bridgedb/safelog.py @@ -32,6 +32,7 @@ Module Overview: :: safelog | + |_setSafeLogging - Enable or disable safelogging globally. |_logSafely - Utility for manually sanitising a portion of a log message | |_BaseSafelogFilter - Base class for log message sanitisation filters diff --git a/lib/bridgedb/util.py b/lib/bridgedb/util.py index 723ed8e..ebca7e1 100644 --- a/lib/bridgedb/util.py +++ b/lib/bridgedb/util.py @@ -11,14 +11,5 @@ """Common utilities for BridgeDB.""" -safe_logging = True -def set_safe_logging(safe): - global safe_logging - safe_logging = safe -def logSafely(val): - if safe_logging: - return "[scrubbed]" - else: - return val

1 0

[bridgedb/master] Move log configuration functions to bridgedb.util module.
by isis＠torproject.org 19 Apr '14

19 Apr '14

commit cc83936455cbe4e39016b3aef9d345652a82130d Author: Isis Lovecruft <isis(a)torproject.org> Date: Mon Apr 7 12:17:49 2014 +0000 Move log configuration functions to bridgedb.util module. * MOVE `Main.configureLogging()` → `util.configureLogging()`. * CHANGE `configureLogging()` function to use `logging.config.dictConfig()` with automatic safelogging filters from `bridgedb.safelog` module. * ADD `util._getRotatingFileHandlers()` function for chmod/chown'ing the rotated log files to be readable only by the running process owner. * ADD `util.JustifiedLogFormatter` class for justified printing of log messages when the config options LOG_TRACE and LOG_THREADS are enabled (this extra information is then printed in justified columns on the left, leaving the actual log messages left-justified to the same width on the right, which in my opinion is much easier to read quickly). --- lib/bridgedb/Main.py | 39 +--------- lib/bridgedb/util.py | 192 ++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 193 insertions(+), 38 deletions(-) diff --git a/lib/bridgedb/Main.py b/lib/bridgedb/Main.py index e29e991..90a03ef 100644 --- a/lib/bridgedb/Main.py +++ b/lib/bridgedb/Main.py @@ -13,7 +13,6 @@ import signal import sys import time import logging -import logging.handlers import gettext from twisted.internet import reactor @@ -29,42 +28,6 @@ import bridgedb.Dist as Dist import bridgedb.Time as Time import bridgedb.Storage -def configureLogging(cfg): - """Set up Python's logging subsystem based on the configuratino. - """ - - # Turn on safe logging by default - safelogging = getattr(cfg, 'SAFELOGGING', True) - - level = getattr(cfg, 'LOGLEVEL', 'WARNING') - level = getattr(logging, level) - logfile = getattr(cfg, 'LOGFILE', "") - logfile_count = getattr(cfg, 'LOGFILE_COUNT', 5) - logfile_rotate_size = getattr(cfg, 'LOGFILE_ROTATE_SIZE', 10000000) - safelog.setSafeLogging(safelogging) - - logging.getLogger().setLevel(level) - if logfile: - handler = logging.handlers.RotatingFileHandler(logfile, 'a', - logfile_rotate_size, - logfile_count) - formatter = logging.Formatter('%(asctime)s [%(levelname)s] %(message)s', - "%b %d %H:%M:%S") - handler.setFormatter(formatter) - logging.getLogger().addHandler(handler) - - logging.info("Logger Started.") - logging.info("Level: %s", level) - if logfile: - logging.info("Log File: %s", os.path.abspath(logfile)) - logging.info("Log File Count: %d", logfile_count) - logging.info("Rotate Logs After Size: %d", logfile_rotate_size) - else: - logging.info("Logging to stderr") - if safelogging: - logging.info("Safe Logging: Enabled") - else: - logging.warn("Safe Logging: Disabled") def load(state, splitter, clear=False): """Read and parse all descriptors, and load into a bridge splitter. @@ -461,7 +424,7 @@ def startup(options): # called. Otherwise a default handler that logs to the console will be # created by the imported module, and all further calls to # :func:`logging.basicConfig` will be ignored. - configureLogging(config) + util.configureLogging(config) if options['dump-bridges'] or (options.subCommand is not None): runSubcommand(options, config) diff --git a/lib/bridgedb/util.py b/lib/bridgedb/util.py index ebca7e1..691b9bc 100644 --- a/lib/bridgedb/util.py +++ b/lib/bridgedb/util.py @@ -11,5 +11,197 @@ """Common utilities for BridgeDB.""" +import logging +import logging.config +import logging.handlers +import os +def _getLogHandlers(logToFile=True, logToStderr=True): + """Get the appropriate list of log handlers. + + :param bool logToFile: If ``True``, add a logfile handler. + :param bool logToStderr: If ``True``, add a stream handler to stderr. + :rtype: list + :returns: A list containing the appropriate log handler names from the + :class:`logging.config.dictConfigClass`. + """ + logHandlers = [] + if logToFile: + logHandlers.append('rotating') + if logToStderr: + logHandlers.append('console') + return logHandlers + +def _getRotatingFileHandler(filename, mode='a', filesize=1000000, filecount=0, + encoding='utf-8', uid=None, gid=None): + """Get a :class:`logging.RotatingFileHandler` with a logfile which is + readable+writable only by the given **uid** and **gid**. + + :param str filename: The full path to the log file. + :param str mode: The mode to open **filename** with. (default: ``'a'``) + :param int filesize: Rotate logfiles after they have grown to this size in + bytes. + :param int filecount: The number of logfiles to keep in rotation. + :param str encoding: The encoding for the logfile. + :param int uid: The owner UID to set on the logfile. + :param int gid: The GID to set on the logfile. + :rtype: :class:`logging.handlers.RotatingFileHandler` + :returns: A logfile handler which will rotate files and chown/chmod newly + created files. + """ + # Default to the current process owner's uid and gid: + uid = os.getuid() if not uid else uid + gid = os.getgid() if not gid else gid + + if not os.path.exists(filename): + open(filename, 'a').close() + os.chown(filename, uid, gid) + os.chmod(filename, os.ST_WRITE | os.ST_APPEND) + + fileHandler = logging.handlers.RotatingFileHandler(filename, mode, + maxBytes=filesize, + backupCount=filecount, + encoding=encoding) + return fileHandler + +def configureLogging(cfg): + """Set up Python's logging subsystem based on the configuration. + + :type cfg: :class:`~bridgedb.persistent.Conf` + :param cfg: The current configuration, including any in-memory settings. + """ + from bridgedb import safelog + + # Turn on safe logging by default: + safelogging = getattr(cfg, 'SAFELOGGING', True) + safelog.setSafeLogging(safelogging) + + level = getattr(cfg, 'LOGLEVEL', 'WARNING') + logLevel = getattr(logging, level, 0) + logStderr = getattr(cfg, 'LOG_TO_STDERR', False) + logfileName = getattr(cfg, 'LOGFILE', "") + logfileCount = getattr(cfg, 'LOGFILE_COUNT', 3) - 1 + logfileRotateSize = getattr(cfg, 'LOGFILE_ROTATE_SIZE', 10000000) + logThreads = getattr(cfg, 'LOG_THREADS', False) + logTrace = getattr(cfg, 'LOG_TRACE', False) + logTimeFormat = getattr(cfg, 'LOG_TIME_FORMAT', "%H:%M:%S") + + logFilters = [] + if safelogging: + logFilters = ['safelogEmail', 'safelogIPv4', 'safelogIPv6'] + + logConfig = { + 'version': 1, + 'filters': { + 'safelogEmail': {'()': safelog.SafelogEmailFilter}, + 'safelogIPv4': {'()': safelog.SafelogIPv4Filter}, + 'safelogIPv6': {'()': safelog.SafelogIPv6Filter}, + }, + 'formatters': { + 'default': {'()': JustifiedLogFormatter, + # These values below are kwargs passed to + # :class:`JustifiedFormatter`: + 'logThreads': logThreads, + 'logTrace': logTrace, + 'datefmt': logTimeFormat}, + }, + 'handlers': { + 'console': {'class': 'logging.StreamHandler', + 'level': logLevel, + 'formatter': 'default', + 'filters': logFilters}, + 'rotating': {'()': _getRotatingFileHandler, + 'level': logLevel, + 'formatter': 'default', + 'filters': logFilters, + # The values below are passed to the handler creator, + # :func:`getChownedFileHandler`, as kwargs: + 'filename': logfileName, + 'filesize': logfileRotateSize, + 'filecount': logfileCount}, + }, + 'root': { + 'handlers': _getLogHandlers(logfileName, logStderr), + 'level': logLevel, + }, + } + + logging.config.dictConfig(logConfig) + + logging.info("Logger Started.") + logging.info("Level: %s", logLevel) + logging.info("Safe Logging: %sabled" % ("En" if safelogging else "Dis")) + + +class JustifiedLogFormatter(logging.Formatter): + """A logging formatter which pretty prints thread and calling function + information, in addition to the normal timestamp, log level, and log + message. + + :ivar int width: The width of the column for the calling function + information, if the latter is to be included. + """ + width = 30 + + def __init__(self, logThreads=False, logTrace=False, + datefmt="%H:%M:%s"): + """If **logTrace** is ``True``, the line number, module name, and + function name where the logger was called will be included in the + message, and the width of this information will always equal ``width``. + + :param bool logThreads: If ``True``, include the current thread name + and ID in formatted log messages. + :param bool logTrace: If ``True``, include information on the calling + function in formatted log messages. + """ + super(JustifiedLogFormatter, self).__init__(datefmt=datefmt) + self.logThreads = logThreads + self.logTrace = logTrace + + _fmt = ["%(asctime)s %(levelname)-7.7s"] + if self.logThreads: + _fmt.append("[%(threadName)s id:%(thread)d]") + _fmt.append("%(callingFunc)s") + _fmt.append("%(message)s") + + self._fmt = " ".join(_fmt) + + def _formatCallingFuncName(self, record): + """Format the combined module name and function name of the place where + the log message/record was recorded, so that the formatted string is + left-justified and not longer than the :cvar:`width`. + + :type record: :class:`logging.LogRecord` + :param record: A record of an event created by calling a logger. + :returns: The :class:`logging.LogRecord` with its ``message`` + attribute rewritten to contain the module and function name, + truncated to ``width``, or padded on the right with spaces as is + necessary. + """ + callingFunc = "" + if self.logTrace: + # The '.' character between the module name and function name + # would otherwise be interpreted as a format string specifier, so + # we must specify ``chr(46)``: + lineno = "L%s:" % record.lineno + caller = "%s%-s%s" % (lineno.rjust(6), record.module, chr(46)) + maxFuncNameWidth = self.width - 2 - len(caller) + funcName = record.funcName + if len(funcName) > maxFuncNameWidth: + funcName = record.funcName[:maxFuncNameWidth] + caller += "%s()" % (funcName) + callingFunc = caller.ljust(self.width) + + record.callingFunc = callingFunc + return record + + def format(self, record): + """Reformat this log **record** to neatly print thread and function + traces, if configured to do so. + + :type record: :class:`logging.LogRecord` + :param record: A record of an event created by calling a logger. + """ + record = self._formatCallingFuncName(record) + return super(JustifiedLogFormatter, self).format(record)

1 0