Changeset 85139 in vbox

Timestamp:

Jul 9, 2020 7:49:52 AM (5 years ago)

Author:

vboxsync

Message:

OCI: (bugref:9469) Proxy support (without authentication) for local gateway, cloud ssh and vpn. Proxy info retrieval in IPRT.

Location:

trunk

Files:

• include/iprt/http.h (modified) (1 diff)
• src/VBox/Frontends/VBoxManage/VBoxManageCloud.cpp (modified) (5 diffs)
• src/VBox/Runtime/generic/http-curl.cpp (modified) (1 diff)

trunk/include/iprt/http.h

@@ -662 +662 @@
 
 
+/**
+ * Supported proxy types.
+ */
+typedef enum {
+    RTHTTPPROXYTYPE_UNKNOWN,
+    RTHTTPPROXYTYPE_HTTP,
+    RTHTTPPROXYTYPE_HTTPS,
+    RTHTTPPROXYTYPE_SOCKS4,
+    RTHTTPPROXYTYPE_SOCKS5
+} RTHTTPPROXYTYPE;
+
+/**
+ * Proxy information structure.
+ */
+typedef struct {
+    /** Proxy host name (RTStrFree). */
+    char               *pszProxyHost;
+    /** Proxy port number (UINT32_MAX if not specified). */
+    uint32_t            uProxyPort;
+    /** The proxy type (RTHTTPPROXYTYPE_HTTP, RTHTTPPROXYTYPE_SOCKS5, ++). */
+    RTHTTPPROXYTYPE     enmProxyType;
+    /** Proxy username (RTStrFree). */
+    char               *pszProxyUsername;
+    /** Proxy password (RTStrFree). */
+    char               *pszProxyPassword;
+} RTHTTPPROXYINFO;
+/** A pointer to proxy information structure. */
+typedef RTHTTPPROXYINFO *PRTHTTPPROXYINFO;
+
+/**
+ * Retrieve system proxy information for the specified URL.
+ *
+ * @returns IPRT status code.
+ * @param   hHttp           The HTTP client handle.
+ * @param   pcszUrl         The URL that needs to be accessed via proxy.
+ * @param   pProxyInfo      A pointer to the structure where the proxy information to be stored.
+ *
+ * @note    This function allocates memory that must be released by RTHttpFreeProxyInfo.
+ */
+RTR3DECL(int) RTHttpGetProxyInfoForUrl(RTHTTP hHttp, const char *pcszUrl, PRTHTTPPROXYINFO pProxyInfo);
+
+/**
+ * Release memory used for storing proxy information.
+ *
+ * @returns IPRT status code.
+ * @param   pProxyInfo      A pointer to the proxy structure being released.
+ *
+ * @note    This function releases memory that has been allocated by RTHttpGetProxyInfoForUrl.
+ */
+RTR3DECL(int) RTHttpFreeProxyInfo(PRTHTTPPROXYINFO pProxyInfo);
+
 /** @name thin wrappers for setting one or a few related curl options
  * @remarks Temporary. Will not be included in the 7.0 release!

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

@@ -31 +31 @@
 #include <iprt/uuid.h>
 #include <iprt/file.h>
+#include <iprt/http.h>
 #include <VBox/log.h>
 
@@ -2107 +2108 @@
 }
 
+static bool getSystemProxyForUrl(const com::Utf8Str &strUrl, Bstr &strProxy)
+{
+    RTHTTP hHttp;
+    int rc = RTHttpCreate(&hHttp);
+    if (RT_FAILURE(rc))
+    {
+        LogRel(("OCI-NET: Failed to create HTTP context (rc=%d)\n", rc));
+        return false;
+    }
+    rc = RTHttpUseSystemProxySettings(hHttp);
+    if (RT_FAILURE(rc))
+    {
+        LogRel(("OCI-NET: Failed to use system proxy (rc=%d)\n", rc));
+        RTHttpDestroy(hHttp);
+        return false;
+    }
+
+    RTHTTPPROXYINFO proxy;
+    RT_ZERO(proxy);
+    rc = RTHttpGetProxyInfoForUrl(hHttp, strUrl.c_str(), &proxy);
+    if (RT_FAILURE(rc))
+    {
+        LogRel(("OCI-NET: Failed to get proxy for %s (rc=%d)\n", strUrl.c_str(), rc));
+        RTHttpDestroy(hHttp);
+        return false;
+    }
+    const char *pcszProxyScheme = "";
+    switch (proxy.enmProxyType)
+    {
+        case RTHTTPPROXYTYPE_HTTP:
+            pcszProxyScheme = "http://";
+            break;
+        case RTHTTPPROXYTYPE_HTTPS:
+            pcszProxyScheme = "https://";
+            break;
+        case RTHTTPPROXYTYPE_SOCKS4:
+            pcszProxyScheme = "socks4://";
+            break;
+        case RTHTTPPROXYTYPE_SOCKS5:
+            pcszProxyScheme = "socks://";
+            break;
+        case RTHTTPPROXYTYPE_UNKNOWN:
+            LogRel(("OCI-NET: Unknown proxy type. Using direct connecton."));
+            RTHttpDestroy(hHttp);
+            return false;
+    }
+    strProxy = BstrFmt("%s%s:%d", pcszProxyScheme, proxy.pszProxyHost, proxy.uProxyPort);
+    RTHttpFreeProxyInfo(&proxy);
+    RTHttpDestroy(hHttp);
+    return true;
+}
+
 static HRESULT createLocalGatewayImage(ComPtr<IVirtualBox> virtualBox, const Bstr& aGatewayIso, const Bstr& aGuestAdditionsIso, const Bstr& aProxy)
 {
@@ -2125 +2178 @@
 
     ComPtr<ISystemProperties> systemProperties;
+    ProxyMode_T enmProxyMode;
+    Bstr strProxy;
     ComPtr<IMedium> hd;
     Bstr defaultMachineFolder;
@@ -2131 +2186 @@
     if (errorOccured(hrc, "Failed to obtain system properties."))
         return hrc;
+    if (aProxy.isNotEmpty())
+        strProxy = aProxy;
+    else
+    {
+        hrc = systemProperties->COMGETTER(ProxyMode)(&enmProxyMode);
+        if (errorOccured(hrc, "Failed to obtain proxy mode."))
+            return hrc;
+        switch (enmProxyMode)
+        {
+            case ProxyMode_NoProxy:
+                strProxy.setNull();
+                break;
+            case ProxyMode_Manual:
+                hrc = systemProperties->COMGETTER(ProxyURL)(strProxy.asOutParam());
+                if (errorOccured(hrc, "Failed to obtain proxy URL."))
+                    return hrc;
+                break;
+            case ProxyMode_System:
+                if (!getSystemProxyForUrl("https://dl.fedoraproject.org", strProxy))
+                    errorOccured(E_FAIL, "Failed to get system proxy for https://dl.fedoraproject.org. Will use direct connection.");
+                break;
+            default: /* To get rid of ProxyMode_32BitHack 'warning' */
+                RTAssertPanic();
+                break;
+        }
+
+    }
     hrc = systemProperties->COMGETTER(DefaultMachineFolder)(defaultMachineFolder.asOutParam());
     if (errorOccured(hrc, "Failed to obtain default machine folder."))
@@ -2283 +2365 @@
         return hrc;
 
-    if (aProxy.isNotEmpty())
-    {
-        hrc = unattended->COMSETTER(Proxy)(aProxy.raw());
+    if (strProxy.isNotEmpty())
+    {
+        hrc = unattended->COMSETTER(Proxy)(strProxy.raw());
         if (errorOccured(hrc, "Failed to set post install script template for the unattended installer."))
             return hrc;
     }
+
     hrc = unattended->Prepare();
     if (errorOccured(hrc, "Failed to prepare unattended installation."))

trunk/src/VBox/Runtime/generic/http-curl.cpp

@@ -3547 +3547 @@
 
 
+RTR3DECL(int) RTHttpGetProxyInfoForUrl(RTHTTP hHttp, const char *pcszUrl, PRTHTTPPROXYINFO pProxy)
+{
+    PRTHTTPINTERNAL pThis = hHttp;
+    rtHttpResetState(pThis);
+    int rc = rtHttpApplySettings(pThis, pcszUrl);
+    if (RT_FAILURE(rc))
+        return rc;
+
+    switch (pThis->enmProxyType)
+    {
+        case CURLPROXY_HTTP:
+        case CURLPROXY_HTTP_1_0:
+            pProxy->enmProxyType = RTHTTPPROXYTYPE_HTTP;
+            break;
+        case CURLPROXY_HTTPS:
+            pProxy->enmProxyType = RTHTTPPROXYTYPE_HTTPS;
+            break;
+        case CURLPROXY_SOCKS4:
+        case CURLPROXY_SOCKS4A:
+            pProxy->enmProxyType = RTHTTPPROXYTYPE_SOCKS4;
+            break;
+        case CURLPROXY_SOCKS5:
+        case CURLPROXY_SOCKS5_HOSTNAME:
+            pProxy->enmProxyType = RTHTTPPROXYTYPE_SOCKS5;
+            break;
+        default:
+            pProxy->enmProxyType = RTHTTPPROXYTYPE_UNKNOWN;
+            break;
+    }
+    if (pThis->pszProxyHost == NULL)
+        return VERR_INTERNAL_ERROR;
+    pProxy->pszProxyHost = RTStrDup(pThis->pszProxyHost);
+    pProxy->uProxyPort = pThis->uProxyPort;
+    pProxy->pszProxyUsername = NULL;
+    pProxy->pszProxyPassword = NULL;
+
+    return VINF_SUCCESS;
+}
+
+
+RTR3DECL(int) RTHttpFreeProxyInfo(PRTHTTPPROXYINFO pProxy)
+{
+    if (pProxy)
+    {
+        RTStrFree(pProxy->pszProxyHost);
+        RTStrFree(pProxy->pszProxyUsername);
+        RTStrFree(pProxy->pszProxyPassword);
+    }
+    return VINF_SUCCESS;
+}
+
+
 RTR3DECL(int) RTHttpPerform(RTHTTP hHttp, const char *pszUrl, RTHTTPMETHOD enmMethod, void const *pvReqBody, size_t cbReqBody,
                             uint32_t *puHttpStatus, void **ppvHeaders, size_t *pcbHeaders, void **ppvBody, size_t *pcbBody)