Changeset 134 for trunk/lib/regfi.c

Timestamp:

01/16/09 13:36:04 (15 years ago)

Author:

tim

Message:

rewrote winsec library, stripping out Samba dependencies

eliminated remaining Samba prs functions

added support for 'li' subkey list records

File:

• trunk/lib/regfi.c (modified) (22 diffs)

trunk/lib/regfi.c

@@ -3 +3 @@
  *   http://viewcvs.samba.org/cgi-bin/viewcvs.cgi/trunk/source/registry/regfio.c?rev=7470&view=auto
  *
- * Unix SMB/CIFS implementation.
- * Windows NT registry parsing library
+ * Windows NT (and later) registry parsing library
  *
  * Copyright (C) 2005-2009 Timothy D. Morgan
@@ -226 +225 @@
 
 
-char* regfi_sid2str(DOM_SID* sid)
-{
-  uint32 i, size = MAXSUBAUTHS*11 + 24;
+char* regfi_sid2str(WINSEC_DOM_SID* sid)
+{
+  uint32 i, size = WINSEC_MAX_SUBAUTHS*11 + 24;
   uint32 left = size;
   uint8 comps = sid->num_auths;
@@ -236 +235 @@
     return NULL;
 
-  if(comps > MAXSUBAUTHS)
-    comps = MAXSUBAUTHS;
+  if(comps > WINSEC_MAX_SUBAUTHS)
+    comps = WINSEC_MAX_SUBAUTHS;
 
   left -= sprintf(ret_val, "S-%u-%u", sid->sid_rev_num, sid->id_auth[5]);
@@ -248 +247 @@
 
 
-char* regfi_get_acl(SEC_ACL* acl)
+char* regfi_get_acl(WINSEC_ACL* acl)
 {
   uint32 i, extra, size = 0;
@@ -263 +262 @@
   for (i = 0; i < acl->num_aces && !failed; i++)
   {
-    sid_str = regfi_sid2str(&acl->ace[i].trustee);
-    type_str = regfi_ace_type2str(acl->ace[i].type);
-    perms_str = regfi_ace_perms2str(acl->ace[i].info.mask);
-    flags_str = regfi_ace_flags2str(acl->ace[i].flags);
+    sid_str = regfi_sid2str(acl->aces[i]->trustee);
+    type_str = regfi_ace_type2str(acl->aces[i]->type);
+    perms_str = regfi_ace_perms2str(acl->aces[i]->access_mask);
+    flags_str = regfi_ace_flags2str(acl->aces[i]->flags);
     
     if(flags_str != NULL && perms_str != NULL 
@@ -307 +306 @@
 
 
-char* regfi_get_sacl(SEC_DESC *sec_desc)
+char* regfi_get_sacl(WINSEC_DESC *sec_desc)
 {
   if (sec_desc->sacl)
@@ -316 +315 @@
 
 
-char* regfi_get_dacl(SEC_DESC *sec_desc)
+char* regfi_get_dacl(WINSEC_DESC *sec_desc)
 {
   if (sec_desc->dacl)
@@ -325 +324 @@
 
 
-char* regfi_get_owner(SEC_DESC *sec_desc)
+char* regfi_get_owner(WINSEC_DESC *sec_desc)
 {
   return regfi_sid2str(sec_desc->owner_sid);
@@ -331 +330 @@
 
 
-char* regfi_get_group(SEC_DESC *sec_desc)
+char* regfi_get_group(WINSEC_DESC *sec_desc)
 {
   return regfi_sid2str(sec_desc->grp_sid);
@@ -447 +446 @@
 {
   uint32 i,j,k;
-  REGF_SUBKEY_LIST* ret_val = (REGF_SUBKEY_LIST*)zalloc(sizeof(REGF_SUBKEY_LIST));
-  if(ret_val == NULL || lists == NULL)
+  REGF_SUBKEY_LIST* ret_val;
+
+  if(lists == NULL)
+    return NULL;
+  ret_val = (REGF_SUBKEY_LIST*)zalloc(sizeof(REGF_SUBKEY_LIST));
+
+  if(ret_val == NULL)
     return NULL;
   
@@ -457 +461 @@
     if(lists[i] == NULL)
     {
-      ret_val->num_keys = 0;
-      break;
+      free(ret_val);
+      free(lists);
+      return NULL;
     }
     ret_val->num_keys += lists[i]->num_keys;
@@ -469 +474 @@
                                      * ret_val->num_keys);
     k=0;
+
     if(ret_val->elements != NULL)
     {
@@ -498 +504 @@
   REGF_SUBKEY_LIST** sublists;
   REGF_HBIN* sublist_hbin;
-  uint32 i, cell_length, length, num_sublists, off, max_length;
+  uint32 i, cell_length, length, num_sublists, off, max_length, elem_size;
   uint8* hashes;
   uint8 buf[REGFI_SUBKEY_LIST_MIN_LEN];
@@ -541 +547 @@
       sublists[i] = regfi_load_subkeylist(file, off, 0, max_length, strict);
     }
-    
+    free(hashes);
+
     return regfi_merge_subkeylists(num_sublists, sublists, strict);
+  }
+
+  if(buf[0] == 'l' && buf[1] == 'i')
+    elem_size = sizeof(uint32);
+  else if((buf[0] == 'l') && (buf[1] == 'f' || buf[1] == 'h'))
+    elem_size = sizeof(REGF_SUBKEY_LIST_ELEM);
+  else
+  {
+    /* fprintf(stderr, "DEBUG: lf->header=%c%c\n", buf[0], buf[1]);*/
+    return NULL;
   }
 
@@ -551 +568 @@
   ret_val->offset = offset;
   ret_val->cell_size = cell_length;
-
-  if((buf[0] != 'l' || buf[1] != 'f') && (buf[0] != 'l' || buf[1] != 'h'))
-  {
-    /*printf("DEBUG: lf->header=%c%c\n", buf[0], buf[1]);*/
-    free(ret_val);
-    return NULL;
-  }
-
   ret_val->magic[0] = buf[0];
   ret_val->magic[1] = buf[1];
@@ -579 +588 @@
 
   if(cell_length - REGFI_SUBKEY_LIST_MIN_LEN - sizeof(uint32) 
-     < ret_val->num_keys*sizeof(REGF_SUBKEY_LIST_ELEM))
-    return NULL;
-
-  length = sizeof(REGF_SUBKEY_LIST_ELEM)*ret_val->num_keys;
-  ret_val->elements = (REGF_SUBKEY_LIST_ELEM*)zalloc(length);
+     < ret_val->num_keys*elem_size)
+  {
+    free(ret_val);
+    return NULL;
+  }
+
+  length = elem_size*ret_val->num_keys;
+  ret_val->elements 
+    = (REGF_SUBKEY_LIST_ELEM*)zalloc(ret_val->num_keys 
+                                     * sizeof(REGF_SUBKEY_LIST_ELEM));
   if(ret_val->elements == NULL)
   {
@@ -599 +613 @@
 
   if(regfi_read(file->fd, hashes, &length) != 0
-     || length != sizeof(REGF_SUBKEY_LIST_ELEM)*ret_val->num_keys)
+     || length != elem_size*ret_val->num_keys)
   {
     free(ret_val->elements);
@@ -606 +620 @@
   }
 
-  for (i=0; i < ret_val->num_keys; i++)
-  {
-    ret_val->elements[i].nk_off = IVAL(hashes, i*sizeof(REGF_SUBKEY_LIST_ELEM));
-    ret_val->elements[i].hash = IVAL(hashes, i*sizeof(REGF_SUBKEY_LIST_ELEM)+4);
+  if(buf[0] == 'l' && buf[1] == 'i')
+  {
+    for (i=0; i < ret_val->num_keys; i++)
+    {
+      ret_val->elements[i].nk_off = IVAL(hashes, i*elem_size);
+      ret_val->elements[i].hash = 0;
+    }
+  }
+  else
+  {
+    for (i=0; i < ret_val->num_keys; i++)
+    {
+      ret_val->elements[i].nk_off = IVAL(hashes, i*elem_size);
+      ret_val->elements[i].hash = IVAL(hashes, i*elem_size+4);
+    }
   }
   free(hashes);
@@ -623 +648 @@
 {
   REGF_SK_REC* ret_val;
+  uint8* sec_desc_buf;
   uint32 cell_length, length;
-  prs_struct ps;
+  /*prs_struct ps;*/
   uint8 sk_header[REGFI_SK_MIN_LENGTH];
   bool unalloc = false;
-
 
   if(!regfi_parse_cell(file->fd, offset, sk_header, REGFI_SK_MIN_LENGTH,
@@ -674 +699 @@
    * code depends on the ps structure.
    */
+  /*
   if(!prs_init(&ps, ret_val->desc_size, NULL, UNMARSHALL))
   {
@@ -687 +713 @@
     return NULL;
   }
-
-  /* XXX: call should look more like: */
-  /*if (!(ret_val->sec_desc = winsec_parse_desc(sec_desc_buf, ret_val->desc_size)))*/
-  if (!sec_io_desc("sec_desc", &ret_val->sec_desc, &ps, 0))
-  {
-    free(ret_val);
-    return NULL;
-  }
-
-  free(ps.data_p);
+  */
+
+  sec_desc_buf = (uint8*)zalloc(ret_val->desc_size);
+  if(ret_val == NULL)
+  {
+    free(ret_val);
+    return NULL;
+  }
+
+  length = ret_val->desc_size;
+  if(regfi_read(file->fd, sec_desc_buf, &length) != 0 
+     || length != ret_val->desc_size)
+  {
+    free(ret_val);
+    return NULL;
+  }
+
+  if(!(ret_val->sec_desc = winsec_parse_desc(sec_desc_buf, ret_val->desc_size)))
+  {
+    free(sec_desc_buf);
+    free(ret_val);
+    return NULL;
+  }
+  free(sec_desc_buf);
+
+  /*  free(ps.data_p);*/
 
   return ret_val;
@@ -893 +935 @@
       off = nk->subkeys_off + REGF_BLOCKSIZE;
       max_length = sub_hbin->block_size + sub_hbin->file_off - off;
-      nk->subkeys = regfi_load_subkeylist(file, off, nk->num_subkeys, 
+      nk->subkeys = regfi_load_subkeylist(file, off, nk->num_subkeys,
                                           max_length, true);
+
       if(nk->subkeys == NULL)
       {