Versino 1.0.4, fixed curl https check, and upload should now work smoothly

Author: Rahul Chatterjee

CMakeLists.txt

@@ -5,7 +5,7 @@ project(typtop)
 # The version number.
 set (typtop_VERSION_MAJOR 1)
 set (typtop_VERSION_MINOR 0)
-set (typtop_VERSION_PATCH 3)
+set (typtop_VERSION_PATCH 4)
 
 ## Set compiler flags
 if(CMAKE_BUILD_TYPE MATCHES "Debug")

src/typtop.cpp

@@ -480,21 +480,24 @@ void TypTop::set_typo_policy(int edit_cutoff, int abs_entcutoff, int rel_entcuto
     if (rel_entcutoff >= 0) tp->set_rel_entcutoff(rel_entcutoff);
 }
 
-#include "upload.cpp"
 int TypTop::send_log(int test) {
     if (!is_initialized()) {
         LOG_INFO << "DB is not initialized. Will send logs later.";
     } else if (db.logs().l_size() < 5) {
         LOG_INFO << "Not many logs (" << db.logs().l_size() << "). Will send logs later.";
     } else {
-        LOG_INFO << "sending logs \n";
+        LOG_INFO << "Sending logs.";
         int ret = send_log_to_server(db.ch().install_id(),
                                      b64encode(db.logs().SerializeAsString()),
                                      test);
         if (ret == 1) {
+            LOG_INFO << "Sending logs succeeded.";
             db.mutable_logs()->clear_l();
             return 1;
+        } else {
+            LOG_INFO << "Sending logs failed.";
         }
+
     }
     return 0;
 }

src/typtop.h

@@ -15,7 +15,6 @@
 #include "plog/Log.h"
 #include "typtopconfig.h"
 
-
 #ifndef TYPTOP_LOG_FILE
 #define TYPTOP_LOG_FILE "/tmp/typtop.log"
 #endif
@@ -86,5 +85,6 @@ class TypTop {
     inline const EncHeaderData& get_ench(){return ench;}
 };
 
+int send_log_to_server(const string uid, const string log, int test=1);
 
 #endif //TYPTOP_C_TYPTOP_H

src/upload.cpp

@@ -8,14 +8,18 @@
 #include <curl/curl.h>
 #include <string>
 #include "typtopconfig.h"
-#include "plog/Log.h"
+#include "typtop.h"
 
 using namespace std;
 
 
 // const string url = "https://ec2-54-209-30-18.compute-1.amazonaws.com/submit";
 const string url = UPLOAD_URL;
-const string key =  "a40648638b48abf2159f9331cbab9cb3ae81d8cd247c145942c3cce9c708ae89";
+// sha256 of the the private key of the server -- a shared secret
+// Doesn't provide much security, except some attacker who are just want to spoof the server.
+// The dedicated attacker can just read the source code and fill my data with garbage.
+const string key =  "82e4ae0301ea4ef8db76945666f08d1b5ffef2ae0f27737889d2d21e32ee7e54";
+
 /**
  * Sends the data to the amazon server. It assumes all the fields are url encoded,
  * and will not try to encode.
@@ -25,7 +29,7 @@ const string key =  "a40648638b48abf2159f9331cbab9cb3ae81d8cd247c145942c3cce9c70
  * @return : success code
  */
 
-int send_log_to_server(const string uid, const string log, int test=1) {
+int send_log_to_server(const string uid, const string log, int test) {
     CURL *curl;
     CURLcode res = CURLE_SEND_ERROR;
     // struct curl_slist *headers = NULL;                      /* http headers to send with request */
@@ -47,22 +51,19 @@ int send_log_to_server(const string uid, const string log, int test=1) {
     curl = curl_easy_init();
     FILE *devnull = fopen("/dev/null", "w");
     if(curl) {
+        curl_easy_setopt(curl, CURLOPT_WRITEDATA, devnull);
         curl_easy_setopt(curl, CURLOPT_URL, url.c_str());
+
         /* Now specify the POST data */
         curl_easy_setopt(curl, CURLOPT_POSTFIELDSIZE, payload.size());
         curl_easy_setopt(curl, CURLOPT_POSTFIELDS, payload.c_str());
-        /* Add the certificate */
-        // curl_easy_setopt(curl, CURLOPT_CAINFO, CAFILE);
-
-        // Till I can fix this weird bug
-        curl_easy_setopt(curl, CURLOPT_SSL_VERIFYPEER, 0L);
-        curl_easy_setopt(curl, CURLOPT_WRITEDATA, devnull);
 
+        curl_easy_setopt(curl, CURLOPT_SSL_VERIFYPEER, 1L);
 
         /* set content type */
-//        headers = curl_slist_append(headers, "Accept: application/json");
-//        headers = curl_slist_append(headers, "Content-Type: application/json");
-//        curl_easy_setopt(curl, CURLOPT_HTTPHEADER, headers);
+        /* headers = curl_slist_append(headers, "Accept: application/json"); */
+        /* headers = curl_slist_append(headers, "Content-Type: application/json"); */
+        /* curl_easy_setopt(curl, CURLOPT_HTTPHEADER, headers); */
 
         /* set timeout */
         curl_easy_setopt(curl, CURLOPT_CONNECTTIMEOUT, 1L);
@@ -72,16 +73,12 @@ int send_log_to_server(const string uid, const string log, int test=1) {
         res = curl_easy_perform(curl);
         /* Check for errors */
         if(res != CURLE_OK){
-            LOG_ERROR << "curl_easy_perform() failed: "<< curl_easy_strerror(res);
-//            // try old cert once
-//            curl_easy_setopt(curl, CURLOPT_CAINFO, OLD_CAFILE);
-//            res = curl_easy_perform(curl);
-//            if(res != CURLE_OK){
-//                LOG_ERROR << "curl_easy_perform() failed: "<< curl_easy_strerror(res)
-//                     << "\nCAFILE: " << OLD_CAFILE << endl;
-//            }
-        } else
+            LOG_DEBUG << "curl_easy_perform() failed: "<< curl_easy_strerror(res);
+        } else {
             curl_easy_getinfo (curl, CURLINFO_RESPONSE_CODE, &response_code);
+            LOG_DEBUG << "CURL response code: " << response_code;
+        }
+
 
         /* always cleanup */
         curl_easy_cleanup(curl);

test/test_typtop.cpp

@@ -295,6 +295,12 @@ TEST_CASE("Test TypTop DB") {
     }
 }
 
+TEST_CASE("Upload"){
+    SECTION("Simple upload") {
+        REQUIRE(send_log_to_server("test-uid", "test-log-loerm-ipsum", 1));
+    }
+}
+
 TEST_CASE("Timing") {
     remove(_db_fname.c_str());
     TypTopTest tp;