[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]

[vidalia-svn] r4005: All connections use SSL, and the reporter uses tor+ssl. Fixe (vidalia/branches/extension-api/src/plugins/HerdictWebReporterPlugin)

To: vidalia-svn@xxxxxxxx
Subject: [vidalia-svn] r4005: All connections use SSL, and the reporter uses tor+ssl. Fixe (vidalia/branches/extension-api/src/plugins/HerdictWebReporterPlugin)
From: tyree731@xxxxxxxxxxxxxxxxxxx
Date: Mon, 3 Aug 2009 23:46:39 -0400 (EDT)
Delivered-to: archiver@xxxxxxxx
Delivered-to: vidalia-svn-outgoing@xxxxxxxx
Delivered-to: vidalia-svn@xxxxxxxx
Delivery-date: Mon, 03 Aug 2009 23:46:41 -0400
Reply-to: vidalia-svn@xxxxxxxxxxxxx
Sender: owner-vidalia-svn@xxxxxxxxxxxxx

Author: tyree731
Date: 2009-08-03 23:46:38 -0400 (Mon, 03 Aug 2009)
New Revision: 4005

Added:
   vidalia/branches/extension-api/src/plugins/HerdictWebReporterPlugin/error.html
   vidalia/branches/extension-api/src/plugins/HerdictWebReporterPlugin/herdict-tab-icon.ico
Modified:
   vidalia/branches/extension-api/src/plugins/HerdictWebReporterPlugin/HerdictWebReporterPanel.cpp
   vidalia/branches/extension-api/src/plugins/HerdictWebReporterPlugin/HerdictWebReporterPanel.h
   vidalia/branches/extension-api/src/plugins/HerdictWebReporterPlugin/HerdictWebReporterPlugin.qrc
Log:
All connections use SSL, and the reporter uses tor+ssl. Fixed numerous littles issues and cleaned up code. Plugin basically complete.

Modified: vidalia/branches/extension-api/src/plugins/HerdictWebReporterPlugin/HerdictWebReporterPanel.cpp
===================================================================
--- vidalia/branches/extension-api/src/plugins/HerdictWebReporterPlugin/HerdictWebReporterPanel.cpp	2009-08-04 03:10:13 UTC (rev 4004)
+++ vidalia/branches/extension-api/src/plugins/HerdictWebReporterPlugin/HerdictWebReporterPanel.cpp	2009-08-04 03:46:38 UTC (rev 4005)
@@ -60,10 +60,6 @@
   connect(_torAccessManager, SIGNAL(finished(QNetworkReply*)),
           this, SLOT(requestFinished(QNetworkReply*)));
 
-  /* TODO: Temporary thingy */
-  connect(_accessManager, SIGNAL(sslErrors(QNetworkReply*,QList<QSslError>)),
-          this, SLOT(sslError(QNetworkReply*,QList<QSslError>)));
-
   /* Make the web views use their respective network access manager */
   ui.webViewPlain->page()->setNetworkAccessManager(_accessManager);
   ui.webViewTor->page()->setNetworkAccessManager(_torAccessManager);
@@ -105,17 +101,10 @@
           ui.progressTor, SLOT(setValue(int)));
 }
 
-void
-HerdictWebReporterPanel::sslError(QNetworkReply* reply, const QList<QSslError>& errors)
-{
-  foreach(QSslError error, errors) {
-    qDebug() << "SSL Error: " <<  error.errorString() << endl;
-  }
-}
-
 HerdictWebReporterPanel::~HerdictWebReporterPanel()
 {
   delete _accessManager;
+  delete _sslConfig;
   delete _statusWidget;
   delete _torAccessManager;
 }
@@ -129,9 +118,7 @@
 QIcon
 HerdictWebReporterPanel::tabIcon() const
 {
-  /* *** TODO: Better icon for the HerdictWeb Reporter Tab *** */
-
-  return QIcon(":/images/16x16/go-home.png");
+  return QIcon(":/herdict/images/herdict-tab-icon.ico");
 }
 
 QWidget*
@@ -164,7 +151,8 @@
   }
 
   if (!result) {
-    webView->load(QUrl("about:blank"));
+    QUrl errorPage = QUrl::fromLocalFile(":/herdict/html/error.html");
+    webView->load(errorPage);
   }
 }
 
@@ -312,8 +300,6 @@
 void
 HerdictWebReporterPanel::submitReport()
 {
-  /* *** TODO: Make use Tor+SSL *** */
-
   /* Disable the submit buttons */
   ui.buttonAccessible->setDisabled(true);
   ui.buttonInAccessible->setDisabled(true);
@@ -332,9 +318,10 @@
   }
   QUrl request(requestString);
   QNetworkRequest networkRequest(request);
+  networkRequest.setSslConfiguration(*_sslConfig);
 
   /* Send request */
-  _accessManager->get(networkRequest);
+  _torAccessManager->get(networkRequest);
 }
 
 QString
@@ -386,22 +373,30 @@
 void
 HerdictWebReporterPanel::populateHerdictOptions()
 {
-  /* *** TODO: Make all requests use SSL ***  */
+  QNetworkRequest request;
+  request.setSslConfiguration(*_sslConfig);
 
-  /* Create each network request */
-  QNetworkRequest categoriesRequest(QUrl("https://www.herdict.org/web/action/ajax/plugin/init-categories/Vidalia1.0";));
-  categoriesRequest.setSslConfiguration(*_sslConfig);
-  QNetworkRequest countriesRequest(QUrl("http://www.herdict.org/web/action/ajax/plugin/init-countries/Vidalia1.0";));
-  QNetworkRequest locationsRequest(QUrl("http://www.herdict.org/web/action/ajax/plugin/init-locations/Vidalia1.0";));
-  QNetworkRequest interestsRequest(QUrl("http://www.herdict.org/web/action/ajax/plugin/init-interests/Vidalia1.0";));
-  QNetworkRequest reasonsRequest(QUrl("http://www.herdict.org/web/action/ajax/plugin/init-reasons/Vidalia1.0";));
-  QNetworkRequest currentLocationRequest(QUrl("http://www.herdict.org/web/action/ajax/plugin/init-currentLocation/Vidalia1.0";));
+  /* Site Categories */
+  request.setUrl(QUrl("https://www.herdict.org/web/action/ajax/plugin/init-categories/Vidalia1.0";));
+  _accessManager->get(request);
 
-  /* Now make the requests */
-  _accessManager->get(categoriesRequest);
-  _accessManager->get(countriesRequest);
-  _accessManager->get(locationsRequest);
-  _accessManager->get(interestsRequest);
-  _accessManager->get(reasonsRequest);
-  _accessManager->get(currentLocationRequest);
+  /* Country */
+  request.setUrl(QUrl("https://www.herdict.org/web/action/ajax/plugin/init-countries/Vidalia1.0";));
+  _accessManager->get(request);
+
+  /* Access Location */
+  request.setUrl(QUrl("https://www.herdict.org/web/action/ajax/plugin/init-locations/Vidalia1.0";));
+  _accessManager->get(request);
+
+  /* Usefulness */
+  request.setUrl(QUrl("https://www.herdict.org/web/action/ajax/plugin/init-interests/Vidalia1.0";));
+  _accessManager->get(request);
+
+  /* Cause of Inaccessibility */
+  request.setUrl(QUrl("https://www.herdict.org/web/action/ajax/plugin/init-reasons/Vidalia1.0";));
+  _accessManager->get(request);
+
+  /* Current location */
+  request.setUrl(QUrl("https://www.herdict.org/web/action/ajax/plugin/init-currentLocation/Vidalia1.0";));
+  _accessManager->get(request);
 }

Modified: vidalia/branches/extension-api/src/plugins/HerdictWebReporterPlugin/HerdictWebReporterPanel.h
===================================================================
--- vidalia/branches/extension-api/src/plugins/HerdictWebReporterPlugin/HerdictWebReporterPanel.h	2009-08-04 03:10:13 UTC (rev 4004)
+++ vidalia/branches/extension-api/src/plugins/HerdictWebReporterPlugin/HerdictWebReporterPanel.h	2009-08-04 03:46:38 UTC (rev 4005)
@@ -43,7 +43,6 @@
   QWidget* statusWidget() const;
 
 private slots:
-  void sslError(QNetworkReply* reply, const QList<QSslError>& errors);
   /* Change the status bar message */
   void changeStatusMessage(const QString& message);
   /* Handle webViewPlain finishing */

Modified: vidalia/branches/extension-api/src/plugins/HerdictWebReporterPlugin/HerdictWebReporterPlugin.qrc
===================================================================
--- vidalia/branches/extension-api/src/plugins/HerdictWebReporterPlugin/HerdictWebReporterPlugin.qrc	2009-08-04 03:10:13 UTC (rev 4004)
+++ vidalia/branches/extension-api/src/plugins/HerdictWebReporterPlugin/HerdictWebReporterPlugin.qrc	2009-08-04 03:46:38 UTC (rev 4005)
@@ -4,8 +4,12 @@
         <file>herdict-button-inaccessible.gif</file>
         <file>herdict-header-background.gif</file>
         <file>herdict-logo.gif</file>
+        <file>herdict-tab-icon.ico</file>
     </qresource>
     <qresource prefix="/herdict/pki">
         <file>EquifaxSecureCA.crt</file>
     </qresource>
+    <qresource prefix="/herdict/html">
+        <file>error.html</file>
+    </qresource>
 </RCC>
\ No newline at end of file

Added: vidalia/branches/extension-api/src/plugins/HerdictWebReporterPlugin/error.html
===================================================================
--- vidalia/branches/extension-api/src/plugins/HerdictWebReporterPlugin/error.html	                        (rev 0)
+++ vidalia/branches/extension-api/src/plugins/HerdictWebReporterPlugin/error.html	2009-08-04 03:46:38 UTC (rev 4005)
@@ -0,0 +1,12 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";>
+<html xmlns="http://www.w3.org/1999/xhtml"; >
+<head>
+    <title>Error Page</title>
+</head>
+<body>
+  <div>    
+    <h1>The page cannot be displayed</h1>
+    <p>If this page is being displayed from the right browser pane, and the left browser pane is not display the same page, this suggests that perhaps the website you are viewing is down or being censored on your ISP.</p>
+  </div>
+</body>
+</html>


Property changes on: vidalia/branches/extension-api/src/plugins/HerdictWebReporterPlugin/error.html
___________________________________________________________________
Added: svn:keywords
   + Id
Added: svn:eol-style
   + native

Added: vidalia/branches/extension-api/src/plugins/HerdictWebReporterPlugin/herdict-tab-icon.ico
===================================================================
(Binary files differ)


Property changes on: vidalia/branches/extension-api/src/plugins/HerdictWebReporterPlugin/herdict-tab-icon.ico
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Prev by Author: [vidalia-svn] r4003: Fixed pki loading to use fromPath. Resource loading still no (vidalia/branches/extension-api/src/plugins/HerdictWebReporterPlugin)
Next by Author: [vidalia-svn] r4012: Added initial code for TBB. (in vidalia/branches/extension-api: . src/plugins src/plugins/TorBrowserBundlePlugin src/vidalia/MessageLogPlugin src/vidalia/NetworkMapPlugin)
Previous by thread: [vidalia-svn] r4004: Q_INIT_RESOURCE is the magic incantation you're looking for. (vidalia/branches/extension-api/src/plugins/HerdictWebReporterPlugin)
Next by thread: [vidalia-svn] r4006: Bump trunk to 0.2.2-svn. (vidalia/trunk)
Index(es):
- Author
- Thread