Changeset 57671 in vbox for trunk/src/VBox/Frontends/VirtualBox

Timestamp:

Sep 9, 2015 3:42:22 PM (9 years ago)

Author:

vboxsync

Message:

UINetworkReply: Fixed s_aCerts size and added a testcase for checking the URL. This testcase replaces the deliberate 404 URLs against the update ping server.

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• Makefile.kmk (modified) (3 diffs)
• src/net/UINetworkReply.cpp (modified) (10 diffs)
• src/net/tstSSLCertDownloads.cpp (added)

trunk/src/VBox/Frontends/VirtualBox/Makefile.kmk

@@ -77 +77 @@
 # the VirtualBox setup below.
 #
+# This is a bit messy.  We boldly ASSUME that LANGUAGE, IMAGES, FORMS
+# and TRANSLATIONS are all unused by kBuild and the host toolchain.
+#
 SAVED_TEMPLATE := $(TEMPLATE)
 include $(PATH_SUB_CURRENT)/VBoxUI.pro
+TEMPLATE       := $(SAVED_TEMPLATE)
+SAVED_TEMPLATE :=
+LANGUAGE       :=
+IMAGES         :=
+# FORMS and TRANSLATIONS are reset further down.
 
 
@@ -1002 +1010 @@
 
 
+#
+# Unset everything that was loaded from VBoxUI.pro.
+#
+FORMS :=
+TRANSLATIONS :=
+
+
 ifeq ($(KBUILD_TARGET),darwin)
 #
@@ -1114 +1129 @@
 endif
 
+
 #
 # Testcase for the darwin keyboard routines.
 #
 ifdef VBOX_WITH_TESTCASES
-PROGRAMS.darwin += tstDarwinKeyboard
-tstDarwinKeyboard_NAME = tstDarwinKeyboard
-tstDarwinKeyboard_TEMPLATE = VBOXR3TSTEXE
-tstDarwinKeyboard_DEFS.x86 = USE_HID_FOR_MODIFIERS
-tstDarwinKeyboard_INCS = include
-tstDarwinKeyboard_SOURCES = \
-        src/platform/darwin/tstDarwinKeyboard.cpp \
-        src/platform/darwin/DarwinKeyboard.cpp
-tstDarwinKeyboard_SOURCES.amd64 = \
-        src/platform/darwin/CocoaEventHelper.mm
-tstDarwinKeyboard_LDFLAGS = -framework IOKit -framework Carbon -framework AppKit
-tstDarwinKeyboard_LIBS = \
-        $(LIB_RUNTIME)
-endif
-
-
-# Unset everything that was loaded from VBoxUI.pro.
-TEMPLATE := $(SAVED_TEMPLATE)
-SAVED_TEMPLATE :=
-LANGUAGE :=
-FORMS :=
-TRANSLATIONS :=
-IMAGES :=
+ PROGRAMS.darwin += tstDarwinKeyboard
+ tstDarwinKeyboard_TEMPLATE = VBOXR3TSTEXE
+ tstDarwinKeyboard_DEFS.x86 = USE_HID_FOR_MODIFIERS
+ tstDarwinKeyboard_INCS = include
+ tstDarwinKeyboard_SOURCES = \
+        src/platform/darwin/tstDarwinKeyboard.cpp \
+        src/platform/darwin/DarwinKeyboard.cpp
+ tstDarwinKeyboard_SOURCES.amd64 = \
+        src/platform/darwin/CocoaEventHelper.mm
+ tstDarwinKeyboard_LDFLAGS = -framework IOKit -framework Carbon -framework AppKit
+ tstDarwinKeyboard_LIBS = \
+        $(LIB_RUNTIME)
+endif
+
+
+#
+# Testcase for SSL certificate downloading.
+#
+if defined(VBOX_WITH_TESTCASES) && defined(VBOX_GUI_WITH_NETWORK_MANAGER)
+ PROGRAMS += tstSSLCertDownloads
+ tstSSLCertDownloads_TEMPLATE = VBOXQT4GUIEXE
+ tstSSLCertDownloads_DEFS = VBOX_GUI_IN_TST_SSL_CERT_DOWNLOADS
+ tstSSLCertDownloads_INCS = \
+        $(VBOX_GUI_INC_DIRS) \
+        $(VirtualBox_0_OUTDIR)/include
+ tstSSLCertDownloads_SOURCES = \
+        src/net/tstSSLCertDownloads.cpp
+ tstSSLCertDownloads_QT_MOCSRCS += \
+        src/net/UINetworkReply.cpp
+ tstSSLCertDownloads_QT_MODULES = Core GUI Network
+endif
 
 

trunk/src/VBox/Frontends/VirtualBox/src/net/UINetworkReply.cpp

@@ -25 +25 @@
 # include <QThread>
 # include <QRegExp>
+# include <QVector>
 
 /* GUI includes: */
 # include "UINetworkReply.h"
 # include "UINetworkManager.h"
-# include "VBoxGlobal.h"
-# include "VBoxUtils.h"
+# ifndef VBOX_GUI_IN_TST_SSL_CERT_DOWNLOADS
+#  include "VBoxGlobal.h"
+#  include "VBoxUtils.h"
+# else
+#  include <VBox/log.h>
+# endif
 
 /* Other VBox includes; */
@@ -116 +121 @@
     QByteArray m_reply;
 
+    static const char * const s_apszRootsZipUrls[];
+    static const CERTINFO s_CertInfoPcaCls3Gen5;
+    static const RTCRCERTWANTED s_aCerts[];
     static const QString s_strCertificateFileName;
-    static const RTCRCERTWANTED s_aCerts[3];
-    static const CERTINFO s_CertInfoPcaCls3Gen5;
+
+#ifdef VBOX_GUI_IN_TST_SSL_CERT_DOWNLOADS
+    friend UINetworkReplyPrivateThreadTestcase;
+#endif
 };
 
+
+/**
+ * URLs to root zip files containing certificates we want.
+ */
+/*static*/ const char * const UINetworkReplyPrivateThread::s_apszRootsZipUrls[] =
+{
+    "http://www.symantec.com/content/en/us/enterprise/verisign/roots/roots.zip"
+};
+
+
+/**
+ * Download details for
+ */
 /*static*/ const UINetworkReplyPrivateThread::CERTINFO UINetworkReplyPrivateThread::s_CertInfoPcaCls3Gen5 =
 {
     /*.pszZipFile     =*/
     "VeriSign Root Certificates/Generation 5 (G5) PCA/VeriSign Class 3 Public Primary Certification Authority - G5.pem",
-    /*.apszUrls[3]    =*/
+    /*.apszUrls[]     =*/
     {
         "http://www.symantec.com/content/en/us/enterprise/verisign/roots/VeriSign-Class%203-Public-Primary-Certification-Authority-G5.pem",
         "http://www.symantec.com/content/en/us/enterprise/verisign/roots/VeriSign-Class-3-Public-Primary-Certification-Authority-G5.pem", /* (in case they correct above typo) */
         "http://www.verisign.com/repository/roots/root-certificates/PCA-3G5.pem", /* dead */
-        "http://update.virtualbox.org/cacerts-symantec-PCA-3G5-pem-has-gone-missing-again" /* attention getter */
+        NULL,
     }
 };
@@ -139 +162 @@
  * The pvUser member points to a UINetworkReplyPrivateThread::CERTINFO.
  */
-/* static */ const RTCRCERTWANTED UINetworkReplyPrivateThread::s_aCerts[3] =
+/* static */ const RTCRCERTWANTED UINetworkReplyPrivateThread::s_aCerts[] =
 {
     /*[0] =*/
@@ -193 +216 @@
     m_strContext = tr("During proxy configuration");
 
+#ifndef VBOX_GUI_IN_TST_SSL_CERT_DOWNLOADS
     /* Get the proxymanager: */
     UIProxyManager proxyManager(vboxGlobal().settings().proxySettings());
@@ -198 +222 @@
     /* If the specific proxy settings aren't enabled, we'll use the
        system default proxy.  Otherwise assume it's configured. */
-    int rc;
-    if (!proxyManager.proxyEnabled())
-        rc = RTHttpUseSystemProxySettings(m_hHttp);
-    else
-        rc = RTHttpSetProxy(m_hHttp,
-                            proxyManager.proxyHost().toUtf8().constData(),
-                            proxyManager.proxyPort().toUInt(),
-                            NULL /* pszProxyUser */, NULL /* pszProxyPwd */);
+    if (proxyManager.proxyEnabled())
+        return RTHttpSetProxy(m_hHttp,
+                              proxyManager.proxyHost().toUtf8().constData(),
+                              proxyManager.proxyPort().toUInt(),
+                              NULL /* pszProxyUser */, NULL /* pszProxyPwd */);
 
     /** @todo This should be some kind of tristate:
@@ -216 +237 @@
      * that would require no real changes to the visible GUI... Just a thought.
      */
-    return rc;
+#endif
+    return RTHttpUseSystemProxySettings(m_hHttp);
 }
 
@@ -377 +399 @@
 QString UINetworkReplyPrivateThread::fullCertificateFileName()
 {
+#ifndef VBOX_GUI_IN_TST_SSL_CERT_DOWNLOADS
     const QDir homeDir(QDir::toNativeSeparators(vboxGlobal().homeFolder()));
     return QDir::toNativeSeparators(homeDir.absoluteFilePath(s_strCertificateFileName));
+#else
+    return QString("/not/such/agency/non-existing-file.cer");
+#endif
 }
 
@@ -536 +562 @@
      * Try get the roots.zip from symantec (or virtualbox.org) first.
      */
-    static const char * const a_apszRootsZipUrls[] =
-    {
-        "http://www.symantec.com/content/en/us/enterprise/verisign/roots/roots.zip",
-        "http://update.virtualbox.org/cacerts-symantec-roots-zip-has-gone-missing-again" /* Just to try grab our attention. */
-    };
-    for (uint32_t iUrl = 0; iUrl < RT_ELEMENTS(a_apszRootsZipUrls); iUrl++)
+    for (uint32_t iUrl = 0; iUrl < RT_ELEMENTS(s_apszRootsZipUrls); iUrl++)
     {
         void   *pvRootsZip;
         size_t  cbRootsZip;
-        rc = RTHttpGetBinary(hHttp, a_apszRootsZipUrls[iUrl], &pvRootsZip, &cbRootsZip);
+        rc = RTHttpGetBinary(hHttp, s_apszRootsZipUrls[iUrl], &pvRootsZip, &cbRootsZip);
         if (RT_SUCCESS(rc))
         {
@@ -778 +799 @@
 };
 
+
+
+/*
+ *
+ * Class UINetworkReply implementation.
+ * Class UINetworkReply implementation.
+ * Class UINetworkReply implementation.
+ *
+ */
+
+#ifndef VBOX_GUI_IN_TST_SSL_CERT_DOWNLOADS
+
 UINetworkReply::UINetworkReply(const QNetworkRequest &request, UINetworkRequestType requestType)
     : m_replyType(UINetworkReplyType_Qt)
@@ -892 +925 @@
 }
 
+#endif /* !VBOX_GUI_IN_TST_SSL_CERT_DOWNLOADS */
+
 #include "UINetworkReply.moc"