tor-commits January 2020

tor-commits@lists.torproject.org

19 participants
1596 discussions

[translation/tails-misc] https://gitweb.torproject.org/translation.git/commit/?h=tails-misc
by translation＠torproject.org 06 Jan '20

06 Jan '20

commit 7370d89edcd30785ac4f1c3a7d1e360d5e73654b Author: Translation commit bot <translation(a)torproject.org> Date: Mon Jan 6 23:17:31 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tails-misc --- pt_BR.po | 103 ++++++++++++++++++++++++++++++++------------------------------- 1 file changed, 52 insertions(+), 51 deletions(-) diff --git a/pt_BR.po b/pt_BR.po index a0b8902427..f26111ffd2 100644 --- a/pt_BR.po +++ b/pt_BR.po @@ -6,6 +6,7 @@ # Alexei Gonçalves de Oliveira <alexis(a)gessicahellmann.com>, 2018 # Communia <ameaneantie(a)riseup.net>, 2013-2018 # carlo giusepe tadei valente sasaki <carlo.gt.valente(a)gmail.com>, 2014 +# C. E., 2020 # C. E., 2019 # C. E., 2019 # Danton Medrado, 2015 @@ -33,8 +34,8 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-01-06 11:20+0100\n" -"PO-Revision-Date: 2020-01-06 13:47+0000\n" -"Last-Translator: carolyn <carolyn(a)anhalt.org>\n" +"PO-Revision-Date: 2020-01-06 23:03+0000\n" +"Last-Translator: C. E.\n" "Language-Team: Portuguese (Brazil) (http://www.transifex.com/otf/torproject/language/pt_BR/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -126,7 +127,7 @@ msgstr "_Saída" msgid "" "For debugging information, execute the following command: sudo tails-" "debugging-info" -msgstr "" +msgstr "Para informações sobre depuração, executar o seguinte comando: sudo tails-debugging-info" #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:244 msgid "" @@ -135,15 +136,15 @@ msgid "" "website.\\n\\nCheck your network connection, and restart Tails to try " "upgrading again.\\n\\nIf the problem persists, go to " "file:///usr/share/doc/tails/website/doc/upgrade/error/check.en.html" -msgstr "" +msgstr "Ocorreu um erro ao atualizar a chave de assinatura.\\n\\nIsso evita determinar se uma atualização está disponível em nosso site.\\n\\nVerifique sua conexão de rede e reinicie o Tails para tentar atualizar novamente.\\n\\nSe o problema persistir, vá para file:///usr/share/doc/tails/website/doc/upgrade/error/check.en.html" #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:250 msgid "Error while updating the signing key" -msgstr "" +msgstr "Erro ao atualizar a chave de assinatura" #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:279 msgid "Error while checking for upgrades" -msgstr "" +msgstr "Erro ao verificar as atualizações" #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:282 msgid "" @@ -152,64 +153,64 @@ msgid "" "Check your network connection, and restart Tails to try upgrading again.\n" "\n" "If the problem persists, go to file:///usr/share/doc/tails/website/doc/upgrade/error/check.en.html" -msgstr "" +msgstr "Não foi possível determinar se uma atualização está disponível em nosso website.\n\nVerifique sua conexão de rede e reinicie o Tails para tentar atualizar novamente.\n\nCaso o problema persista, consulte o arquivo:///usr/share/doc/tails/website/doc/upgrade/error/check.en.html" #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:297 msgid "no automatic upgrade is available from our website for this version" -msgstr "" +msgstr "No nosso website, nenhuma atualização automática para essa versão está disponível" #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:303 msgid "your device was not created using a USB image or Tails Installer" -msgstr "" +msgstr "seu dispositivo não foi criado usando uma imagem USB ou o Tails Installer" #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:308 msgid "Tails was started from a DVD or a read-only device" -msgstr "" +msgstr "O Tails foi inciado a partir de um DVD ou de um dispositivo somente de leitura" #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:313 msgid "there is not enough free space on the Tails system partition" -msgstr "" +msgstr "não há espaço livre suficiente na partição do sistema do Tails" #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:318 msgid "not enough memory is available on this system" -msgstr "" +msgstr "não há memória suficiente disponível nesse sistema" #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:324 #, perl-brace-format msgid "No explanation available for reason '%{reason}s'." -msgstr "" +msgstr "Nenhuma explicação disponível para o motivo '%{reason}s'." #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:345 msgid "The system is up-to-date" -msgstr "" +msgstr "O sistema está atualizado" #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:350 msgid "This version of Tails is outdated, and may have security issues." -msgstr "" +msgstr "Esta versão do Tails está desatualizada e pode ter problemas de segurança." #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:382 #, perl-brace-format msgid "" "The available incremental upgrade requires %{space_needed}s of free space on" " Tails system partition, but only %{free_space}s is available." -msgstr "" +msgstr "A atualização incremental disponível requer %{space_needed}s de espaço livre na partição do sistema Tails, mas somente %{free_space}s está disponível." #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:398 #, perl-brace-format msgid "" "The available incremental upgrade requires %{memory_needed}s of free memory," " but only %{free_memory}s is available." -msgstr "" +msgstr "A atualização incremental disponível requer %{memory_needed}s de espaço livre, mas somente %{free_memory}s está disponível." #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:420 msgid "" "An incremental upgrade is available, but no full upgrade is.\n" "This should not happen. Please report a bug." -msgstr "" +msgstr "Uma atualização incremental está disponível, mas a atualização completa não se encontra disponível. Isso não deve acontecer. Por favor, reporte o bug." #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:424 msgid "Error while detecting available upgrades" -msgstr "" +msgstr "Erro ao detectar as atualizações disponíveis" #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:434 #, perl-brace-format @@ -224,19 +225,19 @@ msgid "" "Download size: %{size}s\n" "\n" "Do you want to upgrade now?" -msgstr "" +msgstr "Você deve atualizar até %{name}s %{version}s \n\nPara mais informações sobre essa nova versão, consulte %{details_url}s\n\nRecomendamos que você feche todas as outras aplicações durante a atualização\nO download da atualização pode levar um tempo bastante longo, entre alguns minutos e algumas horas.\n\nTamanho do download: %{size}s\n\nVocê deseja atualizar agora?" #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:448 msgid "Upgrade available" -msgstr "" +msgstr "Atualização disponível" #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:449 msgid "Upgrade now" -msgstr "" +msgstr "Atualizar agora" #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:450 msgid "Upgrade later" -msgstr "" +msgstr "Atualizar mais tarde" #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:458 #, perl-brace-format @@ -248,20 +249,20 @@ msgid "" "It is not possible to automatically upgrade your device to this new version: %{explanation}s.\n" "\n" "To learn how to do a manual upgrade, go to https://tails.boum.org/doc/upgrade/#manual" -msgstr "" +msgstr "Você deve fazer uma atualização manual para %{name}s %{version}s.\n\nPara mais informações sobre esta nova versão, acesse %{details_url}s\n\nNão é possível atualizar automaticamente o seu dispositivo para esta nova versão: %{explanation}s.\n\nPara saber como fazer uma atualização manual, acesse https://tails.boum.org/doc/upgrade/#manual" #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:474 msgid "New version available" -msgstr "" +msgstr "Nova versão disponível" #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:555 msgid "Downloading upgrade" -msgstr "" +msgstr "Fazendo download da atualização" #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:558 #, perl-brace-format msgid "Downloading the upgrade to %{name}s %{version}s..." -msgstr "" +msgstr "Fazendo download da atualização para %{name}s %{version}s..." #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:599 msgid "" @@ -269,38 +270,38 @@ msgid "" "connection, and restart Tails to try upgrading again.\\n\\nIf the problem " "persists, go to " "file:///usr/share/doc/tails/website/doc/upgrade/error/download.en.html" -msgstr "" +msgstr "O download da atualização não pôde ser feito.\\n\\nVerifique sua conexão de rede e reinicie Tails para tentar atualizar novamente.\\n\\nCaso o problema continue, consulte o arquivo:///usr/share/doc/tails/website/doc/upgrade/error/download.en.html" #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:615 #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:634 msgid "Error while downloading the upgrade" -msgstr "" +msgstr "Erro ao fazer o download das atualizações" #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:627 #, perl-brace-format msgid "" "Output file '%{output_file}s' does not exist, but tails-iuk-get-target-file " "did not complain. Please report a bug." -msgstr "" +msgstr "O arquivo extraído '%{output_file}s' não existe, mas o tails-iuk-get-target-file não reclamou. Por favor, reporte o bug." #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:646 msgid "Error while creating temporary downloading directory" -msgstr "" +msgstr "Erro ao criar um diretório temporário de download" #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:649 msgid "Failed to create temporary download directory" -msgstr "" +msgstr "Falha ao criar um diretório temporário de download" #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:673 msgid "" "Could not choose a download server.\n" "\n" "This should not happen. Please report a bug." -msgstr "" +msgstr "Impossível encontrar um servidor para fazer download.\n\nIsso não deveria acontecer. Por favor, relate um bug." #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:677 msgid "Error while choosing a download server" -msgstr "" +msgstr "Erro ao escolher um servidor para fazer download" #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:692 msgid "" @@ -309,15 +310,15 @@ msgid "" "The network connection will now be disabled.\n" "\n" "Please save your work and close all other applications." -msgstr "" +msgstr "A versão atualizada foi baixada com sucesso\n\n A conexão à rede será desabilitada agora\n\nPor favor, salve o seu trabalho e feche todas as aplicações." #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:698 msgid "Upgrade successfully downloaded" -msgstr "" +msgstr "A versão atualizada foi baixada com sucesso" #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:700 msgid "Apply upgrade" -msgstr "" +msgstr "Instalar a atualização" #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:707 msgid "" @@ -327,46 +328,46 @@ msgid "" "You should restart Tails on the new version as soon as possible.\n" "\n" "Do you want to restart now?" -msgstr "" +msgstr "Seu dispositivo Tails foi atualizado com sucesso.\n\nAlgumas funcionalidades de segurança foram desabilitadas temporariamente.\nVocê deve reiniciar o Tails em sua nova versão assim que puder.\n\nVocê deseja reiniciar agora?" #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:712 msgid "Restart Tails" -msgstr "" +msgstr "Reiniciar o Tails" #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:713 msgid "Restart now" -msgstr "" +msgstr "Reiniciar agora" #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:714 msgid "Restart later" -msgstr "" +msgstr "Reiniciar mais tarde" #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:725 msgid "Error while restarting the system" -msgstr "" +msgstr "Erro ao reiniciar o sistema" #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:728 msgid "Failed to restart the system" -msgstr "" +msgstr "Falha em reiniciar o sistema" #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:743 msgid "Error while shutting down the network" -msgstr "" +msgstr "Erro ao encerrar a rede" #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:746 msgid "Failed to shutdown network" -msgstr "" +msgstr "Falha ao encerrar a rede" #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:753 msgid "Upgrading the system" -msgstr "" +msgstr "Atualizando o sistema" #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:755 msgid "" "Your Tails device is being upgraded...\n" "\n" "For security reasons, the networking is now disabled." -msgstr "" +msgstr " O seu dispositivo Tails está sendo atualizado...\n\nPor razões de segurança, agora, a rede está desabilitada." #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:788 msgid "" @@ -374,11 +375,11 @@ msgid "" " needs to be repaired and might be unable to restart.\\n\\nPlease follow the" " instructions at " "file:///usr/share/doc/tails/website/doc/upgrade/error/install.en.html" -msgstr "" +msgstr "Ocorreu um erro ao instalar a atualização.\\n\\nSeu dispositivo Tails precisa ser reparado e talvez não possa reiniciar.\\n\\nPor favor, siga as instruções no arquivo:///usr/share/doc/tails/website/doc/upgrade/error/install.en.html" #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:798 msgid "Error while installing the upgrade" -msgstr "" +msgstr "Erro ao instalar a atualização" #: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:32 msgid "Additional Settings" @@ -539,13 +540,13 @@ msgstr "Erro" msgid "" "The device Tails is running from cannot be found. Maybe you used the 'toram'" " option?" -msgstr "" +msgstr "O dispositivo a partir do qual o Tails está rodando não foi encontrado. Talvez você tenha usado a opção 'toram'?" #: config/chroot_local-includes/usr/src/perl5lib/lib/Tails/RunningSystem.pm:253 msgid "" "The drive Tails is running from cannot be found. Maybe you used the 'toram' " "option?" -msgstr "" +msgstr "O dispositivo a partir do qual o Tails está rodando não foi encontrado. Talvez você tenha usado a opção 'toram'?" #: config/chroot_local-includes/usr/share/gnome-shell/extensions/status-menu-helper@tails.boum.org/extension.js:75 msgid "Lock screen"

1 0

[translation/donatepages-messagespot] https://gitweb.torproject.org/translation.git/commit/?h=donatepages-messagespot
by translation＠torproject.org 06 Jan '20

06 Jan '20

commit eb8487883af4537a9f99e0204840b031c4a89b70 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Jan 6 23:15:33 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=donatepages-message… --- locale/fa/LC_MESSAGES/messages.po | 119 +++++++++++++++++++------------------- 1 file changed, 61 insertions(+), 58 deletions(-) diff --git a/locale/fa/LC_MESSAGES/messages.po b/locale/fa/LC_MESSAGES/messages.po index bab758ecb2..cb829d1f3a 100644 --- a/locale/fa/LC_MESSAGES/messages.po +++ b/locale/fa/LC_MESSAGES/messages.po @@ -17,10 +17,11 @@ # Samaneh M <asamana.haoma(a)gmail.com>, 2019 # A.Mehraban <Mehr.Ban(a)chmail.ir>, 2019 # magnifico, 2019 +# AmirAli Dabouei <amirgm.info(a)gmail.com>, 2020 # msgid "" msgstr "" -"Last-Translator: magnifico, 2019\n" +"Last-Translator: AmirAli Dabouei <amirgm.info(a)gmail.com>, 2020\n" "Language-Team: Persian (https://www.transifex.com/otf/teams/1519/fa/)\n" "Language: fa\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" @@ -199,6 +200,8 @@ msgid "" "The Tor Project very much appreciates all its donors. " "Thank you for supporting Tor." msgstr "" +"پروژه شبکه تور تمامی حمایت هارا قدردان است. ممنونیم از " +"حمایت شما" #: tmp/cache_locale/fa/fadd8d2107638a3de94449a9eddfca4e8f010bb26f3f6a71e2d875cb910cc5f1.php:113 #: tmp/cache_locale/c8/c806c3e41d2762077fdd1ce236b4b0b7dc838a7c1a428d6d6daeede2a01d35aa.php:134 @@ -375,23 +378,23 @@ msgstr "" #: tmp/cache_locale/cc/cc2e1dd4edb96c59a6514d676ca3f562a2a9a2cd34e2c211c03fb08b3e664469.php:166 msgid "Copied" -msgstr "" +msgstr "کپی شد" #: tmp/cache_locale/cc/cc2e1dd4edb96c59a6514d676ca3f562a2a9a2cd34e2c211c03fb08b3e664469.php:170 msgid "Currency Amount must be a number." -msgstr "" +msgstr "مقدار واحد پول باید یک عدد باشد" #: tmp/cache_locale/cc/cc2e1dd4edb96c59a6514d676ca3f562a2a9a2cd34e2c211c03fb08b3e664469.php:174 #: tmp/cache_locale/a1/a1384b9a21e3d43e946972b01389567dff845ee982dcf05228aa3e5096a74210.php:69 #: tmp/cache_locale/84/843b15891cb1c4a052da0edfef1988434048191530bcfe390199ff0e33e802d4.php:51 msgid "Choose a Currency" -msgstr "" +msgstr "یک واحد پول را انتخاب کنید" #: tmp/cache_locale/cc/cc2e1dd4edb96c59a6514d676ca3f562a2a9a2cd34e2c211c03fb08b3e664469.php:178 #: tmp/cache_locale/a1/a1384b9a21e3d43e946972b01389567dff845ee982dcf05228aa3e5096a74210.php:91 #: tmp/cache_locale/84/843b15891cb1c4a052da0edfef1988434048191530bcfe390199ff0e33e802d4.php:73 msgid "Currency Amount" -msgstr "" +msgstr "مقدار واحد پول" #: tmp/cache_locale/cc/cc2e1dd4edb96c59a6514d676ca3f562a2a9a2cd34e2c211c03fb08b3e664469.php:180 msgid "Estimated Donation Date" @@ -399,7 +402,7 @@ msgstr "" #: tmp/cache_locale/cc/cc2e1dd4edb96c59a6514d676ca3f562a2a9a2cd34e2c211c03fb08b3e664469.php:184 msgid "I'd like to make my donation anonymous." -msgstr "" +msgstr "من علاقه مندم که حمایت هایم را بصورت ناشناس انجام دهم" #: tmp/cache_locale/cc/cc2e1dd4edb96c59a6514d676ca3f562a2a9a2cd34e2c211c03fb08b3e664469.php:188 #: tmp/cache_locale/a1/a1384b9a21e3d43e946972b01389567dff845ee982dcf05228aa3e5096a74210.php:64 @@ -427,7 +430,7 @@ msgstr "نام خانوادگی" #: tmp/cache_locale/a1/a1384b9a21e3d43e946972b01389567dff845ee982dcf05228aa3e5096a74210.php:98 #: tmp/cache_locale/84/843b15891cb1c4a052da0edfef1988434048191530bcfe390199ff0e33e802d4.php:80 msgid "Report Donation" -msgstr "" +msgstr "گزارش حمایت مالی" #: tmp/cache_locale/cc/cc2e1dd4edb96c59a6514d676ca3f562a2a9a2cd34e2c211c03fb08b3e664469.php:204 #: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:370 @@ -475,7 +478,7 @@ msgstr "" #: tmp/cache_locale/60/60fb10a60dd92fe380a6d105fd68d9375e135c65251f204fa37158d9c2e655d9.php:73 #: tmp/cache_locale/12/12677df2d2a5991edb775c6909b7be7ca718fd00abd6950a809cda5ab878d2ce.php:70 msgid "You should receive an email receipt shortly." -msgstr "" +msgstr "شما باید یک ایمیل حاوی رسید دریافت کنید." #: tmp/cache_locale/ca/ca1cd152d40544030a642d8d074e6afb769c3bf80a1b2b61c380f1466e3a03a4.php:55 #: tmp/cache_locale/af/afda2fbd22ed389453e63ca9acc074a25ce820b5bc97120edfd975cf8f46634a.php:55 @@ -530,7 +533,7 @@ msgstr "اشتراک گذاری پروژه تور" #: tmp/cache_locale/60/60fb10a60dd92fe380a6d105fd68d9375e135c65251f204fa37158d9c2e655d9.php:166 #: tmp/cache_locale/12/12677df2d2a5991edb775c6909b7be7ca718fd00abd6950a809cda5ab878d2ce.php:109 msgid "Got Skills?" -msgstr "" +msgstr "مهارتی دارید؟" #: tmp/cache_locale/ca/ca1cd152d40544030a642d8d074e6afb769c3bf80a1b2b61c380f1466e3a03a4.php:151 #: tmp/cache_locale/af/afda2fbd22ed389453e63ca9acc074a25ce820b5bc97120edfd975cf8f46634a.php:121 @@ -553,7 +556,7 @@ msgstr "" #: tmp/cache_locale/60/60fb10a60dd92fe380a6d105fd68d9375e135c65251f204fa37158d9c2e655d9.php:180 #: tmp/cache_locale/12/12677df2d2a5991edb775c6909b7be7ca718fd00abd6950a809cda5ab878d2ce.php:123 msgid "Learn how you can help." -msgstr "" +msgstr "یاد بگیرید که چگونه می توانید کمک کنید" #: tmp/cache_locale/ca/ca1cd152d40544030a642d8d074e6afb769c3bf80a1b2b61c380f1466e3a03a4.php:167 #: tmp/cache_locale/af/afda2fbd22ed389453e63ca9acc074a25ce820b5bc97120edfd975cf8f46634a.php:137 @@ -618,12 +621,12 @@ msgstr "ماهانه" #: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:145 #: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:167 msgid "Want to donate cryptocurrency?" -msgstr "" +msgstr "آیا می خواهید با واحد ارز دیجیتال حمایت کنید؟" #: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:150 #: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:172 msgid "Want to donate stock or via postal mail?" -msgstr "" +msgstr "آیا می خواهید با سهام و یا پستال میل حمایت کنید؟" #: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:166 #: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:187 @@ -633,12 +636,12 @@ msgstr "مقدار نامعتبر" #: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:170 #: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:191 msgid "$2 minimum donation" -msgstr "" +msgstr "$2 کمترین حمایت" #: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:174 #: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:195 msgid "$ other" -msgstr "" +msgstr "$ دیگر..." #: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:181 #: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:202 @@ -648,7 +651,7 @@ msgstr "" #: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:188 #: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:209 msgid "No thanks, I don't want a gift." -msgstr "" +msgstr "نه ممنون ، هدیه ای نمی خوام" #: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:190 #: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:211 @@ -659,7 +662,7 @@ msgstr "" #: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:201 #: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:222 msgid "sticker Pack" -msgstr "" +msgstr "پکیچ استیکر" #: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:208 #: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:229 @@ -680,7 +683,7 @@ msgstr "" #: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:237 #: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:258 msgid "t-shirt pack" -msgstr "" +msgstr "پکیج تی شرت" #: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:247 msgid "" @@ -704,7 +707,7 @@ msgstr "" #: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:272 #: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:277 msgid "sweatshirt" -msgstr "" +msgstr "گرمکن" #: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:279 #: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:284 @@ -722,12 +725,12 @@ msgstr "کارت اعتباری" #: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:304 msgid "Want to donate Bitcoin, Stock, or via snail mail?" -msgstr "" +msgstr "آیا می خواهید با استفاده از بیت کوین/سهام/اسنیل میل حمایت کنید؟" #: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:315 #: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:314 msgid "* required fields" -msgstr "" +msgstr "*اجباری است" #: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:330 #: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:329 @@ -737,7 +740,7 @@ msgstr "آدرس خیابان" #: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:334 #: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:333 msgid "Apt." -msgstr "" +msgstr "Apt." #: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:344 #: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:343 @@ -772,12 +775,12 @@ msgstr "شماره کارت" #: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:384 #: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:383 msgid "MM" -msgstr "MM" +msgstr "ماه" #: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:388 #: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:387 msgid "YY" -msgstr "YY" +msgstr "سال" #: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:392 #: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:391 @@ -796,7 +799,7 @@ msgstr "" #: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:404 #: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:412 msgid "T-shirt:" -msgstr "" +msgstr "تی شرت" #: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:423 #: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:427 @@ -810,7 +813,7 @@ msgstr "دیدگاه‌ها" #: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:435 #: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:434 msgid "Donating:" -msgstr "" +msgstr "حمایت مالی کردن" #: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:443 #: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:446 @@ -819,17 +822,17 @@ msgstr "کمک مالی" #: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:453 msgid "Gift Selected" -msgstr "" +msgstr "هدیه انتخاب شده است" #: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:457 #: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:464 msgid "No Gift Selected" -msgstr "" +msgstr "هیچ هدیه ای انتخاب نشد" #: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:461 #: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:468 msgid "Sticker Pack" -msgstr "" +msgstr "پکیج استیکر" #: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:469 #: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:476 @@ -844,7 +847,7 @@ msgstr "" #: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:477 #: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:484 msgid "T-Shirt Pack" -msgstr "" +msgstr "پکیج تی شرت" #: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:481 #: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:607 @@ -865,7 +868,7 @@ msgstr "اندازه خود را مشخص کنید." #: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:489 #: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:520 msgid "Sweatshirt" -msgstr "" +msgstr "گرمکن" #: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:493 #: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:524 @@ -875,7 +878,7 @@ msgstr "" #: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:495 #: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:526 msgid "Please reload the page and try again." -msgstr "" +msgstr "لطفا این صفحه را رفرش/ریلود کنید" #: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:499 #: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:530 @@ -885,14 +888,14 @@ msgstr "" #: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:503 #: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:534 msgid "validation failed" -msgstr "" +msgstr "عملیات اعتبار سنجی شکست خورد" #. notes: __field_name__ will be replaced with the field name in the #. javascript. #: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:509 #: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:540 msgid "__field_name__ must be filled out." -msgstr "" +msgstr "__فیلد_نام__ باید پر باشد" #: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:514 #: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:545 @@ -902,12 +905,12 @@ msgstr "این فیلد لازم است" #: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:518 #: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:549 msgid "Invalid email address." -msgstr "آدرس ایمیل اشتباه." +msgstr "آدرس ایمیل نادرست است" #: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:522 #: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:553 msgid "per month" -msgstr "" +msgstr "ماهیانه" #: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:614 #: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:622 @@ -931,7 +934,7 @@ msgstr "" #: tmp/cache_locale/b5/b5f4f095d469d66a47aef1a351e119240dbf0291056fdb85b216534a25e91fef.php:70 #: tmp/cache_locale/08/08a9b06344a88c9ea01db4cdf9711c9cee305183a512ae0e8b7381dae8c6d798.php:52 msgid "Company" -msgstr "" +msgstr "شرکت" #: tmp/cache_locale/b5/b5f4f095d469d66a47aef1a351e119240dbf0291056fdb85b216534a25e91fef.php:78 #: tmp/cache_locale/08/08a9b06344a88c9ea01db4cdf9711c9cee305183a512ae0e8b7381dae8c6d798.php:60 @@ -951,7 +954,7 @@ msgstr "اطلاعات بیشتر" #: tmp/cache_locale/b5/b5f4f095d469d66a47aef1a351e119240dbf0291056fdb85b216534a25e91fef.php:102 #: tmp/cache_locale/08/08a9b06344a88c9ea01db4cdf9711c9cee305183a512ae0e8b7381dae8c6d798.php:84 msgid "Procedure" -msgstr "" +msgstr "روند" #: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:247 msgid "Get our limited edition Take Back the Internet With Tor shirt." @@ -965,15 +968,15 @@ msgstr "" #: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:294 msgid "how do you want to DONATE?" -msgstr "" +msgstr "چگونه میخواهید حمایت کنید؟" #: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:456 msgid "State/Province/Region" -msgstr "" +msgstr "ایالت/استان/منطقه" #: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:460 msgid "Gift Selected:" -msgstr "" +msgstr "هدیه انتخاب شد" #: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:492 msgid "Take back the Internet with Tor" @@ -981,12 +984,12 @@ msgstr "اینترنت را با Tor برگردانید" #: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:557 msgid "Gift selected" -msgstr "" +msgstr "هدیه انتخاب شد" #: tmp/cache_locale/af/afda2fbd22ed389453e63ca9acc074a25ce820b5bc97120edfd975cf8f46634a.php:61 #: tmp/cache_locale/12/12677df2d2a5991edb775c6909b7be7ca718fd00abd6950a809cda5ab878d2ce.php:68 msgid "Thank you for your support of the Tor Project." -msgstr "" +msgstr "از شما بخاطر حمایت از پروژه شبکه تور ممنونیم." #: tmp/cache_locale/af/afda2fbd22ed389453e63ca9acc074a25ce820b5bc97120edfd975cf8f46634a.php:65 msgid "" @@ -1017,7 +1020,7 @@ msgstr "" #: tmp/cache_locale/94/94c6c1969d2fadbd23c135ac864b97902daca8f5c816b03864ea5c4970a167cf.php:83 #: tmp/cache_locale/66/666e9197f427d70c0743bcdae2c3e34f41f9d7acf2b2dddb2c21c21723e73d10.php:101 msgid "Become a Defender of Privacy!" -msgstr "" +msgstr "به یک محافظ حریم شخصی تبدیل شوید!" #: tmp/cache_locale/94/94c6c1969d2fadbd23c135ac864b97902daca8f5c816b03864ea5c4970a167cf.php:87 #: tmp/cache_locale/66/666e9197f427d70c0743bcdae2c3e34f41f9d7acf2b2dddb2c21c21723e73d10.php:105 @@ -1043,7 +1046,7 @@ msgstr "" #: tmp/cache_locale/94/94c6c1969d2fadbd23c135ac864b97902daca8f5c816b03864ea5c4970a167cf.php:97 #: tmp/cache_locale/66/666e9197f427d70c0743bcdae2c3e34f41f9d7acf2b2dddb2c21c21723e73d10.php:115 msgid "With your help, we will make the Tor network accessible to everyone!" -msgstr "" +msgstr "با کمک شما، ما شبکه ی تور را برای همه قابل دسترسی خواهیم کرد!" #: tmp/cache_locale/94/94c6c1969d2fadbd23c135ac864b97902daca8f5c816b03864ea5c4970a167cf.php:101 #: tmp/cache_locale/66/666e9197f427d70c0743bcdae2c3e34f41f9d7acf2b2dddb2c21c21723e73d10.php:119 @@ -1060,17 +1063,17 @@ msgstr "" #: tmp/cache_locale/94/94c6c1969d2fadbd23c135ac864b97902daca8f5c816b03864ea5c4970a167cf.php:109 #: tmp/cache_locale/66/666e9197f427d70c0743bcdae2c3e34f41f9d7acf2b2dddb2c21c21723e73d10.php:127 msgid "Want to make a one time donation instead?" -msgstr "" +msgstr "آیا میخواهید یک حمایت یکباره بکنید؟" #: tmp/cache_locale/92/9248b30ecfc0bb3509fc7e1db98f98ec86e72399ad551da3d5abe54c7cd987af.php:34 #: tmp/cache_locale/05/05c65ace52301a00198c48e1d823da2c14fbd489e7fb45efbca4e79e5709cbdb.php:53 msgid "Processing Donation - Tor" -msgstr "در حال پردلزش کمک مالی - تور" +msgstr "در حال پردازش کمک مالی - تور" #: tmp/cache_locale/92/9248b30ecfc0bb3509fc7e1db98f98ec86e72399ad551da3d5abe54c7cd987af.php:44 #: tmp/cache_locale/05/05c65ace52301a00198c48e1d823da2c14fbd489e7fb45efbca4e79e5709cbdb.php:64 msgid "Processing Donation. Please Wait..." -msgstr "در حال پردلزش کمک مالی. لطفا صبر کنید…" +msgstr "در حال پردازش کمک مالی. لطفا صبر کنید…" #: tmp/cache_locale/92/92eb639bc328f3dd569fa22b60c4360b6fe38f1a4cd80a14fce862d91bd765cb.php:43 #: tmp/cache_locale/2d/2d5f07aeb16acd7bb0a8dd355b13f59678a1f0ba6ea2b3d9dec8d2b5dcfbfde5.php:25 @@ -1102,7 +1105,7 @@ msgstr "ثبت نام" #: tmp/cache_locale/92/92eb639bc328f3dd569fa22b60c4360b6fe38f1a4cd80a14fce862d91bd765cb.php:65 #: tmp/cache_locale/2d/2d5f07aeb16acd7bb0a8dd355b13f59678a1f0ba6ea2b3d9dec8d2b5dcfbfde5.php:47 msgid "Donate FAQs" -msgstr "" +msgstr "سوالات متداول حمایت مالی" #: tmp/cache_locale/92/92eb639bc328f3dd569fa22b60c4360b6fe38f1a4cd80a14fce862d91bd765cb.php:69 #: tmp/cache_locale/2d/2d5f07aeb16acd7bb0a8dd355b13f59678a1f0ba6ea2b3d9dec8d2b5dcfbfde5.php:51 @@ -1154,27 +1157,27 @@ msgstr "" #: tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:102 msgid "Bitcoin and Other Cryptocurrencies" -msgstr "" +msgstr "بیت کوین و دیگر ارز های دیجیتال" #: tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:108 msgid "BTCPayServer" -msgstr "" +msgstr "BTCPayServer" #: tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:112 msgid "BottlePay" -msgstr "" +msgstr "BottlePay" #: tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:116 msgid "Amazon Smile" -msgstr "" +msgstr "Amazon Smile" #: tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:120 msgid "Giving Assistant" -msgstr "" +msgstr "مشاوره دادن" #: tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:126 msgid "EU Bank Transfer" -msgstr "" +msgstr "انتقال بانک اروپا ( EU )" #: tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:132 msgid "" @@ -1184,7 +1187,7 @@ msgstr "" #: tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:138 msgid "Stock Donation" -msgstr "" +msgstr "حمایت کردن با سهام" #: tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:143 msgid "" @@ -1255,7 +1258,7 @@ msgstr "" #: tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:178 #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:95 msgid "Who uses Tor?" -msgstr "" +msgstr "چه کسی از تور استفاده می کند؟" #: tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:182 #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:99 @@ -1279,7 +1282,7 @@ msgstr "آیا هر کسی می‌تواند از تور استفاده کند؟ #: tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:194 #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:111 msgid "Yes! Tor is free, and anyone can use it." -msgstr "" +msgstr "بله! تور رایگان است و هر کسی می تواند از آن استفاده کند." #: tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:196 msgid "" @@ -1607,7 +1610,7 @@ msgstr "" #: tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:365 #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:264 msgid "If I am not in the United States, can I still donate?" -msgstr "" +msgstr "اگر من در ایالات متحده آمریکا نباشم، هنوز میتوانم حمایت کنم؟" #: tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:369 #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:268

1 0

[translation/tbmanual-contentspot] https://gitweb.torproject.org/translation.git/commit/?h=tbmanual-contentspot
by translation＠torproject.org 06 Jan '20

06 Jan '20

commit 039f0591620fc09da97cb3b4daf9c3c15373a403 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Jan 6 22:51:01 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tbmanual-contentspot --- contents+fa.po | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/contents+fa.po b/contents+fa.po index 7a8830017b..0ed7210cd1 100644 --- a/contents+fa.po +++ b/contents+fa.po @@ -9,6 +9,7 @@ # Emma Peel, 2019 # MYZJ, 2019 # Samaneh M <asamana.haoma(a)gmail.com>, 2019 +# AmirAli Dabouei <amirgm.info(a)gmail.com>, 2020 # msgid "" msgstr "" @@ -16,7 +17,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2019-11-29 10:58+CET\n" "PO-Revision-Date: 2018-11-14 12:31+0000\n" -"Last-Translator: Samaneh M <asamana.haoma(a)gmail.com>, 2019\n" +"Last-Translator: AmirAli Dabouei <amirgm.info(a)gmail.com>, 2020\n" "Language-Team: Persian (https://www.transifex.com/otf/teams/1519/fa/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -2583,7 +2584,7 @@ msgstr "نام کاربری و رمز عبور استفاده شده برای ا #: lego/templates/secure-connections.html:51 #: templates/secure-connections.html:51 msgid "data" -msgstr "data" +msgstr "داده" #: lego/templates/secure-connections.html:54 #: templates/secure-connections.html:54 @@ -2593,7 +2594,7 @@ msgstr "اطلاعاتی که منتقل می شوند." #: lego/templates/secure-connections.html:58 #: templates/secure-connections.html:58 msgid "location" -msgstr "location" +msgstr "موقعیت جغرافیایی" #: lego/templates/secure-connections.html:61 #: templates/secure-connections.html:61

1 0

[tor/master] test: Add TCPProxy option for haproxy protocol
by nickm＠torproject.org 06 Jan '20

06 Jan '20

commit 9dd04396ba66602e89df52fd8bc1cbad1201083b Author: Suphanat Chunhapanya <haxx.pop(a)gmail.com> Date: Thu Aug 22 10:25:04 2019 +0800 test: Add TCPProxy option for haproxy protocol --- src/test/test_config.c | 47 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) diff --git a/src/test/test_config.c b/src/test/test_config.c index cbb84e4dc..a9094c79b 100644 --- a/src/test/test_config.c +++ b/src/test/test_config.c @@ -672,6 +672,52 @@ transport_is_needed_mock(const char *transport_name) return transport_is_needed_mock_return; } +static void +test_config_parse_tcp_proxy_line(void *arg) +{ + (void)arg; + + int ret; + char *msg = NULL; + or_options_t *options = get_options_mutable(); + + /* Bad TCPProxy line - too short. */ + ret = parse_tcp_proxy_line("haproxy", options, &msg); + /* Return error. */ + tt_int_op(ret, OP_EQ, -1); + /* Correct error message. */ + tt_str_op(msg, OP_EQ, "TCPProxy has no address/port. Please fix."); + /* Free error message. */ + tor_free(msg); + + /* Bad TCPProxy line - unsupported protocol. */ + ret = parse_tcp_proxy_line("unsupported 95.216.163.36:443", options, &msg); + tt_int_op(ret, OP_EQ, -1); + tt_str_op(msg, OP_EQ, "TCPProxy protocol is not supported. Currently the " + "only supported protocol is 'haproxy'. Please fix."); + tor_free(msg); + + /* Bad TCPProxy line - unparsable address/port. */ + ret = parse_tcp_proxy_line("haproxy 95.216.163.36/443", options, &msg); + tt_int_op(ret, OP_EQ, -1); + tt_str_op(msg, OP_EQ, "TCPProxy address/port failed to parse or resolve. " + "Please fix."); + tor_free(msg); + + /* Good TCPProxy line - ipv4. */ + ret = parse_tcp_proxy_line("haproxy 95.216.163.36:443", options, &msg); + tt_int_op(ret, OP_EQ, 0); + tt_ptr_op(msg, OP_EQ, NULL); + tt_int_op(options->TCPProxyProtocol, OP_EQ, TCP_PROXY_PROTOCOL_HAPROXY); + /* Correct the address. */ + tt_assert(tor_addr_eq_ipv4h(&options->TCPProxyAddr, 0x5fd8a324)); + tt_int_op(options->TCPProxyPort, OP_EQ, 443); + tor_free(msg); + + done: + ; +} + /** * Test parsing for the ClientTransportPlugin and ServerTransportPlugin config * options. @@ -6097,6 +6143,7 @@ struct testcase_t config_tests[] = { CONFIG_TEST(parse_bridge_line, 0), CONFIG_TEST(parse_transport_options_line, 0), CONFIG_TEST(parse_transport_plugin_line, TT_FORK), + CONFIG_TEST(parse_tcp_proxy_line, TT_FORK), CONFIG_TEST(check_or_create_data_subdir, TT_FORK), CONFIG_TEST(write_to_data_subdir, TT_FORK), CONFIG_TEST(fix_my_family, 0),

1 0

[tor/master] circuit: Refactor connection_proxy_connect
by nickm＠torproject.org 06 Jan '20

06 Jan '20

commit 52e59640f9ae266d25a7727869c84e506c96a1c8 Author: Suphanat Chunhapanya <haxx.pop(a)gmail.com> Date: Fri Aug 23 10:35:50 2019 +0800 circuit: Refactor connection_proxy_connect Since connection_proxy_connect is too long now, it's better to create new functions (connection_https_proxy_connect, connection_socks4_proxy_connect, and connection_socks5_proxy_connect) to make connection_proxy_connect shorter. --- src/core/mainloop/connection.c | 293 ++++++++++++++++++++++++----------------- 1 file changed, 170 insertions(+), 123 deletions(-) diff --git a/src/core/mainloop/connection.c b/src/core/mainloop/connection.c index 6094f33e4..c135bf395 100644 --- a/src/core/mainloop/connection.c +++ b/src/core/mainloop/connection.c @@ -2326,165 +2326,212 @@ conn_get_proxy_type(const connection_t *conn) username NUL: */ #define SOCKS4_STANDARD_BUFFER_SIZE (1 + 1 + 2 + 4 + 1) -/** Write a proxy request of type (socks4, socks5, https) to conn - * for conn->addr:conn->port, authenticating with the auth details given - * in the configuration (if available). SOCKS 5 and HTTP CONNECT proxies - * support authentication. +/** Write a proxy request of https to conn for conn->addr:conn->port, + * authenticating with the auth details given in the configuration + * (if available). * * Returns -1 if conn->addr is incompatible with the proxy protocol, and * 0 otherwise. - * - * Use connection_read_proxy_handshake() to complete the handshake. */ -int -connection_proxy_connect(connection_t *conn, int type) +static int +connection_https_proxy_connect(connection_t *conn) { - const or_options_t *options; + tor_assert(conn); + + const or_options_t *options = get_options(); + char buf[1024]; + char *base64_authenticator = NULL; + const char *authenticator = options->HTTPSProxyAuthenticator; + + /* Send HTTP CONNECT and authentication (if available) in + * one request */ + + if (authenticator) { + base64_authenticator = alloc_http_authenticator(authenticator); + if (!base64_authenticator) + log_warn(LD_OR, "Encoding https authenticator failed"); + } + + if (base64_authenticator) { + const char *addrport = fmt_addrport(&conn->addr, conn->port); + tor_snprintf(buf, sizeof(buf), "CONNECT %s HTTP/1.1\r\n" + "Host: %s\r\n" + "Proxy-Authorization: Basic %s\r\n\r\n", + addrport, + addrport, + base64_authenticator); + tor_free(base64_authenticator); + } else { + tor_snprintf(buf, sizeof(buf), "CONNECT %s HTTP/1.0\r\n\r\n", + fmt_addrport(&conn->addr, conn->port)); + } + + connection_buf_add(buf, strlen(buf), conn); + conn->proxy_state = PROXY_HTTPS_WANT_CONNECT_OK; + return 0; +} + +/** Write a proxy request of socks4 to conn for conn->addr:conn->port. + * + * Returns -1 if conn->addr is incompatible with the proxy protocol, and + * 0 otherwise. + */ +static int +connection_socks4_proxy_connect(connection_t *conn) +{ tor_assert(conn); - options = get_options(); + unsigned char *buf; + uint16_t portn; + uint32_t ip4addr; + size_t buf_size = 0; + char *socks_args_string = NULL; - switch (type) { - case PROXY_CONNECT: { - char buf[1024]; - char *base64_authenticator=NULL; - const char *authenticator = options->HTTPSProxyAuthenticator; - - /* Send HTTP CONNECT and authentication (if available) in - * one request */ - - if (authenticator) { - base64_authenticator = alloc_http_authenticator(authenticator); - if (!base64_authenticator) - log_warn(LD_OR, "Encoding https authenticator failed"); - } + /* Send a SOCKS4 connect request */ - if (base64_authenticator) { - const char *addrport = fmt_addrport(&conn->addr, conn->port); - tor_snprintf(buf, sizeof(buf), "CONNECT %s HTTP/1.1\r\n" - "Host: %s\r\n" - "Proxy-Authorization: Basic %s\r\n\r\n", - addrport, - addrport, - base64_authenticator); - tor_free(base64_authenticator); - } else { - tor_snprintf(buf, sizeof(buf), "CONNECT %s HTTP/1.0\r\n\r\n", - fmt_addrport(&conn->addr, conn->port)); - } + if (tor_addr_family(&conn->addr) != AF_INET) { + log_warn(LD_NET, "SOCKS4 client is incompatible with IPv6"); + return -1; + } - connection_buf_add(buf, strlen(buf), conn); - conn->proxy_state = PROXY_HTTPS_WANT_CONNECT_OK; - break; + { /* If we are here because we are trying to connect to a + pluggable transport proxy, check if we have any SOCKS + arguments to transmit. If we do, compress all arguments to + a single string in 'socks_args_string': */ + + if (conn_get_proxy_type(conn) == PROXY_PLUGGABLE) { + socks_args_string = + pt_get_socks_args_for_proxy_addrport(&conn->addr, conn->port); + if (socks_args_string) + log_debug(LD_NET, "Sending out '%s' as our SOCKS argument string.", + socks_args_string); } + } - case PROXY_SOCKS4: { - unsigned char *buf; - uint16_t portn; - uint32_t ip4addr; - size_t buf_size = 0; - char *socks_args_string = NULL; + { /* Figure out the buffer size we need for the SOCKS message: */ - /* Send a SOCKS4 connect request */ + buf_size = SOCKS4_STANDARD_BUFFER_SIZE; - if (tor_addr_family(&conn->addr) != AF_INET) { - log_warn(LD_NET, "SOCKS4 client is incompatible with IPv6"); - return -1; - } + /* If we have a SOCKS argument string, consider its size when + calculating the buffer size: */ + if (socks_args_string) + buf_size += strlen(socks_args_string); + } - { /* If we are here because we are trying to connect to a - pluggable transport proxy, check if we have any SOCKS - arguments to transmit. If we do, compress all arguments to - a single string in 'socks_args_string': */ + buf = tor_malloc_zero(buf_size); - if (conn_get_proxy_type(conn) == PROXY_PLUGGABLE) { - socks_args_string = - pt_get_socks_args_for_proxy_addrport(&conn->addr, conn->port); - if (socks_args_string) - log_debug(LD_NET, "Sending out '%s' as our SOCKS argument string.", - socks_args_string); - } - } + ip4addr = tor_addr_to_ipv4n(&conn->addr); + portn = htons(conn->port); - { /* Figure out the buffer size we need for the SOCKS message: */ + buf[0] = 4; /* version */ + buf[1] = SOCKS_COMMAND_CONNECT; /* command */ + memcpy(buf + 2, &portn, 2); /* port */ + memcpy(buf + 4, &ip4addr, 4); /* addr */ + + /* Next packet field is the userid. If we have pluggable + transport SOCKS arguments, we have to embed them + there. Otherwise, we use an empty userid. */ + if (socks_args_string) { /* place the SOCKS args string: */ + tor_assert(strlen(socks_args_string) > 0); + tor_assert(buf_size >= + SOCKS4_STANDARD_BUFFER_SIZE + strlen(socks_args_string)); + strlcpy((char *)buf + 8, socks_args_string, buf_size - 8); + tor_free(socks_args_string); + } else { + buf[8] = 0; /* no userid */ + } - buf_size = SOCKS4_STANDARD_BUFFER_SIZE; + connection_buf_add((char *)buf, buf_size, conn); + tor_free(buf); - /* If we have a SOCKS argument string, consider its size when - calculating the buffer size: */ - if (socks_args_string) - buf_size += strlen(socks_args_string); - } + conn->proxy_state = PROXY_SOCKS4_WANT_CONNECT_OK; + return 0; +} - buf = tor_malloc_zero(buf_size); - - ip4addr = tor_addr_to_ipv4n(&conn->addr); - portn = htons(conn->port); - - buf[0] = 4; /* version */ - buf[1] = SOCKS_COMMAND_CONNECT; /* command */ - memcpy(buf + 2, &portn, 2); /* port */ - memcpy(buf + 4, &ip4addr, 4); /* addr */ - - /* Next packet field is the userid. If we have pluggable - transport SOCKS arguments, we have to embed them - there. Otherwise, we use an empty userid. */ - if (socks_args_string) { /* place the SOCKS args string: */ - tor_assert(strlen(socks_args_string) > 0); - tor_assert(buf_size >= - SOCKS4_STANDARD_BUFFER_SIZE + strlen(socks_args_string)); - strlcpy((char *)buf + 8, socks_args_string, buf_size - 8); - tor_free(socks_args_string); - } else { - buf[8] = 0; /* no userid */ - } +/** Write a proxy request of socks5 to conn for conn->addr:conn->port, + * authenticating with the auth details given in the configuration + * (if available). + * + * Returns -1 if conn->addr is incompatible with the proxy protocol, and + * 0 otherwise. + */ +static int +connection_socks5_proxy_connect(connection_t *conn) +{ + tor_assert(conn); - connection_buf_add((char *)buf, buf_size, conn); - tor_free(buf); + const or_options_t *options = get_options(); + unsigned char buf[4]; /* fields: vers, num methods, method list */ - conn->proxy_state = PROXY_SOCKS4_WANT_CONNECT_OK; - break; - } + /* Send a SOCKS5 greeting (connect request must wait) */ - case PROXY_SOCKS5: { - unsigned char buf[4]; /* fields: vers, num methods, method list */ + buf[0] = 5; /* version */ - /* Send a SOCKS5 greeting (connect request must wait) */ + /* We have to use SOCKS5 authentication, if we have a + Socks5ProxyUsername or if we want to pass arguments to our + pluggable transport proxy: */ + if ((options->Socks5ProxyUsername) || + (conn_get_proxy_type(conn) == PROXY_PLUGGABLE && + (get_socks_args_by_bridge_addrport(&conn->addr, conn->port)))) { + /* number of auth methods */ + buf[1] = 2; + buf[2] = 0x00; /* no authentication */ + buf[3] = 0x02; /* rfc1929 Username/Passwd auth */ + conn->proxy_state = PROXY_SOCKS5_WANT_AUTH_METHOD_RFC1929; + } else { + buf[1] = 1; + buf[2] = 0x00; /* no authentication */ + conn->proxy_state = PROXY_SOCKS5_WANT_AUTH_METHOD_NONE; + } - buf[0] = 5; /* version */ + connection_buf_add((char *)buf, 2 + buf[1], conn); + return 0; +} - /* We have to use SOCKS5 authentication, if we have a - Socks5ProxyUsername or if we want to pass arguments to our - pluggable transport proxy: */ - if ((options->Socks5ProxyUsername) || - (conn_get_proxy_type(conn) == PROXY_PLUGGABLE && - (get_socks_args_by_bridge_addrport(&conn->addr, conn->port)))) { - /* number of auth methods */ - buf[1] = 2; - buf[2] = 0x00; /* no authentication */ - buf[3] = 0x02; /* rfc1929 Username/Passwd auth */ - conn->proxy_state = PROXY_SOCKS5_WANT_AUTH_METHOD_RFC1929; - } else { - buf[1] = 1; - buf[2] = 0x00; /* no authentication */ - conn->proxy_state = PROXY_SOCKS5_WANT_AUTH_METHOD_NONE; - } +/** Write a proxy request of type (socks4, socks5, https, haproxy) + * to conn for conn->addr:conn->port, authenticating with the auth details + * given in the configuration (if available). SOCKS 5 and HTTP CONNECT + * proxies support authentication. + * + * Returns -1 if conn->addr is incompatible with the proxy protocol, and + * 0 otherwise. + * + * Use connection_read_proxy_handshake() to complete the handshake. + */ +int +connection_proxy_connect(connection_t *conn, int type) +{ + int ret = 0; + + tor_assert(conn); - connection_buf_add((char *)buf, 2 + buf[1], conn); + switch (type) { + case PROXY_CONNECT: + ret = connection_https_proxy_connect(conn); + break; + + case PROXY_SOCKS4: + ret = connection_socks4_proxy_connect(conn); + break; + + case PROXY_SOCKS5: + ret = connection_socks5_proxy_connect(conn); break; - } default: log_err(LD_BUG, "Invalid proxy protocol, %d", type); tor_fragile_assert(); - return -1; + ret = -1; + break; } - log_debug(LD_NET, "set state %s", - connection_proxy_state_to_string(conn->proxy_state)); + if (ret == 0) { + log_debug(LD_NET, "set state %s", + connection_proxy_state_to_string(conn->proxy_state)); + } - return 0; + return ret; } /** Read conn's inbuf. If the http response from the proxy is all

1 0

[tor/master] doc: TCPProxy is not supported in TOR_PT_PROXY
by nickm＠torproject.org 06 Jan '20

06 Jan '20

commit 101bdeb02d78aab7d7b4b13e8620203ce6e44b4c Author: Suphanat Chunhapanya <haxx.pop(a)gmail.com> Date: Thu Aug 22 11:53:59 2019 +0800 doc: TCPProxy is not supported in TOR_PT_PROXY Because we need to construct the URI using the TCPProxy configuration but we don't have a standard URI scheme for haproxy yet, we decided to not support TCPProxy in TOR_PT_PROXY now. There is no problem with HTTPSProxy, Socks4Proxy, or Socks5Proxy because they all have standard URI schemes. --- src/feature/client/transports.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/feature/client/transports.c b/src/feature/client/transports.c index 97bfc8ae3..de383c983 100644 --- a/src/feature/client/transports.c +++ b/src/feature/client/transports.c @@ -733,6 +733,9 @@ get_pt_proxy_uri(void) const or_options_t *options = get_options(); char *uri = NULL; + /* XXX: Currently TCPProxy is not supported in TOR_PT_PROXY because + * there isn't a standard URI scheme for some proxy protocols, such as + * haproxy. */ if (options->Socks4Proxy || options->Socks5Proxy || options->HTTPSProxy) { char addr[TOR_ADDR_BUF_LEN+1];

1 0

[tor/master] circuit: Implement haproxy
by nickm＠torproject.org 06 Jan '20

06 Jan '20

commit 119004e87d6303de5e90e7dfad87dd89bae6bd5f Author: Suphanat Chunhapanya <haxx.pop(a)gmail.com> Date: Fri Aug 23 11:44:49 2019 +0800 circuit: Implement haproxy --- src/core/include.am | 2 ++ src/core/mainloop/connection.c | 48 +++++++++++++++++++++++++++++- src/core/mainloop/connection.h | 4 ++- src/core/or/connection_or.c | 15 +++++++++- src/core/or/or.h | 5 ++-- src/core/or/or_connection_st.h | 2 +- src/core/proto/.may_include | 6 +++- src/core/proto/proto_haproxy.c | 45 ++++++++++++++++++++++++++++ src/core/proto/proto_haproxy.h | 12 ++++++++ src/feature/control/btrack_orconn_cevent.c | 1 + 10 files changed, 133 insertions(+), 7 deletions(-) diff --git a/src/core/include.am b/src/core/include.am index 9b4b251c8..8f455c177 100644 --- a/src/core/include.am +++ b/src/core/include.am @@ -63,6 +63,7 @@ LIBTOR_APP_A_SOURCES = \ src/core/proto/proto_cell.c \ src/core/proto/proto_control0.c \ src/core/proto/proto_ext_or.c \ + src/core/proto/proto_haproxy.c \ src/core/proto/proto_http.c \ src/core/proto/proto_socks.c \ src/feature/api/tor_api.c \ @@ -295,6 +296,7 @@ noinst_HEADERS += \ src/core/proto/proto_cell.h \ src/core/proto/proto_control0.h \ src/core/proto/proto_ext_or.h \ + src/core/proto/proto_haproxy.h \ src/core/proto/proto_http.h \ src/core/proto/proto_socks.h \ src/feature/api/tor_api_internal.h \ diff --git a/src/core/mainloop/connection.c b/src/core/mainloop/connection.c index c135bf395..de91b93cb 100644 --- a/src/core/mainloop/connection.c +++ b/src/core/mainloop/connection.c @@ -83,6 +83,7 @@ #include "core/or/reasons.h" #include "core/or/relay.h" #include "core/or/crypt_path.h" +#include "core/proto/proto_haproxy.h" #include "core/proto/proto_http.h" #include "core/proto/proto_socks.h" #include "feature/client/dnsserv.h" @@ -2317,7 +2318,11 @@ conn_get_proxy_type(const connection_t *conn) return PROXY_SOCKS4; else if (options->Socks5Proxy) return PROXY_SOCKS5; - else + else if (options->TCPProxy) { + /* The only supported protocol in TCPProxy is haproxy. */ + tor_assert(options->TCPProxyProtocol == TCP_PROXY_PROTOCOL_HAPROXY); + return PROXY_HAPROXY; + } else return PROXY_NONE; } @@ -2489,6 +2494,35 @@ connection_socks5_proxy_connect(connection_t *conn) return 0; } +/** Write a proxy request of haproxy to conn for conn->addr:conn->port. + * + * Returns -1 if conn->addr is incompatible with the proxy protocol, and + * 0 otherwise. + */ +static int +connection_haproxy_proxy_connect(connection_t *conn) +{ + int ret = 0; + tor_addr_port_t *addr_port = tor_addr_port_new(&conn->addr, conn->port); + char *buf = haproxy_format_proxy_header_line(addr_port); + + if (buf == NULL) { + ret = -1; + goto done; + } + + connection_buf_add(buf, strlen(buf), conn); + /* In haproxy, we don't have to wait for the response, but we wait for ack. + * So we can set the state to be PROXY_HAPROXY_WAIT_FOR_FLUSH. */ + conn->proxy_state = PROXY_HAPROXY_WAIT_FOR_FLUSH; + + ret = 0; + done: + tor_free(buf); + tor_free(addr_port); + return ret; +} + /** Write a proxy request of type (socks4, socks5, https, haproxy) * to conn for conn->addr:conn->port, authenticating with the auth details * given in the configuration (if available). SOCKS 5 and HTTP CONNECT @@ -2519,6 +2553,10 @@ connection_proxy_connect(connection_t *conn, int type) ret = connection_socks5_proxy_connect(conn); break; + case PROXY_HAPROXY: + ret = connection_haproxy_proxy_connect(conn); + break; + default: log_err(LD_BUG, "Invalid proxy protocol, %d", type); tor_fragile_assert(); @@ -5498,6 +5536,13 @@ get_proxy_addrport(tor_addr_t *addr, uint16_t *port, int *proxy_type, *port = options->Socks5ProxyPort; *proxy_type = PROXY_SOCKS5; return 0; + } else if (options->TCPProxy) { + tor_addr_copy(addr, &options->TCPProxyAddr); + *port = options->TCPProxyPort; + /* The only supported protocol in TCPProxy is haproxy. */ + tor_assert(options->TCPProxyProtocol == TCP_PROXY_PROTOCOL_HAPROXY); + *proxy_type = PROXY_HAPROXY; + return 0; } tor_addr_make_unspec(addr); @@ -5535,6 +5580,7 @@ proxy_type_to_string(int proxy_type) case PROXY_CONNECT: return "HTTP"; case PROXY_SOCKS4: return "SOCKS4"; case PROXY_SOCKS5: return "SOCKS5"; + case PROXY_HAPROXY: return "HAPROXY"; case PROXY_PLUGGABLE: return "pluggable transports SOCKS"; case PROXY_NONE: return "NULL"; default: tor_assert(0); diff --git a/src/core/mainloop/connection.h b/src/core/mainloop/connection.h index c93f1ef8e..2ebb053cc 100644 --- a/src/core/mainloop/connection.h +++ b/src/core/mainloop/connection.h @@ -75,8 +75,10 @@ struct buf_t; #define PROXY_SOCKS5_WANT_AUTH_RFC1929_OK 6 /* We use a SOCKS5 proxy and we just sent our CONNECT command. */ #define PROXY_SOCKS5_WANT_CONNECT_OK 7 +/* We use an HAPROXY proxy and we just sent the proxy header. */ +#define PROXY_HAPROXY_WAIT_FOR_FLUSH 8 /* We use a proxy and we CONNECTed successfully!. */ -#define PROXY_CONNECTED 8 +#define PROXY_CONNECTED 9 /** State for any listener connection. */ #define LISTENER_STATE_READY 0 diff --git a/src/core/or/connection_or.c b/src/core/or/connection_or.c index 4c93351e3..d9db17ef7 100644 --- a/src/core/or/connection_or.c +++ b/src/core/or/connection_or.c @@ -726,6 +726,18 @@ connection_or_finished_flushing(or_connection_t *conn) switch (conn->base_.state) { case OR_CONN_STATE_PROXY_HANDSHAKING: + /* PROXY_HAPROXY gets connected by receiving an ack. */ + if (conn->proxy_type == PROXY_HAPROXY) { + tor_assert(TO_CONN(conn)->proxy_state == PROXY_HAPROXY_WAIT_FOR_FLUSH); + TO_CONN(conn)->proxy_state = PROXY_CONNECTED; + + if (connection_tls_start_handshake(conn, 0) < 0) { + /* TLS handshaking error of some kind. */ + connection_or_close_for_error(conn, 0); + return -1; + } + break; + } case OR_CONN_STATE_OPEN: case OR_CONN_STATE_OR_HANDSHAKING_V2: case OR_CONN_STATE_OR_HANDSHAKING_V3: @@ -765,8 +777,9 @@ connection_or_finished_connecting(or_connection_t *or_conn) return -1; } - connection_start_reading(conn); connection_or_change_state(or_conn, OR_CONN_STATE_PROXY_HANDSHAKING); + connection_start_reading(conn); + return 0; } diff --git a/src/core/or/or.h b/src/core/or/or.h index 990cfacbc..9a7a9cc4b 100644 --- a/src/core/or/or.h +++ b/src/core/or/or.h @@ -168,12 +168,13 @@ struct curve25519_public_key_t; #define PROXY_CONNECT 1 #define PROXY_SOCKS4 2 #define PROXY_SOCKS5 3 -/* !!!! If there is ever a PROXY_* type over 3, we must grow the proxy_type +#define PROXY_HAPROXY 4 +/* !!!! If there is ever a PROXY_* type over 7, we must grow the proxy_type * field in or_connection_t */ /* Pluggable transport proxy type. Don't use this in or_connection_t, * instead use the actual underlying proxy type (see above). */ -#define PROXY_PLUGGABLE 4 +#define PROXY_PLUGGABLE 5 /** How many circuits do we want simultaneously in-progress to handle * a given stream? */ diff --git a/src/core/or/or_connection_st.h b/src/core/or/or_connection_st.h index 051fcd00d..ae94b42cd 100644 --- a/src/core/or/or_connection_st.h +++ b/src/core/or/or_connection_st.h @@ -58,7 +58,7 @@ struct or_connection_t { /** True iff this is an outgoing connection. */ unsigned int is_outgoing:1; - unsigned int proxy_type:2; /**< One of PROXY_NONE...PROXY_SOCKS5 */ + unsigned int proxy_type:3; /**< One of PROXY_NONE...PROXY_HAPROXY */ unsigned int wide_circ_ids:1; /** True iff this connection has had its bootstrap failure logged with * control_event_bootstrap_problem. */ diff --git a/src/core/proto/.may_include b/src/core/proto/.may_include index c1647a5cf..a66c3f83a 100644 --- a/src/core/proto/.may_include +++ b/src/core/proto/.may_include @@ -4,7 +4,11 @@ orconfig.h lib/crypt_ops/*.h lib/buf/*.h +lib/malloc/*.h +lib/string/*.h + +lib/net/address.h trunnel/*.h -core/proto/*.h \ No newline at end of file +core/proto/*.h diff --git a/src/core/proto/proto_haproxy.c b/src/core/proto/proto_haproxy.c new file mode 100644 index 000000000..856f2ab15 --- /dev/null +++ b/src/core/proto/proto_haproxy.c @@ -0,0 +1,45 @@ +/* Copyright (c) 2019, The Tor Project, Inc. */ +/* See LICENSE for licensing information */ + +#define PROTO_HAPROXY_PRIVATE +#include "lib/malloc/malloc.h" +#include "lib/net/address.h" +#include "lib/string/printf.h" +#include "core/proto/proto_haproxy.h" + +/** Return a newly allocated PROXY header null-terminated string. Returns NULL + * if addr_port->addr is incompatible with the proxy protocol. + */ +char * +haproxy_format_proxy_header_line(const tor_addr_port_t *addr_port) +{ + tor_assert(addr_port); + + sa_family_t family = tor_addr_family(&addr_port->addr); + const char *family_string = NULL; + const char *src_addr_string = NULL; + + switch (family) { + case AF_INET: + family_string = "TCP4"; + src_addr_string = "0.0.0.0"; + break; + case AF_INET6: + family_string = "TCP6"; + src_addr_string = "::"; + break; + default: + /* Unknown family. */ + return NULL; + } + + char *buf; + char addrbuf[TOR_ADDR_BUF_LEN]; + + tor_addr_to_str(addrbuf, &addr_port->addr, sizeof(addrbuf), 0); + + tor_asprintf(&buf, "PROXY %s %s %s 0 %d\r\n", family_string, src_addr_string, + addrbuf, addr_port->port); + + return buf; +} diff --git a/src/core/proto/proto_haproxy.h b/src/core/proto/proto_haproxy.h new file mode 100644 index 000000000..fd4240f5d --- /dev/null +++ b/src/core/proto/proto_haproxy.h @@ -0,0 +1,12 @@ +/* Copyright (c) 2019, The Tor Project, Inc. */ +/* See LICENSE for licensing information */ + +#ifndef TOR_PROTO_HAPROXY_H +#define TOR_PROTO_HAPROXY_H + +struct tor_addr_port_t; + +char *haproxy_format_proxy_header_line( + const struct tor_addr_port_t *addr_port); + +#endif /* !defined(TOR_PROTO_HAPROXY_H) */ diff --git a/src/feature/control/btrack_orconn_cevent.c b/src/feature/control/btrack_orconn_cevent.c index 535aa8f61..d4ba7f79a 100644 --- a/src/feature/control/btrack_orconn_cevent.c +++ b/src/feature/control/btrack_orconn_cevent.c @@ -45,6 +45,7 @@ using_proxy(const bt_orconn_t *bto) case PROXY_CONNECT: case PROXY_SOCKS4: case PROXY_SOCKS5: + case PROXY_HAPROXY: return true; default: return false;

1 0

[tor/master] test: Implement haproxy
by nickm＠torproject.org 06 Jan '20

06 Jan '20

commit 41b9dca07bb7dea4758cf97f9bbff7a52b09ebf4 Author: Suphanat Chunhapanya <haxx.pop(a)gmail.com> Date: Tue Sep 10 15:32:08 2019 +0800 test: Implement haproxy --- src/test/include.am | 1 + src/test/test.c | 1 + src/test/test.h | 1 + src/test/test_proto_haproxy.c | 66 +++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 69 insertions(+) diff --git a/src/test/include.am b/src/test/include.am index d8e25dea9..b7f3d7ece 100644 --- a/src/test/include.am +++ b/src/test/include.am @@ -182,6 +182,7 @@ src_test_test_SOURCES += \ src/test/test_process_descs.c \ src/test/test_prob_distr.c \ src/test/test_procmon.c \ + src/test/test_proto_haproxy.c \ src/test/test_proto_http.c \ src/test/test_proto_misc.c \ src/test/test_protover.c \ diff --git a/src/test/test.c b/src/test/test.c index 6dbec26fa..11a00606f 100644 --- a/src/test/test.c +++ b/src/test/test.c @@ -899,6 +899,7 @@ struct testgroup_t testgroups[] = { { "prob_distr/", prob_distr_tests }, { "procmon/", procmon_tests }, { "process/", process_tests }, + { "proto/haproxy/", proto_haproxy_tests }, { "proto/http/", proto_http_tests }, { "proto/misc/", proto_misc_tests }, { "protover/", protover_tests }, diff --git a/src/test/test.h b/src/test/test.h index 76c4c0ec7..fdae38a10 100644 --- a/src/test/test.h +++ b/src/test/test.h @@ -254,6 +254,7 @@ extern struct testcase_t slow_stochastic_prob_distr_tests[]; extern struct testcase_t procmon_tests[]; extern struct testcase_t process_tests[]; extern struct testcase_t process_descs_tests[]; +extern struct testcase_t proto_haproxy_tests[]; extern struct testcase_t proto_http_tests[]; extern struct testcase_t proto_misc_tests[]; extern struct testcase_t protover_tests[]; diff --git a/src/test/test_proto_haproxy.c b/src/test/test_proto_haproxy.c new file mode 100644 index 000000000..653bf67e2 --- /dev/null +++ b/src/test/test_proto_haproxy.c @@ -0,0 +1,66 @@ +/* Copyright (c) 2019, The Tor Project, Inc. */ +/* See LICENSE for licensing information */ + +/** + * \file test_proto_haproxy.c + * \brief Tests for our HAProxy protocol parser code + */ + +#define PROTO_HAPROXY_PRIVATE + +#include "test/test.h" +#include "core/proto/proto_haproxy.h" +#include "test/log_test_helpers.h" + +static void +test_format_proxy_header_line(void *arg) +{ + tor_addr_t addr; + tor_addr_port_t *addr_port = NULL; + char *output = NULL; + + (void) arg; + + /* IPv4 address. */ + tor_addr_parse(&addr, "192.168.1.2"); + addr_port = tor_addr_port_new(&addr, 8000); + output = haproxy_format_proxy_header_line(addr_port); + + tt_str_op(output, OP_EQ, "PROXY TCP4 0.0.0.0 192.168.1.2 0 8000\r\n"); + + tor_free(addr_port); + tor_free(output); + + /* IPv6 address. */ + tor_addr_parse(&addr, "123:45:6789::5005:11"); + addr_port = tor_addr_port_new(&addr, 8000); + output = haproxy_format_proxy_header_line(addr_port); + + tt_str_op(output, OP_EQ, "PROXY TCP6 :: 123:45:6789::5005:11 0 8000\r\n"); + + tor_free(addr_port); + tor_free(output); + + /* UNIX socket address. */ + memset(&addr, 0, sizeof(addr)); + addr.family = AF_UNIX; + addr_port = tor_addr_port_new(&addr, 8000); + output = haproxy_format_proxy_header_line(addr_port); + + /* If it's not an IPv4 or IPv6 address, haproxy_format_proxy_header_line + * must return NULL. */ + tt_ptr_op(output, OP_EQ, NULL); + + tor_free(addr_port); + tor_free(output); + + done: + tor_free(addr_port); + tor_free(output); +} + +struct testcase_t proto_haproxy_tests[] = { + { "format_proxy_header_line", test_format_proxy_header_line, 0, NULL, NULL }, + + END_OF_TESTCASES +};

1 0

[tor/master] test: HAPRoxy protocol
by nickm＠torproject.org 06 Jan '20

06 Jan '20

commit de58a49a2db20638823a77a1fb4c7f913f4f2169 Author: Suphanat Chunhapanya <haxx.pop(a)gmail.com> Date: Mon Oct 21 18:00:02 2019 +0800 test: HAPRoxy protocol --- src/core/or/connection_or.c | 11 ++---- src/core/or/connection_or.h | 7 ++++ src/test/test_connection.c | 77 ++++++++++++++++++++++++++++++++++++++++-- src/test/test_connection.h | 1 + src/test/test_helpers.c | 81 +++++++++++++++++++++++++++++++++++++++++++++ src/test/test_helpers.h | 3 ++ 6 files changed, 169 insertions(+), 11 deletions(-) diff --git a/src/core/or/connection_or.c b/src/core/or/connection_or.c index d9db17ef7..31b821088 100644 --- a/src/core/or/connection_or.c +++ b/src/core/or/connection_or.c @@ -95,13 +95,6 @@ static unsigned int connection_or_is_bad_for_new_circs(or_connection_t *or_conn); static void connection_or_mark_bad_for_new_circs(or_connection_t *or_conn); -/* - * Call this when changing connection state, so notifications to the owning - * channel can be handled. - */ - -static void connection_or_change_state(or_connection_t *conn, uint8_t state); - static void connection_or_check_canonicity(or_connection_t *conn, int started_here); @@ -457,8 +450,8 @@ connection_or_state_publish(const or_connection_t *conn, uint8_t state) * be notified. */ -static void -connection_or_change_state(or_connection_t *conn, uint8_t state) +MOCK_IMPL(STATIC void, +connection_or_change_state,(or_connection_t *conn, uint8_t state)) { tor_assert(conn); diff --git a/src/core/or/connection_or.h b/src/core/or/connection_or.h index 272f536b8..9d414254a 100644 --- a/src/core/or/connection_or.h +++ b/src/core/or/connection_or.h @@ -134,6 +134,13 @@ void connection_or_group_set_badness_(smartlist_t *group, int force); #ifdef CONNECTION_OR_PRIVATE STATIC int should_connect_to_relay(const or_connection_t *or_conn); STATIC void note_or_connect_failed(const or_connection_t *or_conn); + +/* + * Call this when changing connection state, so notifications to the owning + * channel can be handled. + */ +MOCK_DECL(STATIC void,connection_or_change_state, + (or_connection_t *conn, uint8_t state)); #endif #ifdef TOR_UNIT_TESTS diff --git a/src/test/test_connection.c b/src/test/test_connection.c index ebe7c6d36..36543b3af 100644 --- a/src/test/test_connection.c +++ b/src/test/test_connection.c @@ -10,6 +10,7 @@ #include "core/or/or.h" #include "test/test.h" +#include "app/config/or_options_st.h" #include "core/mainloop/connection.h" #include "core/or/connection_edge.h" #include "feature/hs/hs_common.h" @@ -312,6 +313,31 @@ test_conn_download_status_teardown(const struct testcase_t *tc, void *arg) return rv; } +static void * +test_conn_proxy_connect_setup(const struct testcase_t *tc) +{ + tcp_proxy_protocol_t proxy_type = (tcp_proxy_protocol_t)tc->setup_data; + switch (proxy_type) { + case TCP_PROXY_PROTOCOL_HAPROXY: + return test_conn_get_proxy_or_connection(PROXY_HAPROXY); + default: + return NULL; + } +} + +static int +test_conn_proxy_connect_teardown(const struct testcase_t *tc, void *arg) +{ + (void)tc; + or_connection_t *conn = arg; + + tt_assert(conn); + assert_connection_ok(&conn->base_, time(NULL)); + + done: + return 1; +} + /* Like connection_ap_make_link(), but does much less */ static connection_t * test_conn_get_linked_connection(connection_t *l_conn, uint8_t state) @@ -360,6 +386,10 @@ static struct testcase_setup_t test_conn_download_status_st = { test_conn_download_status_setup, test_conn_download_status_teardown }; +static struct testcase_setup_t test_conn_proxy_connect_st = { + test_conn_proxy_connect_setup, test_conn_proxy_connect_teardown +}; + static void test_conn_get_basic(void *arg) { @@ -788,6 +818,45 @@ test_conn_download_status(void *arg) /* the teardown function removes all the connections in the global list*/; } +static int handshake_start_called = 0; + +static int +handshake_start(or_connection_t *conn, int receiving) +{ + (void)receiving; + + tor_assert(conn); + + handshake_start_called = 1; + return 0; +} + +static void +test_conn_haproxy_proxy_connect(void *arg) +{ + size_t sz; + char *buf = NULL; + or_connection_t *conn = arg; + + MOCK(connection_or_change_state, mock_connection_or_change_state); + MOCK(connection_tls_start_handshake, handshake_start); + + tt_int_op(conn->base_.proxy_state, OP_EQ, PROXY_HAPROXY_WAIT_FOR_FLUSH); + + buf = buf_get_contents(conn->base_.outbuf, &sz); + tt_str_op(buf, OP_EQ, "PROXY TCP4 0.0.0.0 127.0.0.1 0 12345\r\n"); + + connection_or_finished_flushing(conn); + + tt_int_op(conn->base_.proxy_state, OP_EQ, PROXY_CONNECTED); + tt_int_op(handshake_start_called, OP_EQ, 1); + + done: + UNMOCK(connection_or_change_state); + UNMOCK(connection_tls_start_handshake); + tor_free(buf); +} + static node_t test_node; static node_t * @@ -892,10 +961,14 @@ struct testcase_t connection_tests[] = { CONNECTION_TESTCASE(get_basic, TT_FORK, test_conn_get_basic_st), CONNECTION_TESTCASE(get_rend, TT_FORK, test_conn_get_rend_st), CONNECTION_TESTCASE(get_rsrc, TT_FORK, test_conn_get_rsrc_st), - CONNECTION_TESTCASE_ARG(download_status, TT_FORK, + + CONNECTION_TESTCASE_ARG(download_status, TT_FORK, test_conn_download_status_st, FLAV_MICRODESC), - CONNECTION_TESTCASE_ARG(download_status, TT_FORK, + CONNECTION_TESTCASE_ARG(download_status, TT_FORK, test_conn_download_status_st, FLAV_NS), + CONNECTION_TESTCASE_ARG(haproxy_proxy_connect, TT_FORK, + test_conn_proxy_connect_st, + TCP_PROXY_PROTOCOL_HAPROXY), //CONNECTION_TESTCASE(func_suffix, TT_FORK, setup_func_pair), { "failed_orconn_tracker", test_failed_orconn_tracker, TT_FORK, NULL, NULL }, END_OF_TESTCASES diff --git a/src/test/test_connection.h b/src/test/test_connection.h index 40121e6d3..9efe31ebc 100644 --- a/src/test/test_connection.h +++ b/src/test/test_connection.h @@ -7,6 +7,7 @@ /** Some constants used by test_connection and helpers */ #define TEST_CONN_FAMILY (AF_INET) #define TEST_CONN_ADDRESS "127.0.0.1" +#define TEST_CONN_ADDRESS_2 "127.0.0.2" #define TEST_CONN_PORT (12345) #define TEST_CONN_ADDRESS_PORT "127.0.0.1:12345" #define TEST_CONN_FD_INIT 50 diff --git a/src/test/test_helpers.c b/src/test/test_helpers.c index 8eb3c2c92..f972aca5b 100644 --- a/src/test/test_helpers.c +++ b/src/test/test_helpers.c @@ -9,6 +9,7 @@ #define ROUTERLIST_PRIVATE #define CONFIG_PRIVATE #define CONNECTION_PRIVATE +#define CONNECTION_OR_PRIVATE #define MAINLOOP_PRIVATE #include "orconfig.h" @@ -19,6 +20,7 @@ #include "lib/confmgt/confparse.h" #include "app/main/subsysmgr.h" #include "core/mainloop/connection.h" +#include "core/or/connection_or.h" #include "lib/crypt_ops/crypto_rand.h" #include "core/mainloop/mainloop.h" #include "feature/nodelist/nodelist.h" @@ -33,6 +35,7 @@ #include "core/or/cell_st.h" #include "core/or/connection_st.h" +#include "core/or/or_connection_st.h" #include "feature/nodelist/node_st.h" #include "core/or/origin_circuit_st.h" #include "feature/nodelist/routerlist_st.h" @@ -194,6 +197,14 @@ fake_close_socket(tor_socket_t sock) return 0; } +/* Helper for test_conn_get_proxy_or_connection() */ +void +mock_connection_or_change_state(or_connection_t *conn, uint8_t state) +{ + tor_assert(conn); + conn->base_.state = state; +} + static int mock_connection_connect_sockaddr_called = 0; static int fake_socket_number = TEST_CONN_FD_INIT; @@ -228,6 +239,76 @@ mock_connection_connect_sockaddr(connection_t *conn, return 1; } +or_connection_t * +test_conn_get_proxy_or_connection(unsigned int proxy_type) +{ + or_connection_t *conn = NULL; + tor_addr_t dst_addr; + tor_addr_t proxy_addr; + int socket_err = 0; + int in_progress = 0; + + MOCK(connection_connect_sockaddr, + mock_connection_connect_sockaddr); + MOCK(connection_write_to_buf_impl_, + connection_write_to_buf_mock); + MOCK(connection_or_change_state, + mock_connection_or_change_state); + MOCK(tor_close_socket, fake_close_socket); + + tor_init_connection_lists(); + + conn = or_connection_new(CONN_TYPE_OR, TEST_CONN_FAMILY); + tt_assert(conn); + + /* Set up a destination address. */ + test_conn_lookup_addr_helper(TEST_CONN_ADDRESS, TEST_CONN_FAMILY, + &dst_addr); + tt_assert(!tor_addr_is_null(&dst_addr)); + + conn->proxy_type = proxy_type; + conn->base_.proxy_state = PROXY_INFANT; + + tor_addr_copy_tight(&conn->base_.addr, &dst_addr); + conn->base_.address = tor_addr_to_str_dup(&dst_addr); + conn->base_.port = TEST_CONN_PORT; + + /* Set up a proxy address. */ + test_conn_lookup_addr_helper(TEST_CONN_ADDRESS_2, TEST_CONN_FAMILY, + &proxy_addr); + tt_assert(!tor_addr_is_null(&proxy_addr)); + + conn->base_.state = OR_CONN_STATE_CONNECTING; + + mock_connection_connect_sockaddr_called = 0; + in_progress = connection_connect(TO_CONN(conn), TEST_CONN_ADDRESS_PORT, + &proxy_addr, TEST_CONN_PORT, &socket_err); + tt_int_op(mock_connection_connect_sockaddr_called, OP_EQ, 1); + tt_assert(!socket_err); + tt_assert(in_progress == 0 || in_progress == 1); + + assert_connection_ok(TO_CONN(conn), time(NULL)); + + in_progress = connection_or_finished_connecting(conn); + tt_int_op(in_progress, OP_EQ, 0); + + assert_connection_ok(TO_CONN(conn), time(NULL)); + + UNMOCK(connection_connect_sockaddr); + UNMOCK(connection_write_to_buf_impl_); + UNMOCK(connection_or_change_state); + UNMOCK(tor_close_socket); + return conn; + + /* On failure */ + done: + UNMOCK(connection_connect_sockaddr); + UNMOCK(connection_write_to_buf_impl_); + UNMOCK(connection_or_change_state); + UNMOCK(tor_close_socket); + return NULL; +} + /** Create and return a new connection/stream */ connection_t * test_conn_get_connection(uint8_t state, uint8_t type, uint8_t purpose) diff --git a/src/test/test_helpers.h b/src/test/test_helpers.h index d82072bb3..d5a541798 100644 --- a/src/test/test_helpers.h +++ b/src/test/test_helpers.h @@ -26,6 +26,9 @@ char *buf_get_contents(buf_t *buf, size_t *sz_out); int mock_tor_addr_lookup__fail_on_bad_addrs(const char *name, uint16_t family, tor_addr_t *out); +void mock_connection_or_change_state(or_connection_t *conn, uint8_t state); + +or_connection_t *test_conn_get_proxy_or_connection(unsigned int proxy_type); connection_t *test_conn_get_connection(uint8_t state, uint8_t type, uint8_t purpose); or_options_t *helper_parse_options(const char *conf);

1 0

[tor/master] test: HTTP CONNECT protocol
by nickm＠torproject.org 06 Jan '20

06 Jan '20

commit 4264717ca377464b5304df0e3a322afaef72d812 Author: Suphanat Chunhapanya <haxx.pop(a)gmail.com> Date: Tue Oct 22 01:55:23 2019 +0800 test: HTTP CONNECT protocol --- src/test/test_connection.c | 37 ++++++++++++++++++++++++++++--------- 1 file changed, 28 insertions(+), 9 deletions(-) diff --git a/src/test/test_connection.c b/src/test/test_connection.c index 36543b3af..34ef3fdf1 100644 --- a/src/test/test_connection.c +++ b/src/test/test_connection.c @@ -316,13 +316,7 @@ test_conn_download_status_teardown(const struct testcase_t *tc, void *arg) static void * test_conn_proxy_connect_setup(const struct testcase_t *tc) { - tcp_proxy_protocol_t proxy_type = (tcp_proxy_protocol_t)tc->setup_data; - switch (proxy_type) { - case TCP_PROXY_PROTOCOL_HAPROXY: - return test_conn_get_proxy_or_connection(PROXY_HAPROXY); - default: - return NULL; - } + return test_conn_get_proxy_or_connection(*(unsigned int *)tc->setup_data); } static int @@ -818,6 +812,25 @@ test_conn_download_status(void *arg) /* the teardown function removes all the connections in the global list*/; } +static void +test_conn_https_proxy_connect(void *arg) +{ + size_t sz; + char *buf = NULL; + or_connection_t *conn = arg; + + MOCK(connection_or_change_state, mock_connection_or_change_state); + + tt_int_op(conn->base_.proxy_state, OP_EQ, PROXY_HTTPS_WANT_CONNECT_OK); + + buf = buf_get_contents(conn->base_.outbuf, &sz); + tt_str_op(buf, OP_EQ, "CONNECT 127.0.0.1:12345 HTTP/1.0\r\n\r\n"); + + done: + UNMOCK(connection_or_change_state); + tor_free(buf); +} + static int handshake_start_called = 0; static int @@ -957,6 +970,9 @@ test_failed_orconn_tracker(void *arg) #define CONNECTION_TESTCASE_ARG(name, fork, setup, arg) \ { #name "_" #arg, test_conn_##name, fork, &setup, (void *)arg } +static const unsigned int PROXY_CONNECT_ARG = PROXY_CONNECT; +static const unsigned int PROXY_HAPROXY_ARG = PROXY_HAPROXY; + struct testcase_t connection_tests[] = { CONNECTION_TESTCASE(get_basic, TT_FORK, test_conn_get_basic_st), CONNECTION_TESTCASE(get_rend, TT_FORK, test_conn_get_rend_st), @@ -966,9 +982,12 @@ struct testcase_t connection_tests[] = { test_conn_download_status_st, FLAV_MICRODESC), CONNECTION_TESTCASE_ARG(download_status, TT_FORK, test_conn_download_status_st, FLAV_NS), + + CONNECTION_TESTCASE_ARG(https_proxy_connect, TT_FORK, + test_conn_proxy_connect_st, &PROXY_CONNECT_ARG), CONNECTION_TESTCASE_ARG(haproxy_proxy_connect, TT_FORK, - test_conn_proxy_connect_st, - TCP_PROXY_PROTOCOL_HAPROXY), + test_conn_proxy_connect_st, &PROXY_HAPROXY_ARG), + //CONNECTION_TESTCASE(func_suffix, TT_FORK, setup_func_pair), { "failed_orconn_tracker", test_failed_orconn_tracker, TT_FORK, NULL, NULL }, END_OF_TESTCASES

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits January 2020