Changeset 2960

Timestamp:

08/14/08 10:03:39 (3 months ago)

Author:

borkdomenik

Message:

Some more bugfixes and changes according to proposal 121.
* make the comment for client authorization optional (client side)
* changes in the serviceAccessValueChanged because of the point mentioned above
* remove the validation for the comment/identification on client side
* improve the ui.file (not finished yet!)
* applied checkSpace.pl

Location:

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

Files:

• service.cpp (modified) (3 diffs)
• service.h (modified) (1 diff)
• servicepage.cpp (modified) (20 diffs)
• servicepage.h (modified) (3 diffs)
• servicesettings.cpp (modified) (3 diffs)
• userauthorizationdata.cpp (modified) (1 diff)

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

@@ -16 +16 @@
 
 /** Constructor to create a new Service with initial settings */
-Service::Service(QString serviceAddress, QString virtualPort,
- QString physicalAddressPort, QString serviceDirectory, bool enabled, bool stealth)
+Service::Service(QString serviceAddress, QString virtualPort,QString
+ physicalAddressPort,QString serviceDirectory,bool enabled,bool stealth)
 {
 
@@ -128 +128 @@
   /* Read in from the data stream */
   in >> serviceAddress >> virtualPort  >> physicalAddressPort
-   >> serviceDirectory >> enabled >> stealth 
+   >> serviceDirectory >> enabled >> stealth
    >> additionalServiceOptions >> users;
 
@@ -155 +155 @@
   }
   s.append(_serviceAddress +"#"+ _virtualPort +"#"+  _physicalAddressPort +
-    "#"+ _serviceDirectory +"#"+  _enabled + "#"+ stealth +"#"+ 
+    "#"+ _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, bool stealth);
+   QString physicalAddressPort, QString serviceDirectory,
+   bool enabled, bool stealth);
   /** Destructor */
   virtual ~Service();

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

@@ -43 +43 @@
   /* a map mapping from the unique identification, to the auth data
    * of a service*/
-  _consumedServices = new QMap<QString, ServiceAuthorizationData>();
+  _consumedServices = new QMap<int, ServiceAuthorizationData>();
   /** A QRegExpValidator to validate the identification of client auth(Id)
    * and service auth(Id)*/
@@ -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()));
+  connect(ui.checkBox_basic, SIGNAL(toggled(bool)), this,
+   SLOT(checkBoxBasicToggled()));
+  connect(ui.checkBox_stealth, SIGNAL(toggled(bool)), this,
+   SLOT(checkBoxStealthToggled()));
 }
 
@@ -222 +224 @@
       if(VMessageBox::warning(this, tr("Error"), tr("Some of the required user\
        authorization identification fields are empty. Do you want Vidalia to\
-       create some dummy values you can change later? If not, the corresponding\
-       authorization data is going to be deleted."),
+       create some dummy values you can change later? If not, the\
+       corresponding authorization data is going to be deleted."),
         VMessageBox::Yes, VMessageBox::No) == VMessageBox::Yes) {
           //create a list containing of all identifications to ensure
@@ -255 +257 @@
            for(int i = 0; i < ui.serviceAuthWidget->rowCount(); i++) {
              QTableWidgetItem *currentItem = ui.serviceAuthWidget->item(i, 1);
-             if(currentItem->text() == NULL || currentItem->text().length()==0){
+             if(currentItem->text()==NULL || currentItem->text().length()==0){
                ui.serviceAuthWidget->removeRow(i);
                i--;
@@ -313 +315 @@
       }
       serviceConfString.append(" hiddenserviceversion=\"2\" \
-       hiddenserviceauthorizeclient="+string_escape(stealthMode+" " + 
+       hiddenserviceauthorizeclient="+string_escape(stealthMode+" " +
        createUserAuthStringForTor(publishedUsers)));
     }
     serviceConfString.append(" "+ temp.additionalServiceOptions());
   }
-  VMessageBox::warning(this, tr("torConfString"), serviceConfString,
-     VMessageBox::Ok);
   _serviceSettings->applyServices(serviceConfString, &errmsg);
 }
@@ -380 +380 @@
   QString torConfigurationString = _serviceSettings->
    getHiddenServiceDirectories();
-   VMessageBox::warning(this, tr("kompletter string:"), torConfigurationString,
-             VMessageBox::Ok);
   torServiceList = extractSingleServices(torConfigurationString);
   // the services stored with vidalia
@@ -453 +451 @@
      }
     //remove first appearance of HiddenServiceVerison
-    indexstart = additionalOptions.indexOf("hiddenserviceversion", 0, Qt::CaseInsensitive);
+    indexstart = additionalOptions.indexOf("hiddenserviceversion", 0,
+     Qt::CaseInsensitive);
     endindex = additionalOptions.indexOf("250", indexstart);
     if(endindex != -1) {
@@ -582 +581 @@
         }
   }
-  Service service(address, virtualPort, physAddressPort, serviceDir, true, stealth);
+  Service service(address,virtualPort,physAddressPort,serviceDir,true,stealth);
   service.setAdditionalServiceOptions(additionalOptions);
   service.setUsers(actualUsers);
@@ -588 +587 @@
   return service;
 }
-
-/** this method is called to parse the client_keys file in order to
- *  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;
-  //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
@@ -743 +701 @@
 
 void
-ServicePage::initServiceAccessTable(QList<ServiceAuthorizationData> authdataList)
+ServicePage::initServiceAccessTable(QList<ServiceAuthorizationData>
+ authdataList)
 {
   while(ui.serviceAccessWidget->rowCount() > 0) {
     ui.serviceAccessWidget->removeRow(0);
   }
+  int index = 0;
   foreach(ServiceAuthorizationData tempService, authdataList) {
-    int rows = ui.serviceAccessWidget->rowCount();
+    //int rows = ui.serviceAccessWidget->rowCount();
     QString authdata = tempService.authdata();
-    QString identification = tempService.identification();
+    QString identification = ""+tempService.identification();
     ServiceAuthorizationData s(authdata, identification);
-    ui.serviceAccessWidget->insertRow(rows);
+    ui.serviceAccessWidget->insertRow(index);
     QTableWidgetItem* authdataItem = new QTableWidgetItem(authdata);
-    QTableWidgetItem* identificationItem = new QTableWidgetItem(identification);
+    QTableWidgetItem* identificationItem = new
+     QTableWidgetItem(identification);
     identificationItem->setData(32, identification);
     authdataItem->setData(32, authdata);
-    ui.serviceAccessWidget->setItem(rows, 0, authdataItem);
-    ui.serviceAccessWidget->setItem(rows, 1, identificationItem);
-    _consumedServices->insert(identification, s);
+    ui.serviceAccessWidget->setItem(index, 0, authdataItem);
+    ui.serviceAccessWidget->setItem(index, 1, identificationItem);
+    _consumedServices->insert(index, s);
+    index++;
   }
 }
@@ -887 +849 @@
               identification = ui.serviceAuthWidget->item(i, 1)->text();
               UserAuthorizationData u(authdata, identification);
-              if(ui.serviceAuthWidget->item(i,2)->checkState() == Qt::Checked) {
+              if(ui.serviceAuthWidget->item(i,2)->checkState()==Qt::Checked){
                 enabled = true;
               }
@@ -902 +864 @@
             QList<QString> identifications;
             for(int i = 0; i < ui.serviceAuthWidget->rowCount(); i++) {
-              QTableWidgetItem *selectedItem = ui.serviceAuthWidget->item(i, 1);
+              QTableWidgetItem *selectedItem = ui.serviceAuthWidget->item(i,1);
               if(selectedItem->text() != NULL &&
                selectedItem->text().length() > 0) {
@@ -1227 +1189 @@
   serviceIdentification = ""+ui.commentLineAccess->text();
   if(serviceAuthdata.length() == 0) {
-    VMessageBox::warning(this, tr("Error"), tr("Authorization data has to be set."),
-     VMessageBox::Ok);
+    VMessageBox::warning(this, tr("Error"), tr("Authorization data\
+     has to be set."), VMessageBox::Ok);
      return;
   } else {
@@ -1238 +1200 @@
         QTableWidgetItem* identificationItem =
          new QTableWidgetItem(serviceIdentification);
-        identificationItem->setData(32, serviceIdentification);
+        //identificationItem->setData(32, serviceIdentification);
         authItem->setData(32, serviceAuthdata);
         ui.serviceAccessWidget->setItem(rows, 0, authItem);
@@ -1245 +1207 @@
         ui.commentLineAccess->clear();
         ServiceAuthorizationData s(serviceAuthdata, serviceIdentification);
-        _consumedServices->insert(serviceIdentification, s);
+        _consumedServices->insert(rows, s);
       } else {
          VMessageBox::warning(this, tr("Error"), tr("Invalid input for the\
@@ -1277 +1239 @@
     }
   } else {
-    VMessageBox::warning(this, tr("Error"), tr("Your onion adress is not valid,\
-     please correct it."), VMessageBox::Ok);
+    VMessageBox::warning(this, tr("Error"), tr("Your onion adress is\
+     not valid, please correct it."), VMessageBox::Ok);
     return QValidator::Invalid;
   }
@@ -1287 +1249 @@
 ServicePage::removeServiceAuthBtnClicked()
 {
-  QString identification = ui.serviceAccessWidget->item(ui.serviceAccessWidget->
-   currentRow(), 1)->text();
-  _consumedServices->take(identification);
-  ui.serviceAccessWidget->removeRow(ui.serviceAccessWidget->currentRow());
+  int id = ui.serviceAccessWidget->currentRow();
+  _consumedServices->take(id);
+  ui.serviceAccessWidget->removeRow(id);
+  //shift all higher ones one row up!
+  for(int index = id+1; index < ui.serviceAccessWidget->rowCount(); index++){
+    ServiceAuthorizationData s = _consumedServices->take(index);
+    _consumedServices->insert(id,s);
+    QTableWidgetItem* auth = new QTableWidgetItem(s.authdata());
+    QTableWidgetItem* ident = new QTableWidgetItem(s.identification());
+    ui.serviceAccessWidget->setItem(id, 0, auth);
+    ui.serviceAccessWidget->setItem(id, 1, ident);
+    id++;
+  }
 }
 
@@ -1378 +1349 @@
 ServicePage::serviceAccessValueChanged()
 {
-  QString currentString, currentAuthdata;
-  QStringList values;
+  QString currentAuthdata;
   QTableWidgetItem *item = ui.serviceAccessWidget->item(
    ui.serviceAccessWidget->currentRow(), 1);
   QTableWidgetItem* authItem = ui.serviceAccessWidget->item(
    ui.serviceAccessWidget->currentRow(), 0);
-  if(item == NULL || item->text() == NULL || item->text().length() == 0 ||
-    authItem == NULL) {
+  if(item == NULL || authItem == NULL) {
     // nothing to validate here
     return;
   } else {
-    currentString = item->text();
-    for(int i = 0; i < ui.serviceAccessWidget->rowCount(); i++) {
-      if(i != ui.serviceAccessWidget->currentRow()) {
-        QTableWidgetItem* tempItem = ui.serviceAccessWidget->item(i, 1);
-        if(tempItem != NULL && tempItem->text() != NULL &&
-         tempItem->text().length() > 0) {
-          values.push_back(tempItem->text());
+    QString identification = ""+item->text();
+    ServiceAuthorizationData s = _consumedServices->take(
+     ui.serviceAccessWidget->currentRow());
+    s.setIdentification(identification);
+    _consumedServices->insert(ui.serviceAccessWidget->currentRow(), s);
+    if(authItem->text() == NULL || authItem->text().length() == 0) {
+      VMessageBox::warning(this, tr("Error"), tr("No empty authorization\
+       allowed!"), VMessageBox::Ok);
+      if(authItem->data(32).toString() != NULL &&
+        authItem->data(32).toString().length() > 0) {
+        currentAuthdata = authItem->data(32).toString();
+        authItem->setText(currentAuthdata);
+        s.setAuthdata(currentAuthdata);
+        _consumedServices->insert(ui.serviceAccessWidget->currentRow(), s);
+      } else {
+        authItem->setText("");
+        s.setAuthdata("");
+        _consumedServices->insert(ui.serviceAccessWidget->currentRow(), s);
         }
-      }
-    }
-    if(values.contains(currentString)) {
-      VMessageBox::warning(this, tr("Error"), tr("The identification has to be\
-      unique, please choose a different one."), VMessageBox::Ok);
-      if(item->data(32).toString() != NULL &&
-       item->data(32).toString().length() > 0) {
-          item->setText(item->data(32).toString());
-      } else {
-        item->setText("");
-       }
     } else {
-      int pos = 0;
-      if(_identificationValidator->validate(currentString, pos) ==
-       QValidator::Acceptable) {
-        if(authItem->text() == NULL || authItem->text().length() == 0) {
-          VMessageBox::warning(this, tr("Error"), tr("No empty authorization\
-           allowed!"), VMessageBox::Ok);
-           if(authItem->data(32).toString() != NULL &&
-            authItem->data(32).toString().length() > 0) {
-             authItem->setText(authItem->data(32).toString());
-           } else {
-             authItem->setText("");
-           }
-        } else {
-          currentAuthdata = authItem->text();
-          if(validateServiceAuth(authItem->text()) == QValidator::Acceptable) {
-            authItem->setData(32, currentAuthdata);
-            authItem->setText(currentAuthdata);
-          } else {
-            if(authItem->data(32).toString() != NULL &&
-             authItem->data(32).toString().length() > 0) {
-               authItem->setText(authItem->data(32).toString());
-             } else {
-               authItem->setText("");
-             }
-          }
-        }
+      currentAuthdata = authItem->text();
+      if(validateServiceAuth(authItem->text()) == QValidator::Acceptable) {
+        authItem->setData(32, currentAuthdata);
+        authItem->setText(currentAuthdata);
+        s.setAuthdata(currentAuthdata);
+        _consumedServices->insert(ui.serviceAccessWidget->currentRow(), 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);
-        if(item->data(32) == NULL || item->data(32).toString() == NULL ||
-         item->data(32).toString().length() <= 0) {
-          item->setText("");
-        } else {
-          item->setText(item->data(32).toString());
-         }
-      }
-    }
-  }
+         authorization. Only [onion-Address] [descriptor-cookie] allowed"),
+         VMessageBox::Ok);
+        if(authItem->data(32).toString() != NULL &&
+         authItem->data(32).toString().length() > 0) {
+          currentAuthdata = authItem->data(32).toString();
+          authItem->setText(currentAuthdata);
+          s.setAuthdata(currentAuthdata);
+          _consumedServices->insert(ui.serviceAccessWidget->currentRow(), s);
+         } else {
+           authItem->setText("");
+           s.setAuthdata("");
+           _consumedServices->insert(ui.serviceAccessWidget->currentRow(), s);
+           }
+        }
+      }
+   }
 }
 
@@ -1524 +1478 @@
 }
 
+/** Called whenever the user clicks on the basic authorization checkbox*/
 void
 ServicePage::checkBoxBasicToggled()
@@ -1538 +1493 @@
 }
 
+/** Called whenever the user clicks on the stealth authorization checkbox*/
 void
 ServicePage::checkBoxStealthToggled()

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

@@ -51 +51 @@
   *  @return a QValidator::State signalling whether the string is valid or not*/
   QValidator::State validateServiceAuth(QString authString);
-  /** this method is called to parse the client_keys file in order to
-  * 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);
   /** this method creates the configuration string for tor including the
    * user authorization*/
@@ -114 +110 @@
    * entry(Provided Services)*/
   void serviceAuthSelectionChanged();
+  /** Called whenever the user clicks on the basic authorization checkbox*/
   void checkBoxBasicToggled();
+  /** Called whenever the user clicks on the stealth authorization checkbox*/
   void checkBoxStealthToggled();
 
@@ -126 +124 @@
   QMap<QString, Service>* _torServices;
   /* a map mapping from the unique comment, to the auth data of a service*/
-  QMap<QString, ServiceAuthorizationData>* _consumedServices;
+  QMap<int, ServiceAuthorizationData>* _consumedServices;
   /** Qt Designer generated object */
   Ui::ServicePage ui;

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

@@ -54 +54 @@
 ServiceSettings::apply(QString *errmsg)
 {
-  //dummy
   return true;
 }
@@ -62 +61 @@
 ServiceSettings::getServices()
 {
-  QString address,virtualPort,physAddrPort,serviceDir,enabledS,stealthS,additionalData;
+  QString address,virtualPort,physAddrPort,serviceDir,enabledS,
+   stealthS,additionalData;
   bool enabled = false;
   bool stealth = false;
@@ -106 +106 @@
       }
     }
-    Service s(address, virtualPort, physAddrPort, serviceDir, enabled, stealth);
+    Service s(address,virtualPort,physAddrPort,serviceDir,enabled,stealth);
     s.setAdditionalServiceOptions(additionalData);
     s.setUsers(users);

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

@@ -16 +16 @@
 
 /** Constructor to create a new User with initial settings */
-UserAuthorizationData::UserAuthorizationData(QString authdata, QString identification):
- AbstractAuthorizationData(authdata, identification)
+UserAuthorizationData::UserAuthorizationData(QString authdata,
+ QString identification):AbstractAuthorizationData(authdata,identification)
 {
 }