Changeset 549

Timestamp:

04/01/06 07:46:27 (3 years ago)

Author:

hipplej

Message:

First crack at getting the exit policy stuff to work. I'm tired so this is probably fundamentally flawed in some way but it appears to work.

Location:

trunk/src

Files:

• config/serversettings.cpp (modified) (3 diffs)
• config/serversettings.h (modified) (1 diff)
• gui/config/serverpage.cpp (modified) (7 diffs)
• gui/config/serverpage.h (modified) (2 diffs)
• gui/config/serverpage.ui (modified) (2 diffs)

trunk/src/config/serversettings.cpp

@@ -51 +51 @@
 #define SETTING_SERVER_CONTACT    "Server/"SERVER_CONTACTINFO
 #define SETTING_SERVER_EXITPOLICY "Server/"SERVER_EXITPOLICY
+#define SETTING_SERVER_OVERRIDE   "Server/OverrideDefault"
 
 /* Default server configuration */
@@ -63 +64 @@
 #define DEFAULT_SERVER_ADDRESS    net_local_address().toString() 
 #define DEFAULT_SERVER_EXITPOLICY (ExitPolicy().toString()) 
-
+#define DEFAULT_SERVER_OVERRIDE   false
 
 /** Constructor.
@@ -387 +388 @@
 }
 
+/** Sets whether we override the default exit policy */
+void
+ServerSettings::setOverridePolicy(bool override)
+{
+  setValue(SETTING_SERVER_OVERRIDE, override);
+}
+
+/** Returns whether we override the default exit policy */
+bool
+ServerSettings::getOverridePolicy()
+{
+  return value(SETTING_SERVER_OVERRIDE, DEFAULT_SERVER_OVERRIDE).toBool();
+}
+

trunk/src/config/serversettings.h

@@ -93 +93 @@
   ExitPolicy getExitPolicy();
 
+  /** Sets whether we override the default exit policy */
+  void setOverridePolicy(bool override);
+  /** Gets whether we override the default exit policy */
+  bool getOverridePolicy();
+
 private:
   /** Sets a value indicating that the server settings have changed since

trunk/src/gui/config/serverpage.cpp

@@ -33 +33 @@
 #include "portvalidator.h"
 
+/* Default Exit Policy */
+#define DEFAULT_POLICY    Policy(AcceptAll)
 /* Columns of the Exit Policy list */
 #define COL_ACTION    0
@@ -95 +97 @@
   _settings->setAddress(ui.lineServerAddress->text());
   _settings->setContactInfo(ui.lineServerContact->text());
+  _settings->setOverridePolicy(ui.chkExitOverride->isChecked());
+
+  /* Remove/Add necessary default exit rule */
+  setDefaultRule();
+  
+  /* Save exit polices */
+  ExitPolicy exitPolicy;
+  for (int i = 0; i < ui.lstExitPolicies->topLevelItemCount(); ++i) {
+    savePolicy(ui.lstExitPolicies->topLevelItem(i), exitPolicy);
+  }
+  _settings->setExitPolicy(exitPolicy);
+  
   bool success = (_torControl->isConnected() ? _settings->apply(&errmsg) : true);
   if (!success) {
@@ -109 +123 @@
   ui.chkMirrorDirectory->setChecked(_settings->isDirectoryMirror());
   ui.chkMiddleMan->setChecked(_settings->isMiddleman());
+  
   ui.lineServerNickname->setText(_settings->getNickname());
   ui.lineServerPort->setText(QString::number(_settings->getORPort()));
@@ -114 +129 @@
   ui.lineServerAddress->setText(_settings->getAddress());
   ui.lineServerContact->setText(_settings->getContactInfo());
-
+  ui.chkExitOverride->setChecked(_settings->getOverridePolicy());
+  
+  /* Load the exit policies into the list */
+  ui.lstExitPolicies->clear();
+  
+  foreach (Policy policy, _settings->getExitPolicy().policyList()) {
+    addPolicyItem(policy);
+  }
+  
   ui.frmServer->setVisible(ui.chkEnableServer->isChecked());
+}
+
+/** Adds the exit policy contained in item to the exitPolicy */
+void
+ServerPage::savePolicy(QTreeWidgetItem *item, ExitPolicy &exitPolicy)
+{
+  /* Build policy string */
+  QString policyString = item->text(COL_ACTION) + " ";
+  policyString += item->text(COL_ADDRESS) + ":" + item->text(COL_PORT);
+  
+  /* Add policy to ServerSettings */
+  exitPolicy.addPolicy(Policy(policyString));
+}
+
+/** Moves or appends the correct default exit rule to the policy list */
+void
+ServerPage::setDefaultRule()
+{
+  bool override = ui.chkExitOverride->isChecked();
+  Policy::SpecialPolicy action;
+  QString actionString;
+  QList<QTreeWidgetItem *> list;
+  bool found = false;
+  
+  if (override) {
+    action = Policy::RejectAll;
+    actionString = "reject";
+  } else {
+    action = Policy::AcceptAll;
+    actionString = "accept";
+  }
+  
+  /* Search for the policy, if exists: move to bottom else: append it */
+  /* Remove any of the opposite default exit policy */
+  list = ui.lstExitPolicies->findItems("0.0.0.0", Qt::MatchExactly, COL_ADDRESS);
+  
+  foreach (QTreeWidgetItem *item, list) {
+    if (item->text(COL_PORT) == "*") {
+      int index = ui.lstExitPolicies->indexOfTopLevelItem(item);
+      
+      /* Found target so move to bottom of list */
+      if (item->text(COL_ACTION) == actionString) {
+        ui.lstExitPolicies->addTopLevelItem(ui.lstExitPolicies->
+                                                      takeTopLevelItem(index));
+        found = true;
+        
+      /* Found the opposite so remove */
+      } else {
+        ui.lstExitPolicies->takeTopLevelItem(index);
+      }
+    }
+  }
+
+  /* Search failed so just append the necessary policy */
+  if (!found) addPolicyItem(Policy(action));
 }
 
@@ -127 +205 @@
   }
   
-  QTreeWidgetItem *newPolicy = new QTreeWidgetItem();
-  
-  /* Add new policy's action */
-  newPolicy->setText(COL_ACTION, ui.cmboExitAction->currentText());
-  newPolicy->setTextAlignment(COL_ACTION, Qt::AlignCenter);
-
-  /* Add new policy's ip address */
-  QString address = ui.lineExitAddress->text();
-  if (!ui.lineExitMask->text().isEmpty()) {
-    address += ":" + ui.lineExitMask->text();
-  }  
-  newPolicy->setText(COL_ADDRESS, address);
-  newPolicy->setTextAlignment(COL_ADDRESS, Qt::AlignCenter);
-  
-  /* Add new policy's port or port range */
-  QString portRange = ui.lineExitFromPort->text();
-  if (!portRange.isEmpty()) {
-    QString toPort = ui.lineExitToPort->text();
-    if (!toPort.isEmpty() && portRange != "*") {
-      portRange += "-" + ui.lineExitToPort->text();
-    }
-  }
-  newPolicy->setText(COL_PORT, portRange);
-  newPolicy->setTextAlignment(COL_PORT, Qt::AlignCenter);
-  
-  /* Add new policy to list */
-  ui.lstExitPolicies->addTopLevelItem(newPolicy);
+  /* Add the policy to the list */
+  addPolicyItem(ui.cmboExitAction->currentText(), ui.lineExitAddress->text(),
+                ui.lineExitMask->text(), ui.lineExitFromPort->text(),
+                ui.lineExitToPort->text());
 
   /* Clear input text boxes */
@@ -162 +217 @@
 }
 
+/* Adds a new QTreeWidget item to the exit policy list */
+void
+ServerPage::addPolicyItem(Policy policy)
+{
+  /* Convert to strings */
+  QString action = (policy.action() == Policy::Accept ? "accept" : "reject");
+  QHostAddress address = policy.address();
+  QString addr = (address.isNull() ? "*" : address.toString());
+  QString mask = (policy.mask() ? QString::number(policy.mask()) : "");
+  int port = policy.fromPort();
+  QString fromPort = (port ? QString::number(port) : "");
+  port = policy.toPort();
+  QString toPort = (port ? QString::number(port) : "");
+
+  /* Add to list */
+  addPolicyItem(action, addr, mask, fromPort, toPort);
+}
+
+/* Adds a new QTreeWidget item to the exit policy list */
+void
+ServerPage::addPolicyItem(QString action, QString address, QString mask,
+                          QString fromPort, QString toPort)
+{
+  QTreeWidgetItem *newPolicy = new QTreeWidgetItem();
+  
+  newPolicy->setText(COL_ACTION, action);
+  newPolicy->setTextAlignment(COL_ACTION, Qt::AlignCenter);
+  
+  if (!mask.isEmpty()) {
+    address += "/" + mask;
+  }
+  newPolicy->setText(COL_ADDRESS, address);
+  newPolicy->setTextAlignment(COL_ADDRESS, Qt::AlignCenter);
+
+  if (!fromPort.isEmpty()) {
+    if (!toPort.isEmpty() && fromPort != "*") {
+      fromPort += "-" + toPort;
+    }
+  } else {
+    fromPort = "*";
+  }
+
+  newPolicy->setText(COL_PORT, fromPort);
+  newPolicy->setTextAlignment(COL_PORT, Qt::AlignCenter);
+
+  ui.lstExitPolicies->addTopLevelItem(newPolicy);
+}
+
 /** Removes selected exit policy from the user's configuration */
 void
@@ -202 +305 @@
 ServerPage::selectedIndex()
 {
+  if (ui.lstExitPolicies->selectedItems().isEmpty()) return -1;
+  
   /* This list only contains one element so take it */
   QTreeWidgetItem *selectedItem = ui.lstExitPolicies->selectedItems()[0];
-
-  if (selectedItem) {
-    return ui.lstExitPolicies->indexOfTopLevelItem(selectedItem);
-  }
-  return -1;
+  return ui.lstExitPolicies->indexOfTopLevelItem(selectedItem);
 }
 

trunk/src/gui/config/serverpage.h

@@ -31 +31 @@
 #include <control/torcontrol.h>
 #include <config/serversettings.h>
+#include <config/exitpolicy.h>
 #include "../help/browser/helpbrowser.h"
 
@@ -69 +70 @@
   /** Returns the index of the selected item in lstExitPolicies */
   int selectedIndex();
- 
+  /** Adds a new exit policy to the exit policy list */
+  void addPolicyItem(QString action, QString address, QString mask,
+                     QString fromPort, QString toPort);
+  void addPolicyItem(Policy policy);
+  /** Saves the policy specified in item to the exitPolicy */
+  void savePolicy(QTreeWidgetItem *item, ExitPolicy &exitPolicy);
+  /** Moves or appends the necessary default rule as specified by the user */
+  void setDefaultRule();
+
   /** A TorControl object used to talk to Tor */
   TorControl* _torControl;

trunk/src/gui/config/serverpage.ui

@@ -1062 +1062 @@
              <item>
               <property name="text" >
-               <string>Accept</string>
+               <string>accept</string>
               </property>
              </item>
              <item>
               <property name="text" >
-               <string>Reject</string>
+               <string>reject</string>
               </property>
              </item>
@@ -1088 +1088 @@
          </item>
          <item row="2" column="0" colspan="3" >
-          <widget class="QCheckBox" name="checkBox" >
+          <widget class="QCheckBox" name="chkExitOverride" >
+           <property name="contextMenuPolicy" >
+            <enum>Qt::NoContextMenu</enum>
+           </property>
            <property name="toolTip" >
             <string>If enabled, appends 'reject *.*' to the end of the policy</string>