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

Timestamp:

Oct 18, 2012 11:59:24 AM (13 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

81485

Message:

FE/Qt: Disabling proxy-authentication for security reasons.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• globals/VBoxGlobal.cpp (modified) (2 diffs)
• settings/global/UIGlobalSettingsProxy.cpp (modified) (9 diffs)
• settings/global/UIGlobalSettingsProxy.h (modified) (3 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp

@@ -2048 +2048 @@
 {
     UIProxyManager proxyManager(settings().proxySettings());
+    if (proxyManager.authEnabled())
+    {
+        proxyManager.setAuthEnabled(false);
+        proxyManager.setAuthLogin(QString());
+        proxyManager.setAuthPassword(QString());
+        VBoxGlobalSettings globalSettings = settings();
+        globalSettings.setProxySettings(proxyManager.toString());
+        vboxGlobal().setSettings(globalSettings);
+    }
     if (proxyManager.proxyEnabled())
     {
+#if 0
         QNetworkProxy::setApplicationProxy(QNetworkProxy(QNetworkProxy::HttpProxy,
                                                          proxyManager.proxyHost(),
@@ -2055 +2065 @@
                                                          proxyManager.authEnabled() ? proxyManager.authLogin() : QString(),
                                                          proxyManager.authEnabled() ? proxyManager.authPassword() : QString()));
+#else
+        QNetworkProxy::setApplicationProxy(QNetworkProxy(QNetworkProxy::HttpProxy,
+                                                         proxyManager.proxyHost(),
+                                                         proxyManager.proxyPort().toInt()));
+#endif
     }
     else

trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsProxy.cpp

@@ -7 +7 @@
 
 /*
- * Copyright (C) 2011 Oracle Corporation
+ * Copyright (C) 2011-2012 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -37 +37 @@
     m_pHostEditor->setValidator(new QRegExpValidator(QRegExp("\\S+"), m_pHostEditor));
     m_pPortEditor->setValidator(new QRegExpValidator(QRegExp("\\d+"), m_pPortEditor));
+#if 0
     m_pLoginEditor->setValidator(new QRegExpValidator(QRegExp("\\S+"), m_pLoginEditor));
     m_pPasswordEditor->setValidator(new QRegExpValidator(QRegExp("\\S+"), m_pPasswordEditor));
+#else
+    m_pLoginLabel->hide();
+    m_pLoginEditor->hide();
+    m_pPasswordLabel->hide();
+    m_pPasswordEditor->hide();
+#endif
 
     /* Setup connections: */
     connect(m_pProxyCheckbox, SIGNAL(stateChanged(int)), this, SLOT(sltProxyToggled()));
+#if 0
     connect(m_pAuthCheckbox, SIGNAL(stateChanged(int)), this, SLOT(sltAuthToggled()));
+#else
+    m_pAuthCheckbox->hide();
+#endif
 
     /* Apply language settings: */
@@ -60 +71 @@
     m_cache.m_strProxyHost = proxyManager.proxyHost();
     m_cache.m_strProxyPort = proxyManager.proxyPort();
+#if 0
     m_cache.m_fAuthEnabled = proxyManager.authEnabled();
     m_cache.m_strAuthLogin = proxyManager.authLogin();
     m_cache.m_strAuthPassword = proxyManager.authPassword();
+#endif
 
     /* Upload properties & settings to data: */
@@ -76 +89 @@
     m_pHostEditor->setText(m_cache.m_strProxyHost);
     m_pPortEditor->setText(m_cache.m_strProxyPort);
+#if 0
     m_pAuthCheckbox->setChecked(m_cache.m_fAuthEnabled);
     m_pLoginEditor->setText(m_cache.m_strAuthLogin);
     m_pPasswordEditor->setText(m_cache.m_strAuthPassword);
+#endif
     sltProxyToggled();
 }
@@ -90 +105 @@
     m_cache.m_strProxyHost = m_pHostEditor->text();
     m_cache.m_strProxyPort = m_pPortEditor->text();
+#if 0
     m_cache.m_fAuthEnabled = m_pAuthCheckbox->isChecked();
     m_cache.m_strAuthLogin = m_pLoginEditor->text();
     m_cache.m_strAuthPassword = m_pPasswordEditor->text();
+#endif
 }
 
@@ -106 +123 @@
     proxyManager.setProxyHost(m_cache.m_strProxyHost);
     proxyManager.setProxyPort(m_cache.m_strProxyPort);
+#if 0
     proxyManager.setAuthEnabled(m_cache.m_fAuthEnabled);
     proxyManager.setAuthLogin(m_cache.m_strAuthLogin);
     proxyManager.setAuthPassword(m_cache.m_strAuthPassword);
+#endif
     m_settings.setProxySettings(proxyManager.toString());
 
@@ -127 +146 @@
     setTabOrder(m_pProxyCheckbox, m_pHostEditor);
     setTabOrder(m_pHostEditor, m_pPortEditor);
+#if 0
     setTabOrder(m_pPortEditor, m_pAuthCheckbox);
     setTabOrder(m_pAuthCheckbox, m_pLoginEditor);
     setTabOrder(m_pLoginEditor, m_pPasswordEditor);
+#endif
 }
 
@@ -146 +167 @@
     m_pPortLabel->setEnabled(m_pProxyCheckbox->isChecked());
     m_pPortEditor->setEnabled(m_pProxyCheckbox->isChecked());
+#if 0
     m_pAuthCheckbox->setEnabled(m_pProxyCheckbox->isChecked());
 
     /* Update auth widgets also: */
     sltAuthToggled();
+#endif
 }
 
+#if 0
 void UIGlobalSettingsProxy::sltAuthToggled()
 {
@@ -164 +188 @@
         m_pValidator->revalidate();
 }
+#endif
 

trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsProxy.h

@@ -6 +6 @@
 
 /*
- * Copyright (C) 2011 Oracle Corporation
+ * Copyright (C) 2011-2012 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -27 +27 @@
 struct UISettingsCacheGlobalProxy
 {
-    UISettingsCacheGlobalProxy() : m_fProxyEnabled(false), m_fAuthEnabled(false) {}
+    UISettingsCacheGlobalProxy()
+        : m_fProxyEnabled(false)
+#if 0
+        , m_fAuthEnabled(false)
+#endif
+    {}
     bool m_fProxyEnabled;
     QString m_strProxyHost;
     QString m_strProxyPort;
+#if 0
     bool m_fAuthEnabled;
     QString m_strAuthLogin;
     QString m_strAuthPassword;
+#endif
 };
 
@@ -74 +81 @@
 
     void sltProxyToggled();
+#if 0
     void sltAuthToggled();
+#endif
 
 private: