Changeset 2959

Timestamp:

08/14/08 06:01:50 (3 months ago)

Author:

borkdomenik

Message:

First commit including the changes according to proposal 121 and the changes of the hidden service authorization protocol.
* changes of the .ui file to imclude basic|stealth check boxes
* include a attribute stealth to the Service entity in order to store the authorization mode
* several changes in the servicepage file according to proposal 121
* several changes in the servicesettings file because of the enlargement of the Service entity
* some smaller bugfixes

Location:

vidalia/branches/hidden-services/src/vidalia/config

Files:

• service.cpp (modified) (8 diffs)
• service.h (modified) (4 diffs)
• servicepage.cpp (modified) (19 diffs)
• servicepage.h (modified) (2 diffs)
• servicepage.ui (modified) (9 diffs)
• servicesettings.cpp (modified) (5 diffs)

vidalia/branches/hidden-services/src/vidalia/config/service.cpp

@@ -17 +17 @@
 /** Constructor to create a new Service with initial settings */
 Service::Service(QString serviceAddress, QString virtualPort,
- QString physicalAddressPort, QString serviceDirectory, bool enabled)
+ QString physicalAddressPort, QString serviceDirectory, bool enabled, bool stealth)
 {
 
@@ -25 +25 @@
   _serviceDirectory = serviceDirectory;
   _enabled = enabled;
+  _stealth = stealth;
 }
 
@@ -36 +37 @@
 {
   _enabled = enabled;
+}
+
+/** Sets the authorization configuration mode */
+void Service::setStealth(bool stealth)
+{
+  _stealth = stealth;
 }
 
@@ -99 +106 @@
   out << myObj.serviceDirectory();
   out << myObj.enabled();
+  out << myObj.stealth();
   out << myObj.additionalServiceOptions();
   out << myObj.users();
@@ -114 +122 @@
   QString serviceDirectory;
   bool enabled;
+  bool stealth;
   QString additionalServiceOptions;
   QList<UserAuthorizationData> users;
@@ -119 +128 @@
   /* Read in from the data stream */
   in >> serviceAddress >> virtualPort  >> physicalAddressPort
-   >> serviceDirectory >> enabled >> additionalServiceOptions >> users;
+   >> serviceDirectory >> enabled >> stealth 
+   >> additionalServiceOptions >> users;
 
   /* Set the appropriate class member variables */
@@ -127 +137 @@
   myObj.setServiceDirectory(serviceDirectory);
   myObj.setEnabled(enabled);
+  myObj.setStealth(stealth);
   myObj.setAdditionalServiceOptions(additionalServiceOptions);
   myObj.setUsers(users);
@@ -139 +150 @@
 Service::toString()
 {
-  QString s;
+  QString s, stealth;
+  if(_stealth) {
+    stealth = "x1";
+  }
   s.append(_serviceAddress +"#"+ _virtualPort +"#"+  _physicalAddressPort +
-    "#"+ _serviceDirectory +"#"+  _enabled + "#"+ _additionalServiceOptions +
-    "#");
+    "#"+ _serviceDirectory +"#"+  _enabled + "#"+ stealth +"#"+ 
+    _additionalServiceOptions + "#");
   foreach(UserAuthorizationData user, _users)
   {

vidalia/branches/hidden-services/src/vidalia/config/service.h

@@ -25 +25 @@
   /** Constructor to create a new Service with initial settings */
   Service(QString serviceAddress, QString virtualPort,
-   QString physicalAddressPort, QString serviceDirectory, bool enabled);
+   QString physicalAddressPort, QString serviceDirectory, bool enabled, bool stealth);
   /** Destructor */
   virtual ~Service();
@@ -38 +38 @@
   /** Returns the deployed status of a service */
   bool enabled() const { return _enabled; }
+  /** Returns the authorization configuration mode */
+  bool stealth() const { return _stealth; }
   /** Returns the additional options of a service e.g. excludeNodes */
   QString additionalServiceOptions() const
@@ -53 +55 @@
   /** Sets the deployed status a service */
   void setEnabled(bool enabled);
+  /** Sets the authorization configuration mode */
+  void setStealth(bool stealth);
   /** Sets the additional options of a service e.g. excludeNodes */
   void setAdditionalServiceOptions(QString options);
@@ -81 +85 @@
   /** The Enabled status of the service */
   bool _enabled;
+  /** This attribute represents the configuration mode of the authorization*/
+  bool _stealth;
   /** Some additional service options, not configured/displayed by Vidalia */
   QString _additionalServiceOptions;

vidalia/branches/hidden-services/src/vidalia/config/servicepage.cpp

@@ -114 +114 @@
   connect(ui.serviceAccessWidget, SIGNAL(itemClicked(QTableWidgetItem*)), this,
    SLOT(serviceAccessSelectionChanged()));
+  connect(ui.checkBox_basic, SIGNAL(toggled(bool)), this, SLOT(checkBoxBasicToggled()));
+  connect(ui.checkBox_stealth, SIGNAL(toggled(bool)), this, SLOT(checkBoxStealthToggled()));
 }
 
@@ -141 +143 @@
       bool enabled = _services->value(index).enabled();
       QList<UserAuthorizationData> users = _services->value(index).users();
+      bool stealth = _services->value(index).stealth();
       Service temp(address, virtualPort, physicalAddress, directoryPath,
-       enabled);
+       enabled, stealth);
       temp.setAdditionalServiceOptions(_services->value(ui.serviceWidget->
        currentRow()).additionalServiceOptions());
@@ -287 +290 @@
   QString errmsg = "Error while trying to publish services.";
   QListIterator<Service> it(services);
-  QList<UserAuthorizationData> publishedUsers;
   bool first = true;
   while(it.hasNext()) {
+    QList<UserAuthorizationData> publishedUsers;
     Service temp = it.next();
     serviceConfString.append("hiddenservicedir=" +
@@ -305 +308 @@
     }
     if(publishedUsers.size() > 0) {
+      QString stealthMode = "basic";
+      if(temp.stealth()) {
+        stealthMode = "stealth";
+      }
       serviceConfString.append(" hiddenserviceversion=\"2\" \
-       hiddenserviceauthorizeclient="+
-       string_escape(createUserAuthStringForTor(publishedUsers)));
+       hiddenserviceauthorizeclient="+string_escape(stealthMode+" " + 
+       createUserAuthStringForTor(publishedUsers)));
     }
     serviceConfString.append(" "+ temp.additionalServiceOptions());
   }
+  VMessageBox::warning(this, tr("torConfString"), serviceConfString,
+     VMessageBox::Ok);
   _serviceSettings->applyServices(serviceConfString, &errmsg);
 }
@@ -371 +380 @@
   QString torConfigurationString = _serviceSettings->
    getHiddenServiceDirectories();
+   VMessageBox::warning(this, tr("kompletter string:"), torConfigurationString,
+             VMessageBox::Ok);
   torServiceList = extractSingleServices(torConfigurationString);
   // the services stored with vidalia
@@ -410 +421 @@
 /** this method returns a Service by parseing the configuration string
  *  of Tor and storing its values into the object */
+ //XTODO hier den parser auch anpassen um basic/stealth abzufange!!
 Service
 ServicePage::generateService(QString s)
@@ -440 +452 @@
        additionalOptions.remove(indexstart, (indexend-indexstart));
      }
+    //remove first appearance of HiddenServiceVerison
+    indexstart = additionalOptions.indexOf("hiddenserviceversion", 0, Qt::CaseInsensitive);
+    endindex = additionalOptions.indexOf("250", indexstart);
+    if(endindex != -1) {
+      additionalOptions.remove(indexstart, (endindex-indexstart)+4);
+    } else {
+      endindex = additionalOptions.indexOf("\n", indexstart);
+      if(endindex != -1) {
+        additionalOptions.remove(indexstart, (endindex-indexstart));
+      } else {
+        endindex = additionalOptions.length()-1;
+        additionalOptions.remove(indexstart, (endindex-indexstart));
+      }
+    }
     //remove all appearances of "250"
     while(additionalOptions.contains("250")) {
@@ -464 +490 @@
 
   QString address, virtualPort, physAddressPort, serviceDir;
+  bool stealth = false;
   // service directory
   QStringList strList = s.split("\n");
@@ -485 +512 @@
        virtualPort = tempVirtualPort.remove(0, 1);
   }
-  //get all users that are in the client-keys file
-  QList<UserAuthorizationData> allUsers = parseClientKeys(serviceDir);
-  //get all actual users by parsing the hostname file
   QList<UserAuthorizationData> actualUsers;
   if(s.contains("HiddenServiceAuthorizeClient")) {
@@ -495 +519 @@
     QStringList strList6 = strList5.first().split("\n");
     strList6.first().remove(0,1);
+    QStringList stealthList = strList6.first().split(" ");
+    if(stealthList.first().compare("stealth") == 0) {
+      stealth = true;
+      strList6.first().remove(0,8);
+    } else {
+      strList6.first().remove(0,6);
+    }
     QStringList userList = strList6.first().split(",");
     foreach(QString user, userList) {
       QString authdata, filereader;
       int index = 0;
-      //remove the users in the allUsers data structure,if they are actual users
-      while(index < allUsers.size()) {
-        UserAuthorizationData temp = allUsers.at(index);
-        if(temp.identification().compare(user) == 0) {
-          allUsers.removeAt(index);
-        }
-        index++;
-      }
       //parse the hostname file to get the authorization data
       QString dir = serviceDir;
@@ -520 +543 @@
         }
         QStringList strList7 = filereader.split("\n");
-        //remove first 5 lines
-        for(int i = 0; i < 5; i++) {
-          strList7.removeFirst();
-        }
-        while(strList7.isEmpty() == false) {
-          QString temp = strList7.first();
-          if(temp.contains(""+user)){
-            break;
-          } else {
-             strList7.removeFirst();
-          }
-        }
-        QString temp = strList7.first();
-        QStringList strList8 = temp.split("#");
-        authdata = strList8.first();
-        authdata.remove(authdata.length()-1,1);
-      }
-      UserAuthorizationData u(authdata, user);
-      actualUsers.push_back(u);
-    }
-  }
-  //if there are some users not in the actual users data structure,
-  //but in client-keys
-  if(allUsers.size() > 0) {
-    QListIterator<UserAuthorizationData> it2(allUsers);
-    while(it2.hasNext()) {
-      UserAuthorizationData tempData = it2.next();
-      actualUsers.push_back(tempData);
-    }
-  }
-  //get .onion address
+        foreach(QString userString, strList7) {
+         if(userString.length() > 1 && userString.contains(user)) {
+           QString onion, cookie, id;
+           QStringList strList2 = userString.split(" ");
+           onion = strList2.first();
+           strList2.removeFirst();
+           cookie = strList2.first();
+           strList2.removeFirst();
+           strList2.removeFirst();
+           strList2.removeFirst();
+           id = strList2.first();
+           authdata = onion+" "+cookie;
+           UserAuthorizationData u(onion+" "+cookie, id);
+           u.setEnabled(true);
+           actualUsers.push_back(u);
+         }
+       }
+      }
+    }
+  }
+  //get .onion address, cookie and identification
   if(userAuthConfigured == true) {
     address = "[Client Auth Configured]";
@@ -569 +582 @@
         }
   }
-  Service service(address, virtualPort, physAddressPort, serviceDir, true);
+  Service service(address, virtualPort, physAddressPort, serviceDir, true, stealth);
   service.setAdditionalServiceOptions(additionalOptions);
   service.setUsers(actualUsers);
@@ -579 +592 @@
  *  get all users that had a authorization for the Service
  * @return a list of all users found in client_keys*/
-QList<UserAuthorizationData>
-ServicePage::parseClientKeys(QString dir)
-{
-  QList<UserAuthorizationData> result;
-  QString value;
-  QFile file(dir.append("/client_keys"));
-  if (!file.open(QIODevice::ReadOnly | QIODevice::Text)) {
-    return result;
-  } else {
-      QTextStream in(&file);
-      QString content;
-      while (!in.atEnd()) {
-        content.append(in.readLine());
-        content.append("\n");
-      }
-      value = content;
-  }
-  QStringList strList = value.split("client-name");
-  strList.removeFirst();
-  foreach(QString user, strList) {
-    QStringList strList2 = user.split("\n");
-    UserAuthorizationData u("[Created by Tor]", strList2.first().trimmed());
-    u.setEnabled(false);
-    result.push_back(u);
-  }
-  return result;
-}
+//QList<UserAuthorizationData>
+//ServicePage::parseClientKeys(QString dir)
+//{
+  //QList<UserAuthorizationData> result;
+  //QString value;
+  //XTODO hier änderungen!!
+  //QFile file(dir.append("/hostname"));
+  //if (!file.open(QIODevice::ReadOnly | QIODevice::Text)) {
+    //return result;
+  //} else {
+      //QTextStream in(&file);
+      //QString content;
+      //while (!in.atEnd()) {
+        //content.append(in.readLine());
+        //content.append("\n");
+      //}
+      //value = content;
+  //}
+  //QStringList strList1 = value.split("\n");
+  //foreach(QString user, strList1) {
+   //if(user.length() > 1) {
+     //QString onion, cookie, id;
+     //QStringList strList2 = user.split(" ");
+     //onion = strList2.first();
+     //strList2.removeFirst();
+     //cookie = strList2.first();
+     //strList2.removeFirst();
+     //strList2.removeFirst();
+     //strList2.removeFirst();
+     //id = strList2.first();
+     //UserAuthorizationData u(onion+" "+cookie, id);
+     //u.setEnabled(false);
+     //result.push_back(u);
+   //}
+ //}
+  //return result;
+//}
 
 /** this method merges the list of services received from Vidalia and Tor
@@ -763 +786 @@
   Service s;
   s.setEnabled(true);
+  s.setStealth(false);
   _services->insert(rows, s);
 }
@@ -976 +1000 @@
     ui.restrictAccessCheckBox->setCheckState(Qt::Unchecked);
   } else {
+      if(selService.stealth()) {
+        ui.checkBox_stealth->setCheckState(Qt::Checked);
+        ui.checkBox_basic->setCheckState(Qt::Unchecked);
+      } else {
+        ui.checkBox_basic->setCheckState(Qt::Checked);
+        ui.checkBox_stealth->setCheckState(Qt::Unchecked);
+      }
       int rowcount = 0;
       QListIterator<UserAuthorizationData> it(assoziatedUsers);
@@ -1194 +1225 @@
   QString serviceAuthdata, serviceIdentification;
   serviceAuthdata = ui.authLineAccess->text();
-  serviceIdentification = ui.commentLineAccess->text();
-  if(serviceAuthdata.length() == 0 || serviceIdentification.length() == 0) {
-    VMessageBox::warning(this, tr("Error"), tr("Please fill out both fields."),
+  serviceIdentification = ""+ui.commentLineAccess->text();
+  if(serviceAuthdata.length() == 0) {
+    VMessageBox::warning(this, tr("Error"), tr("Authorization data has to be set."),
      VMessageBox::Ok);
      return;
   } else {
-    for(int i = 0; i < ui.serviceAccessWidget->rowCount(); i++) {
-      QString tempidentification = ui.serviceAccessWidget->item(i, 1)->text();
-      if(serviceIdentification.compare(tempidentification) == 0) {
-        VMessageBox::warning(this, tr("Error"), tr("Identification has to be\
-        unique, try another one please."), VMessageBox::Ok);
-        ui.commentLineAccess->clear();
-        return;
-     }
-    }
     int pos = 0;
-    if(_identificationValidator->validate(serviceIdentification, pos) ==
-     QValidator::Acceptable) {
       if(validateServiceAuth(serviceAuthdata) == QValidator::Acceptable) {
         int rows = ui.serviceAccessWidget->rowCount();
@@ -1226 +1246 @@
         ServiceAuthorizationData s(serviceAuthdata, serviceIdentification);
         _consumedServices->insert(serviceIdentification, s);
-      }
-    } else {
-      VMessageBox::warning(this, tr("Error"), tr("Invalid characters for the\
-       identification, only {[a-z][A-Z][0-9]+-_} allowed. The length has to be\
-       between 1 and 19."), VMessageBox::Ok);
-        ui.commentLineAccess->clear();
-        return;
-    }
+      } else {
+         VMessageBox::warning(this, tr("Error"), tr("Invalid input for the\
+          authorization. Only [onion-Address] [descriptor-cookie] allowed."),
+          VMessageBox::Ok);
+      }
   }
 }
@@ -1243 +1260 @@
 ServicePage::validateServiceAuth(QString authString)
 {
+  if(authString.length() != 45 || authString.contains(" ") == false) {
+    return QValidator::Invalid;
+  }
   QStringList strList = authString.split(" ");
   int pos = 0;
@@ -1504 +1524 @@
 }
 
+void
+ServicePage::checkBoxBasicToggled()
+{
+  bool state = ui.checkBox_basic->checkState() == Qt::Checked;
+  if(state) {
+    ui.checkBox_stealth->setCheckState(Qt::Unchecked);
+  } else {
+    ui.checkBox_stealth->setCheckState(Qt::Checked);
+  }
+  Service s = _services->take(ui.serviceWidget->currentRow());
+  s.setStealth(!state);
+  _services->insert(ui.serviceWidget->currentRow(), s);
+}
+
+void
+ServicePage::checkBoxStealthToggled()
+{
+  bool state = ui.checkBox_stealth->checkState() == Qt::Checked;
+  if(state) {
+    ui.checkBox_basic->setCheckState(Qt::Unchecked);
+  } else {
+    ui.checkBox_basic->setCheckState(Qt::Checked);
+  }
+  Service s = _services->take(ui.serviceWidget->currentRow());
+  s.setStealth(state);
+  _services->insert(ui.serviceWidget->currentRow(), s);
+}
+

vidalia/branches/hidden-services/src/vidalia/config/servicepage.h

@@ -54 +54 @@
   * get all users that had a authorization for the Service
   * @return a list of all users found in client_keys*/
-  QList<UserAuthorizationData> parseClientKeys(QString dir);
+  //QList<UserAuthorizationData> parseClientKeys(QString dir);
   /** this method creates the configuration string for tor including the
    * user authorization*/
@@ -114 +114 @@
    * entry(Provided Services)*/
   void serviceAuthSelectionChanged();
+  void checkBoxBasicToggled();
+  void checkBoxStealthToggled();
 
 private:

vidalia/branches/hidden-services/src/vidalia/config/servicepage.ui

@@ -7 +7 @@
     <y>0</y>
     <width>653</width>
-    <height>519</height>
+    <height>496</height>
    </rect>
   </property>
@@ -25 +25 @@
    <iconset>../../../../../.designer/backup</iconset>
   </property>
-  <layout class="QVBoxLayout" >
-   <item>
+  <layout class="QGridLayout" >
+   <item row="0" column="0" >
     <widget class="QTabWidget" name="tabWidget" >
      <property name="sizePolicy" >
@@ -41 +41 @@
        <string>Provide Hidden Services</string>
       </attribute>
-      <layout class="QVBoxLayout" >
-       <item>
-        <widget class="QGroupBox" name="groupBox" >
-         <property name="sizePolicy" >
-          <sizepolicy vsizetype="Fixed" hsizetype="Minimum" >
-           <horstretch>0</horstretch>
-           <verstretch>0</verstretch>
-          </sizepolicy>
-         </property>
-         <property name="minimumSize" >
-          <size>
-           <width>0</width>
-           <height>0</height>
-          </size>
-         </property>
-         <property name="maximumSize" >
-          <size>
-           <width>16777215</width>
-           <height>16777215</height>
-          </size>
-         </property>
-         <property name="title" >
-          <string>Service List</string>
-         </property>
+      <widget class="QGroupBox" name="groupBox" >
+       <property name="geometry" >
+        <rect>
+         <x>9</x>
+         <y>7</y>
+         <width>613</width>
+         <height>230</height>
+        </rect>
+       </property>
+       <property name="sizePolicy" >
+        <sizepolicy vsizetype="Fixed" hsizetype="Minimum" >
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="minimumSize" >
+        <size>
+         <width>561</width>
+         <height>230</height>
+        </size>
+       </property>
+       <property name="maximumSize" >
+        <size>
+         <width>16777215</width>
+         <height>16777215</height>
+        </size>
+       </property>
+       <property name="title" >
+        <string>Service List</string>
+       </property>
+       <widget class="QWidget" name="layoutWidget" >
+        <property name="geometry" >
+         <rect>
+          <x>11</x>
+          <y>29</y>
+          <width>591</width>
+          <height>190</height>
+         </rect>
+        </property>
+        <layout class="QGridLayout" >
+         <item rowspan="5" row="0" column="0" >
+          <widget class="QTableWidget" name="serviceWidget" >
+           <property name="sizePolicy" >
+            <sizepolicy vsizetype="Preferred" hsizetype="Expanding" >
+             <horstretch>0</horstretch>
+             <verstretch>0</verstretch>
+            </sizepolicy>
+           </property>
+           <property name="minimumSize" >
+            <size>
+             <width>0</width>
+             <height>0</height>
+            </size>
+           </property>
+           <property name="maximumSize" >
+            <size>
+             <width>16777215</width>
+             <height>16777215</height>
+            </size>
+           </property>
+           <property name="baseSize" >
+            <size>
+             <width>0</width>
+             <height>0</height>
+            </size>
+           </property>
+           <property name="selectionMode" >
+            <enum>QAbstractItemView::SingleSelection</enum>
+           </property>
+           <property name="selectionBehavior" >
+            <enum>QAbstractItemView::SelectRows</enum>
+           </property>
+           <property name="textElideMode" >
+            <enum>Qt::ElideLeft</enum>
+           </property>
+           <property name="showGrid" >
+            <bool>true</bool>
+           </property>
+           <column>
+            <property name="text" >
+             <string>Onion Address</string>
+            </property>
+           </column>
+           <column>
+            <property name="text" >
+             <string>Virtual Port</string>
+            </property>
+           </column>
+           <column>
+            <property name="text" >
+             <string>Target</string>
+            </property>
+           </column>
+           <column>
+            <property name="text" >
+             <string>Directory Path</string>
+            </property>
+           </column>
+           <column>
+            <property name="text" >
+             <string>Enabled</string>
+            </property>
+           </column>
+          </widget>
+         </item>
+         <item row="0" column="1" >
+          <widget class="QToolButton" name="addServiceBtn" >
+           <property name="sizePolicy" >
+            <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
+             <horstretch>0</horstretch>
+             <verstretch>0</verstretch>