Changeset 57577 in vbox for trunk/src/VBox/Runtime/common/misc

Timestamp:

Aug 28, 2015 6:57:36 PM (10 years ago)

Author:

vboxsync

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

102405

Message:

IPRT,QtGui: Redid the certificate download code in the GUI and reduced the number of unnecessary wrapper methods. Removed RTHttpCertDigest, adding RTHttpFreeResponse and RTHttpFreeResponseText. Also added RTCrPemParseContent.

File:

• trunk/src/VBox/Runtime/common/misc/http.cpp (modified) (17 diffs)

trunk/src/VBox/Runtime/common/misc/http.cpp

@@ -41 +41 @@
 
 #include <curl/curl.h>
-#include <openssl/ssl.h>
 #include "internal/magics.h"
 
@@ -69 +68 @@
 typedef struct RTHTTPMEMCHUNK
 {
-    uint8_t *pu8Mem;
-    size_t cb;
+    uint8_t    *pu8Mem;
+    size_t      cb;
 } RTHTTPMEMCHUNK;
 typedef RTHTTPMEMCHUNK *PRTHTTPMEMCHUNK;
@@ -122 +121 @@
 }
 
+
 RTR3DECL(void) RTHttpDestroy(RTHTTP hHttp)
 {
@@ -147 +147 @@
     curl_global_cleanup();
 }
+
 
 static DECLCALLBACK(size_t) rtHttpWriteData(void *pvBuf, size_t cb, size_t n, void *pvUser)
@@ -163 +164 @@
 }
 
-static DECLCALLBACK(int) rtHttpProgress(void *pData, double DlTotal, double DlNow,
-                                        double UlTotal, double UlNow)
+
+static DECLCALLBACK(int) rtHttpProgress(void *pData, double DlTotal, double DlNow, double UlTotal, double UlNow)
 {
     PRTHTTPINTERNAL pHttpInt = (PRTHTTPINTERNAL)pData;
@@ -172 +173 @@
 }
 
+
 RTR3DECL(int) RTHttpAbort(RTHTTP hHttp)
 {
@@ -181 +183 @@
     return VINF_SUCCESS;
 }
+
 
 RTR3DECL(int) RTHttpGetRedirLocation(RTHTTP hHttp, char **ppszRedirLocation)
@@ -193 +196 @@
     return VINF_SUCCESS;
 }
+
 
 RTR3DECL(int) RTHttpUseSystemProxySettings(RTHTTP hHttp)
@@ -229 +233 @@
 }
 
+
 RTR3DECL(int) RTHttpSetProxy(RTHTTP hHttp, const char *pcszProxy, uint32_t uPort,
                              const char *pcszProxyUser, const char *pcszProxyPwd)
@@ -260 +265 @@
     return VINF_SUCCESS;
 }
+
 
 RTR3DECL(int) RTHttpSetHeaders(RTHTTP hHttp, size_t cHeaders, const char * const *papszHeaders)
@@ -286 +292 @@
 }
 
-RTR3DECL(int) RTHttpCertDigest(RTHTTP hHttp, char *pcszCert, size_t cbCert,
-                               uint8_t **pabSha1,   size_t *pcbSha1,
-                               uint8_t **pabSha512, size_t *pcbSha512)
-{
-    int rc = VINF_SUCCESS;
-
-    BIO *cert = BIO_new_mem_buf(pcszCert, (int)cbCert);
-    if (cert)
-    {
-        X509 *crt = NULL;
-        if (PEM_read_bio_X509(cert, &crt, NULL, NULL))
-        {
-            unsigned cb;
-            unsigned char md[EVP_MAX_MD_SIZE];
-
-            int rc1 = X509_digest(crt, EVP_sha1(), md, &cb);
-            if (rc1 > 0)
-            {
-                *pabSha1 = (uint8_t*)RTMemAlloc(cb);
-                if (*pabSha1)
-                {
-                    memcpy(*pabSha1, md, cb);
-                    *pcbSha1 = cb;
-
-                    rc1 = X509_digest(crt, EVP_sha512(), md, &cb);
-                    if (rc1 > 0)
-                    {
-                        *pabSha512 = (uint8_t*)RTMemAlloc(cb);
-                        if (*pabSha512)
-                        {
-                            memcpy(*pabSha512, md, cb);
-                            *pcbSha512 = cb;
-                        }
-                        else
-                            rc = VERR_NO_MEMORY;
-                    }
-                    else
-                        rc = VERR_HTTP_CACERT_WRONG_FORMAT;
-
-                    if (RT_FAILURE(rc))
-                        RTMemFree(*pabSha1);
-                }
-                else
-                    rc = VERR_NO_MEMORY;
-            }
-            else
-                rc = VERR_HTTP_CACERT_WRONG_FORMAT;
-            X509_free(crt);
-        }
-        else
-            rc = VERR_HTTP_CACERT_WRONG_FORMAT;
-        BIO_free(cert);
-    }
-    else
-        rc = VERR_INTERNAL_ERROR;
-
-    return rc;
-}
 
 RTR3DECL(int) RTHttpSetCAFile(RTHTTP hHttp, const char *pcszCAFile)
@@ -449 +397 @@
 }
 
+
+/**
+ * Internal worker that performs a HTTP GET.
+ *
+ * @returns IPRT status code.
+ * @param   hHttp               The HTTP instance.
+ * @param   pcszUrl             The URL.
+ * @param   ppvResponse         Where to return the pointer to the allocated
+ *                              response data (RTMemFree).  There will always be
+ *                              an zero terminator char after the response, that
+ *                              is not part of the size returned via @a pcb.
+ * @param   pcb                 The size of the response data.
+ */
 RTR3DECL(int) rtHttpGet(RTHTTP hHttp, const char *pcszUrl, uint8_t **ppvResponse, size_t *pcb)
 {
@@ -476 +437 @@
     }
 
-    RTHTTPMEMCHUNK chunk = { NULL, 0 };
+    RTHTTPMEMCHUNK Chunk = { NULL, 0 };
     rcCurl = curl_easy_setopt(pHttpInt->pCurl, CURLOPT_WRITEFUNCTION, &rtHttpWriteData);
     if (CURL_FAILED(rcCurl))
         return VERR_INTERNAL_ERROR;
-    rcCurl = curl_easy_setopt(pHttpInt->pCurl, CURLOPT_WRITEDATA, (void*)&chunk);
+    rcCurl = curl_easy_setopt(pHttpInt->pCurl, CURLOPT_WRITEDATA, (void *)&Chunk);
     if (CURL_FAILED(rcCurl))
         return VERR_INTERNAL_ERROR;
@@ -486 +447 @@
     if (CURL_FAILED(rcCurl))
         return VERR_INTERNAL_ERROR;
-    rcCurl = curl_easy_setopt(pHttpInt->pCurl, CURLOPT_PROGRESSDATA, (void*)pHttpInt);
+    rcCurl = curl_easy_setopt(pHttpInt->pCurl, CURLOPT_PROGRESSDATA, (void *)pHttpInt);
     if (CURL_FAILED(rcCurl))
         return VERR_INTERNAL_ERROR;
@@ -497 +458 @@
 
     rcCurl = curl_easy_perform(pHttpInt->pCurl);
+
     int rc = rtHttpGetCalcStatus(pHttpInt, rcCurl);
-    *ppvResponse = chunk.pu8Mem;
-    *pcb = chunk.cb;
+    if (RT_SUCCESS(rc))
+    {
+        *ppvResponse = Chunk.pu8Mem;
+        *pcb         = Chunk.cb;
+    }
+    else
+    {
+        if (Chunk.pu8Mem)
+            RTMemFree(Chunk.pu8Mem);
+        *ppvResponse = NULL;
+        *pcb         = 0;
+    }
 
     return rc;
@@ -505 +477 @@
 
 
-RTR3DECL(int) RTHttpGetText(RTHTTP hHttp, const char *pcszUrl, char **ppszResponse)
+RTR3DECL(int) RTHttpGetText(RTHTTP hHttp, const char *pcszUrl, char **ppszNotUtf8)
 {
     uint8_t *pv;
-    size_t cb;
+    size_t   cb;
     int rc = rtHttpGet(hHttp, pcszUrl, &pv, &cb);
-    *ppszResponse = (char*)pv;
+    if (RT_SUCCESS(rc))
+    {
+        if (pv) /* paranoia */
+            *ppszNotUtf8 = (char *)pv;
+        else
+            *ppszNotUtf8 = (char *)RTMemDup("", 1);
+    }
+    else
+        *ppszNotUtf8 = NULL;
     return rc;
 }
 
 
+RTR3DECL(void) RTHttpFreeResponseText(char *pszNotUtf8)
+{
+    RTMemFree(pszNotUtf8);
+}
+
+
 RTR3DECL(int) RTHttpGetBinary(RTHTTP hHttp, const char *pcszUrl, void **ppvResponse, size_t *pcb)
 {
-    return rtHttpGet(hHttp, pcszUrl, (uint8_t**)ppvResponse, pcb);
+    return rtHttpGet(hHttp, pcszUrl, (uint8_t **)ppvResponse, pcb);
+}
+
+
+RTR3DECL(void) RTHttpFreeResponse(void *pvResponse)
+{
+    RTMemFree(pvResponse);
 }
 
@@ -570 +562 @@
     if (CURL_FAILED(rcCurl))
         return VERR_INTERNAL_ERROR;
-    rcCurl = curl_easy_setopt(pHttpInt->pCurl, CURLOPT_PROGRESSDATA, (void*)pHttpInt);
+    rcCurl = curl_easy_setopt(pHttpInt->pCurl, CURLOPT_PROGRESSDATA, (void *)pHttpInt);
     if (CURL_FAILED(rcCurl))
         return VERR_INTERNAL_ERROR;