#include "librpc/gen_ndr/ndr_security.h"
#include "../libcli/security/dom_sid.h"
#include "../libcli/security/security.h"
-#include "include/dbwrap.h"
+#include "dbwrap/dbwrap.h"
+#include "dbwrap/dbwrap_open.h"
#include "system/filesys.h"
#include "passdb/lookup_sid.h"
#include "util_tdb.h"
extern const struct generic_mapping file_generic_mapping;
-#define SMB_ACE4_INT_MAGIC 0x76F8A967
-typedef struct _SMB_ACE4_INT_T
+struct SMB4ACE_T
{
- uint32 magic;
SMB_ACE4PROP_T prop;
- void *next;
-} SMB_ACE4_INT_T;
+ struct SMB4ACE_T *next;
+};
-#define SMB_ACL4_INT_MAGIC 0x29A3E792
-typedef struct _SMB_ACL4_INT_T
+struct SMB4ACL_T
{
- uint32 magic;
- uint32 naces;
- SMB_ACE4_INT_T *first;
- SMB_ACE4_INT_T *last;
-} SMB_ACL4_INT_T;
+ uint16_t controlflags;
+ uint32_t naces;
+ struct SMB4ACE_T *first;
+ struct SMB4ACE_T *last;
+};
+
+enum smbacl4_mode_enum {e_simple=0, e_special=1};
+enum smbacl4_acedup_enum {e_dontcare=0, e_reject=1, e_ignore=2, e_merge=3};
+
+struct smbacl4_vfs_params {
+ enum smbacl4_mode_enum mode;
+ bool do_chown;
+ enum smbacl4_acedup_enum acedup;
+ bool map_full_control;
+};
+
+/*
+ * Gather special parameters for NFS4 ACL handling
+ */
+static int smbacl4_get_vfs_params(
+ struct connection_struct *conn,
+ struct smbacl4_vfs_params *params
+)
+{
+ static const struct enum_list enum_smbacl4_modes[] = {
+ { e_simple, "simple" },
+ { e_special, "special" },
+ { -1 , NULL }
+ };
+ static const struct enum_list enum_smbacl4_acedups[] = {
+ { e_dontcare, "dontcare" },
+ { e_reject, "reject" },
+ { e_ignore, "ignore" },
+ { e_merge, "merge" },
+ { -1 , NULL }
+ };
+ int enumval;
+
+ ZERO_STRUCTP(params);
+
+ enumval = lp_parm_enum(SNUM(conn), SMBACL4_PARAM_TYPE_NAME, "mode",
+ enum_smbacl4_modes, e_simple);
+ if (enumval == -1) {
+ DEBUG(10, ("value for %s:mode unknown\n",
+ SMBACL4_PARAM_TYPE_NAME));
+ return -1;
+ }
+ params->mode = (enum smbacl4_mode_enum)enumval;
+
+ params->do_chown = lp_parm_bool(SNUM(conn), SMBACL4_PARAM_TYPE_NAME,
+ "chown", true);
+
+ enumval = lp_parm_enum(SNUM(conn), SMBACL4_PARAM_TYPE_NAME, "acedup",
+ enum_smbacl4_acedups, e_dontcare);
+ if (enumval == -1) {
+ DEBUG(10, ("value for %s:acedup unknown\n",
+ SMBACL4_PARAM_TYPE_NAME));
+ return -1;
+ }
+ params->acedup = (enum smbacl4_acedup_enum)enumval;
+
+ params->map_full_control = lp_acl_map_full_control(SNUM(conn));
+
+ DEBUG(10, ("mode:%s, do_chown:%s, acedup: %s map full control:%s\n",
+ enum_smbacl4_modes[params->mode].name,
+ params->do_chown ? "true" : "false",
+ enum_smbacl4_acedups[params->acedup].name,
+ params->map_full_control ? "true" : "false"));
+
+ return 0;
+}
/************************************************
Split the ACE flag mapping between nfs4 and Windows
are mapped to what in one place.
************************************************/
-static uint32_t map_nfs4_ace_flags_to_windows_ace_flags(uint32_t nfs4_ace_flags)
+static uint32_t map_nfs4_ace_flags_to_windows_ace_flags(
+ uint32_t nfs4_ace_flags)
{
uint32_t win_ace_flags = 0;
return nfs4_ace_flags;
}
-static SMB_ACL4_INT_T *get_validated_aclint(SMB4ACL_T *theacl)
+struct SMB4ACL_T *smb_create_smb4acl(TALLOC_CTX *mem_ctx)
{
- SMB_ACL4_INT_T *aclint = (SMB_ACL4_INT_T *)theacl;
- if (theacl==NULL)
- {
- DEBUG(2, ("acl is NULL\n"));
- errno = EINVAL;
- return NULL;
- }
- if (aclint->magic!=SMB_ACL4_INT_MAGIC)
- {
- DEBUG(2, ("aclint bad magic 0x%x\n", aclint->magic));
- errno = EINVAL;
- return NULL;
- }
- return aclint;
-}
-
-static SMB_ACE4_INT_T *get_validated_aceint(SMB4ACE_T *ace)
-{
- SMB_ACE4_INT_T *aceint = (SMB_ACE4_INT_T *)ace;
- if (ace==NULL)
- {
- DEBUG(2, ("ace is NULL\n"));
- errno = EINVAL;
- return NULL;
- }
- if (aceint->magic!=SMB_ACE4_INT_MAGIC)
- {
- DEBUG(2, ("aceint bad magic 0x%x\n", aceint->magic));
- errno = EINVAL;
- return NULL;
- }
- return aceint;
-}
+ struct SMB4ACL_T *theacl;
-SMB4ACL_T *smb_create_smb4acl(void)
-{
- TALLOC_CTX *mem_ctx = talloc_tos();
- SMB_ACL4_INT_T *theacl = (SMB_ACL4_INT_T *)TALLOC_ZERO_SIZE(mem_ctx, sizeof(SMB_ACL4_INT_T));
+ theacl = talloc_zero(mem_ctx, struct SMB4ACL_T);
if (theacl==NULL)
{
DEBUG(0, ("TALLOC_SIZE failed\n"));
errno = ENOMEM;
return NULL;
}
- theacl->magic = SMB_ACL4_INT_MAGIC;
+ theacl->controlflags = SEC_DESC_SELF_RELATIVE;
/* theacl->first, last = NULL not needed */
- return (SMB4ACL_T *)theacl;
+ return theacl;
}
-SMB4ACE_T *smb_add_ace4(SMB4ACL_T *theacl, SMB_ACE4PROP_T *prop)
+struct SMB4ACE_T *smb_add_ace4(struct SMB4ACL_T *acl, SMB_ACE4PROP_T *prop)
{
- SMB_ACL4_INT_T *aclint = get_validated_aclint(theacl);
- TALLOC_CTX *mem_ctx = talloc_tos();
- SMB_ACE4_INT_T *ace;
+ struct SMB4ACE_T *ace;
- ace = (SMB_ACE4_INT_T *)TALLOC_ZERO_SIZE(mem_ctx, sizeof(SMB_ACE4_INT_T));
+ ace = talloc_zero(acl, struct SMB4ACE_T);
if (ace==NULL)
{
DEBUG(0, ("TALLOC_SIZE failed\n"));
errno = ENOMEM;
return NULL;
}
- ace->magic = SMB_ACE4_INT_MAGIC;
/* ace->next = NULL not needed */
memcpy(&ace->prop, prop, sizeof(SMB_ACE4PROP_T));
- if (aclint->first==NULL)
+ if (acl->first==NULL)
{
- aclint->first = ace;
- aclint->last = ace;
+ acl->first = ace;
+ acl->last = ace;
} else {
- aclint->last->next = (void *)ace;
- aclint->last = ace;
+ acl->last->next = ace;
+ acl->last = ace;
}
- aclint->naces++;
+ acl->naces++;
- return (SMB4ACE_T *)ace;
+ return ace;
}
-SMB_ACE4PROP_T *smb_get_ace4(SMB4ACE_T *ace)
+SMB_ACE4PROP_T *smb_get_ace4(struct SMB4ACE_T *ace)
{
- SMB_ACE4_INT_T *aceint = get_validated_aceint(ace);
- if (aceint==NULL)
+ if (ace == NULL) {
return NULL;
+ }
- return &aceint->prop;
+ return &ace->prop;
}
-SMB4ACE_T *smb_next_ace4(SMB4ACE_T *ace)
+struct SMB4ACE_T *smb_next_ace4(struct SMB4ACE_T *ace)
{
- SMB_ACE4_INT_T *aceint = get_validated_aceint(ace);
- if (aceint==NULL)
+ if (ace == NULL) {
return NULL;
+ }
- return (SMB4ACE_T *)aceint->next;
+ return ace->next;
}
-SMB4ACE_T *smb_first_ace4(SMB4ACL_T *theacl)
+struct SMB4ACE_T *smb_first_ace4(struct SMB4ACL_T *acl)
{
- SMB_ACL4_INT_T *aclint = get_validated_aclint(theacl);
- if (aclint==NULL)
+ if (acl == NULL) {
return NULL;
+ }
+
+ return acl->first;
+}
- return (SMB4ACE_T *)aclint->first;
+uint32_t smb_get_naces(struct SMB4ACL_T *acl)
+{
+ if (acl == NULL) {
+ return 0;
+ }
+
+ return acl->naces;
}
-uint32 smb_get_naces(SMB4ACL_T *theacl)
+uint16_t smbacl4_get_controlflags(struct SMB4ACL_T *acl)
{
- SMB_ACL4_INT_T *aclint = get_validated_aclint(theacl);
- if (aclint==NULL)
+ if (acl == NULL) {
return 0;
+ }
- return aclint->naces;
+ return acl->controlflags;
+}
+
+bool smbacl4_set_controlflags(struct SMB4ACL_T *acl, uint16_t controlflags)
+{
+ if (acl == NULL) {
+ return false;
+ }
+
+ acl->controlflags = controlflags;
+ return true;
}
static int smbacl4_GetFileOwner(struct connection_struct *conn,
- const char *filename,
+ const struct smb_filename *smb_fname,
SMB_STRUCT_STAT *psbuf)
{
- memset(psbuf, 0, sizeof(SMB_STRUCT_STAT));
+ ZERO_STRUCTP(psbuf);
/* Get the stat struct for the owner info. */
- if (vfs_stat_smb_fname(conn, filename, psbuf) != 0)
+ if (vfs_stat_smb_basename(conn, smb_fname, psbuf) != 0)
{
- DEBUG(8, ("vfs_stat_smb_fname failed with error %s\n",
+ DEBUG(8, ("vfs_stat_smb_basename failed with error %s\n",
strerror(errno)));
return -1;
}
static int smbacl4_fGetFileOwner(files_struct *fsp, SMB_STRUCT_STAT *psbuf)
{
- memset(psbuf, 0, sizeof(SMB_STRUCT_STAT));
+ ZERO_STRUCTP(psbuf);
if (fsp->fh->fd == -1) {
return smbacl4_GetFileOwner(fsp->conn,
- fsp->fsp_name->base_name, psbuf);
+ fsp->fsp_name, psbuf);
}
if (SMB_VFS_FSTAT(fsp, psbuf) != 0)
{
return 0;
}
-static bool smbacl4_nfs42win(TALLOC_CTX *mem_ctx, SMB4ACL_T *theacl, /* in */
+static bool smbacl4_nfs42win(TALLOC_CTX *mem_ctx,
+ const struct smbacl4_vfs_params *params,
+ struct SMB4ACL_T *acl, /* in */
struct dom_sid *psid_owner, /* in */
struct dom_sid *psid_group, /* in */
bool is_directory, /* in */
int *pgood_aces /* out */
)
{
- SMB_ACL4_INT_T *aclint = (SMB_ACL4_INT_T *)theacl;
- SMB_ACE4_INT_T *aceint;
+ struct SMB4ACE_T *aceint;
struct security_ace *nt_ace_list = NULL;
int good_aces = 0;
- DEBUG(10, ("smbacl_nfs42win entered\n"));
+ DEBUG(10, ("%s entered\n", __func__));
- aclint = get_validated_aclint(theacl);
- /* We do not check for naces being 0 or theacl being NULL here because it is done upstream */
- /* in smb_get_nt_acl_nfs4(). */
- nt_ace_list = (struct security_ace *)TALLOC_ZERO_SIZE(mem_ctx, aclint->naces * sizeof(struct security_ace));
+ nt_ace_list = talloc_zero_array(mem_ctx, struct security_ace,
+ 2 * acl->naces);
if (nt_ace_list==NULL)
{
- DEBUG(10, ("talloc error"));
+ DEBUG(10, ("talloc error with %d aces", acl->naces));
errno = ENOMEM;
- return False;
+ return false;
}
- for (aceint=aclint->first; aceint!=NULL; aceint=(SMB_ACE4_INT_T *)aceint->next) {
+ for (aceint = acl->first; aceint != NULL; aceint = aceint->next) {
uint32_t mask;
struct dom_sid sid;
SMB_ACE4PROP_T *ace = &aceint->prop;
uint32_t win_ace_flags;
- DEBUG(10, ("magic: 0x%x, type: %d, iflags: %x, flags: %x, mask: %x, "
- "who: %d\n", aceint->magic, ace->aceType, ace->flags,
- ace->aceFlags, ace->aceMask, ace->who.id));
-
- SMB_ASSERT(aceint->magic==SMB_ACE4_INT_MAGIC);
+ DEBUG(10, ("type: %d, iflags: %x, flags: %x, "
+ "mask: %x, who: %d\n",
+ ace->aceType, ace->flags,
+ ace->aceFlags, ace->aceMask, ace->who.id));
if (ace->flags & SMB_ACE4_ID_SPECIAL) {
switch (ace->who.special_id) {
default:
DEBUG(8, ("invalid special who id %d "
"ignored\n", ace->who.special_id));
+ continue;
}
} else {
if (ace->aceFlags & SMB_ACE4_IDENTIFIER_GROUP) {
ace->aceMask |= SMB_ACE4_DELETE_CHILD;
}
- win_ace_flags = map_nfs4_ace_flags_to_windows_ace_flags(ace->aceFlags);
- if (!is_directory && (win_ace_flags & (SEC_ACE_FLAG_OBJECT_INHERIT|SEC_ACE_FLAG_CONTAINER_INHERIT))) {
+ if (!is_directory && params->map_full_control) {
+ /*
+ * Do we have all access except DELETE_CHILD
+ * (not caring about the delete bit).
+ */
+ uint32_t test_mask = ((ace->aceMask|SMB_ACE4_DELETE|SMB_ACE4_DELETE_CHILD) &
+ SMB_ACE4_ALL_MASKS);
+ if (test_mask == SMB_ACE4_ALL_MASKS) {
+ ace->aceMask |= SMB_ACE4_DELETE_CHILD;
+ }
+ }
+
+ win_ace_flags = map_nfs4_ace_flags_to_windows_ace_flags(
+ ace->aceFlags);
+ if (!is_directory &&
+ (win_ace_flags & (SEC_ACE_FLAG_OBJECT_INHERIT|
+ SEC_ACE_FLAG_CONTAINER_INHERIT))) {
/*
* GPFS sets inherits dir_inhert and file_inherit flags
* to files, too, which confuses windows, and seems to
* be wrong anyways. ==> Map these bits away for files.
*/
DEBUG(10, ("removing inherit flags from nfs4 ace\n"));
- win_ace_flags &= ~(SEC_ACE_FLAG_OBJECT_INHERIT|SEC_ACE_FLAG_CONTAINER_INHERIT);
+ win_ace_flags &= ~(SEC_ACE_FLAG_OBJECT_INHERIT|
+ SEC_ACE_FLAG_CONTAINER_INHERIT);
}
DEBUG(10, ("Windows mapped ace flags: 0x%x => 0x%x\n",
ace->aceFlags, win_ace_flags));
+ mask = ace->aceMask;
/* Windows clients expect SYNC on acls to
correctly allow rename. See bug #7909. */
- mask = ace->aceMask | SMB_ACE4_SYNCHRONIZE;
- init_sec_ace(&nt_ace_list[good_aces++], &sid,
- ace->aceType, mask,
- win_ace_flags);
+ /* But not on DENY ace entries. See
+ bug #8442. */
+ if(ace->aceType == SMB_ACE4_ACCESS_ALLOWED_ACE_TYPE) {
+ mask = ace->aceMask | SMB_ACE4_SYNCHRONIZE;
+ }
+
+ /* Mapping of owner@ and group@ to creator owner and
+ creator group. Keep old behavior in mode special. */
+ if (params->mode != e_special &&
+ ace->flags & SMB_ACE4_ID_SPECIAL &&
+ (ace->who.special_id == SMB_ACE4_WHO_OWNER ||
+ ace->who.special_id == SMB_ACE4_WHO_GROUP)) {
+ DEBUG(10, ("Map special entry\n"));
+ if (!(win_ace_flags & SEC_ACE_FLAG_INHERIT_ONLY)) {
+ uint32_t win_ace_flags_current;
+ DEBUG(10, ("Map current sid\n"));
+ win_ace_flags_current = win_ace_flags &
+ ~(SEC_ACE_FLAG_OBJECT_INHERIT |
+ SEC_ACE_FLAG_CONTAINER_INHERIT);
+ init_sec_ace(&nt_ace_list[good_aces++], &sid,
+ ace->aceType, mask,
+ win_ace_flags_current);
+ }
+ if (ace->who.special_id == SMB_ACE4_WHO_OWNER &&
+ win_ace_flags & (SEC_ACE_FLAG_OBJECT_INHERIT |
+ SEC_ACE_FLAG_CONTAINER_INHERIT)) {
+ uint32_t win_ace_flags_creator;
+ DEBUG(10, ("Map creator owner\n"));
+ win_ace_flags_creator = win_ace_flags |
+ SMB_ACE4_INHERIT_ONLY_ACE;
+ init_sec_ace(&nt_ace_list[good_aces++],
+ &global_sid_Creator_Owner,
+ ace->aceType, mask,
+ win_ace_flags_creator);
+ }
+ if (ace->who.special_id == SMB_ACE4_WHO_GROUP &&
+ win_ace_flags & (SEC_ACE_FLAG_OBJECT_INHERIT |
+ SEC_ACE_FLAG_CONTAINER_INHERIT)) {
+ uint32_t win_ace_flags_creator;
+ DEBUG(10, ("Map creator owner group\n"));
+ win_ace_flags_creator = win_ace_flags |
+ SMB_ACE4_INHERIT_ONLY_ACE;
+ init_sec_ace(&nt_ace_list[good_aces++],
+ &global_sid_Creator_Group,
+ ace->aceType, mask,
+ win_ace_flags_creator);
+ }
+ } else {
+ DEBUG(10, ("Map normal sid\n"));
+ init_sec_ace(&nt_ace_list[good_aces++], &sid,
+ ace->aceType, mask,
+ win_ace_flags);
+ }
+ }
+
+ nt_ace_list = talloc_realloc(mem_ctx, nt_ace_list, struct security_ace,
+ good_aces);
+
+ /* returns a NULL ace list when good_aces is zero. */
+ if (good_aces && nt_ace_list == NULL) {
+ DEBUG(10, ("realloc error with %d aces", good_aces));
+ errno = ENOMEM;
+ return false;
}
*ppnt_ace_list = nt_ace_list;
*pgood_aces = good_aces;
- return True;
+ return true;
}
static NTSTATUS smb_get_nt_acl_nfs4_common(const SMB_STRUCT_STAT *sbuf,
- uint32 security_info,
- struct security_descriptor **ppdesc, SMB4ACL_T *theacl)
+ const struct smbacl4_vfs_params *params,
+ uint32_t security_info,
+ TALLOC_CTX *mem_ctx,
+ struct security_descriptor **ppdesc,
+ struct SMB4ACL_T *theacl)
{
- int good_aces = 0;
+ int good_aces = 0;
struct dom_sid sid_owner, sid_group;
size_t sd_size = 0;
struct security_ace *nt_ace_list = NULL;
struct security_acl *psa = NULL;
- TALLOC_CTX *mem_ctx = talloc_tos();
+ TALLOC_CTX *frame = talloc_stackframe();
+ bool ok;
- if (theacl==NULL || smb_get_naces(theacl)==0)
+ if (theacl==NULL) {
+ TALLOC_FREE(frame);
return NT_STATUS_ACCESS_DENIED; /* special because we
- * shouldn't alloc 0 for
- * win */
+ * need to think through
+ * the null case.*/
+ }
uid_to_sid(&sid_owner, sbuf->st_ex_uid);
gid_to_sid(&sid_group, sbuf->st_ex_gid);
- if (smbacl4_nfs42win(mem_ctx, theacl, &sid_owner, &sid_group,
- S_ISDIR(sbuf->st_ex_mode),
- &nt_ace_list, &good_aces)==False) {
+ ok = smbacl4_nfs42win(frame, params, theacl, &sid_owner, &sid_group,
+ S_ISDIR(sbuf->st_ex_mode),
+ &nt_ace_list, &good_aces);
+ if (!ok) {
DEBUG(8,("smbacl4_nfs42win failed\n"));
+ TALLOC_FREE(frame);
return map_nt_error_from_unix(errno);
}
- psa = make_sec_acl(mem_ctx, NT4_ACL_REVISION, good_aces, nt_ace_list);
+ psa = make_sec_acl(frame, NT4_ACL_REVISION, good_aces, nt_ace_list);
if (psa == NULL) {
DEBUG(2,("make_sec_acl failed\n"));
+ TALLOC_FREE(frame);
return NT_STATUS_NO_MEMORY;
}
DEBUG(10,("after make sec_acl\n"));
- *ppdesc = make_sec_desc(mem_ctx, SD_REVISION, SEC_DESC_SELF_RELATIVE,
- (security_info & SECINFO_OWNER) ? &sid_owner : NULL,
- (security_info & SECINFO_GROUP) ? &sid_group : NULL,
- NULL, psa, &sd_size);
+ *ppdesc = make_sec_desc(
+ mem_ctx, SD_REVISION, smbacl4_get_controlflags(theacl),
+ (security_info & SECINFO_OWNER) ? &sid_owner : NULL,
+ (security_info & SECINFO_GROUP) ? &sid_group : NULL,
+ NULL, psa, &sd_size);
if (*ppdesc==NULL) {
DEBUG(2,("make_sec_desc failed\n"));
+ TALLOC_FREE(frame);
return NT_STATUS_NO_MEMORY;
}
- DEBUG(10, ("smb_get_nt_acl_nfs4_common successfully exited with sd_size %d\n",
+ DEBUG(10, ("smb_get_nt_acl_nfs4_common successfully exited with "
+ "sd_size %d\n",
(int)ndr_size_security_descriptor(*ppdesc, 0)));
+ TALLOC_FREE(frame);
return NT_STATUS_OK;
}
NTSTATUS smb_fget_nt_acl_nfs4(files_struct *fsp,
- uint32 security_info,
- struct security_descriptor **ppdesc, SMB4ACL_T *theacl)
+ uint32_t security_info,
+ TALLOC_CTX *mem_ctx,
+ struct security_descriptor **ppdesc,
+ struct SMB4ACL_T *theacl)
{
SMB_STRUCT_STAT sbuf;
+ struct smbacl4_vfs_params params;
DEBUG(10, ("smb_fget_nt_acl_nfs4 invoked for %s\n", fsp_str_dbg(fsp)));
return map_nt_error_from_unix(errno);
}
- return smb_get_nt_acl_nfs4_common(&sbuf, security_info, ppdesc, theacl);
+ /* Special behaviours */
+ if (smbacl4_get_vfs_params(fsp->conn, ¶ms)) {
+ return NT_STATUS_NO_MEMORY;
+ }
+
+ return smb_get_nt_acl_nfs4_common(&sbuf, ¶ms, security_info,
+ mem_ctx, ppdesc, theacl);
}
NTSTATUS smb_get_nt_acl_nfs4(struct connection_struct *conn,
- const char *name,
- uint32 security_info,
- struct security_descriptor **ppdesc, SMB4ACL_T *theacl)
+ const struct smb_filename *smb_fname,
+ uint32_t security_info,
+ TALLOC_CTX *mem_ctx,
+ struct security_descriptor **ppdesc,
+ struct SMB4ACL_T *theacl)
{
SMB_STRUCT_STAT sbuf;
+ struct smbacl4_vfs_params params;
- DEBUG(10, ("smb_get_nt_acl_nfs4 invoked for %s\n", name));
+ DEBUG(10, ("smb_get_nt_acl_nfs4 invoked for %s\n",
+ smb_fname->base_name));
- if (smbacl4_GetFileOwner(conn, name, &sbuf)) {
+ if (smbacl4_GetFileOwner(conn, smb_fname, &sbuf)) {
return map_nt_error_from_unix(errno);
}
- return smb_get_nt_acl_nfs4_common(&sbuf, security_info, ppdesc, theacl);
-}
-
-enum smbacl4_mode_enum {e_simple=0, e_special=1};
-enum smbacl4_acedup_enum {e_dontcare=0, e_reject=1, e_ignore=2, e_merge=3};
-
-typedef struct _smbacl4_vfs_params {
- enum smbacl4_mode_enum mode;
- bool do_chown;
- enum smbacl4_acedup_enum acedup;
- struct db_context *sid_mapping_table;
-} smbacl4_vfs_params;
-
-/*
- * Gather special parameters for NFS4 ACL handling
- */
-static int smbacl4_get_vfs_params(
- const char *type_name,
- files_struct *fsp,
- smbacl4_vfs_params *params
-)
-{
- static const struct enum_list enum_smbacl4_modes[] = {
- { e_simple, "simple" },
- { e_special, "special" },
- { -1 , NULL }
- };
- static const struct enum_list enum_smbacl4_acedups[] = {
- { e_dontcare, "dontcare" },
- { e_reject, "reject" },
- { e_ignore, "ignore" },
- { e_merge, "merge" },
- { -1 , NULL }
- };
-
- memset(params, 0, sizeof(smbacl4_vfs_params));
- params->mode = (enum smbacl4_mode_enum)lp_parm_enum(
- SNUM(fsp->conn), type_name,
- "mode", enum_smbacl4_modes, e_simple);
- params->do_chown = lp_parm_bool(SNUM(fsp->conn), type_name,
- "chown", True);
- params->acedup = (enum smbacl4_acedup_enum)lp_parm_enum(
- SNUM(fsp->conn), type_name,
- "acedup", enum_smbacl4_acedups, e_dontcare);
-
- DEBUG(10, ("mode:%s, do_chown:%s, acedup: %s\n",
- enum_smbacl4_modes[params->mode].name,
- params->do_chown ? "true" : "false",
- enum_smbacl4_acedups[params->acedup].name));
+ /* Special behaviours */
+ if (smbacl4_get_vfs_params(conn, ¶ms)) {
+ return NT_STATUS_NO_MEMORY;
+ }
- return 0;
+ return smb_get_nt_acl_nfs4_common(&sbuf, ¶ms, security_info,
+ mem_ctx, ppdesc, theacl);
}
-static void smbacl4_dump_nfs4acl(int level, SMB4ACL_T *theacl)
+static void smbacl4_dump_nfs4acl(int level, struct SMB4ACL_T *acl)
{
- SMB_ACL4_INT_T *aclint = get_validated_aclint(theacl);
- SMB_ACE4_INT_T *aceint;
+ struct SMB4ACE_T *aceint;
- DEBUG(level, ("NFS4ACL: size=%d\n", aclint->naces));
+ DEBUG(level, ("NFS4ACL: size=%d\n", acl->naces));
- for(aceint = aclint->first; aceint!=NULL; aceint=(SMB_ACE4_INT_T *)aceint->next) {
+ for (aceint = acl->first; aceint != NULL; aceint = aceint->next) {
SMB_ACE4PROP_T *ace = &aceint->prop;
- DEBUG(level, ("\tACE: type=%d, flags=0x%x, fflags=0x%x, mask=0x%x, id=%d\n",
- ace->aceType,
- ace->aceFlags, ace->flags,
- ace->aceMask,
- ace->who.id));
+ DEBUG(level, ("\tACE: type=%d, flags=0x%x, fflags=0x%x, "
+ "mask=0x%x, id=%d\n",
+ ace->aceType,
+ ace->aceFlags, ace->flags,
+ ace->aceMask,
+ ace->who.id));
}
}
-/*
+/*
* Find 2 NFS4 who-special ACE property (non-copy!!!)
* match nonzero if "special" and who is equal
* return ace if found matching; otherwise NULL
*/
static SMB_ACE4PROP_T *smbacl4_find_equal_special(
- SMB4ACL_T *theacl,
+ struct SMB4ACL_T *acl,
SMB_ACE4PROP_T *aceNew)
{
- SMB_ACL4_INT_T *aclint = get_validated_aclint(theacl);
- SMB_ACE4_INT_T *aceint;
+ struct SMB4ACE_T *aceint;
- for(aceint = aclint->first; aceint!=NULL; aceint=(SMB_ACE4_INT_T *)aceint->next) {
+ for (aceint = acl->first; aceint != NULL; aceint = aceint->next) {
SMB_ACE4PROP_T *ace = &aceint->prop;
- DEBUG(10,("ace type:0x%x flags:0x%x aceFlags:0x%x "
+ DEBUG(10,("ace type:0x%x flags:0x%x aceFlags:0x%x "
"new type:0x%x flags:0x%x aceFlags:0x%x\n",
ace->aceType, ace->flags, ace->aceFlags,
aceNew->aceType, aceNew->flags,aceNew->aceFlags));
if (ace->flags == aceNew->flags &&
ace->aceType==aceNew->aceType &&
- ace->aceFlags==aceNew->aceFlags &&
- (ace->aceFlags&SMB_ACE4_IDENTIFIER_GROUP)==
- (aceNew->aceFlags&SMB_ACE4_IDENTIFIER_GROUP)
- ) {
+ ace->aceFlags==aceNew->aceFlags)
+ {
/* keep type safety; e.g. gid is an u.short */
if (ace->flags & SMB_ACE4_ID_SPECIAL)
{
- if (ace->who.special_id==aceNew->who.special_id)
+ if (ace->who.special_id ==
+ aceNew->who.special_id)
return ace;
} else {
if (ace->aceFlags & SMB_ACE4_IDENTIFIER_GROUP)
return NULL;
}
-static bool nfs4_map_sid(smbacl4_vfs_params *params, const struct dom_sid *src,
- struct dom_sid *dst)
-{
- static struct db_context *mapping_db = NULL;
- TDB_DATA data;
-
- if (mapping_db == NULL) {
- const char *dbname = lp_parm_const_string(
- -1, SMBACL4_PARAM_TYPE_NAME, "sidmap", NULL);
-
- if (dbname == NULL) {
- DEBUG(10, ("%s:sidmap not defined\n",
- SMBACL4_PARAM_TYPE_NAME));
- return False;
- }
-
- become_root();
- mapping_db = db_open(NULL, dbname, 0, TDB_DEFAULT,
- O_RDONLY, 0600);
- unbecome_root();
-
- if (mapping_db == NULL) {
- DEBUG(1, ("could not open sidmap: %s\n",
- strerror(errno)));
- return False;
- }
- }
-
- if (mapping_db->fetch(mapping_db, NULL,
- string_term_tdb_data(sid_string_tos(src)),
- &data) != 0) {
- DEBUG(10, ("could not find mapping for SID %s\n",
- sid_string_dbg(src)));
- return False;
- }
-
- if ((data.dptr == NULL) || (data.dsize <= 0)
- || (data.dptr[data.dsize-1] != '\0')) {
- DEBUG(5, ("invalid mapping for SID %s\n",
- sid_string_dbg(src)));
- TALLOC_FREE(data.dptr);
- return False;
- }
-
- if (!string_to_sid(dst, (char *)data.dptr)) {
- DEBUG(1, ("invalid mapping %s for SID %s\n",
- (char *)data.dptr, sid_string_dbg(src)));
- TALLOC_FREE(data.dptr);
- return False;
- }
-
- TALLOC_FREE(data.dptr);
-
- return True;
-}
static bool smbacl4_fill_ace4(
- TALLOC_CTX *mem_ctx,
- const char *filename,
- smbacl4_vfs_params *params,
+ const struct smb_filename *filename,
+ const struct smbacl4_vfs_params *params,
uid_t ownerUID,
gid_t ownerGID,
const struct security_ace *ace_nt, /* input */
{
DEBUG(10, ("got ace for %s\n", sid_string_dbg(&ace_nt->trustee)));
- memset(ace_v4, 0, sizeof(SMB_ACE4PROP_T));
- ace_v4->aceType = ace_nt->type; /* only ACCESS|DENY supported right now */
- ace_v4->aceFlags = map_windows_ace_flags_to_nfs4_ace_flags(ace_nt->flags);
+ ZERO_STRUCTP(ace_v4);
+
+ /* only ACCESS|DENY supported right now */
+ ace_v4->aceType = ace_nt->type;
+
+ ace_v4->aceFlags = map_windows_ace_flags_to_nfs4_ace_flags(
+ ace_nt->flags);
+
+ /* remove inheritance flags on files */
+ if (VALID_STAT(filename->st) &&
+ !S_ISDIR(filename->st.st_ex_mode)) {
+ DEBUG(10, ("Removing inheritance flags from a file\n"));
+ ace_v4->aceFlags &= ~(SMB_ACE4_FILE_INHERIT_ACE|
+ SMB_ACE4_DIRECTORY_INHERIT_ACE|
+ SMB_ACE4_NO_PROPAGATE_INHERIT_ACE|
+ SMB_ACE4_INHERIT_ONLY_ACE);
+ }
+
ace_v4->aceMask = ace_nt->access_mask &
(SEC_STD_ALL | SEC_FILE_ALL);
if (dom_sid_equal(&ace_nt->trustee, &global_sid_World)) {
ace_v4->who.special_id = SMB_ACE4_WHO_EVERYONE;
ace_v4->flags |= SMB_ACE4_ID_SPECIAL;
+ } else if (params->mode!=e_special &&
+ dom_sid_equal(&ace_nt->trustee,
+ &global_sid_Creator_Owner)) {
+ DEBUG(10, ("Map creator owner\n"));
+ ace_v4->who.special_id = SMB_ACE4_WHO_OWNER;
+ ace_v4->flags |= SMB_ACE4_ID_SPECIAL;
+ /* A non inheriting creator owner entry has no effect. */
+ ace_v4->aceFlags |= SMB_ACE4_INHERIT_ONLY_ACE;
+ if (!(ace_v4->aceFlags & SMB_ACE4_DIRECTORY_INHERIT_ACE)
+ && !(ace_v4->aceFlags & SMB_ACE4_FILE_INHERIT_ACE)) {
+ return false;
+ }
+ } else if (params->mode!=e_special &&
+ dom_sid_equal(&ace_nt->trustee,
+ &global_sid_Creator_Group)) {
+ DEBUG(10, ("Map creator owner group\n"));
+ ace_v4->who.special_id = SMB_ACE4_WHO_GROUP;
+ ace_v4->flags |= SMB_ACE4_ID_SPECIAL;
+ /* A non inheriting creator group entry has no effect. */
+ ace_v4->aceFlags |= SMB_ACE4_INHERIT_ONLY_ACE;
+ if (!(ace_v4->aceFlags & SMB_ACE4_DIRECTORY_INHERIT_ACE)
+ && !(ace_v4->aceFlags & SMB_ACE4_FILE_INHERIT_ACE)) {
+ return false;
+ }
} else {
- const char *dom, *name;
- enum lsa_SidType type;
uid_t uid;
gid_t gid;
- struct dom_sid sid;
-
- sid_copy(&sid, &ace_nt->trustee);
-
- if (!lookup_sid(mem_ctx, &sid, &dom, &name, &type)) {
-
- struct dom_sid mapped;
-
- if (!nfs4_map_sid(params, &sid, &mapped)) {
- DEBUG(1, ("nfs4_acls.c: file [%s]: SID %s "
- "unknown\n", filename, sid_string_dbg(&sid)));
- errno = EINVAL;
- return False;
- }
-
- DEBUG(2, ("nfs4_acls.c: file [%s]: mapped SID %s "
- "to %s\n", filename, sid_string_dbg(&sid), sid_string_dbg(&mapped)));
-
- if (!lookup_sid(mem_ctx, &mapped, &dom,
- &name, &type)) {
- DEBUG(1, ("nfs4_acls.c: file [%s]: SID %s "
- "mapped from %s is unknown\n",
- filename, sid_string_dbg(&mapped), sid_string_dbg(&sid)));
- errno = EINVAL;
- return False;
- }
-
- sid_copy(&sid, &mapped);
- }
-
- if (type == SID_NAME_USER) {
- if (!sid_to_uid(&sid, &uid)) {
- DEBUG(1, ("nfs4_acls.c: file [%s]: could not "
- "convert %s to uid\n", filename,
- sid_string_dbg(&sid)));
- return False;
- }
- if (params->mode==e_special && uid==ownerUID) {
- ace_v4->flags |= SMB_ACE4_ID_SPECIAL;
- ace_v4->who.special_id = SMB_ACE4_WHO_OWNER;
- } else {
- ace_v4->who.uid = uid;
- }
- } else { /* else group? - TODO check it... */
- if (!sid_to_gid(&sid, &gid)) {
- DEBUG(1, ("nfs4_acls.c: file [%s]: could not "
- "convert %s to gid\n", filename,
- sid_string_dbg(&sid)));
- return False;
- }
-
+ if (sid_to_gid(&ace_nt->trustee, &gid)) {
ace_v4->aceFlags |= SMB_ACE4_IDENTIFIER_GROUP;
-
- if (params->mode==e_special && gid==ownerGID) {
- ace_v4->flags |= SMB_ACE4_ID_SPECIAL;
- ace_v4->who.special_id = SMB_ACE4_WHO_GROUP;
- } else {
- ace_v4->who.gid = gid;
- }
+ ace_v4->who.gid = gid;
+ } else if (sid_to_uid(&ace_nt->trustee, &uid)) {
+ ace_v4->who.uid = uid;
+ } else if (dom_sid_compare_domain(&ace_nt->trustee,
+ &global_sid_Unix_NFS) == 0) {
+ return false;
+ } else {
+ DEBUG(1, ("nfs4_acls.c: file [%s]: could not "
+ "convert %s to uid or gid\n",
+ filename->base_name,
+ sid_string_dbg(&ace_nt->trustee)));
+ return false;
}
}
- return True; /* OK */
+ return true; /* OK */
}
static int smbacl4_MergeIgnoreReject(
enum smbacl4_acedup_enum acedup,
- SMB4ACL_T *theacl, /* may modify it */
+ struct SMB4ACL_T *theacl, /* may modify it */
SMB_ACE4PROP_T *ace, /* the "new" ACE */
bool *paddNewACE,
int i
switch(acedup)
{
case e_merge: /* "merge" flags */
- *paddNewACE = False;
+ *paddNewACE = false;
ace4found->aceFlags |= ace->aceFlags;
ace4found->aceMask |= ace->aceMask;
break;
case e_ignore: /* leave out this record */
- *paddNewACE = False;
+ *paddNewACE = false;
break;
case e_reject: /* do an error */
DEBUG(8, ("ACL rejected by duplicate nt ace#%d\n", i));
return result;
}
-static SMB4ACL_T *smbacl4_win2nfs4(
- const char *filename,
+static int smbacl4_substitute_special(
+ struct SMB4ACL_T *acl,
+ uid_t ownerUID,
+ gid_t ownerGID
+)
+{
+ struct SMB4ACE_T *aceint;
+
+ for (aceint = acl->first; aceint != NULL; aceint = aceint->next) {
+ SMB_ACE4PROP_T *ace = &aceint->prop;
+
+ DEBUG(10,("ace type: %d, iflags: %x, flags: %x, "
+ "mask: %x, who: %d\n",
+ ace->aceType, ace->flags, ace->aceFlags,
+ ace->aceMask, ace->who.id));
+
+ if (!(ace->flags & SMB_ACE4_ID_SPECIAL) &&
+ !(ace->aceFlags & SMB_ACE4_IDENTIFIER_GROUP) &&
+ ace->who.uid == ownerUID) {
+ ace->flags |= SMB_ACE4_ID_SPECIAL;
+ ace->who.special_id = SMB_ACE4_WHO_OWNER;
+ DEBUG(10,("replaced with special owner ace\n"));
+ }
+
+ if (!(ace->flags & SMB_ACE4_ID_SPECIAL) &&
+ ace->aceFlags & SMB_ACE4_IDENTIFIER_GROUP &&
+ ace->who.uid == ownerGID) {
+ ace->flags |= SMB_ACE4_ID_SPECIAL;
+ ace->who.special_id = SMB_ACE4_WHO_GROUP;
+ DEBUG(10,("replaced with special group ace\n"));
+ }
+ }
+ return true; /* OK */
+}
+
+static int smbacl4_substitute_simple(
+ struct SMB4ACL_T *acl,
+ uid_t ownerUID,
+ gid_t ownerGID
+)
+{
+ struct SMB4ACE_T *aceint;
+
+ for (aceint = acl->first; aceint != NULL; aceint = aceint->next) {
+ SMB_ACE4PROP_T *ace = &aceint->prop;
+
+ DEBUG(10,("ace type: %d, iflags: %x, flags: %x, "
+ "mask: %x, who: %d\n",
+ ace->aceType, ace->flags, ace->aceFlags,
+ ace->aceMask, ace->who.id));
+
+ if (!(ace->flags & SMB_ACE4_ID_SPECIAL) &&
+ !(ace->aceFlags & SMB_ACE4_IDENTIFIER_GROUP) &&
+ ace->who.uid == ownerUID &&
+ !(ace->aceFlags & SMB_ACE4_INHERIT_ONLY_ACE) &&
+ !(ace->aceFlags & SMB_ACE4_FILE_INHERIT_ACE) &&
+ !(ace->aceFlags & SMB_ACE4_DIRECTORY_INHERIT_ACE)) {
+ ace->flags |= SMB_ACE4_ID_SPECIAL;
+ ace->who.special_id = SMB_ACE4_WHO_OWNER;
+ DEBUG(10,("replaced with special owner ace\n"));
+ }
+
+ if (!(ace->flags & SMB_ACE4_ID_SPECIAL) &&
+ ace->aceFlags & SMB_ACE4_IDENTIFIER_GROUP &&
+ ace->who.uid == ownerGID &&
+ !(ace->aceFlags & SMB_ACE4_INHERIT_ONLY_ACE) &&
+ !(ace->aceFlags & SMB_ACE4_FILE_INHERIT_ACE) &&
+ !(ace->aceFlags & SMB_ACE4_DIRECTORY_INHERIT_ACE)) {
+ ace->flags |= SMB_ACE4_ID_SPECIAL;
+ ace->who.special_id = SMB_ACE4_WHO_GROUP;
+ DEBUG(10,("replaced with special group ace\n"));
+ }
+ }
+ return true; /* OK */
+}
+
+static struct SMB4ACL_T *smbacl4_win2nfs4(
+ TALLOC_CTX *mem_ctx,
+ const files_struct *fsp,
const struct security_acl *dacl,
- smbacl4_vfs_params *pparams,
+ const struct smbacl4_vfs_params *pparams,
uid_t ownerUID,
gid_t ownerGID
)
{
- SMB4ACL_T *theacl;
- uint32 i;
- TALLOC_CTX *mem_ctx = talloc_tos();
+ struct SMB4ACL_T *theacl;
+ uint32_t i;
+ const char *filename = fsp->fsp_name->base_name;
DEBUG(10, ("smbacl4_win2nfs4 invoked\n"));
- theacl = smb_create_smb4acl();
+ theacl = smb_create_smb4acl(mem_ctx);
if (theacl==NULL)
return NULL;
for(i=0; i<dacl->num_aces; i++) {
SMB_ACE4PROP_T ace_v4;
- bool addNewACE = True;
+ bool addNewACE = true;
- if (!smbacl4_fill_ace4(mem_ctx, filename, pparams,
+ if (!smbacl4_fill_ace4(fsp->fsp_name, pparams,
ownerUID, ownerGID,
dacl->aces + i, &ace_v4)) {
DEBUG(3, ("Could not fill ace for file %s, SID %s\n",
smb_add_ace4(theacl, &ace_v4);
}
+ if (pparams->mode==e_simple) {
+ smbacl4_substitute_simple(theacl, ownerUID, ownerGID);
+ }
+
+ if (pparams->mode==e_special) {
+ smbacl4_substitute_special(theacl, ownerUID, ownerGID);
+ }
+
return theacl;
}
-NTSTATUS smb_set_nt_acl_nfs4(files_struct *fsp,
- uint32 security_info_sent,
+NTSTATUS smb_set_nt_acl_nfs4(vfs_handle_struct *handle, files_struct *fsp,
+ uint32_t security_info_sent,
const struct security_descriptor *psd,
set_nfs4acl_native_fn_t set_nfs4_native)
{
- smbacl4_vfs_params params;
- SMB4ACL_T *theacl = NULL;
+ struct smbacl4_vfs_params params;
+ struct SMB4ACL_T *theacl = NULL;
bool result;
SMB_STRUCT_STAT sbuf;
uid_t newUID = (uid_t)-1;
gid_t newGID = (gid_t)-1;
int saved_errno;
+ TALLOC_CTX *frame = talloc_stackframe();
DEBUG(10, ("smb_set_nt_acl_nfs4 invoked for %s\n", fsp_str_dbg(fsp)));
{
DEBUG(9, ("security_info_sent (0x%x) ignored\n",
security_info_sent));
- return NT_STATUS_OK; /* won't show error - later to be refined... */
+ TALLOC_FREE(frame);
+ return NT_STATUS_OK; /* won't show error - later to be
+ * refined... */
}
/* Special behaviours */
- if (smbacl4_get_vfs_params(SMBACL4_PARAM_TYPE_NAME, fsp, ¶ms))
+ if (smbacl4_get_vfs_params(fsp->conn, ¶ms)) {
+ TALLOC_FREE(frame);
return NT_STATUS_NO_MEMORY;
+ }
- if (smbacl4_fGetFileOwner(fsp, &sbuf))
+ if (smbacl4_fGetFileOwner(fsp, &sbuf)) {
+ TALLOC_FREE(frame);
return map_nt_error_from_unix(errno);
+ }
if (params.do_chown) {
/* chown logic is a copy/paste from posix_acl.c:set_nt_acl */
- NTSTATUS status = unpack_nt_owners(fsp->conn, &newUID, &newGID, security_info_sent, psd);
+ NTSTATUS status = unpack_nt_owners(fsp->conn, &newUID, &newGID,
+ security_info_sent, psd);
if (!NT_STATUS_IS_OK(status)) {
DEBUG(8, ("unpack_nt_owners failed"));
+ TALLOC_FREE(frame);
return status;
}
if (((newUID != (uid_t)-1) && (sbuf.st_ex_uid != newUID)) ||
(unsigned int)newUID,
(unsigned int)newGID,
nt_errstr(status)));
+ TALLOC_FREE(frame);
return status;
}
fsp_str_dbg(fsp), (unsigned int)newUID,
(unsigned int)newGID));
if (smbacl4_GetFileOwner(fsp->conn,
- fsp->fsp_name->base_name,
- &sbuf))
+ fsp->fsp_name,
+ &sbuf)){
+ TALLOC_FREE(frame);
return map_nt_error_from_unix(errno);
+ }
/* If we successfully chowned, we know we must
* be able to set the acl, so do it as root.
}
if (!(security_info_sent & SECINFO_DACL) || psd->dacl ==NULL) {
- DEBUG(10, ("no dacl found; security_info_sent = 0x%x\n", security_info_sent));
+ DEBUG(10, ("no dacl found; security_info_sent = 0x%x\n",
+ security_info_sent));
+ TALLOC_FREE(frame);
return NT_STATUS_OK;
}
- theacl = smbacl4_win2nfs4(fsp->fsp_name->base_name, psd->dacl, ¶ms,
+ theacl = smbacl4_win2nfs4(frame, fsp, psd->dacl, ¶ms,
sbuf.st_ex_uid, sbuf.st_ex_gid);
- if (!theacl)
+ if (!theacl) {
+ TALLOC_FREE(frame);
return map_nt_error_from_unix(errno);
+ }
+ smbacl4_set_controlflags(theacl, psd->type);
smbacl4_dump_nfs4acl(10, theacl);
if (set_acl_as_root) {
become_root();
}
- result = set_nfs4_native(fsp, theacl);
+ result = set_nfs4_native(handle, fsp, theacl);
saved_errno = errno;
if (set_acl_as_root) {
unbecome_root();
}
- if (result!=True) {
+
+ TALLOC_FREE(frame);
+
+ if (result!=true) {
errno = saved_errno;
- DEBUG(10, ("set_nfs4_native failed with %s\n", strerror(errno)));
+ DEBUG(10, ("set_nfs4_native failed with %s\n",
+ strerror(errno)));
return map_nt_error_from_unix(errno);
}
git.samba.org / samba.git / blobdiff