Changeset 68 for trunk/src/sh_utils.c

Timestamp:

Oct 30, 2006, 12:03:44 AM (14 years ago)

Author:

rainer

Message:

Update trunk to samhain 2.3

File:

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

trunk/src/sh_utils.c

@@ -196 +196 @@
 
   SL_RETURN(i, _("sh_util_hidesetup"));
+}
+
+char * sh_util_acl_compact(char * buf, ssize_t len)
+{
+  unsigned char  * p = (unsigned char *) buf;
+  int       state = 0;
+  ssize_t   rem = 0;
+  char    * out;
+  
+  SH_VALIDATE_NE(buf, NULL);
+  SH_VALIDATE_GE(len, 0);
+
+  out = SH_ALLOC(len + 1);
+
+  while (*p != '\0')  {
+
+    /* -- not at start or after newline
+     */
+    if (state == 1) {
+      if (*p == '\n' || *p == ' ' || *p == '\t' || *p == '#') {
+        while (*p != '\n') {
+          ++p;
+          if (*p == '\0') {
+            goto exit_it;
+          }
+        }
+        out[rem] = ','; ++rem;
+        while (p[1] == '\n') ++p; /* scan over consecutive newlines */
+        state = 0;
+        if (p[1] == '\0') {
+          if (rem > 0) out[rem-1] = '\0';
+          break;
+        }
+      }
+      else {
+        if (*p <= 0x7F && isgraph((int) *p)) {
+          out[rem] = (char) *p; ++rem;
+        }
+      }
+    }
+
+    /* -- at start or after newline
+     */
+    else /* if (state == 0) */ {
+      if        (0 == strncmp((char *) p, "user", 4)) {
+        out[rem] = 'u'; ++rem;
+        p += 3; state = 1;
+      } else if (0 == strncmp((char *) p, "group", 5)) {
+        out[rem] = 'g'; ++rem;
+        p += 4; state = 1; 
+      } else if (0 == strncmp((char *) p, "mask", 4)) {
+        out[rem] = 'm'; ++rem;
+        p += 3; state = 1;
+      } else if (0 == strncmp((char *) p, "other", 5)) {
+        out[rem] = 'o';
+        p += 4; state = 1; ++rem;
+      } else if (*p == '\0') {
+        if (rem > 0) { out[rem-1] = '\0'; }
+        break;
+      } else {
+        if (*p <= 0x7F && isprint((int) *p)) {
+          out[rem] = (char) *p; ++rem;
+        }
+      }
+      state = 1;
+    }
+    ++p;
+  }
+ exit_it:
+  out[rem] = '\0';
+  return out;
 }
     
@@ -1343 +1414 @@
 static unsigned char sh_obscure_index[256];
 
+int sh_util_valid_utf8 (const unsigned char * str) 
+{
+  size_t        len = strlen((char *)str);
+  size_t        l   = 0;
+  unsigned char c;
+
+#define SH_VAL_UTF8_1 ((c != '\0') && ((c & 0x80) == 0x00))
+#define SH_VAL_UTF8_2 ((c != '\0') && ((c & 0xE0) == 0xC0)) /* 110x xxxx */
+#define SH_VAL_UTF8_3 ((c != '\0') && ((c & 0xF0) == 0xE0)) /* 1110 xxxx */
+#define SH_VAL_UTF8_4 ((c != '\0') && ((c & 0xF8) == 0xF0)) /* 1111 0xxx */
+#define SH_VAL_UTF8_N ((c != '\0') && ((c & 0xC0) == 0x80)) /* 10xx xxxx */
+#define SH_VAL_BAD    ((c == '"') || (c == '\t') || (c == '\b') || (c == '\f') || (c == '\n') || \
+                       (c == '\r') || (c == '\v') || iscntrl((int) c) || \
+                       (c != ' ' && !isgraph ((int) c)))
+   
+  while(l < len) 
+    {
+      c = str[l];
+
+      if      (SH_VAL_UTF8_1) 
+        {
+          if (SH_VAL_BAD && (sh_obscure_index[c] != 1)) return S_FALSE;
+          ++l; continue; /* ASCII character */
+        } 
+      else if (SH_VAL_UTF8_2) 
+        { 
+          if ((c & 0x3e) == 0x00) 
+            return S_FALSE; /* overlong 2-byte seq. */
+          ++l; if (l == len) return S_FALSE; c = str[l];
+          if(!SH_VAL_UTF8_N) return S_FALSE; 
+          ++l; continue;
+          
+        } 
+      else if (SH_VAL_UTF8_3) 
+        {
+          ++l; if (l == len) return S_FALSE; c = str[l];
+          if(!SH_VAL_UTF8_N) return S_FALSE;
+          if (((str[l-1] & 0x1F) == 0x00) && ((c & 0x60) == 0x00))
+            return S_FALSE; /* overlong 3-byte seq. */
+          ++l; if (l == len) return S_FALSE; c = str[l];
+          if(!SH_VAL_UTF8_N) return S_FALSE;
+          ++l; continue;
+        } 
+      else if (SH_VAL_UTF8_4) 
+        {
+          ++l; if (l == len) return S_FALSE; c = str[l];
+          if(!SH_VAL_UTF8_N) return S_FALSE;
+          if (((str[l-1] & 0x0F) == 0x00) && ((c & 0x70) == 0x00))
+            return S_FALSE; /* overlong 4-byte seq. */
+          ++l; if (l == len) return S_FALSE; c = str[l];
+          if(!SH_VAL_UTF8_N) return S_FALSE;
+          ++l; if (l == len) return S_FALSE; c = str[l];
+          if(!SH_VAL_UTF8_N) return S_FALSE;
+          ++l; continue;
+        }
+      return S_FALSE;
+    }
+  return S_TRUE;
+}
+
+
 int sh_util_obscure_ok (const char * str)
 {
@@ -1387 +1519 @@
 }
 
+static int sh_obscure_check_utf8 = S_FALSE;
+
+int sh_util_obscure_utf8 (const char * c)
+{
+  int i;
+  SL_ENTER(_("sh_util_obscure_utf8"));
+  i = sh_util_flagval(c, &(sh_obscure_check_utf8));
+
+  SL_RETURN(i, _("sh_util_obscure_utf8"));
+}
+
+
 int sh_util_obscurename (ShErrLevel level, char * name_orig, int flag)
 {
@@ -1396 +1540 @@
 
   ASSERT_RET((name != NULL), _("name != NULL"), (0))
+
+  if (sh_obscure_check_utf8 == S_TRUE)
+    {
+      if (S_FALSE == sh_util_valid_utf8(name))
+        {
+          goto err;
+        }
+      SL_RETURN((0),_("sh_util_obscurename"));
+    }
 
   /* -- Check name. --
@@ -1410 +1563 @@
           if (sh_obscure_index[i] != (unsigned char)1)
             {
-              if (flag == S_TRUE)
-                {
-                  safe = sh_util_safe_name (name_orig);  
-                  sh_error_handle (level, FIL__, __LINE__, 0, MSG_FI_OBSC, 
-                                   safe);
-                  SH_FREE(safe);
-                }
-              SL_RETURN((-1),_("sh_util_obscurename"));
+              goto err;
             }
         }
@@ -1424 +1570 @@
 
   SL_RETURN((0),_("sh_util_obscurename"));
-}
+
+ err:
+
+  if (flag == S_TRUE)
+    {
+      safe = sh_util_safe_name (name_orig);  
+      sh_error_handle (level, FIL__, __LINE__, 0, MSG_FI_OBSC, 
+                       safe);
+      SH_FREE(safe);
+    }
+  SL_RETURN((-1),_("sh_util_obscurename"));
+}
+
 #endif