Changeset 452 for trunk/src/sh_suidchk.c

Timestamp:

Jun 26, 2014, 8:01:54 PM (10 years ago)

Author:

katerina

Message:

Fix for ticket #353 (multiple exclusions for SUID check).

File:

• trunk/src/sh_suidchk.c (modified) (8 diffs)

trunk/src/sh_suidchk.c

@@ -82 +82 @@
 #include "sh_schedule.h"
 #include "sh_calls.h"
+#include "zAVLTree.h"
 
 
@@ -146 +147 @@
 static int     ShSuidchkQDelete  = S_FALSE;
 static int     ShSuidchkSeverity = SH_ERR_SEVERE;
-static char *  ShSuidchkExclude  = NULL;
-static size_t  ExcludeLen        = 0;
 
 static time_t  FileLimNow        = 0;
@@ -155 +154 @@
 
 static sh_schedule_t * ShSuidchkSched = NULL;
+
+
+static zAVLTree *  ShSuidchkExclude  = NULL;
+static void sh_suid_exclude_free()
+{
+  zAVL_string_reset(ShSuidchkExclude);
+  ShSuidchkExclude  = NULL;
+  return;
+}
+static int sh_suid_exclude_add(const char * str)
+{
+  size_t len;
+  int    ret;
+  char * key = sh_util_strdup(str);
+
+  len = sl_strlen (key);
+  if (len && key[len-1] == '/')
+    {
+      key[len-1] = '\0';
+    }
+  ret = zAVL_string_set(&ShSuidchkExclude, key);
+  SH_FREE(key);
+  return ret;
+}
+
 
 static char *
@@ -179 +203 @@
   ShSuidchkSeverity = SH_ERR_SEVERE;
   if (ShSuidchkExclude != NULL)
-    SH_FREE(ShSuidchkExclude);
-  ShSuidchkExclude  = NULL;
-  ExcludeLen        = 0;
+    sh_suid_exclude_free(ShSuidchkExclude);
 
   FileLimNow        = 0;
@@ -1136 +1158 @@
         if (tlen >= 6 && 0 == strcmp(&tmp[tlen-6], _("/.gvfs")))
           elevel = SH_ERR_NOTICE;
+        else if (tlen >= 5 && 0 == strcmp(&((mnt->mnt_dir)[tlen-5]), _("/gvfs")))
+          elevel = SH_ERR_NOTICE;
 
         /* If we are scanning a temporary directory where dirs and files
@@ -1156 +1180 @@
         if (/*@-usedef@*/S_ISDIR(buf.st_mode)/*@+usedef@*/ &&
             (ShSuidchkExclude == NULL || 
-             0 != strcmp(tmpcat, ShSuidchkExclude)))
+             NULL == zAVL_string_get(ShSuidchkExclude, tmpcat)))
           {
             /* fs is a STATIC string or NULL
@@ -1529 +1553 @@
 int sh_suidchk_set_exclude (const char * c)
 {
+  int ret = 0;
   SL_ENTER(_("sh_suidchk_set_exclude"));
 
@@ -1539 +1564 @@
     {
       if (ShSuidchkExclude != NULL)
-        SH_FREE(ShSuidchkExclude);
-      ShSuidchkExclude = NULL;
+        sh_suid_exclude_free();
       SL_RETURN(0, _("sh_suidchk_set_exclude"));
     }
 
-  if (ShSuidchkExclude != NULL)
-    SH_FREE(ShSuidchkExclude);
-
-  ShSuidchkExclude = sh_util_strdup (c);
-  ExcludeLen       = sl_strlen (ShSuidchkExclude);
-  if (ShSuidchkExclude && ShSuidchkExclude[ExcludeLen-1] == '/')
-    {
-      ShSuidchkExclude[ExcludeLen-1] = '\0';
-      ExcludeLen--;
-    }
-  SL_RETURN(0, _("sh_suidchk_set_exclude"));
+  ret = sh_suid_exclude_add(c);
+
+  SL_RETURN(ret, _("sh_suidchk_set_exclude"));
 }