Changed to reporting capabilities by string vs GUID

Author: rlillback

agent.c

@@ -61,6 +61,12 @@
 struct SessionInfo SessionData;
 struct ScheduledJob* JobList;
 
+/* KF v9 Adds in text capabilities */
+const char* cap_pem_inventory = "CertStores.PEM.Inventory";
+const char* cap_pem_management = "CertStores.PEM.Management";
+const char* cap_pem_reenrollment = "CertStores.PEM.Reenrollment";
+const char* cap_fetch_logs = "Custom.FetchLogs";
+
 #if defined(__OPEN_SSL__)
 	char engine_id[21]; /* 20 Characters should be enough */
 #endif

agent.h

@@ -99,6 +99,7 @@ extern struct ScheduledJob* currentJob; /* Defined in schedule.c */
 /* 2.15.2.0 = Updated DTO for Warning to allow agent rotation                 */
 /* 2.16.0.0 = Updated TPM for default passkey                                 */
 /* 2.16.0.1 = Updated Makefile for OpenSSL v3.x                               */
-#define AGENT_VERSION 0x0002001000000001
+/* 2.16.1.0 = Modified agent to not send GUID capabilities.  Compile bug fix  */
+#define AGENT_VERSION 0x0002001000010000
 
 #endif /* AGENT_H_ */

constants.h

@@ -19,6 +19,12 @@
 #define CAP_PEM_REENROLLMENT "aa015d10-cffc-41f7-a9a4-c9615f6f3bdf"
 #define CAP_FETCH_LOGS "0D8CF0C8-56CA-4B8A-B16A-C062018E170D"
 
+/* KF v9 adds in text Capabilities - they are defined in agent.c */
+extern const char* cap_pem_inventory;
+extern const char* cap_pem_management;
+extern const char* cap_pem_reenrollment;
+extern const char* cap_fetch_logs;
+
 /* The following capabilities are not implemented in the C-Agent */
 #define CAP_AWS_INVENTORY "afb8c78d-1436-4c93-a8e7-0218c2cb6955"
 #define CAP_AWS_MANAGEMENT "56c1e4f9-366c-44b3-8cae-1b8f39e2026c"

httpclient.c

@@ -71,7 +71,7 @@ static int handle_curl_error(CURL *curl, int errNum) {
     /* When tracing, dump the error buffer to stderr */
     if ( is_log_trace() ) {
         size_t len = strlen( errBuff );
-        log_error( "%s::%s-libcurl: (%d) ", LOG_INF, errNum );
+        log_error( "%s::%s(%d) -libcurl: (%d) ", LOG_INF, errNum );
         if ( len ) {
             log_error( "%s::%s(%d) : %s%s", LOG_INF, errBuff,
               ((errBuff[len-1] != '\n') ? "\n" : ""));
@@ -432,8 +432,8 @@ int http_post_json(const char* url, const char* username,
         if ((add_client_cert_to_header) && (NULL != client_cert_compressed)) {
             log_debug("%s::%s(%d) : Adding client certificate to %s header", LOG_INF, CLIENT_CERT_HEADER);
             char certBuf[MAX_CERT_SIZE];
-            stripCR(client_cert_compressed);
-            (void)snprintf(certBuf, MAX_CERT_SIZE, "%s: %s",CLIENT_CERT_HEADER, client_cert_compressed);
+            stripCR((char*)client_cert_compressed);
+            (void)snprintf(certBuf, MAX_CERT_SIZE, "%s: %s",CLIENT_CERT_HEADER, (char*)client_cert_compressed);
             list = curl_slist_append(list, certBuf);
         } else {
             log_debug("%s::%s(%d) : Skipping adding header = %s", LOG_INF, CLIENT_CERT_HEADER);

session.c

@@ -272,10 +272,10 @@ static bool register_add_capabilities(struct SessionRegisterReq* sessionReq)
 	sessionReq->Capabilities_count = 4;
 	sessionReq->Capabilities = calloc(sessionReq->Capabilities_count, sizeof(char*));
 	if ( sessionReq->Capabilities )	{
-		sessionReq->Capabilities[0] = strdup(CAP_PEM_INVENTORY);
-		sessionReq->Capabilities[1] = strdup(CAP_PEM_MANAGEMENT);
-		sessionReq->Capabilities[2] = strdup(CAP_PEM_REENROLLMENT);
-		sessionReq->Capabilities[3] = strdup(CAP_FETCH_LOGS);
+		sessionReq->Capabilities[0] = strdup(cap_pem_inventory);
+		sessionReq->Capabilities[1] = strdup(cap_pem_management);
+		sessionReq->Capabilities[2] = strdup(cap_pem_reenrollment);
+		sessionReq->Capabilities[3] = strdup(cap_fetch_logs);
 		bResult = true;
 	} else {
 		log_error("%s::%s(%d) : Out of memory",	LOG_INF);