March 2012 - tor-commits - lists.torproject.org

[vidalia/alpha] Implement wizard for first run
by chiiph＠torproject.org 30 Mar '12

30 Mar '12

commit baa7e2d3a6b66e8e766c1099ccea29ee0ab877c9 Author: Tomás Touceda <chiiph(a)torproject.org> Date: Thu Mar 29 17:57:04 2012 -0300 Implement wizard for first run --- changes/bug2905 | 6 +++++ src/vidalia/CMakeLists.txt | 2 + src/vidalia/MainWindow.cpp | 33 ++++++++++++++++++++++++----- src/vidalia/MainWindow.h | 7 ++++++ src/vidalia/config/AdvancedPage.cpp | 20 ++++++++++++++++++ src/vidalia/config/AdvancedPage.h | 10 +++++++++ src/vidalia/config/AdvancedPage.ui | 2 +- src/vidalia/config/NetworkSettings.cpp | 4 +++ src/vidalia/config/TorSettings.cpp | 25 ++++++++++++++++++++++ src/vidalia/config/TorSettings.h | 6 +++++ src/vidalia/config/torrc/TorrcParser.cpp | 1 + 11 files changed, 109 insertions(+), 7 deletions(-) diff --git a/changes/bug2905 b/changes/bug2905 new file mode 100644 index 0000000..3eae285 --- /dev/null +++ b/changes/bug2905 @@ -0,0 +1,6 @@ + New Features: + o Add a wizard for the special cases where the user starts Vidalia + while tor has DisableNetwork=1 or the Panic feature enabled. This + wizard is meant to warn the user about either the Panic feature or + that she might need to configure a proxy or a bridge before tor + connects to the outside world. Fixes ticket 2905. \ No newline at end of file diff --git a/src/vidalia/CMakeLists.txt b/src/vidalia/CMakeLists.txt index 86f755a..30e2a9f 100644 --- a/src/vidalia/CMakeLists.txt +++ b/src/vidalia/CMakeLists.txt @@ -182,6 +182,7 @@ set(vidalia_SRCS ${vidalia_SRCS} VidaliaTab.cpp StatusTab.cpp HelperProcess.cpp + FirstRunWizard.cpp ) qt4_wrap_cpp(vidalia_SRCS Vidalia.h @@ -194,6 +195,7 @@ qt4_wrap_cpp(vidalia_SRCS VidaliaTab.h StatusTab.h HelperProcess.h + FirstRunWizard.h ) if (USE_MINIUPNPC) diff --git a/src/vidalia/MainWindow.cpp b/src/vidalia/MainWindow.cpp index b203b84..741f55e 100644 --- a/src/vidalia/MainWindow.cpp +++ b/src/vidalia/MainWindow.cpp @@ -23,6 +23,7 @@ #include "VMessageBox.h" #include "TorSettings.h" #include "ServerSettings.h" +#include "NetworkSettings.h" #include "AboutDialog.h" #include "HelpBrowser.h" #include "VAttachButton.h" @@ -41,6 +42,8 @@ #include "PluginWrapper.h" #include "DebugDialog.h" +#include "FirstRunWizard.h" + #include <QtGui> #ifdef Q_WS_MAC @@ -138,13 +141,17 @@ MainWindow::MainWindow() VidaliaWindow::setVisible(settings.showMainWindowAtStart()); #endif + TorSettings tor_settings(_torControl); + if(settings.firstRun()) { - if(settings.allowPanic()) - VMessageBox::warning(this, tr("Panic is enabled"), - tr("WARNING: The Panic button is enabled. Use " - "it carefully because it will remove Tor completely."), - VMessageBox::Ok|VMessageBox::Default); - settings.setFirstRun(false); + if(tor_settings.getDisableNetwork() or settings.allowPanic()) { + _wizard = new FirstRunWizard(this, settings.allowPanic(), tor_settings.getDisableNetwork()); + _wizard->show(); + connect(_wizard, SIGNAL(accepted()), + this, SLOT(enableNetwork())); + + settings.setFirstRun(false); + } } } @@ -154,6 +161,20 @@ MainWindow::~MainWindow() delete _engine; } +/** Called when the user has finished the first run wizard */ +void +MainWindow::enableNetwork() +{ + TorSettings tor_settings(_torControl); + tor_settings.setDisableNetwork(false); + QString errmsg; + if(not tor_settings.apply(&errmsg)) + VMessageBox::warning(this, tr("Error finishing apply of first run settings"), + tr("Error: %1").arg(errmsg), + VMessageBox::Ok|VMessageBox::Default); +} + + /** Calls the different methods that will handle the GUI "creation". * It's called once at the MainWindow creation. */ void diff --git a/src/vidalia/MainWindow.h b/src/vidalia/MainWindow.h index 5acd2ee..4a34ee3 100644 --- a/src/vidalia/MainWindow.h +++ b/src/vidalia/MainWindow.h @@ -42,6 +42,8 @@ #include <QTimer> #include <QSystemTrayIcon> +class FirstRunWizard; + class MainWindow : public VidaliaWindow { Q_OBJECT @@ -198,6 +200,9 @@ private slots: void upnpError(UPNPControl::UPNPError error); #endif + /** Called when the user has finished the first run wizard */ + void enableNetwork(); + private: enum TorStatus { Unset, /**< Tor's status has not yet been set. */ @@ -319,6 +324,8 @@ private: QString _previousSocksPort; /**< Holds the previous socksport used */ bool _pressedStop; /**< True if the user has pressed the Stop Tor button */ + + FirstRunWizard *_wizard; /**< Wizard displayed when running Vidalia for the first time */ }; #endif diff --git a/src/vidalia/config/AdvancedPage.cpp b/src/vidalia/config/AdvancedPage.cpp index 084d17c..8e617fd 100644 --- a/src/vidalia/config/AdvancedPage.cpp +++ b/src/vidalia/config/AdvancedPage.cpp @@ -478,3 +478,23 @@ AdvancedPage::browsePanicPath() if (!panicPath.isEmpty()) ui.linePanicPath->setText(panicPath); } + +/** Hides the specified group */ +void +AdvancedPage::hideGroup(ConfigGroup group) +{ + switch(group) { + case Control: + ui.grpControlPort->hide(); + break; + case ConfigurationFile: + ui.grpTorConfigFile->hide(); + break; + case DataDirectory: + ui.grpTorDataDirectory->hide(); + break; + case Panic: + ui.grpPanic->hide(); + break; + } +} diff --git a/src/vidalia/config/AdvancedPage.h b/src/vidalia/config/AdvancedPage.h index ab91d0e..11cd6b6 100644 --- a/src/vidalia/config/AdvancedPage.h +++ b/src/vidalia/config/AdvancedPage.h @@ -28,6 +28,13 @@ class AdvancedPage : public ConfigPage Q_OBJECT public: + enum ConfigGroup { + Control, + ConfigurationFile, + DataDirectory, + Panic + }; + /** Default Constructor */ AdvancedPage(QWidget *parent = 0); /** Default Destructor */ @@ -50,6 +57,9 @@ public: /** Called when the user changes the UI translation. */ virtual void retranslateUi(); + /** Hides the specified group */ + void hideGroup(ConfigGroup group); + signals: /** Emitted when the user changes torrc file to restart Tor */ void restartTor(); diff --git a/src/vidalia/config/AdvancedPage.ui b/src/vidalia/config/AdvancedPage.ui index a9c97fa..58631cd 100644 --- a/src/vidalia/config/AdvancedPage.ui +++ b/src/vidalia/config/AdvancedPage.ui @@ -415,7 +415,7 @@ </widget> </item> <item> - <widget class="QGroupBox" name="groupBox"> + <widget class="QGroupBox" name="grpPanic"> <property name="title"> <string>Panic</string> </property> diff --git a/src/vidalia/config/NetworkSettings.cpp b/src/vidalia/config/NetworkSettings.cpp index bb4e7ba..21c41c7 100644 --- a/src/vidalia/config/NetworkSettings.cpp +++ b/src/vidalia/config/NetworkSettings.cpp @@ -65,6 +65,10 @@ bool NetworkSettings::apply(QString *errmsg) { quint32 torVersion = torControl()->getTorVersion(); + // If there is no tor version, asume the greatest + if(not torVersion) + torVersion = 0xffffff; + Torrc *torrc = Vidalia::torrc(); QStringList clearKeys; diff --git a/src/vidalia/config/TorSettings.cpp b/src/vidalia/config/TorSettings.cpp index fe7e4c1..b7da39a 100644 --- a/src/vidalia/config/TorSettings.cpp +++ b/src/vidalia/config/TorSettings.cpp @@ -47,6 +47,7 @@ #define SETTING_BOOTSTRAP "Bootstrap" #define SETTING_BOOTSTRAP_FROM "BootstrapFrom" #define SETTING_AUTOCONTROL "AutoControl" +#define SETTING_DISABLE_NETWORK "DisableNetwork" /** Default to using hashed password authentication */ #define DEFAULT_AUTH_METHOD PasswordAuth @@ -97,6 +98,7 @@ TorSettings::TorSettings(TorControl *torControl) setDefault(SETTING_BOOTSTRAP, false); setDefault(SETTING_BOOTSTRAP_FROM, ""); setDefault(SETTING_AUTOCONTROL, false); + setDefault(SETTING_DISABLE_NETWORK, false); } /** Applies any changes to Tor's control port or authentication settings. */ @@ -156,6 +158,9 @@ TorSettings::apply(QString *errmsg) torrc->setValue(TOR_ARG_HASHED_PASSWORD, ""); } + torrc->setValue(SETTING_DISABLE_NETWORK, + volatileValue(SETTING_DISABLE_NETWORK).toBool() ? "1" : "0"); + return torrc->apply(Vidalia::torControl(), errmsg); } @@ -446,6 +451,26 @@ TorSettings::setRejectPlaintextPorts(const QList<quint16> &ports) setValue(SETTING_REJECT_PLAINTEXT_PORTS, rejectList.join(",")); } +/** Returns the value for the DisableNetwork option */ +bool +TorSettings::getDisableNetwork() const +{ + bool val = false; + with_torrc_value(SETTING_DISABLE_NETWORK) { + val = (bool)ret.at(0).toUInt(); + } + + return val; +} + +/** Sets the DisableNetwork property for tor. When enabled, tor + * won't try to reach any node. */ +void +TorSettings::setDisableNetwork(bool val) +{ + setVolatileValue(SETTING_DISABLE_NETWORK, val); +} + /** Returns the string description of the authentication method specified by * method. The authentication method string is stored in Vidalia's * configuration file. */ diff --git a/src/vidalia/config/TorSettings.h b/src/vidalia/config/TorSettings.h index 1352518..6feabe7 100644 --- a/src/vidalia/config/TorSettings.h +++ b/src/vidalia/config/TorSettings.h @@ -127,6 +127,12 @@ public: * when the user tries to connect to one of them. */ void setRejectPlaintextPorts(const QList<quint16> &ports); + /** Returns the value for the DisableNetwork option */ + bool getDisableNetwork() const; + /** Sets the DisableNetwork property for tor. When enabled, tor + * won't try to reach any node. */ + void setDisableNetwork(bool val); + /** Generates a random control password consisting of PASSWORD_LEN * characters. */ static QString randomPassword(); diff --git a/src/vidalia/config/torrc/TorrcParser.cpp b/src/vidalia/config/torrc/TorrcParser.cpp index 2c5c679..bdcd618 100644 --- a/src/vidalia/config/torrc/TorrcParser.cpp +++ b/src/vidalia/config/torrc/TorrcParser.cpp @@ -87,6 +87,7 @@ TorrcParser::TorrcParser() _torOpts << TorOpt("DirServer", TorOpt::LineList, ""); _torOpts << TorOpt("DisableAllSwap", TorOpt::Boolean, "0"); _torOpts << TorOpt("DisableIOCP", TorOpt::Boolean, "1"); + _torOpts << TorOpt("DisableNetwork", TorOpt::Boolean, "0"); _torOpts << TorOpt("DNSPort", TorOpt::LineList, ""); _torOpts << TorOpt("DNSListenAddress", TorOpt::LineList, ""); _torOpts << TorOpt("DownloadExtraInfo", TorOpt::Boolean, "0");

1 0

[vidalia/alpha] Merge branch 'bug2905_disablenetwork' into alpha
by chiiph＠torproject.org 30 Mar '12

30 Mar '12

commit 8c6782173e1b4044ab720fdd4f5976d6d6e7c3ea Merge: ff63bed baa7e2d Author: Tomás Touceda <chiiph(a)torproject.org> Date: Fri Mar 30 16:55:12 2012 -0300 Merge branch 'bug2905_disablenetwork' into alpha changes/bug2905 | 6 +++++ src/vidalia/CMakeLists.txt | 2 + src/vidalia/MainWindow.cpp | 33 ++++++++++++++++++++++++----- src/vidalia/MainWindow.h | 7 ++++++ src/vidalia/config/AdvancedPage.cpp | 20 ++++++++++++++++++ src/vidalia/config/AdvancedPage.h | 10 +++++++++ src/vidalia/config/AdvancedPage.ui | 2 +- src/vidalia/config/NetworkSettings.cpp | 4 +++ src/vidalia/config/TorSettings.cpp | 25 ++++++++++++++++++++++ src/vidalia/config/TorSettings.h | 6 +++++ src/vidalia/config/torrc/TorrcParser.cpp | 1 + 11 files changed, 109 insertions(+), 7 deletions(-)

1 0

[vidalia/alpha] Merge branch '5518_adv_tab_layout' into alpha
by chiiph＠torproject.org 30 Mar '12

30 Mar '12

commit ff63bedab34215c6f46a01652bb943b8b04af078 Merge: b304178 50e241f Author: Tomás Touceda <chiiph(a)torproject.org> Date: Fri Mar 30 16:51:52 2012 -0300 Merge branch '5518_adv_tab_layout' into alpha changes/bug5518 | 4 ++++ src/vidalia/config/AdvancedPage.ui | 12 ++++++++++++ 2 files changed, 16 insertions(+), 0 deletions(-)

1 0

[vidalia/alpha] Corrected radio buttons minimum sizes in advanced settings tab
by chiiph＠torproject.org 30 Mar '12

30 Mar '12

commit 50e241f3da4ec2708713ea62d71a98ed4d311a8a Author: Sebastian Baginski <sebthestampede(a)gmail.com> Date: Thu Mar 29 14:30:48 2012 +0200 Corrected radio buttons minimum sizes in advanced settings tab --- changes/bug5518 | 4 ++++ src/vidalia/config/AdvancedPage.ui | 12 ++++++++++++ 2 files changed, 16 insertions(+), 0 deletions(-) diff --git a/changes/bug5518 b/changes/bug5518 new file mode 100644 index 0000000..f2323f9 --- /dev/null +++ b/changes/bug5518 @@ -0,0 +1,4 @@ + Bugfixes relative to Vidalia 0.2.x: + o In Advanced Settings tab, corrected radio buttons minimum sizes + to prevent hiding of socket controls on window resize. + Fixes bug 5518. \ No newline at end of file diff --git a/src/vidalia/config/AdvancedPage.ui b/src/vidalia/config/AdvancedPage.ui index a9c97fa..255a36f 100644 --- a/src/vidalia/config/AdvancedPage.ui +++ b/src/vidalia/config/AdvancedPage.ui @@ -189,6 +189,12 @@ <verstretch>0</verstretch> </sizepolicy> </property> + <property name="minimumSize"> + <size> + <width>0</width> + <height>18</height> + </size> + </property> <property name="text"> <string>Use TCP connection (ControlPort)</string> </property> @@ -225,6 +231,12 @@ <verstretch>0</verstretch> </sizepolicy> </property> + <property name="minimumSize"> + <size> + <width>0</width> + <height>18</height> + </size> + </property> <property name="text"> <string>Use Unix domain socket (ControlSocket)</string> </property>

1 0

[translation/vidalia] Update translations for vidalia
by translation＠torproject.org 30 Mar '12

30 Mar '12

commit 1a3c4c66974aafb722086a6c8c57da38d5a2886a Author: Translation commit bot <translation(a)torproject.org> Date: Fri Mar 30 19:15:08 2012 +0000 Update translations for vidalia --- tr/vidalia_tr.po | 28 ++++++++++++++-------------- 1 files changed, 14 insertions(+), 14 deletions(-) diff --git a/tr/vidalia_tr.po b/tr/vidalia_tr.po index bc3e09c..cac5fce 100644 --- a/tr/vidalia_tr.po +++ b/tr/vidalia_tr.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2012-03-21 17:52+0000\n" -"PO-Revision-Date: 2012-03-30 18:45+0000\n" +"PO-Revision-Date: 2012-03-30 19:09+0000\n" "Last-Translator: Equal1zer <cannuhlar(a)hotmail.com>\n" "Language-Team: translations(a)vidalia-project.net\n" "MIME-Version: 1.0\n" @@ -237,7 +237,7 @@ msgstr "Vidalia seçmiş olduğunuz dili yükleyemiyor." msgctxt "AppearancePage" msgid "" "System Icon Preferences (changes will take effect when you restart Vidalia)" -msgstr "" +msgstr "Sistem Simgesi Ayarları (Vidalia'yı yeniden başlatmanız gerekir)" msgctxt "AppearancePage" msgid "Show the Tray Icon and Dock Icon (default)" @@ -2088,7 +2088,7 @@ msgstr "Bu bağlantı üzerinden gönderilen herhangi birşey izlenebilir. Lütf msgctxt "MainWindow" msgid "Bootstrapping torrc from %1 to %2" -msgstr "" +msgstr "Torrc %1 den %2 ye önyükleniyor" msgctxt "MainWindow" msgid "(probably Telnet)" @@ -2102,7 +2102,7 @@ msgctxt "MainWindow" msgid "" "One of your applications %1 appears to be making a potentially unencrypted " "and unsafe connection to port %2." -msgstr "" +msgstr "Uygulamalarınızdan biri %1 , %2 portundan olası bir şifrelenmemiş ve güvensiz bir bağlantı yapıyor." msgctxt "MainWindow" msgid "failed (%1)" @@ -2120,7 +2120,7 @@ msgid "" "\n" "Here's the last error message:\n" "%2" -msgstr "" +msgstr "Vidalia, Tor ile iletişim kuramadı çünkü %1 dosyasına erişemedi.\n\nSon hata mesajı:\n%2" msgctxt "MainWindow" msgid "" @@ -3116,11 +3116,11 @@ msgstr "Köprü adresimi otomatik olarak dağıt" msgctxt "ServerPage" msgid "Relay traffic for the Tor network (exit relay)" -msgstr "" +msgstr "Tor ağının bir parçası(relay) olun. (son sunucu)" msgctxt "ServerPage" msgid "Relay traffic inside the Tor network (non-exit relay)" -msgstr "" +msgstr "Tor ağının bir parçası(relay) olun. (ara sunucu)" msgctxt "ServerPage" msgid "Mirror the Relay Directory" @@ -3333,7 +3333,7 @@ msgid "" "One of your applications tried to establish a connection through Tor using a" " protocol that Tor does not understand. Please ensure you configure your " "applications to use only SOCKS4a or SOCKS5 with remote hostname resolution." -msgstr "" +msgstr "Uygulamalarınızdan biri Tor'un anlamadığı bir protokol kullanarak Tor üzerinden bağlantı kurmaya çalıştı. Lütfen uygulamalarınızın sadece SOCKS4a ya da SOCKS5 kullanmak üzere yapılandırıldığından emin olun." msgctxt "StatusEventWidget" msgid "Invalid Destination Hostname" @@ -3344,7 +3344,7 @@ msgid "" "One of your applications tried to establish a connection through Tor to " "\"%1\", which Tor does not recognize as a valid hostname. Please check your " "application's configuration." -msgstr "" +msgstr "Uygulamalarınızdan biri Tor'un geçerli bir sunucu adı olarak tanımadığı \"%1\" sunucusuyla bağlantı kurmaya çalıştı. Lütfen uygulamanızın yapılandırmasını kontrol edin." msgctxt "StatusEventWidget" msgid "External IP Address Changed" @@ -3355,11 +3355,11 @@ msgid "" "Tor has determined your relay's public IP address is currently %1%2. If that" " is not correct, please consider setting the 'Address' option in your " "relay's configuration." -msgstr "" +msgstr "Tor relayinizin IP adresinin %1%2 olduğunu belirledi. Doğru değilse lütfen relayinizin yapılandırmasındaki 'Adres' alanını ayarlayın." msgctxt "StatusEventWidget" msgid "DNS Hijacking Detected" -msgstr "" +msgstr "DNS Hijackingi Tespit Edildi" msgctxt "StatusEventWidget" msgid "" @@ -3384,7 +3384,7 @@ msgid "" "Tor is trying to determine if your relay's server port is reachable from the" " Tor network by connecting to itself at %1:%2. This test could take several " "minutes." -msgstr "" +msgstr "Tor, relayinizin Tor ağından erişilebilirliğini kendisine %1:%2 de bağlanarak kontrol ediyor. Bu test bir kaç dakika alabilir." msgctxt "StatusEventWidget" msgid "Server Port Reachability Test Successful!" @@ -3392,7 +3392,7 @@ msgstr "Sunucu Port Ulaşılabilirlik Testi Başarılı" msgctxt "StatusEventWidget" msgid "Your relay's server port is reachable from the Tor network!" -msgstr "" +msgstr "Relayinizin sunucu portu Tor ağından erişilebilir!" msgctxt "StatusEventWidget" msgid "Server Port Reachability Test Failed" @@ -3423,7 +3423,7 @@ msgstr "Dizin Port Ulaşılabilirliği Testi Başarılı" msgctxt "StatusEventWidget" msgid "Your relay's directory port is reachable from the Tor network!" -msgstr "" +msgstr "Relayinizin dizin portu Tor ağından erişilebilir!" msgctxt "StatusEventWidget" msgid "Directory Port Reachability Test Failed"

1 0

[translation/vidalia] Update translations for vidalia
by translation＠torproject.org 30 Mar '12

30 Mar '12

commit 666cc91f3e2de4213fda85b3605b715851e472e9 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Mar 30 18:45:10 2012 +0000 Update translations for vidalia --- tr/vidalia_tr.po | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/tr/vidalia_tr.po b/tr/vidalia_tr.po index 1c49dc6..bc3e09c 100644 --- a/tr/vidalia_tr.po +++ b/tr/vidalia_tr.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2012-03-21 17:52+0000\n" -"PO-Revision-Date: 2012-03-30 08:32+0000\n" +"PO-Revision-Date: 2012-03-30 18:45+0000\n" "Last-Translator: Equal1zer <cannuhlar(a)hotmail.com>\n" "Language-Team: translations(a)vidalia-project.net\n" "MIME-Version: 1.0\n" @@ -1319,7 +1319,7 @@ msgctxt "CrashReportDialog" msgid "" "<a " "href=\"https://trac.torproject.org/projects/tor/newticket\">https://trac.torproject.org/projects/tor/newticket</a>" -msgstr "" +msgstr "<a href=\"https://trac.torproject.org/projects/tor/newticket\">https://trac.torproject.org/projects/tor/newticket</a>" msgctxt "CrashReportDialog" msgid "" @@ -2692,7 +2692,7 @@ msgstr "HTTP / HTTPS" msgctxt "NetworkPage" msgid "You must specify one or more bridges." -msgstr "" +msgstr "Bir ya da daha fazla köprü belirtmelisiniz." msgctxt "Policy" msgid "accept" @@ -3283,7 +3283,7 @@ msgid "" "the past compared to the source \"%2\". If your clock is not correct, Tor " "will not be able to function. Please verify your computer displays the " "correct time." -msgstr "" +msgstr "Tor bilgisayarınızın saatinin, \"%2\" kaynağına göre karşılaştırıldığında %1 saniye geride olduğunu belirledi. Saatiniz doğru değilse Tor çalışamayacaktır. Lütfen bilgisayarınızın doğru saati gösterdiğinden emin olun." msgctxt "StatusEventWidget" msgid "" @@ -3291,7 +3291,7 @@ msgid "" "the future compared to the source \"%2\". If your clock is not correct, Tor " "will not be able to function. Please verify your computer displays the " "correct time." -msgstr "" +msgstr "Tor bilgisayarınızın saatinin, \"%2\" kaynağına göre karşılaştırıldığında %1 saniye geride olduğunu belirledi. Saatiniz doğru değilse Tor çalışamayacaktır. Lütfen bilgisayarınızın doğru saati gösterdiğinden emin olun." msgctxt "StatusEventWidget" msgid "Your Computer's Clock is Potentially Incorrect" @@ -3303,14 +3303,14 @@ msgid "" "unencrypted connection through Tor to port %1. Sending unencrypted " "information over the Tor network is dangerous and not recommended. For your " "protection, Tor has automatically closed this connection." -msgstr "" +msgstr "Bilgisayarınızdaki uygulamalardan biri Tor üzerinden %1 portuna şifrelenmemiş bağlantı kurmayı denedi. Tor ağı üzerinden şifrelenmemiş veri göndermek tehlikelidir ve önerilmez. Tor bu bağlantıyı sizin güvenliğiniz için otomatik olarak kesti." msgctxt "StatusEventWidget" msgid "" "One of the applications on your computer may have attempted to make an " "unencrypted connection through Tor to port %1. Sending unencrypted " "information over the Tor network is dangerous and not recommended." -msgstr "" +msgstr "Bilgisayarınızdaki uygulamalardan biri Tor üzerinden %1 portuna şifrelenmemiş bağlantı kurmayı denedi. Tor ağı üzerinden şifrelenmemiş veri göndermek tehlikelidir ve önerilmez." msgctxt "StatusEventWidget" msgid "Potentially Dangerous Connection!" @@ -3322,7 +3322,7 @@ msgid "" "using a protocol that may leak information about your destination. Please " "ensure you configure your applications to use only SOCKS4a or SOCKS5 with " "remote hostname resolution." -msgstr "" +msgstr "Uygulamalarınızdan biri \"%1\"e Tor üzerinden yeriniz hakkında bilgi sızdırabilecek bir bağlantı sağladı. Lütfen uygulamalarınızın sadece SOCKS4a ya da SOCKS5 kullanmak üzere yapılandırıldığından emin olun. " msgctxt "StatusEventWidget" msgid "Unknown SOCKS Protocol" @@ -3563,7 +3563,7 @@ msgstr "Boş seçim. Lütfen biraz metin seçin, ya da \"Tümüne uygula\"yı i msgctxt "TorrcDialog" msgid "Error at line %1: \"%2\"" -msgstr "" +msgstr "Satır %1 de hata: \"%2\"" msgctxt "TorrcDialog" msgid "Error" @@ -3795,7 +3795,7 @@ msgstr "Günlük dosyası açılamıyor'%1':%2" msgctxt "Vidalia" msgid "Value required for parameter :" -msgstr "" +msgstr "Parametre için gereken değer :" msgctxt "Vidalia" msgid "Invalid language code specified:"

1 0

[stem/master] Fixes for prior version parsing fixes
by atagar＠torproject.org 30 Mar '12

30 Mar '12

commit e427e6d7aff32d15ecf3d5ef3e0c78d2758deb24 Author: Damian Johnson <atagar(a)torproject.org> Date: Fri Mar 30 08:14:33 2012 -0700 Fixes for prior version parsing fixes I never cease to be amazed at how error prone something that sounds as simple as 'parse the tor version' can be. Guess that's why we're writing a library... This has a couple fixes for the prior set of fixes. a. The runner was misparsing 'GETINFO version' output for verisons without a space. b. Sinister bug (took me almost an hour to track down) where the results from our mocked "tor --version" call were cached and broke later tests. This only manifested if your tor version wasn't 0.2.2.35 and you ran both the unit and integ tests together. --- test/runner.py | 4 +++- test/unit/version.py | 8 ++++++++ 2 files changed, 11 insertions(+), 1 deletions(-) diff --git a/test/runner.py b/test/runner.py index dcc7f9c..32c3872 100644 --- a/test/runner.py +++ b/test/runner.py @@ -409,7 +409,9 @@ class Runner: control_socket.close() tor_version = list(version_response)[0] - tor_version = tor_version[8:tor_version.find(' ', 8)] + tor_version = tor_version[8:] + if " " in tor_version: tor_version = tor_version.split(' ', 1)[0] + return stem.version.Version(tor_version) except TorInaccessable: return stem.version.get_system_tor_version(self.get_tor_command()) diff --git a/test/unit/version.py b/test/unit/version.py index 4843321..2b5cf96 100644 --- a/test/unit/version.py +++ b/test/unit/version.py @@ -18,6 +18,12 @@ class TestVersion(unittest.TestCase): mocking.revert_mocking() def test_get_system_tor_version(self): + # Clear the version cache both before and after the test. Without this + # prior results short circuit the system call, and future calls will + # provide this mocked value. + + stem.version.VERSION_CACHE = {} + def _mock_call(command): if command == "tor --version": return TOR_VERSION_OUTPUT.splitlines() @@ -27,6 +33,8 @@ class TestVersion(unittest.TestCase): mocking.mock(stem.util.system.call, _mock_call) version = stem.version.get_system_tor_version() self.assert_versions_match(version, 0, 2, 2, 35, None) + + stem.version.VERSION_CACHE = {} def test_parsing(self): """

1 0

[tor/master] Fix comment typo
by nickm＠torproject.org 30 Mar '12

30 Mar '12

commit 458718d4975661831fa21d9f2653932e17c1bae0 Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Fri Mar 30 07:58:32 2012 -0700 Fix comment typo --- src/or/routerparse.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/or/routerparse.c b/src/or/routerparse.c index 0aae0aa..33c68d7 100644 --- a/src/or/routerparse.c +++ b/src/or/routerparse.c @@ -1262,7 +1262,7 @@ dump_distinct_digest_count(int severity) * s through end into the signed_descriptor_body of the resulting * routerinfo_t. * - * If end is NULL, s must be properly NULL-terminated. + * If end is NULL, s must be properly NUL-terminated. * * If allow_annotations, it's okay to encounter annotations in s * before the router; if it's false, reject the router if it's annotated. If

1 0

[tor/master] Remove a couple redundant NULL-checks before crypto_cipher_free
by nickm＠torproject.org 30 Mar '12

30 Mar '12

commit ab3197c0596de087f43c08bda500fcc36ba2ef20 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Mar 30 10:16:58 2012 -0400 Remove a couple redundant NULL-checks before crypto_cipher_free Calling crypto_cipher_free(NULL) is always safe, since (by convention) all of our xyz_free() functions treat xyz_free(NULL) as a no-op. Flagged by coverity scan; fixes CID 508 and 509. --- src/common/crypto.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/common/crypto.c b/src/common/crypto.c index e79666f..dd85d14 100644 --- a/src/common/crypto.c +++ b/src/common/crypto.c @@ -1055,7 +1055,7 @@ crypto_pk_public_hybrid_encrypt(crypto_pk_t *env, memset(buf, 0, pkeylen); tor_free(buf); } - if (cipher) crypto_cipher_free(cipher); + crypto_cipher_free(cipher); return -1; } @@ -1112,7 +1112,7 @@ crypto_pk_private_hybrid_decrypt(crypto_pk_t *env, err: memset(buf,0,pkeylen); tor_free(buf); - if (cipher) crypto_cipher_free(cipher); + crypto_cipher_free(cipher); return -1; }

1 0

[tor/master] Fix a memory leak in an error case of SAFECOOKIE authentication.
by nickm＠torproject.org 30 Mar '12

30 Mar '12

commit affbcded5ca03d8e3ccc5debd3c23240e492c62a Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Mar 30 10:20:48 2012 -0400 Fix a memory leak in an error case of SAFECOOKIE authentication. Found by Coverity Scan; fix for CID 507; bugfix on 0.2.3.13-alpha. --- changes/memleak_safecookie | 4 ++++ src/or/control.c | 1 + 2 files changed, 5 insertions(+), 0 deletions(-) diff --git a/changes/memleak_safecookie b/changes/memleak_safecookie new file mode 100644 index 0000000..9773af5 --- /dev/null +++ b/changes/memleak_safecookie @@ -0,0 +1,4 @@ + o Minor bugfixes: + - Fix a small memory leak when trying to decode incorrect base16 + authenticator during SAFECOOKIE authentication. Found by + Coverity Scan. Fixes CID 507. Bugfix on 0.2.3.13-alpha. diff --git a/src/or/control.c b/src/or/control.c index 1eb6b80..397bb53 100644 --- a/src/or/control.c +++ b/src/or/control.c @@ -3020,6 +3020,7 @@ handle_control_authchallenge(control_connection_t *conn, uint32_t len, connection_write_str_to_buf("513 Invalid base16 client nonce", conn); connection_mark_for_close(TO_CONN(conn)); + tor_free(client_nonce); return -1; }

1 0