fixed nttrans.c

(This used to be commit 06cd46b0ec10b32af54edd8256d2fdbec45e1371)

1 files changed, 38 insertions, 406 deletions

diff --git a/source3/smbd/nttrans.c b/source3/smbd/nttrans.c
index f64ca386f8..a149374114 100644
--- a/source3/smbd/nttrans.c
+++ b/source3/smbd/nttrans.c
@@ -1823,74 +1823,14 @@ name = %s\n", fsp->fsp_name ));
 }
 
 /****************************************************************************
- Map unix perms to NT.
-****************************************************************************/
-
-static SEC_ACCESS map_unix_perms( int *pacl_type, mode_t perm, int r_mask, int w_mask, int x_mask, BOOL is_directory)
-{
-	SEC_ACCESS sa;
-	uint32 nt_mask = 0;
-
-	*pacl_type = SEC_ACE_TYPE_ACCESS_ALLOWED;
-
-	if((perm & (r_mask|w_mask|x_mask)) == (r_mask|w_mask|x_mask)) {
-		nt_mask = UNIX_ACCESS_RWX;
-	} else if((perm & (r_mask|w_mask|x_mask)) == 0) {
-		nt_mask = UNIX_ACCESS_NONE;
-	} else {
-		nt_mask |= (perm & r_mask) ? UNIX_ACCESS_R : 0;
-		if(is_directory)
-			nt_mask |= (perm & w_mask) ? UNIX_ACCESS_W : 0;
-		else
-			nt_mask |= (perm & w_mask) ? UNIX_ACCESS_W : 0;
-		nt_mask |= (perm & x_mask) ? UNIX_ACCESS_X : 0;
-	}
-	init_sec_access(&sa,nt_mask);
-	return sa;
-}
-
-/****************************************************************************
- Function to create owner and group SIDs from a SMB_STRUCT_STAT.
-****************************************************************************/
-
-static void create_file_sids(SMB_STRUCT_STAT *psbuf, DOM_SID *powner_sid, DOM_SID *pgroup_sid)
-{
-  extern DOM_SID global_sam_sid;
-
-  sid_copy(powner_sid, &global_sam_sid);
-  sid_copy(pgroup_sid, &global_sam_sid);
-  sid_append_rid(powner_sid, pdb_uid_to_user_rid(psbuf->st_uid));
-  sid_append_rid(pgroup_sid, pdb_gid_to_group_rid(psbuf->st_gid));
-}
-
-/****************************************************************************
  Reply to query a security descriptor from an fsp. If it succeeds it allocates
  the space for the return elements and returns True.
 ****************************************************************************/
 
 static size_t get_nt_acl(files_struct *fsp, SEC_DESC **ppdesc)
 {
-  extern DOM_SID global_sid_World;
   SMB_STRUCT_STAT sbuf;
-  SEC_ACE ace_list[6];
-  DOM_SID owner_sid;
-  DOM_SID group_sid;
-  size_t sec_desc_size;
-  SEC_ACL *psa = NULL;
-  SEC_ACCESS owner_access;
-  int owner_acl_type;
-  SEC_ACCESS group_access;
-  int grp_acl_type;
-  SEC_ACCESS other_access;
-  int other_acl_type;
-  int num_acls = 0;
- 
-  *ppdesc = NULL;
-
-  if(!lp_nt_acl_support()) {
-    sid_copy( &owner_sid, &global_sid_World);
-    sid_copy( &group_sid, &global_sid_World);
-  } else {
+  mode_t mode;
 
     if(fsp->is_directory || fsp->fd == -1) {
       if(dos_stat(fsp->fsp_name, &sbuf) != 0) {
@@ -1902,80 +1842,19 @@ static size_t get_nt_acl(files_struct *fsp, SEC_DESC **ppdesc)
       }
     }
 
-    /*
-     * Get the owner, group and world SIDs.
-     */
-
-    create_file_sids(&sbuf, &owner_sid, &group_sid);
-
-    /*
-     * Create the generic 3 element UNIX acl.
-     */
-
-    owner_access = map_unix_perms(&owner_acl_type, sbuf.st_mode,
-							S_IRUSR, S_IWUSR, S_IXUSR, fsp->is_directory);
-    group_access = map_unix_perms(&grp_acl_type, sbuf.st_mode,
-							S_IRGRP, S_IWGRP, S_IXGRP, fsp->is_directory);
-    other_access = map_unix_perms(&other_acl_type, sbuf.st_mode,
-							S_IROTH, S_IWOTH, S_IXOTH, fsp->is_directory);
-
-    if(owner_access.mask)
-      init_sec_ace(&ace_list[num_acls++], &owner_sid, owner_acl_type,
-                   owner_access, 0);
-
-    if(group_access.mask)
-      init_sec_ace(&ace_list[num_acls++], &group_sid, grp_acl_type,
-                   group_access, 0);
-
-    if(other_access.mask)
-      init_sec_ace(&ace_list[num_acls++], &global_sid_World, other_acl_type,
-                   other_access, 0);
-
     if(fsp->is_directory) {
       /*
        * For directory ACLs we also add in the inherited permissions
        * ACE entries. These are the permissions a file would get when
        * being created in the directory.
        */
-      mode_t mode = unix_mode( fsp->conn, FILE_ATTRIBUTE_ARCHIVE, fsp->fsp_name);
-
-      owner_access = map_unix_perms(&owner_acl_type, mode,
-                            S_IRUSR, S_IWUSR, S_IXUSR, fsp->is_directory);
-      group_access = map_unix_perms(&grp_acl_type, mode,
-                            S_IRGRP, S_IWGRP, S_IXGRP, fsp->is_directory);
-      other_access = map_unix_perms(&other_acl_type, mode,
-                            S_IROTH, S_IWOTH, S_IXOTH, fsp->is_directory);
-
-      if(owner_access.mask)
-        init_sec_ace(&ace_list[num_acls++], &owner_sid, owner_acl_type,
-                     owner_access, SEC_ACE_FLAG_OBJECT_INHERIT|SEC_ACE_FLAG_INHERIT_ONLY);
-
-      if(group_access.mask)
-        init_sec_ace(&ace_list[num_acls++], &group_sid, grp_acl_type,
-                     group_access, SEC_ACE_FLAG_OBJECT_INHERIT|SEC_ACE_FLAG_INHERIT_ONLY);
-
-      if(other_access.mask)
-        init_sec_ace(&ace_list[num_acls++], &global_sid_World, other_acl_type,
-                     other_access, SEC_ACE_FLAG_OBJECT_INHERIT|SEC_ACE_FLAG_INHERIT_ONLY);
+      mode = unix_mode( fsp->conn, FILE_ATTRIBUTE_ARCHIVE, fsp->fsp_name);
     }
-
-    if(num_acls)
-      if((psa = make_sec_acl( 3, num_acls, ace_list)) == NULL) {
-        DEBUG(0,("get_nt_acl: Unable to malloc space for acl.\n"));
-        return 0;
-      }
-  }
-
-  *ppdesc = make_standard_sec_desc( &owner_sid, &group_sid, psa, &sec_desc_size);
-
-  if(!*ppdesc) {
-    DEBUG(0,("get_nt_acl: Unable to malloc space for security descriptor.\n"));
-    sec_desc_size = 0;
-  }
-
-  free_sec_acl(&psa);
-
-  return sec_desc_size;
+    else
+    {
+	    mode = sbuf.st_mode;
+    }
+  return convertperms_unix_to_sd(&sbuf, fsp->is_directory, mode, ppdesc);
 }
 
 /****************************************************************************
@@ -1993,7 +1872,7 @@ static int call_nt_transact_query_security_desc(connection_struct *conn,
   char *params = *ppparams;
   char *data = *ppdata;
   prs_struct pd;
-  SEC_DESC *psd;
+  SEC_DESC *psd = NULL;
   size_t sec_desc_size;
 
   files_struct *fsp = file_fsp(params,0);
@@ -2020,7 +1899,8 @@ static int call_nt_transact_query_security_desc(connection_struct *conn,
 
   if(max_data_count < sec_desc_size) {
 
-    free_sec_desc(&psd);
+    free_sec_desc(psd);
+    safe_free(psd);
 
     send_nt_replies(inbuf, outbuf, bufsize, 0xC0000000|NT_STATUS_BUFFER_TOO_SMALL,
                     params, 4, *ppdata, 0);
@@ -2033,7 +1913,8 @@ static int call_nt_transact_query_security_desc(connection_struct *conn,
 
   data = *ppdata = Realloc(*ppdata, sec_desc_size);
   if(data == NULL) {
-    free_sec_desc(&psd);
+    free_sec_desc(psd);
+    safe_free(psd);
     return(ERROR(ERRDOS,ERRnomem));
   }
 
@@ -2043,21 +1924,17 @@ static int call_nt_transact_query_security_desc(connection_struct *conn,
    * Init the parse struct we will marshall into.
    */
 
-  prs_init(&pd, 0, 4, MARSHALL);
-
-  /*
-   * Setup the prs_struct to point at the memory we just
-   * allocated.
-   */
-	
-  prs_give_memory( &pd, data, (uint32)sec_desc_size, False);
+  prs_init(&pd, sec_desc_size, 4, MARSHALL);
 
   /*
    * Finally, linearize into the outgoing buffer.
    */
 
-  if(!sec_io_desc( "sd data", &psd, &pd, 1)) {
-    free_sec_desc(&psd);
+  if(!sec_io_desc( "sd data", psd, &pd, 1))
+  {
+    free_sec_desc(psd);
+    safe_free(psd);
+    prs_mem_free(&pd);
     DEBUG(0,("call_nt_transact_query_security_desc: Error in marshalling \
 security descriptor.\n"));
     /*
@@ -2067,274 +1944,21 @@ security descriptor.\n"));
   }
 
   /*
-   * Now we can delete the security descriptor.
-   */
-
-  free_sec_desc(&psd);
-
-  send_nt_replies(inbuf, outbuf, bufsize, 0, params, 4, data, (int)sec_desc_size);
-  return -1;
-}
-
-/****************************************************************************
- Validate a SID.
-****************************************************************************/
-
-static BOOL validate_unix_sid( DOM_SID *psid, uint32 *prid, DOM_SID *sd_sid)
-{
-  extern DOM_SID global_sam_sid;
-  DOM_SID sid;
-
-  if(!sd_sid) {
-    DEBUG(5,("validate_unix_sid: sid missing.\n"));
-    return False;
-  }
-
-  sid_copy(psid, sd_sid);
-  sid_copy(&sid, sd_sid);
-
-  if(!sid_split_rid(&sid, prid)) {
-    DEBUG(5,("validate_unix_sid: cannot get RID from sid.\n"));
-    return False;
-  }
-
-  if(!sid_equal( &sid, &global_sam_sid)) {
-    DEBUG(5,("validate_unix_sid: sid is not ours.\n"));
-    return False;
-  }
-
-  return True;
-}
-
-/****************************************************************************
- Map NT perms to UNIX.
-****************************************************************************/
-
-#define FILE_SPECIFIC_READ_BITS (FILE_READ_DATA|FILE_READ_EA|FILE_READ_ATTRIBUTES)
-#define FILE_SPECIFIC_WRITE_BITS (FILE_WRITE_DATA|FILE_APPEND_DATA|FILE_WRITE_EA|FILE_WRITE_ATTRIBUTES)
-#define FILE_SPECIFIC_EXECUTE_BITS (FILE_EXECUTE)
-
-static mode_t map_nt_perms( SEC_ACCESS sec_access, int type)
-{
-  mode_t mode = 0;
-
-  switch(type) {
-  case S_IRUSR:
-    if(sec_access.mask & GENERIC_ALL_ACCESS)
-      mode = S_IRUSR|S_IWUSR|S_IXUSR;
-    else {
-      mode |= (sec_access.mask & (GENERIC_READ_ACCESS|FILE_SPECIFIC_READ_BITS)) ? S_IRUSR : 0;
-      mode |= (sec_access.mask & (GENERIC_WRITE_ACCESS|FILE_SPECIFIC_WRITE_BITS)) ? S_IWUSR : 0;
-      mode |= (sec_access.mask & (GENERIC_EXECUTE_ACCESS|FILE_SPECIFIC_EXECUTE_BITS)) ? S_IXUSR : 0;
-    }
-    break;
-  case S_IRGRP:
-    if(sec_access.mask & GENERIC_ALL_ACCESS)
-      mode = S_IRGRP|S_IWGRP|S_IXGRP;
-    else {
-      mode |= (sec_access.mask & (GENERIC_READ_ACCESS|FILE_SPECIFIC_READ_BITS)) ? S_IRGRP : 0;
-      mode |= (sec_access.mask & (GENERIC_WRITE_ACCESS|FILE_SPECIFIC_WRITE_BITS)) ? S_IWGRP : 0;
-      mode |= (sec_access.mask & (GENERIC_EXECUTE_ACCESS|FILE_SPECIFIC_EXECUTE_BITS)) ? S_IXGRP : 0;
-    }
-    break;
-  case S_IROTH:
-    if(sec_access.mask & GENERIC_ALL_ACCESS)
-      mode = S_IROTH|S_IWOTH|S_IXOTH;
-    else {
-      mode |= (sec_access.mask & (GENERIC_READ_ACCESS|FILE_SPECIFIC_READ_BITS)) ? S_IROTH : 0;
-      mode |= (sec_access.mask & (GENERIC_WRITE_ACCESS|FILE_SPECIFIC_WRITE_BITS)) ? S_IWOTH : 0;
-      mode |= (sec_access.mask & (GENERIC_EXECUTE_ACCESS|FILE_SPECIFIC_EXECUTE_BITS)) ? S_IXOTH : 0;
-    }
-    break;
-  }
-
-  return mode;
-}
-
-/****************************************************************************
- Unpack a SEC_DESC into a owner, group and set of UNIX permissions.
-****************************************************************************/
-
-static BOOL unpack_nt_permissions(SMB_STRUCT_STAT *psbuf, uid_t *puser, gid_t *pgrp, mode_t *pmode,
-                                  uint32 security_info_sent, SEC_DESC *psd, BOOL is_directory)
-{
-  extern DOM_SID global_sid_World;
-  DOM_SID owner_sid;
-  DOM_SID grp_sid;
-  DOM_SID file_owner_sid;
-  DOM_SID file_grp_sid;
-  uint32 owner_rid;
-  uint32 grp_rid;
-  SEC_ACL *dacl = psd->dacl;
-  BOOL all_aces_are_inherit_only = (is_directory ? True : False);
-  int i;
-
-  *pmode = 0;
-  *puser = (uid_t)-1;
-  *pgrp = (gid_t)-1;
-
-  if(security_info_sent == 0) {
-    DEBUG(0,("unpack_nt_permissions: no security info sent !\n"));
-    return False;
-  }
-
-  /*
-   * Windows 2000 sends the owner and group SIDs as the logged in
-   * user, not the connected user. But it still sends the file
-   * owner SIDs on an ACL set. So we need to check for the file
-   * owner and group SIDs as well as the owner SIDs. JRA.
-   */
- 
-  create_file_sids(psbuf, &file_owner_sid, &file_grp_sid);
-
-  /*
-   * Validate the owner and group SID's.
-   */
-
-  memset(&owner_sid, '\0', sizeof(owner_sid));
-  memset(&grp_sid, '\0', sizeof(grp_sid));
-
-  DEBUG(5,("unpack_nt_permissions: validating owner_sid.\n"));
-
-  /*
-   * Don't immediately fail if the owner sid cannot be validated.
-   * This may be a group chown only set.
-   */
-
-  if(!validate_unix_sid( &owner_sid, &owner_rid, psd->owner_sid))
-    DEBUG(3,("unpack_nt_permissions: unable to validate owner sid.\n"));
-  else if(security_info_sent & OWNER_SECURITY_INFORMATION)
-    *puser = pdb_user_rid_to_uid(owner_rid);
-
-  /*
-   * Don't immediately fail if the group sid cannot be validated.
-   * This may be an owner chown only set.
-   */
-
-  if(!validate_unix_sid( &grp_sid, &grp_rid, psd->grp_sid))
-    DEBUG(3,("unpack_nt_permissions: unable to validate group sid.\n"));
-  else if(security_info_sent & GROUP_SECURITY_INFORMATION)
-    *pgrp = pdb_user_rid_to_gid(grp_rid);
-
-  /*
-   * If no DACL then this is a chown only security descriptor.
+   * copy the data out of the marshalled structure
    */
 
-  if(!(security_info_sent & DACL_SECURITY_INFORMATION) || !dacl) {
-    *pmode = 0;
-    return True;
-  }
+  prs_give_memory( &pd, data, (uint32)sec_desc_size, False);
 
   /*
-   * Now go through the DACL and ensure that
-   * any owner/group sids match.
+   * Now we can delete the security descriptor.
    */
 
-  for(i = 0; i < dacl->num_aces; i++) {
-    DOM_SID ace_sid;
-    SEC_ACE *psa = &dacl->ace[i];
-
-    if((psa->type != SEC_ACE_TYPE_ACCESS_ALLOWED) &&
-       (psa->type != SEC_ACE_TYPE_ACCESS_DENIED)) {
-      DEBUG(3,("unpack_nt_permissions: unable to set anything but an ALLOW or DENY ACE.\n"));
-      return False;
-    }
-
-    /*
-     * Ignore or remove bits we don't care about on a directory ACE.
-     */
-
-    if(is_directory) {
-      if(psa->flags & SEC_ACE_FLAG_INHERIT_ONLY) {
-        DEBUG(3,("unpack_nt_permissions: ignoring inherit only ACE.\n"));
-        continue;
-      }
-
-      /*
-       * At least one of the ACE entries wasn't inherit only.
-       * Flag this so we know the returned mode is valid.
-       */
+  prs_mem_free(&pd);
+  free_sec_desc(psd);
+  safe_free(psd);
 
-      all_aces_are_inherit_only = False;
-    }
-
-    /*
-     * Windows 2000 sets these flags even on *file* ACE's. This is wrong
-     * but we can ignore them for now. Revisit this when we go to POSIX
-     * ACLs on directories.
-     */
-
-    psa->flags &= ~(SEC_ACE_FLAG_OBJECT_INHERIT|SEC_ACE_FLAG_CONTAINER_INHERIT);
-
-    if(psa->flags != 0) {
-      DEBUG(1,("unpack_nt_permissions: unable to set ACE flags (%x).\n", 
-            (unsigned int)psa->flags));
-      return False;
-    }
-
-    /*
-     * The security mask may be UNIX_ACCESS_NONE which should map into
-     * no permissions (we overload the WRITE_OWNER bit for this) or it
-     * should be one of the ALL/EXECUTE/READ/WRITE bits. Arrange for this
-     * to be so. Any other bits override the UNIX_ACCESS_NONE bit.
-     */
-
-    psa->info.mask &= (GENERIC_ALL_ACCESS|GENERIC_EXECUTE_ACCESS|GENERIC_WRITE_ACCESS|
-                     GENERIC_READ_ACCESS|UNIX_ACCESS_NONE|FILE_ALL_ATTRIBUTES);
-
-    if(psa->info.mask != UNIX_ACCESS_NONE)
-      psa->info.mask &= ~UNIX_ACCESS_NONE;
-
-    sid_copy(&ace_sid, &psa->sid);
-
-    if(sid_equal(&ace_sid, &file_owner_sid)) {
-      /*
-       * Map the desired permissions into owner perms.
-       */
-
-      if(psa->type == SEC_ACE_TYPE_ACCESS_ALLOWED)
-        *pmode |= map_nt_perms( psa->info, S_IRUSR);
-      else
-        *pmode &= ~(map_nt_perms( psa->info, S_IRUSR));
-
-    } else if( sid_equal(&ace_sid, &file_grp_sid)) {
-      /*
-       * Map the desired permissions into group perms.
-       */
-
-      if(psa->type == SEC_ACE_TYPE_ACCESS_ALLOWED)
-        *pmode |= map_nt_perms( psa->info, S_IRGRP);
-      else
-        *pmode &= ~(map_nt_perms( psa->info, S_IRGRP));
-
-    } else if( sid_equal(&ace_sid, &global_sid_World)) {
-      /*
-       * Map the desired permissions into other perms.
-       */
-
-      if(psa->type == SEC_ACE_TYPE_ACCESS_ALLOWED)
-        *pmode |= map_nt_perms( psa->info, S_IROTH);
-      else
-        *pmode &= ~(map_nt_perms( psa->info, S_IROTH));
-
-    } else {
-      DEBUG(0,("unpack_nt_permissions: unknown SID used in ACL.\n"));
-      return False;
-    }
-  }
-
-  if (is_directory && all_aces_are_inherit_only) {
-    /*
-     * Windows 2000 is doing one of these weird 'inherit acl'
-     * traverses to conserve NTFS ACL resources. Just pretend
-     * there was no DACL sent. JRA.
-     */
-
-    DEBUG(10,("unpack_nt_permissions: Win2k inherit acl traverse. Ignoring DACL.\n"));
-    free_sec_acl(&psd->dacl);
-  }
-
-  return True;
+  send_nt_replies(inbuf, outbuf, bufsize, 0, params, 4, data, (int)sec_desc_size);
+  return -1;
 }
 
 /****************************************************************************
@@ -2350,7 +1974,7 @@ static int call_nt_transact_set_security_desc(connection_struct *conn,
   char *params= *ppparams;
   char *data = *ppdata;
   prs_struct pd;
-  SEC_DESC *psd = NULL;
+  SEC_DESC psd;
   uint32 total_data_count = (uint32)IVAL(inbuf, smb_nts_TotalDataCount);
   uid_t user = (uid_t)-1;
   gid_t grp = (gid_t)-1;
@@ -2391,8 +2015,10 @@ static int call_nt_transact_set_security_desc(connection_struct *conn,
    * Finally, unmarshall from the data buffer.
    */
 
-  if(!sec_io_desc( "sd data", &psd, &pd, 1)) {
+  if(!sec_io_desc( "sd data", &psd, &pd, 1))
+  {
     free_sec_desc(&psd);
+    prs_mem_free(&pd);
     DEBUG(0,("call_nt_transact_set_security_desc: Error in unmarshalling \
 security descriptor.\n"));
     /*
@@ -2402,6 +2028,12 @@ security descriptor.\n"));
   }
 
   /*
+   * finished with the marshalling structure, already
+   */
+
+  prs_mem_free(&pd);
+
+  /*
    * Get the current state of the file.
    */
 
@@ -2429,12 +2061,12 @@ security descriptor.\n"));
    * Unpack the user/group/world id's and permissions.
    */
 
-  if(!unpack_nt_permissions( &sbuf, &user, &grp, &perms, security_info_sent, psd, fsp->is_directory)) {
+  if(!convertperms_sd_to_unix( &sbuf, &user, &grp, &perms, security_info_sent, &psd, fsp->is_directory)) {
     free_sec_desc(&psd);
     return(UNIXERROR(ERRDOS,ERRnoaccess));
   }
 
-  if (psd->dacl != NULL)
+  if (psd.dacl != NULL)
     got_dacl = True;
 
   free_sec_desc(&psd);