Changeset 45398 in vbox

Timestamp:

Apr 8, 2013 9:32:00 AM (12 years ago)

Author:

vboxsync

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

84824

Message:

Runtime/http: more error codes

Location:

trunk

Files:

• include/iprt/err.h (modified) (1 diff)
• include/iprt/http.h (modified) (1 diff)
• src/VBox/Runtime/common/misc/http.cpp (modified) (6 diffs)
• src/VBox/Runtime/testcase/tstHttp.cpp (modified) (6 diffs)

trunk/include/iprt/err.h

@@ -1572 +1572 @@
 /** @name HTTP status codes
  * @{ */
+/** HTTP initialization failed. */
+#define VERR_HTTP_INIT_FAILED                   (-885)
 /** The server has not found anything matching the URI given. */
-#define VERR_HTTP_NOT_FOUND                     (-885)
+#define VERR_HTTP_NOT_FOUND                     (-886)
 /** The request is for something forbidden. Authorization will not help. */
-#define VERR_HTTP_ACCESS_DENIED                 (-886)
+#define VERR_HTTP_ACCESS_DENIED                 (-887)
 /** The server did not understand the request due to bad syntax. */
-#define VERR_HTTP_BAD_REQUEST                   (-887)
-/** Couldn't connect to the server (proxy?) */
-#define VERR_HTTP_COULDNT_CONNECT               (-888)
+#define VERR_HTTP_BAD_REQUEST                   (-888)
+/** Couldn't connect to the server (proxy?). */
+#define VERR_HTTP_COULDNT_CONNECT               (-889)
+/** SSL connection error. */
+#define VERR_HTTP_SSL_CONNECT_ERROR             (-890)
+/** CAcert is missing or has the wrong format. */
+#define VERR_HTTP_CACERT_WRONG_FORMAT           (-891)
+/** Certificate cannot be authenticated with the given CA certificates. */
+#define VERR_HTTP_CACERT_CANNOT_AUTHENTICATE    (-892)
 /** @} */
 

trunk/include/iprt/http.h

@@ -69 +69 @@
  * @param    hHttp         HTTP interface handle.
  * @param    pcszUrl       URL.
- * @param    ppszResponse  HTTP response.
+ * @param    ppszResponse  HTTP response. It is guaranteed that this string is
+ *                         '\0'-terminated.
  */
 RTR3DECL(int) RTHttpGet(RTHTTP hHttp, const char *pcszUrl, char **ppszResponse);

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

@@ -35 +35 @@
 #include <iprt/string.h>
 #include <iprt/file.h>
+#include <iprt/stream.h>
 
 #include <curl/curl.h>
@@ -90 +91 @@
     CURLcode rcCurl = curl_global_init(CURL_GLOBAL_ALL);
     if (CURL_FAILED(rcCurl))
-        return VERR_INTERNAL_ERROR;
+        return VERR_HTTP_INIT_FAILED;
 
     CURL *pCurl = curl_easy_init();
     if (!pCurl)
-        return VERR_INTERNAL_ERROR;
+        return VERR_HTTP_INIT_FAILED;
 
     PRTHTTPINTERNAL pHttpInt = (PRTHTTPINTERNAL)RTMemAllocZ(sizeof(RTHTTPINTERNAL));
@@ -237 +238 @@
                     }
                     else
-                        rc = VERR_INTERNAL_ERROR;
+                        rc = VERR_HTTP_CACERT_WRONG_FORMAT;
                 }
                 else
@@ -243 +244 @@
             }
             else
-                rc = VERR_INTERNAL_ERROR;
+                rc = VERR_HTTP_CACERT_WRONG_FORMAT;
             X509_free(crt);
         }
         else
-            rc = VERR_INTERNAL_ERROR;
+            rc = VERR_HTTP_CACERT_WRONG_FORMAT;
         BIO_free(cert);
     }
@@ -334 +335 @@
     else
     {
+        RTPrintf("rcCurl = %d\n", rcCurl);
         switch (rcCurl)
         {
@@ -343 +345 @@
                 rc = VERR_HTTP_COULDNT_CONNECT;
                 break;
+            case CURLE_SSL_CONNECT_ERROR:
+                rc = VERR_HTTP_SSL_CONNECT_ERROR;
+                break;
+            case CURLE_SSL_CACERT:
+                /* The peer certificate cannot be authenticated with the CA certificates
+                 * set by RTHttpSetCAFile(). We need other or additional CA certificates. */
+                rc = VERR_HTTP_CACERT_CANNOT_AUTHENTICATE;
+                break;
+            case CURLE_SSL_CACERT_BADFILE:
+                /* CAcert file (see RTHttpSetCAFile()) has wrong format */
+                rc = VERR_HTTP_CACERT_WRONG_FORMAT;
+                break;
             default:
                 break;

trunk/src/VBox/Runtime/testcase/tstHttp.cpp

@@ -66 +66 @@
         uint8_t *abSha512;
         size_t  cbSha512;
+        size_t cbBuf = strlen(pszBuf);
         const uint8_t abSha1PCA3G5[] =
         {
@@ -82 +83 @@
             0xd2, 0x6b, 0xa8, 0x9a, 0xf0, 0xb3, 0x6a, 0x01
         };
-        rc = RTHttpCertDigest(hHttp, pszBuf, strlen(pszBuf),
+        rc = RTHttpCertDigest(hHttp, pszBuf, cbBuf,
                               &abSha1, &cbSha1, &abSha512, &cbSha512);
         if (RT_SUCCESS(rc))
@@ -115 +116 @@
             RTMemFree(abSha512);
             if (RT_SUCCESS(rc))
-                rc = RTStrmWrite(CAFile, pszBuf, strlen(pszBuf));
+                rc = RTStrmWrite(CAFile, pszBuf, cbBuf);
             if (RT_SUCCESS(rc))
                 rc = RTStrmWrite(CAFile, RTFILE_LINEFEED, strlen(RTFILE_LINEFEED));
@@ -137 +138 @@
         uint8_t *abSha512;
         size_t  cbSha512;
+        size_t  cbBuf = strlen(pszBuf);
         const uint8_t abSha1PCA3[] =
         {
@@ -153 +155 @@
             0x0a, 0x67, 0x83, 0x87, 0xc5, 0x45, 0xc4, 0x99
         };
-        rc = RTHttpCertDigest(hHttp, pszBuf, strlen(pszBuf),
+        rc = RTHttpCertDigest(hHttp, pszBuf, cbBuf,
                               &abSha1, &cbSha1, &abSha512, &cbSha512);
         if (RT_SUCCESS(rc))
@@ -186 +188 @@
             RTMemFree(abSha512);
             if (RT_SUCCESS(rc))
-                rc = RTStrmWrite(CAFile, pszBuf, strlen(pszBuf));
+                rc = RTStrmWrite(CAFile, pszBuf, cbBuf);
             if (RT_SUCCESS(rc))
                 rc = RTStrmWrite(CAFile, RTFILE_LINEFEED, strlen(RTFILE_LINEFEED));