[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
[vidalia-svn] r3290: Remove support for configuring Tor's User and Group options (in vidalia/trunk: . src/vidalia src/vidalia/config)
Author: edmanm
Date: 2008-11-09 20:10:01 -0500 (Sun, 09 Nov 2008)
New Revision: 3290
Modified:
vidalia/trunk/CHANGELOG
vidalia/trunk/src/vidalia/config/advancedpage.cpp
vidalia/trunk/src/vidalia/config/advancedpage.ui
vidalia/trunk/src/vidalia/config/torsettings.cpp
vidalia/trunk/src/vidalia/config/torsettings.h
vidalia/trunk/src/vidalia/mainwindow.cpp
Log:
Remove support for configuring Tor's User and Group options in the
Advanced settings page.
Modified: vidalia/trunk/CHANGELOG
===================================================================
--- vidalia/trunk/CHANGELOG 2008-11-07 20:37:05 UTC (rev 3289)
+++ vidalia/trunk/CHANGELOG 2008-11-10 01:10:01 UTC (rev 3290)
@@ -1,5 +1,7 @@
0.2.0 xx-xxx-2008
o Support changing UI languages without having to restart Vidalia.
+ o Remove support for configuring Tor's User and Group options in the
+ Advanced settings page.
o Add tooltips to tree items in the help browser's table of contents. Some
of the help topic labels are a bit long.
o Switch to a simpler About dialog and move the license information to a
Modified: vidalia/trunk/src/vidalia/config/advancedpage.cpp
===================================================================
--- vidalia/trunk/src/vidalia/config/advancedpage.cpp 2008-11-07 20:37:05 UTC (rev 3289)
+++ vidalia/trunk/src/vidalia/config/advancedpage.cpp 2008-11-10 01:10:01 UTC (rev 3290)
@@ -54,7 +54,6 @@
/* Hide platform specific features */
#if defined(Q_WS_WIN)
- ui.grpPermissions->setVisible(false);
#if 0
ui.grpService->setVisible(TorService::isSupported());
#endif
@@ -139,9 +138,7 @@
_settings->setControlAddress(controlAddress);
_settings->setControlPort(ui.lineControlPort->text().toUShort());
- _settings->setUser(ui.lineUser->text());
- _settings->setGroup(ui.lineGroup->text());
-
+
_settings->setAuthenticationMethod(authMethod);
_settings->setUseRandomPassword(ui.chkRandomPassword->isChecked());
if (authMethod == TorSettings::PasswordAuth
@@ -166,9 +163,7 @@
ui.lineControlPort->setText(QString::number(_settings->getControlPort()));
ui.lineTorConfig->setText(_settings->getTorrc());
ui.lineTorDataDirectory->setText(_settings->getDataDirectory());
- ui.lineUser->setText(_settings->getUser());
- ui.lineGroup->setText(_settings->getGroup());
-
+
ui.cmbAuthMethod->setCurrentIndex(
authMethodToIndex(_settings->getAuthenticationMethod()));
ui.chkRandomPassword->setChecked(_settings->useRandomPassword());
Modified: vidalia/trunk/src/vidalia/config/advancedpage.ui
===================================================================
--- vidalia/trunk/src/vidalia/config/advancedpage.ui 2008-11-07 20:37:05 UTC (rev 3289)
+++ vidalia/trunk/src/vidalia/config/advancedpage.ui 2008-11-10 01:10:01 UTC (rev 3290)
@@ -323,90 +323,6 @@
</widget>
</item>
<item>
- <widget class="QGroupBox" name="grpPermissions" >
- <property name="minimumSize" >
- <size>
- <width>0</width>
- <height>0</height>
- </size>
- </property>
- <property name="contextMenuPolicy" >
- <enum>Qt::NoContextMenu</enum>
- </property>
- <property name="title" >
- <string>Permissions</string>
- </property>
- <layout class="QVBoxLayout" >
- <property name="margin" >
- <number>9</number>
- </property>
- <property name="spacing" >
- <number>6</number>
- </property>
- <item>
- <layout class="QHBoxLayout" >
- <property name="margin" >
- <number>0</number>
- </property>
- <property name="spacing" >
- <number>6</number>
- </property>
- <item>
- <widget class="QLabel" name="label_3" >
- <property name="contextMenuPolicy" >
- <enum>Qt::NoContextMenu</enum>
- </property>
- <property name="text" >
- <string>Run as User:</string>
- </property>
- <property name="indent" >
- <number>8</number>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QLineEdit" name="lineUser" >
- <property name="contextMenuPolicy" >
- <enum>Qt::NoContextMenu</enum>
- </property>
- <property name="toolTip" >
- <string>Vidalia will run with this User's permissions</string>
- </property>
- </widget>
- </item>
- </layout>
- </item>
- <item>
- <layout class="QHBoxLayout" >
- <property name="margin" >
- <number>0</number>
- </property>
- <property name="spacing" >
- <number>6</number>
- </property>
- <item>
- <widget class="QLabel" name="label_9" >
- <property name="contextMenuPolicy" >
- <enum>Qt::NoContextMenu</enum>
- </property>
- <property name="text" >
- <string>Run as Group:</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QLineEdit" name="lineGroup" >
- <property name="toolTip" >
- <string>Vidalia will run with this Group's permissions</string>
- </property>
- </widget>
- </item>
- </layout>
- </item>
- </layout>
- </widget>
- </item>
- <item>
<spacer>
<property name="orientation" >
<enum>Qt::Vertical</enum>
Modified: vidalia/trunk/src/vidalia/config/torsettings.cpp
===================================================================
--- vidalia/trunk/src/vidalia/config/torsettings.cpp 2008-11-07 20:37:05 UTC (rev 3289)
+++ vidalia/trunk/src/vidalia/config/torsettings.cpp 2008-11-10 01:10:01 UTC (rev 3290)
@@ -45,8 +45,6 @@
/* Arguments we can pass to Tor on the command-line */
#define TOR_ARG_CONTROL_PORT "ControlPort"
#define TOR_ARG_TORRC "-f"
-#define TOR_ARG_USER "User"
-#define TOR_ARG_GROUP "Group"
#define TOR_ARG_DATA_DIRECTORY "DataDirectory"
#define TOR_ARG_HASHED_PASSWORD "HashedControlPassword"
#define TOR_ARG_COOKIE_AUTH "CookieAuthentication"
@@ -74,8 +72,6 @@
setDefault(SETTING_CONTROL_ADDR, "127.0.0.1");
setDefault(SETTING_CONTROL_PORT, 9051);
setDefault(SETTING_AUTH_METHOD, toString(DEFAULT_AUTH_METHOD));
- setDefault(SETTING_TOR_USER, "");
- setDefault(SETTING_TOR_GROUP, "");
setDefault(SETTING_DATA_DIRECTORY, "");
setDefault(SETTING_CONTROL_PASSWORD, "");
setDefault(SETTING_USE_RANDOM_PASSWORD, true);
@@ -169,38 +165,6 @@
setValue(SETTING_TORRC, torrc);
}
-/** Returns the user used when running Tor. The user is specified as an
- * argument to Tor, which will setuid to this user. */
-QString
-TorSettings::getUser() const
-{
- return value(SETTING_TOR_USER).toString();
-}
-
-/** Sets the user used when running Tor. The user is specified as an argument
- * to Tor, which will setuid to this user. */
-void
-TorSettings::setUser(const QString &user)
-{
- setValue(SETTING_TOR_USER, user);
-}
-
-/** Returns the group used when running Tor. The group is specified as an
- * argument to Tor, which will setgid to this group. */
-QString
-TorSettings::getGroup() const
-{
- return value(SETTING_TOR_GROUP).toString();
-}
-
-/** Sets the group used when running Tor. The group is specified as an
- * argument to Tor, which will setgid to this group. */
-void
-TorSettings::setGroup(const QString &group)
-{
- setValue(SETTING_TOR_GROUP, group);
-}
-
/** Get the address or hostname used to connect to Tor */
QHostAddress
TorSettings::getControlAddress() const
Modified: vidalia/trunk/src/vidalia/config/torsettings.h
===================================================================
--- vidalia/trunk/src/vidalia/config/torsettings.h 2008-11-07 20:37:05 UTC (rev 3289)
+++ vidalia/trunk/src/vidalia/config/torsettings.h 2008-11-10 01:10:01 UTC (rev 3290)
@@ -85,16 +85,6 @@
AuthenticationMethod getAuthenticationMethod() const;
/** Sets the authentication method used when starting Tor to <b>method</b>.*/
void setAuthenticationMethod(AuthenticationMethod method);
-
- /** Get which user will be used to run Tor. */
- QString getUser() const;
- /** Set which user will be used to run Tor. */
- void setUser(const QString &user);
-
- /** Get which group will be used to run Tor. */
- QString getGroup() const;
- /** Set which group will be used to run Tor. */
- void setGroup(const QString &group);
/** Generates a random control password consisting of PASSWORD_LEN
* characters. */
Modified: vidalia/trunk/src/vidalia/mainwindow.cpp
===================================================================
--- vidalia/trunk/src/vidalia/mainwindow.cpp 2008-11-07 20:37:05 UTC (rev 3289)
+++ vidalia/trunk/src/vidalia/mainwindow.cpp 2008-11-10 01:10:01 UTC (rev 3290)
@@ -837,14 +837,6 @@
<< "HashedControlPassword" << "";
}
- /* Add custom user and group information (if specified) */
- QString user = settings.getUser();
- if (!user.isEmpty())
- args << "User" << user;
- QString group = settings.getGroup();
- if (!group.isEmpty())
- args << "Group" << group;
-
/* This doesn't get set to false until Tor is actually up and running, so we
* don't yell at users twice if their Tor doesn't even start, due to the fact
* that QProcess::stopped() is emitted even if the process didn't even