X-Git-Url: http://ftp.carnet.hr/carnet-debian/scm?p=ossec-hids.git;a=blobdiff_plain;f=src%2Fagentlessd%2Fagentlessd.c;fp=src%2Fagentlessd%2Fagentlessd.c;h=d2c6668ec49767284513e0e2b54fab3ba2cb5719;hp=1ff73036a92c4f7e1939d5624743a7f677437258;hb=3f728675941dc69d4e544d3a880a56240a6e394a;hpb=927951d1c1ad45ba9e7325f07d996154a91c911b

diff --git a/src/agentlessd/agentlessd.c b/src/agentlessd/agentlessd.c
old mode 100755
new mode 100644
index 1ff7303..d2c6668
--- a/src/agentlessd/agentlessd.c
+++ b/src/agentlessd/agentlessd.c
@@ -1,6 +1,3 @@
-/* @(#) $Id: ./src/agentlessd/agentlessd.c, 2011/09/08 dcid Exp $
- */
-
 /* Copyright (C) 2009 Trend Micro Inc.
  * All rights reserved.
  *
@@ -10,54 +7,56 @@
  * Foundation
  */
 
-
-
 #include "shared.h"
 #include "os_crypto/md5/md5_op.h"
 #include "agentlessd.h"
 
+/* Prototypes */
+static int  save_agentless_entry(const char *host, const char *script, const char *agttype);
+static int  send_intcheck_msg(const char *script, const char *host, const char *msg);
+static int  send_log_msg(const char *script, const char *host, const char *msg);
+static int  gen_diff_alert(const char *host, const char *script, time_t alert_diff_time);
+static int  check_diff_file(const char *host, const char *script);
+static FILE *open_diff_file(const char *host, const char *script);
+static int  run_periodic_cmd(agentlessd_entries *entry, int test_it);
 
+/* Global variables */
+agentlessd_config lessdc;
 
-/* Saves agentless entry for the control tools to gather. */
-int save_agentless_entry(char *host, char *script, char *agttype)
+
+/* Save agentless entry for the control tools to gather */
+static int save_agentless_entry(const char *host, const char *script, const char *agttype)
 {
     FILE *fp;
-    char sys_location[1024 +1];
+    char sys_location[1024 + 1];
 
     sys_location[1024] = '\0';
     snprintf(sys_location, 1024, "%s/(%s) %s",
              AGENTLESS_ENTRYDIRPATH, script, host);
 
     fp = fopen(sys_location, "w");
-    if(fp)
-    {
+    if (fp) {
         fprintf(fp, "type: %s\n", agttype);
         fclose(fp);
-    }
-    else
-    {
-        merror(FOPEN_ERROR, ARGV0, sys_location);
+    } else {
+        merror(FOPEN_ERROR, ARGV0, sys_location, errno, strerror(errno));
     }
 
-    return(0);
+    return (0);
 }
 
-
-
-/* send integrity checking message. */
-int send_intcheck_msg(char *script, char *host, char *msg)
+/* Send integrity checking message */
+static int send_intcheck_msg(const char *script, const char *host, const char *msg)
 {
-    char sys_location[1024 +1];
+    char sys_location[1024 + 1];
 
     sys_location[1024] = '\0';
     snprintf(sys_location, 1024, "(%s) %s->%s", script, host, SYSCHECK);
 
-    if(SendMSG(lessdc.queue, msg, sys_location, SYSCHECK_MQ) < 0)
-    {
+    if (SendMSG(lessdc.queue, msg, sys_location, SYSCHECK_MQ) < 0) {
         merror(QUEUE_SEND, ARGV0);
 
-        if((lessdc.queue = StartMQ(DEFAULTQPATH,WRITE)) < 0)
-        {
+        if ((lessdc.queue = StartMQ(DEFAULTQPATH, WRITE)) < 0) {
             ErrorExit(QUEUE_FATAL, ARGV0, DEFAULTQPATH);
         }
 
@@ -65,95 +64,79 @@ int send_intcheck_msg(char *script, char *host, char *msg)
         SendMSG(lessdc.queue, msg, sys_location, SYSCHECK_MQ);
     }
 
-    return(0);
+    return (0);
 }
 
-
-
-/* Send generic log message. */
-int send_log_msg(char *script, char *host, char *msg)
+/* Send generic log message */
+static int send_log_msg(const char *script, const char *host, const char *msg)
 {
-    char sys_location[1024 +1];
+    char sys_location[1024 + 1];
 
     sys_location[1024] = '\0';
     snprintf(sys_location, 1024, "(%s) %s->%s", script, host, SYSCHECK);
 
-    if(SendMSG(lessdc.queue, msg, sys_location, LOCALFILE_MQ) < 0)
-    {
+    if (SendMSG(lessdc.queue, msg, sys_location, LOCALFILE_MQ) < 0) {
         merror(QUEUE_SEND, ARGV0);
-        if((lessdc.queue = StartMQ(DEFAULTQPATH, WRITE)) < 0)
-        {
+        if ((lessdc.queue = StartMQ(DEFAULTQPATH, WRITE)) < 0) {
             ErrorExit(QUEUE_FATAL, ARGV0, DEFAULTQPATH);
         }
 
         /* If we reach here, we can try to send it again */
         SendMSG(lessdc.queue, msg, sys_location, LOCALFILE_MQ);
     }
-    return(0);
+    return (0);
 }
 
-
-
-/* Generate diffs alerts. */
-int gen_diff_alert(char *host, char *script, int alert_diff_time)
+/* Generate diffs alert */
+static int gen_diff_alert(const char *host, const char *script, time_t alert_diff_time)
 {
-    int n = 0;
+    size_t n;
     FILE *fp;
     char *tmp_str;
-    char buf[2048 +1];
-    char diff_alert[4096 +1];
+    char buf[2048 + 1];
+    char diff_alert[4096 + 1];
 
     buf[2048] = '\0';
     diff_alert[4096] = '\0';
 
     snprintf(buf, 2048, "%s/%s->%s/diff.%d",
-             DIFF_DIR_PATH, host, script,  alert_diff_time);
+             DIFF_DIR_PATH, host, script, (int)alert_diff_time);
 
     fp = fopen(buf, "r");
-    if(!fp)
-    {
+    if (!fp) {
         merror("%s: ERROR: Unable to generate diff alert.", ARGV0);
-        return(0);
+        return (0);
     }
 
-    n = fread(buf, 1, 2048 -1, fp);
-    if(n <= 0)
-    {
+    n = fread(buf, 1, 2048 - 1, fp);
+    if (n <= 0) {
         merror("%s: ERROR: Unable to generate diff alert (fread).", ARGV0);
         fclose(fp);
-        return(0);
-    }
-    else if(n >= 2040)
-    {
-        /* We need to clear the last new line. */
+        return (0);
+    } else if (n >= 2040) {
+        /* We need to clear the last newline */
         buf[n] = '\0';
         tmp_str = strrchr(buf, '\n');
-        if(tmp_str)
+        if (tmp_str) {
             *tmp_str = '\0';
-        else
-        {
-            /* Weird diff with only one large line. */
+        } else {
+            /* Weird diff with only one large line */
             buf[256] = '\0';
         }
-    }
-    else
-    {
+    } else {
         buf[n] = '\0';
     }
 
     n = 0;
 
-
-    /* Getting up to 8 line changes. */
+    /* Get up to 8 line changes */
     tmp_str = buf;
 
-    while(tmp_str && (*tmp_str != '\0'))
-    {
+    while (tmp_str && (*tmp_str != '\0')) {
         tmp_str = strchr(tmp_str, '\n');
-        if(!tmp_str)
+        if (!tmp_str) {
             break;
-        else if(n >= 7)
-        {
+        } else if (n >= 7) {
             *tmp_str = '\0';
             break;
         }
@@ -161,22 +144,18 @@ int gen_diff_alert(char *host, char *script, int alert_diff_time)
         tmp_str++;
     }
 
-
-    /* Creating alert. */
-    snprintf(diff_alert, 4096 -1, "ossec: agentless: Change detected:\n%s%s",
-             buf, n>=7?
-             "\nMore changes..":
+    /* Create alert */
+    snprintf(diff_alert, 4096 - 1, "ossec: agentless: Change detected:\n%s%s",
+             buf, n >= 7 ?
+             "\nMore changes.." :
              "");
 
-
     snprintf(buf, 1024, "(%s) %s->agentless", script, host);
 
-    if(SendMSG(lessdc.queue, diff_alert, buf, LOCALFILE_MQ) < 0)
-    {
+    if (SendMSG(lessdc.queue, diff_alert, buf, LOCALFILE_MQ) < 0) {
         merror(QUEUE_SEND, ARGV0);
 
-        if((lessdc.queue = StartMQ(DEFAULTQPATH, WRITE)) < 0)
-        {
+        if ((lessdc.queue = StartMQ(DEFAULTQPATH, WRITE)) < 0) {
             ErrorExit(QUEUE_FATAL, ARGV0, DEFAULTQPATH);
         }
 
@@ -187,19 +166,17 @@ int gen_diff_alert(char *host, char *script, int alert_diff_time)
     save_agentless_entry(host, script, "diff");
 
     fclose(fp);
-    return(0);
+    return (0);
 }
 
-
-
-/* Checks if the file has changed */
-int check_diff_file(char *host, char *script)
+/* Check if the file has changed */
+static int check_diff_file(const char *host, const char *script)
 {
-    int date_of_change;
-    char old_location[1024 +1];
-    char new_location[1024 +1];
-    char tmp_location[1024 +1];
-    char diff_cmd[2048 +1];
+    time_t date_of_change;
+    char old_location[1024 + 1];
+    char new_location[1024 + 1];
+    char tmp_location[1024 + 1];
+    char diff_cmd[2048 + 1];
 
     os_md5 md5sum_old;
     os_md5 md5sum_new;
@@ -214,265 +191,222 @@ int check_diff_file(char *host, char *script)
     snprintf(old_location, 1024, "%s/%s->%s/%s", DIFF_DIR_PATH, host, script,
              DIFF_LAST_FILE);
 
-
-    /* If the file is not there, rename new location to last location. */
-    if(OS_MD5_File(old_location, md5sum_old) != 0)
-    {
-        if(rename(new_location, old_location) != 0)
-        {
-            merror(RENAME_ERROR, ARGV0, new_location);
+    /* If the file is not there, rename new location to last location */
+    if (OS_MD5_File(old_location, md5sum_old, OS_TEXT) != 0) {
+        if (rename(new_location, old_location) != 0) {
+            merror(RENAME_ERROR, ARGV0, new_location, old_location, errno, strerror(errno));
         }
-        return(0);
+        return (0);
     }
 
-    /* Get md5sum of the new file. */
-    if(OS_MD5_File(new_location, md5sum_new) != 0)
-    {
+    /* Get md5sum of the new file */
+    if (OS_MD5_File(new_location, md5sum_new, OS_TEXT) != 0) {
         merror("%s: ERROR: Invalid internal state (missing '%s').",
                ARGV0, new_location);
-        return(0);
+        return (0);
     }
 
-    /* If they match, keep the old file and remove the new. */
-    if(strcmp(md5sum_new, md5sum_old) == 0)
-    {
+    /* If they match, keep the old file and remove the new */
+    if (strcmp(md5sum_new, md5sum_old) == 0) {
         unlink(new_location);
-        return(0);
+        return (0);
     }
 
-
-    /* Saving the old file at timestamp and renaming new to last. */
+    /* Save the old file at timestamp and rename new to last */
     date_of_change = File_DateofChange(old_location);
     snprintf(tmp_location, 1024, "%s/%s->%s/state.%d", DIFF_DIR_PATH, host, script,
-             date_of_change);
-    rename(old_location, tmp_location);
-    rename(new_location, old_location);
+             (int)date_of_change);
 
+    if (rename(old_location, tmp_location) != 0) {
+        merror(RENAME_ERROR, ARGV0, old_location, tmp_location, errno, strerror(errno));
+        return (0);
+    }
+    if (rename(new_location, old_location) != 0) {
+        merror(RENAME_ERROR, ARGV0, new_location, old_location, errno, strerror(errno));
+        return (0);
+    }
 
-    /* Run diff. */
+    /* Run diff */
     date_of_change = File_DateofChange(old_location);
     snprintf(diff_cmd, 2048, "diff \"%s\" \"%s\" > \"%s/%s->%s/diff.%d\" "
              "2>/dev/null",
              tmp_location, old_location,
-             DIFF_DIR_PATH, host, script, date_of_change);
-    if(system(diff_cmd) != 256)
-    {
+             DIFF_DIR_PATH, host, script, (int)date_of_change);
+    if (system(diff_cmd) != 256) {
         merror("%s: ERROR: Unable to run diff for %s->%s",
                ARGV0,  host, script);
-        return(0);
+        return (0);
     }
 
-
-    /* Generate alert. */
+    /* Generate alert */
     gen_diff_alert(host, script, date_of_change);
 
-
-    return(0);
+    return (0);
 }
 
-
-
-/* get the diff file. */
-FILE *open_diff_file(char *host, char *script)
+/* Get the diff file */
+static FILE *open_diff_file(const char *host, const char *script)
 {
     FILE *fp = NULL;
-    char sys_location[1024 +1];
+    char sys_location[1024 + 1];
 
     sys_location[1024] = '\0';
     snprintf(sys_location, 1024, "%s/%s->%s/%s", DIFF_DIR_PATH, host, script,
              DIFF_NEW_FILE);
 
-
     fp = fopen(sys_location, "w");
 
-    /* If we can't open, try creating the directory. */
-    if(!fp)
-    {
+    /* If we can't open, try creating the directory */
+    if (!fp) {
         snprintf(sys_location, 1024, "%s/%s->%s", DIFF_DIR_PATH, host, script);
-        if(IsDir(sys_location) == -1)
-        {
-            if(mkdir(sys_location, 0770) == -1)
-            {
-                merror(MKDIR_ERROR, ARGV0, sys_location);
-                return(NULL);
+        if (IsDir(sys_location) == -1) {
+            if (mkdir(sys_location, 0770) == -1) {
+                merror(MKDIR_ERROR, ARGV0, sys_location, errno, strerror(errno));
+                return (NULL);
             }
         }
 
         snprintf(sys_location, 1024, "%s/%s->%s/%s", DIFF_DIR_PATH, host,
                  script, DIFF_NEW_FILE);
         fp = fopen(sys_location, "w");
-        if(!fp)
-        {
-            merror(FOPEN_ERROR, ARGV0, sys_location);
-            return(NULL);
+        if (!fp) {
+            merror(FOPEN_ERROR, ARGV0, sys_location, errno, strerror(errno));
+            return (NULL);
         }
     }
 
-    return(fp);
+    return (fp);
 }
 
-
-
-/* Run periodic commands. */
-int run_periodic_cmd(agentlessd_entries *entry, int test_it)
+/* Run periodic commands */
+static int run_periodic_cmd(agentlessd_entries *entry, int test_it)
 {
     int i = 0;
     char *tmp_str;
-    char buf[OS_SIZE_2048 +1];
-    char command[OS_SIZE_1024 +1];
+    char buf[OS_SIZE_2048 + 1];
+    char command[OS_SIZE_1024 + 1];
     FILE *fp;
     FILE *fp_store = NULL;
 
-
     buf[0] = '\0';
     command[0] = '\0';
     command[OS_SIZE_1024] = '\0';
 
-
-    while(entry->server[i])
-    {
-        /* Ignored entry. */
-        if(entry->server[i][0] == '\0')
-        {
+    while (entry->server[i]) {
+        /* Ignored entry */
+        if (entry->server[i][0] == '\0') {
             i++;
             continue;
         }
 
-
-        /* We only test for the first server entry. */
-        else if(test_it)
-        {
+        /* We only test for the first server entry */
+        else if (test_it) {
             int ret_code = 0;
             snprintf(command, OS_SIZE_1024,
-                    "%s/%s test test >/dev/null 2>&1",
-                    AGENTLESSDIRPATH, entry->type);
+                     "%s/%s test test >/dev/null 2>&1",
+                     AGENTLESSDIRPATH, entry->type);
             ret_code = system(command);
 
-            /* Checking if the test worked. */
-            if(ret_code != 0)
-            {
-                if(ret_code == 32512)
-                {
+            /* Check if the test worked */
+            if (ret_code != 0) {
+                if (ret_code == 32512) {
                     merror("%s: ERROR: Expect command not found (or bad "
                            "arguments) for '%s'.",
                            ARGV0, entry->type);
                 }
                 merror("%s: ERROR: Test failed for '%s' (%d). Ignoring.",
-                       ARGV0, entry->type, ret_code/256);
+                       ARGV0, entry->type, ret_code / 256);
                 entry->error_flag = 99;
-                return(-1);
+                return (-1);
             }
 
             verbose("%s: INFO: Test passed for '%s'.", ARGV0, entry->type);
-            return(0);
+            return (0);
         }
 
-        if(entry->server[i][0] == 's')
-        {
+        if (entry->server[i][0] == 's') {
             snprintf(command, OS_SIZE_1024, "%s/%s \"use_su\" \"%s\" %s 2>&1",
-                AGENTLESSDIRPATH, entry->type, entry->server[i] +1,
-                entry->options);
-        }
-        else if(entry->server[i][0] == 'o')
-        {
+                     AGENTLESSDIRPATH, entry->type, entry->server[i] + 1,
+                     entry->options);
+        } else if (entry->server[i][0] == 'o') {
             snprintf(command, OS_SIZE_1024, "%s/%s \"use_sudo\" \"%s\" %s 2>&1",
-                AGENTLESSDIRPATH, entry->type, entry->server[i] +1,
-                entry->options);
-        }
-        else
-        {
+                     AGENTLESSDIRPATH, entry->type, entry->server[i] + 1,
+                     entry->options);
+        } else {
             snprintf(command, OS_SIZE_1024, "%s/%s \"%s\" %s 2>&1",
-                AGENTLESSDIRPATH, entry->type, entry->server[i] +1,
-                entry->options);
+                     AGENTLESSDIRPATH, entry->type, entry->server[i] + 1,
+                     entry->options);
         }
 
         fp = popen(command, "r");
-        if(fp)
-        {
-            while(fgets(buf, OS_SIZE_2048, fp) != NULL)
-            {
-                /* Removing new lines or carriage returns. */
+        if (fp) {
+            while (fgets(buf, OS_SIZE_2048, fp) != NULL) {
+                /* Remove newlines and carriage returns */
                 tmp_str = strchr(buf, '\r');
-                if(tmp_str)
+                if (tmp_str) {
                     *tmp_str = '\0';
+                }
                 tmp_str = strchr(buf, '\n');
-                if(tmp_str)
+                if (tmp_str) {
                     *tmp_str = '\0';
+                }
 
-                if(strncmp(buf, "ERROR: ", 7) == 0)
-                {
+                if (strncmp(buf, "ERROR: ", 7) == 0) {
                     merror("%s: ERROR: %s: %s: %s", ARGV0,
-                           entry->type, entry->server[i] +1, buf +7);
+                           entry->type, entry->server[i] + 1, buf + 7);
                     entry->error_flag++;
                     break;
-                }
-                else if(strncmp(buf, "INFO: ", 6) == 0)
-                {
+                } else if (strncmp(buf, "INFO: ", 6) == 0) {
                     verbose("%s: INFO: %s: %s: %s", ARGV0,
-                            entry->type, entry->server[i] +1, buf +6);
-                }
-                else if(strncmp(buf, "FWD: ", 4) == 0)
-                {
+                            entry->type, entry->server[i] + 1, buf + 6);
+                } else if (strncmp(buf, "FWD: ", 4) == 0) {
                     tmp_str = buf + 5;
-                    send_intcheck_msg(entry->type, entry->server[i]+1,
+                    send_intcheck_msg(entry->type, entry->server[i] + 1,
                                       tmp_str);
-                }
-                else if(strncmp(buf, "LOG: ", 4) == 0)
-                {
+                } else if (strncmp(buf, "LOG: ", 4) == 0) {
                     tmp_str = buf + 5;
-                    send_log_msg(entry->type, entry->server[i]+1,
+                    send_log_msg(entry->type, entry->server[i] + 1,
                                  tmp_str);
-                }
-                else if((entry->state & LESSD_STATE_DIFF) &&
-                        (strncmp(buf, "STORE: ", 7) == 0))
-                {
-                    fp_store = open_diff_file(entry->server[i]+1,
+                } else if ((entry->state & LESSD_STATE_DIFF) &&
+                           (strncmp(buf, "STORE: ", 7) == 0)) {
+                    if (fp_store) {
+                        fclose(fp_store);
+                    }
+                    fp_store = open_diff_file(entry->server[i] + 1,
                                               entry->type);
-                }
-                else if(fp_store)
-                {
+                } else if (fp_store) {
                     fprintf(fp_store, "%s\n", buf);
-                }
-                else
-                {
+                } else {
                     debug1("%s: DEBUG: buffer: %s", ARGV0, buf);
                 }
             }
 
-            if(fp_store)
-            {
+            if (fp_store) {
                 fclose(fp_store);
                 fp_store = NULL;
 
-                check_diff_file(entry->server[i] +1, entry->type);
-            }
-            else
-            {
-                save_agentless_entry(entry->server[i] +1,
+                check_diff_file(entry->server[i] + 1, entry->type);
+            } else {
+                save_agentless_entry(entry->server[i] + 1,
                                      entry->type, "syscheck");
             }
             pclose(fp);
-        }
-        else
-        {
+        } else {
             merror("%s: ERROR: popen failed on '%s' for '%s'.", ARGV0,
-                   entry->type, entry->server[i] +1);
+                   entry->type, entry->server[i] + 1);
             entry->error_flag++;
         }
 
         i++;
     }
 
-    if(fp_store)
-    {
+    if (fp_store) {
         fclose(fp_store);
     }
 
-    return(0);
+    return (0);
 }
 
-
-
 /* Main agentlessd */
 void Agentlessd()
 {
@@ -482,52 +416,37 @@ void Agentlessd()
     int today = 0;
     int test_it = 1;
 
-    char str[OS_SIZE_1024 +1];
-
+    char str[OS_SIZE_1024 + 1];
 
-    /* Waiting a few seconds to settle */
+    /* Wait a few seconds to settle */
     sleep(2);
-    memset(str, '\0', OS_SIZE_1024 +1);
-
+    memset(str, '\0', OS_SIZE_1024 + 1);
 
-    /* Getting currently time before starting */
+    /* Get current time before starting */
     tm = time(NULL);
     p = localtime(&tm);
 
     today = p->tm_mday;
 
-
-    /* Connecting to the message queue
-     * Exit if it fails.
-     */
-    if((lessdc.queue = StartMQ(DEFAULTQPATH, WRITE)) < 0)
-    {
+    /* Connect to the message queue. Exit if it fails. */
+    if ((lessdc.queue = StartMQ(DEFAULTQPATH, WRITE)) < 0) {
         ErrorExit(QUEUE_FATAL, ARGV0, DEFAULTQUEUE);
     }
 
-
-
     /* Main monitor loop */
-    while(1)
-    {
-        int i = 0;
+    while (1) {
+        unsigned int i = 0;
         tm = time(NULL);
         p = localtime(&tm);
 
-
         /* Day changed, deal with log files */
-        if(today != p->tm_mday)
-        {
+        if (today != p->tm_mday) {
             today = p->tm_mday;
         }
 
-
-        while(lessdc.entries[i])
-        {
-            if(lessdc.entries[i]->error_flag >= 10)
-            {
-                if(lessdc.entries[i]->error_flag != 99)
-                {
+        while (lessdc.entries[i]) {
+            if (lessdc.entries[i]->error_flag >= 10) {
+                if (lessdc.entries[i]->error_flag != 99) {
                     merror("%s: ERROR: Too many failures for '%s'. Ignoring it.",
                            ARGV0, lessdc.entries[i]->type);
                     lessdc.entries[i]->error_flag = 99;
@@ -538,15 +457,14 @@ void Agentlessd()
                 continue;
             }
 
-
-            /* Run the check again if the frequency has elapsed. */
-            if((lessdc.entries[i]->state & LESSD_STATE_PERIODIC) &&
-               ((lessdc.entries[i]->current_state +
-                 lessdc.entries[i]->frequency) < tm))
-            {
+            /* Run the check again if the frequency has elapsed */
+            if ((lessdc.entries[i]->state & LESSD_STATE_PERIODIC) &&
+                    ((lessdc.entries[i]->current_state +
+                      lessdc.entries[i]->frequency) < tm)) {
                 run_periodic_cmd(lessdc.entries[i], test_it);
-                if(!test_it)
+                if (!test_it) {
                     lessdc.entries[i]->current_state = tm;
+                }
             }
 
             i++;
@@ -560,4 +478,3 @@ void Agentlessd()
     }
 }
 
-/* EOF */