Changeset 94981 in vbox

Timestamp:

May 10, 2022 2:48:36 PM (3 years ago)

Author:

vboxsync

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

151394

Message:

Main/Update check Removed update agent-specific proxy settings. ​bugref:7983

Location:

trunk

Files:

• include/VBox/settings.h (modified) (1 diff)
• src/VBox/Frontends/VBoxManage/VBoxManageUpdateCheck.cpp (modified) (8 diffs)
• src/VBox/Main/idl/VirtualBox.xidl (modified) (2 diffs)
• src/VBox/Main/include/UpdateAgentImpl.h (modified) (2 diffs)
• src/VBox/Main/src-server/UpdateAgentImpl.cpp (modified) (6 diffs)
• src/VBox/Main/xml/Settings.cpp (modified) (3 diffs)

trunk/include/VBox/settings.h

@@ -312 +312 @@
     uint32_t                uCheckFreqSeconds;
     com::Utf8Str            strRepoUrl;
-    ProxyMode_T             enmProxyMode;
-    com::Utf8Str            strProxyUrl;
     com::Utf8Str            strLastCheckDate;
     uint32_t                uCheckCount;

trunk/src/VBox/Frontends/VBoxManage/VBoxManageUpdateCheck.cpp

@@ -42 +42 @@
 
 
-/**
- * Returns the proxy mode as a string.
- *
- * @returns Proxy mode as string.
- * @param   enmMode             Proxy mode to return as string.
- */
-static const char *proxyModeToStr(ProxyMode_T enmMode)
-{
-    switch (enmMode)
-    {
-        case ProxyMode_System:  return "System";
-        case ProxyMode_Manual:  return "Manual";
-        case ProxyMode_NoProxy: return "None";
-        default:                break;
-    }
-
-    AssertFailed();
-    return "<Invalid>";
-}
-
 static RTEXITCODE doUpdateList(int argc, char **argv, ComPtr<IUpdateAgent> pUpdateAgent)
 {
@@ -167 +147 @@
         RTPrintf(UpdateCheck::tr("Repository:             %ls\n"), bstrVal.raw());
 
-    ProxyMode_T enmProxyMode;
-    CHECK_ERROR2I_RET(pUpdateAgent, COMGETTER(ProxyMode)(&enmProxyMode), RTEXITCODE_FAILURE);
-    if (fMachineReadable)
-        outputMachineReadableString("proxy-mode", proxyModeToStr(enmProxyMode));
-    else
-        RTPrintf(UpdateCheck::tr("Proxy mode:             %s\n"), proxyModeToStr(enmProxyMode));
-    CHECK_ERROR2I_RET(pUpdateAgent, COMGETTER(ProxyURL)(bstrVal.asOutParam()), RTEXITCODE_FAILURE);
-    if (fMachineReadable)
-        outputMachineReadableString("proxy-url", &bstrVal);
-    else
-        RTPrintf(UpdateCheck::tr("Proxy URL:              %ls\n"), bstrVal.raw());
-
     return RTEXITCODE_SUCCESS;
 }
@@ -187 +155 @@
      * Parse options.
      */
-    enum GETOPTDEF_UPDATEMODIFY
-    {
-        GETOPTDEF_UPDATEMODIFY_PROXY_MODE = 2000,
-        GETOPTDEF_UPDATEMODIFY_PROXY_URL
-    };
     static const RTGETOPTDEF s_aOptions[] =
     {
@@ -198 +161 @@
         { "--channel",       'c',                                   RTGETOPT_REQ_STRING  },
         { "--frequency",     'f',                                   RTGETOPT_REQ_UINT32  },
-        { "--proxy-mode",    GETOPTDEF_UPDATEMODIFY_PROXY_MODE,     RTGETOPT_REQ_STRING  },
-        { "--proxy-url",     GETOPTDEF_UPDATEMODIFY_PROXY_URL,      RTGETOPT_REQ_STRING  }
     };
 
@@ -209 +170 @@
     UpdateChannel_T             enmChannel     = (UpdateChannel_T)-1;
     uint32_t                    cFrequencyDays = 0;
-    ProxyMode_T                 enmProxyMode   = (ProxyMode_T)-1; /* Default  if not modified, or ProxyMode_T values. */
-    Bstr                        strProxyURL    = "unmodified";    /* Default if not modified, so that empty values also can be set (clears proxy). */
 
     int c;
@@ -244 +203 @@
                 break;
 
-            case GETOPTDEF_UPDATEMODIFY_PROXY_MODE:
-                if (!RTStrICmp(ValueUnion.psz, "system"))
-                    enmProxyMode = ProxyMode_System;
-                else if (   !RTStrICmp(ValueUnion.psz, "none")
-                         || !RTStrICmp(ValueUnion.psz, "disabled")
-                         || !RTStrICmp(ValueUnion.psz, "off"))
-                    enmProxyMode = ProxyMode_NoProxy;
-                else if (!RTStrICmp(ValueUnion.psz, "manual"))
-                    enmProxyMode = ProxyMode_Manual;
-                else
-                    return errorArgument(UpdateCheck::tr("Invalid proxy mode specified: '%s'"), ValueUnion.psz);
-                break;
-
-            case GETOPTDEF_UPDATEMODIFY_PROXY_URL:
-                strProxyURL = ValueUnion.psz;
-                break;
-
             /** @todo Add more options like repo handling etc. */
 
@@ -270 +212 @@
     if (   fEnabled       == -1
         && enmChannel     == (UpdateChannel_T)-1
-        && cFrequencyDays == 0
-        && enmProxyMode   == (ProxyMode_T)-1
-        && strProxyURL    == "unmodified")
+        && cFrequencyDays == 0)
         return errorSyntax(UpdateCheck::tr("No change requested"));
 
@@ -289 +229 @@
     {
         CHECK_ERROR2I_RET(pUpdateAgent, COMSETTER(CheckFrequency)(cFrequencyDays * RT_SEC_1DAY), RTEXITCODE_FAILURE);
-    }
-    if (enmProxyMode != (ProxyMode_T)-1)
-    {
-        CHECK_ERROR2I_RET(pUpdateAgent, COMSETTER(ProxyMode)(enmProxyMode), RTEXITCODE_FAILURE);
-    }
-    if (strProxyURL.compare("unmodified") != 0)
-    {
-        CHECK_ERROR2I_RET(pUpdateAgent, COMSETTER(ProxyURL)(strProxyURL.raw()), RTEXITCODE_FAILURE);
     }
     return RTEXITCODE_SUCCESS;

trunk/src/VBox/Main/idl/VirtualBox.xidl

@@ -11345 +11345 @@
   <interface
     name="IUpdateAgent" extends="$unknown"
-    uuid="4c3788aa-747f-4a3c-a159-fb6df7a00532"
+    uuid="c4b1b5f4-8cdf-4923-9ef6-b92476a84109"
     wsmap="managed"
     reservedMethods="2" reservedAttributes="4"
@@ -11506 +11506 @@
         Only repositories with the https:// URL scheme are allowed.
       </note>
-    </attribute>
-
-    <attribute name="proxyMode" type="ProxyMode" readonly="no">
-      <desc>
-        Proxy mode to use.
-      </desc>
-    </attribute>
-
-    <attribute name="proxyURL" type="wstring" readonly="no">
-      <desc>
-        Proxy URL to use.
-      </desc>
     </attribute>
 

trunk/src/VBox/Main/include/UpdateAgentImpl.h

@@ -97 +97 @@
         UpdateState_T                      m_enmState;
         uint32_t                           m_uOrder;
-        /** Whether to use the own (dedicated) proxy settings or
-         *  use the ones of ISystemProperties. */
-        bool                               m_fUseOwnProxy;
 
         Data(void)
@@ -174 +171 @@
     HRESULT getRepositoryURL(com::Utf8Str &aRepo);
     HRESULT setRepositoryURL(const com::Utf8Str &aRepo);
-    HRESULT getProxyMode(ProxyMode_T *aMode);
-    HRESULT setProxyMode(ProxyMode_T aMode);
-    HRESULT getProxyURL(com::Utf8Str &aAddress);
-    HRESULT setProxyURL(const com::Utf8Str &aAddress);
     HRESULT getLastCheckDate(com::Utf8Str &aData);
     HRESULT getIsCheckNeeded(BOOL *aCheckNeeded);

trunk/src/VBox/Main/src-server/UpdateAgentImpl.cpp

@@ -333 +333 @@
     HRESULT hr = unconst(m_EventSource).createObject();
     if (SUCCEEDED(hr))
-    {
         hr = m_EventSource->init();
-        if (SUCCEEDED(hr))
-            mData.m_fUseOwnProxy = false;
-    }
 
     return hr;
@@ -555 +551 @@
 
     m->strRepoUrl = aRepo;
-
-    return i_commitSettings(alock);
-}
-
-HRESULT UpdateAgent::getProxyMode(ProxyMode_T *aMode)
-{
-    AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
-
-    return i_getProxyMode(aMode);
-}
-
-HRESULT UpdateAgent::setProxyMode(ProxyMode_T aMode)
-{
-    AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
-
-    m->enmProxyMode = aMode;
-    mData.m_fUseOwnProxy = true;
-
-    return i_commitSettings(alock);
-}
-
-HRESULT UpdateAgent::getProxyURL(com::Utf8Str &aAddress)
-{
-    AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
-
-    return i_getProxyURL(aAddress);
-}
-
-HRESULT UpdateAgent::setProxyURL(const com::Utf8Str &aAddress)
-{
-    AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
-
-    m->strProxyUrl = aAddress;
-    mData.m_fUseOwnProxy = true;
 
     return i_commitSettings(alock);
@@ -694 +656 @@
     if (data.strRepoUrl.isNotEmpty()) /* Prevent overwriting the agent's default URL when XML settings are empty. */
         m->strRepoUrl    = data.strRepoUrl;
-    m->enmProxyMode      = data.enmProxyMode;
-    if (data.strProxyUrl.isNotEmpty()) /* Explicitly set (and mark) an own proxy? */
-    {
-        m->strProxyUrl   = data.strProxyUrl;
-        mData.m_fUseOwnProxy = true;
-    }
     m->strLastCheckDate  = data.strLastCheckDate;
     m->uCheckCount       = data.uCheckCount;
@@ -725 +681 @@
     data = *m;
 
-    /* Cancel out eventually set proxy settings if those were not explicitly set.
-     * This way the ISystemProperties proxy settings will be used then. */
-    if (!mData.m_fUseOwnProxy)
-    {
-        data.strProxyUrl  = "";
-        data.enmProxyMode = ProxyMode_System;
-    }
-
     return S_OK;
 }
@@ -797 +745 @@
 HRESULT UpdateAgent::i_getProxyMode(ProxyMode_T *aMode)
 {
-    HRESULT hrc;
-
-    if (!mData.m_fUseOwnProxy) /* If not explicitly set, use the ISystemProperties proxy settings. */
-    {
-        ComPtr<ISystemProperties> pSystemProperties;
-        hrc = m_VirtualBox->COMGETTER(SystemProperties)(pSystemProperties.asOutParam());
-        if (SUCCEEDED(hrc))
-            hrc = pSystemProperties->COMGETTER(ProxyMode)(aMode);
-    }
-    else
-    {
-        *aMode = m->enmProxyMode;
-        hrc = S_OK;
-    }
+    ComPtr<ISystemProperties> pSystemProperties;
+    HRESULT hrc = m_VirtualBox->COMGETTER(SystemProperties)(pSystemProperties.asOutParam());
+    if (SUCCEEDED(hrc))
+        hrc = pSystemProperties->COMGETTER(ProxyMode)(aMode);
 
     return hrc;
@@ -823 +761 @@
 HRESULT UpdateAgent::i_getProxyURL(com::Utf8Str &aUrl)
 {
-    HRESULT hrc;
-
-    if (!mData.m_fUseOwnProxy) /* If not explicitly set, use the ISystemProperties proxy settings. */
-    {
-        ComPtr<ISystemProperties> pSystemProperties;
-        hrc = m_VirtualBox->COMGETTER(SystemProperties)(pSystemProperties.asOutParam());
+    ComPtr<ISystemProperties> pSystemProperties;
+    HRESULT hrc = m_VirtualBox->COMGETTER(SystemProperties)(pSystemProperties.asOutParam());
+    if (SUCCEEDED(hrc))
+    {
+        com::Bstr bstrVal;
+        hrc = pSystemProperties->COMGETTER(ProxyURL)(bstrVal.asOutParam());
         if (SUCCEEDED(hrc))
-        {
-            com::Bstr bstrVal;
-            hrc = pSystemProperties->COMGETTER(ProxyURL)(bstrVal.asOutParam());
-            if (SUCCEEDED(hrc))
-                aUrl = bstrVal;
-        }
-    }
-    else
-    {
-        aUrl = m->strProxyUrl;
-        hrc = S_OK;
+            aUrl = bstrVal;
     }
 

trunk/src/VBox/Main/xml/Settings.cpp

@@ -1649 +1649 @@
    , enmChannel(UpdateChannel_Stable)
    , uCheckFreqSeconds(RT_SEC_1DAY)
-   , enmProxyMode(ProxyMode_NoProxy)
    , uCheckCount(0)
 {
@@ -2359 +2358 @@
                                 pelmLevel4Child->getAttributeValue("checkFreqSec", updateHost.uCheckFreqSeconds);
                                 pelmLevel4Child->getAttributeValue("repoUrl", updateHost.strRepoUrl);
-                                pelmLevel4Child->getAttributeValue("proxyMode", (uint32_t&)updateHost.enmProxyMode);
-                                pelmLevel4Child->getAttributeValue("proxyUrl", updateHost.strProxyUrl);
                                 pelmLevel4Child->getAttributeValue("lastCheckDate", updateHost.strLastCheckDate);
                                 pelmLevel4Child->getAttributeValue("checkCount", updateHost.uCheckCount);
@@ -2607 +2604 @@
     if (updateHost.strRepoUrl.length())
         pelmUpdateHost->setAttribute("repoUrl", updateHost.strRepoUrl);
-    pelmUpdateHost->setAttribute("proxyMode", (int32_t)updateHost.enmProxyMode);
-    if (updateHost.strProxyUrl.length())
-        pelmUpdateHost->setAttribute("proxyUrl", updateHost.strProxyUrl);
     if (updateHost.strLastCheckDate.length())
         pelmUpdateHost->setAttribute("lastCheckDate", updateHost.strLastCheckDate);