Changeset 115 for trunk/src/sh_hash.c

Timestamp:

Aug 21, 2007, 10:22:59 PM (17 years ago)

Author:

rainer

Message:

Fix the problem that new suid/sgid file found by the file system check already will not be quarantined in the suid check (ticket #71).

File:

• trunk/src/sh_hash.c (modified) (6 diffs)

trunk/src/sh_hash.c

@@ -1054 +1054 @@
   memcpy( &(*p).theFile, &ft, sizeof(sh_filestore_t) );
 
-  p->fflags = 0;
-
+  /* init fflags, such that suid files in 
+   * database are recognized as such 
+   */
+  {
+    mode_t mode = (mode_t) ft.mode;
+
+    if (S_ISREG(mode) &&
+        (0 !=(S_ISUID & mode) ||
+#if defined(HOST_IS_LINUX)
+         (0 !=(S_ISGID & mode) && 
+          0 !=(S_IXGRP & mode)) 
+#else  
+         0 !=(S_ISGID & mode)
+#endif
+         )
+        )
+      p->fflags = SH_FFLAG_SUIDCHK;
+
+    else
+      p->fflags = 0;
+  }
+      
   p->modi_mask = 0L;
   p->fullpath  = fullpath;
@@ -1812 +1832 @@
   sh_file_t * p;
 
-  SL_ENTER(_("sh_hash_have_it"));
+  SL_ENTER(_("sh_hash_have_it_int"));
 
   if (newname == NULL)
-    SL_RETURN( (NULL), _("sh_hash_have_it"));
+    SL_RETURN( (NULL), _("sh_hash_have_it_int"));
 
   if (IsInit != 1) 
@@ -1824 +1844 @@
     p = hashsearch ( sh_tiger_hash(newname, TIGER_DATA, sl_strlen(newname)) );
   if (p == NULL) 
-     SL_RETURN( (NULL), _("sh_hash_have_it"));
+     SL_RETURN( (NULL), _("sh_hash_have_it_int"));
   /*
   if (p->allignore == S_FALSE && 
@@ -1831 +1851 @@
     SL_RETURN( (1), _("sh_hash_have_it"));
   */
-  SL_RETURN( (p), _("sh_hash_have_it"));
+  SL_RETURN( (p), _("sh_hash_have_it_int"));
 }
 
@@ -1860 +1880 @@
   return 0;
 }
- 
+
+int sh_hash_getflags (char * filename)
+{
+  sh_file_t * p = sh_hash_have_it_int (filename);
+  if (!p)
+    return (-1);
+  return (p->fflags);
+}
+
+int sh_hash_setflags (char * filename, int flags)
+{
+  sh_file_t * p = sh_hash_have_it_int (filename);
+  if (!p)
+    return (-1);
+  p->fflags = flags;
+  return 0;
+}
+
+/* needs lock to be threadsafe
+ */
+void sh_hash_addflag (char * filename, int flag_to_set)
+{
+  int fflags = sh_hash_getflags(filename);
+
+  if (fflags >= 0)
+    {
+      fflags |= flag_to_set;
+      sh_hash_setflags(filename, fflags);
+    }
+  return;
+}
 
 /*****************************************************************
@@ -2106 +2156 @@
 
   memcpy( &(*fp).theFile, &p, sizeof(sh_filestore_t) );
-  fp->fflags    = 0;
+  fp->fflags    = 0;  /* init fflags */
   fp->modi_mask = 0L;