Changeset 305

Timestamp:

Nov 13, 2010, 11:24:24 PM (14 years ago)

Author:

katerina

Message:

Fix for ticker #226 (incorrect handling of missing files when secondary schedule is active).

Location:

trunk

Files:

• docs/Changelog (modified) (1 diff)
• include/sh_hash.h (modified) (1 diff)
• include/sh_utils.h (modified) (1 diff)
• src/samhain.c (modified) (1 diff)
• src/sh_files.c (modified) (3 diffs)
• src/sh_hash.c (modified) (8 diffs)
• src/sh_utils.c (modified) (1 diff)

trunk/docs/Changelog

@@ -1 +1 @@
 2.8.1:
+        * Fix incorrect handling of missing files when secondary schedule
+          is used (reported by Sergey)
         * Fix null pointer dereference in config parse handler for SetMailAlias
           (reported by Sergey)

trunk/include/sh_hash.h

@@ -35 +35 @@
  */
 int hashreport_missing( char *fullpath, int level);
+
+/* remove internal db record for a file
+ */
+void sh_hash_remove (const char * path);
 
 /* write database to stdout

trunk/include/sh_utils.h

@@ -94 +94 @@
 /* ask if a file should be updated (returns S_TRUE/S_FALSE)
  */
-int sh_util_ask_update(char * path);
+int sh_util_ask_update(const char * path);
 int sh_util_set_interactive(const char * str);
 

trunk/src/samhain.c

@@ -2024 +2024 @@
           if (flag_check_2 == 1 || FileSchedTwo == NULL)
             {
+              fprintf(stderr, "FIXME check unvisited\n");
               TPT((0, FIL__, __LINE__, _("msg=<Check for missing files.>\n")))
               sh_hash_unvisited (ShDFLevel[SH_ERR_T_FILE]);

trunk/src/sh_files.c

@@ -377 +377 @@
                   if (S_FALSE == sh_ignore_chk_del(ptr->name))
                     {
+                      fprintf(stderr, "FIXME 1 %s, %d\n", ptr->name, ptr->is_reported);
                       if (0 != hashreport_missing(ptr->name, 
                                                   (ptr->class == SH_LEVEL_ALLIGNORE) ? 
@@ -430 +431 @@
                    * file has been added.
                    */
-                  if (sh_hash_have_it (ptr->name) >= 0)
+                  if (sh_hash_have_it (ptr->name) >= 0 && 
+                      !SH_FFLAG_REPORTED_SET(ptr->is_reported))
                     {
                       if (S_FALSE == sh_ignore_chk_del(ptr->name))
                         {
+                          fprintf(stderr, "FIXME 2 %s, %d\n", ptr->name, ptr->is_reported);
                           if (0 != hashreport_missing(ptr->name, 
                                                       (ptr->class == SH_LEVEL_ALLIGNORE) ? 
@@ -1289 +1292 @@
               if (S_FALSE == sh_ignore_chk_del(ptr->name))
                 {
+                  fprintf(stderr, "FIXME 2 %s, %d\n", ptr->name, ptr->is_reported);
                   if (0 != hashreport_missing(ptr->name, 
                                               (ptr->class == SH_LEVEL_ALLIGNORE) ? 

trunk/src/sh_hash.c

@@ -393 +393 @@
 }
 
+struct two_sh_file_t {
+  sh_file_t * prev;
+  sh_file_t * this;
+};
+
 static sh_file_t * hashsearch (const char * s);
+static int hashsearch_prev (const char * s, struct two_sh_file_t * a, int * index); 
 
 static sh_file_t * tab[TABSIZE];
@@ -423 +429 @@
   char hashbuf[KEYBUF_SIZE];
   int  retval;
+  volatile int flag = 0;
 
   /* --------  find the entry for the file ----------------       */
@@ -449 +456 @@
   sh_error_handle (level, FIL__, __LINE__, 0, 
                    MSG_FI_MISS2, tmp, str);
+  flag = 1;
   SH_FREE(tmp);
   SH_FREE(str);
@@ -458 +466 @@
   ; /* 'label at end of compound statement */
   SH_MUTEX_UNLOCK(mutex_hash);
+
   return retval;
 }
@@ -625 +634 @@
 
 
+
 /*********************************************************************
  *
@@ -646 +656 @@
   SL_RET0(_("hash_unvisited"));
 }
+
+/*********************************************************************
+ *
+ * Remove a single file from the database.
+ *
+ *********************************************************************/
+void sh_hash_remove (const char * path)
+{
+  struct two_sh_file_t entries;
+  int index;
+
+  SL_ENTER(_("sh_hash_remove"));
+
+  SH_MUTEX_LOCK(mutex_hash);
+
+  if ((sh.flag.reportonce == S_TRUE && sh.flag.update == S_FALSE) || 
+      (S_TRUE == sh.flag.update && S_TRUE == sh_util_ask_update(path)))
+    {
+      if (0 == hashsearch_prev (path, &entries, &index))
+        {
+          sh_file_t * p = entries.this;
+#ifdef REPLACE_OLD
+          /* Remove the old entry
+           */
+          if (entries.prev == p)
+            tab[index] = p->next;
+          else
+            entries.prev->next = p->next;
+          
+          p = delete_db_entry(p);
+          
+          goto end;
+          SL_RET0(_("sh_hash_remove"));
+#else
+          SET_SH_FFLAG_REPORTED(p->fflags); 
+#endif
+        }
+    }
+
+ end:
+  ; /* 'label at end of compound statement' */
+  SH_MUTEX_UNLOCK(mutex_hash);
+
+  SL_RET0(_("sh_hash_remove"));
+}
+
 
 /*********************************************************************
@@ -772 +828 @@
     } 
   SL_RETURN( NULL, _("hashsearch"));
+} 
+
+static int hashsearch_prev (const char * s, struct two_sh_file_t * a, int * index) 
+{
+  sh_file_t * this;
+  sh_file_t * prev = NULL;
+
+  SL_ENTER(_("hashsearch_prev"));
+
+  if (s)
+    {
+      *index = hashfunc(s);
+
+      this = tab[*index];
+
+      prev  = this;
+
+      if (this)
+        {
+          do {
+            
+            if ((this->fullpath != NULL) && (0 == strcmp(s, this->fullpath)))
+              {
+                a->prev = prev;
+                a->this = this;
+                
+                SL_RETURN( 0, _("hashsearch_prev"));
+              }
+            
+            prev = this;
+            this = this->next;
+            
+          } while(this);
+        } 
+    }
+  SL_RETURN( -1, _("hashsearch"));
 } 
 
@@ -2226 +2318 @@
   int i;
   SL_ENTER(_("sh_hash_set_missing"));
+
   i = sh_hash_set_visited_int(newname, SH_FFLAG_CHECKED);
+
+  if (sh.flag.checkSum != SH_CHECK_INIT) {
+    sh_hash_remove(newname);
+  }
+
   SL_RETURN(i, _("sh_hash_set_missing"));
 }

trunk/src/sh_utils.c

@@ -120 +120 @@
 #endif
 
-int sh_util_ask_update(char * path)
+int sh_util_ask_update(const char * path)
 {
   int    inchar, c;