* along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
-/* NOTE: This is an experimental module, not yet finished. JRA. */
-
#include "includes.h"
+#include "smbd/smbd.h"
+#include "system/filesys.h"
#include "librpc/gen_ndr/xattr.h"
-#include "librpc/gen_ndr/ndr_xattr.h"
+#include "dbwrap/dbwrap.h"
+#include "dbwrap/dbwrap_open.h"
+#include "auth.h"
+#include "util_tdb.h"
+#include "vfs_acl_common.h"
#undef DBGC_CLASS
#define DBGC_CLASS DBGC_VFS
+#define ACL_MODULE_NAME "acl_tdb"
+
static unsigned int ref_count;
static struct db_context *acl_db;
Open acl_db if not already open, increment ref count.
*******************************************************************/
-static bool acl_tdb_init(struct db_context **pp_db)
+static bool acl_tdb_init(void)
{
char *dbname;
if (acl_db) {
- *pp_db = acl_db;
ref_count++;
return true;
}
- dbname = state_path("file_ntacls.tdb");
+ dbname = state_path(talloc_tos(), "file_ntacls.tdb");
if (dbname == NULL) {
errno = ENOSYS;
}
become_root();
- *pp_db = db_open(NULL, dbname, 0, TDB_DEFAULT, O_RDWR|O_CREAT, 0600);
+ acl_db = db_open(NULL, dbname, 0, TDB_DEFAULT, O_RDWR|O_CREAT, 0600,
+ DBWRAP_LOCK_ORDER_1, DBWRAP_FLAG_NONE);
unbecome_root();
- if (*pp_db == NULL) {
+ if (acl_db == NULL) {
#if defined(ENOTSUP)
errno = ENOTSUP;
#else
Lower ref count and close acl_db if zero.
*******************************************************************/
-static void free_acl_tdb_data(void **pptr)
+static void disconnect_acl_tdb(struct vfs_handle_struct *handle)
{
- struct db_context **pp_db = (struct db_context **)pptr;
-
+ SMB_VFS_NEXT_DISCONNECT(handle);
ref_count--;
if (ref_count == 0) {
- TALLOC_FREE(*pp_db);
- acl_db = NULL;
+ TALLOC_FREE(acl_db);
}
}
-/*******************************************************************
- Fetch_lock the tdb acl record for a file
-*******************************************************************/
-
-static struct db_record *acl_tdb_lock(TALLOC_CTX *mem_ctx,
- struct db_context *db,
- const struct file_id *id)
-{
- uint8 id_buf[16];
-
- /* For backwards compatibility only store the dev/inode. */
- push_file_id_16((char *)id_buf, id);
- return db->fetch_locked(db,
- mem_ctx,
- make_tdb_data(id_buf,
- sizeof(id_buf)));
-}
-
/*******************************************************************
Delete the tdb acl record for a file
*******************************************************************/
{
NTSTATUS status;
struct file_id id = vfs_file_id_from_sbuf(handle->conn, psbuf);
- struct db_record *rec = acl_tdb_lock(talloc_tos(), db, &id);
-
- /*
- * If rec == NULL there's not much we can do about it
- */
+ uint8_t id_buf[16];
- if (rec == NULL) {
- DEBUG(10,("acl_tdb_delete: rec == NULL\n"));
- TALLOC_FREE(rec);
- return NT_STATUS_OK;
- }
+ /* For backwards compatibility only store the dev/inode. */
+ push_file_id_16(id_buf, &id);
- status = rec->delete_rec(rec);
- TALLOC_FREE(rec);
+ status = dbwrap_delete(db, make_tdb_data(id_buf, sizeof(id_buf)));
return status;
}
/*******************************************************************
- Parse out a struct security_descriptor from a DATA_BLOB.
+ Pull a security descriptor from an fsp into a DATA_BLOB from a tdb store.
*******************************************************************/
-static NTSTATUS parse_acl_blob(const DATA_BLOB *pblob,
- uint32 security_info,
- struct security_descriptor **ppdesc)
-{
- TALLOC_CTX *ctx = talloc_tos();
- struct xattr_NTACL xacl;
- enum ndr_err_code ndr_err;
- size_t sd_size;
-
- ndr_err = ndr_pull_struct_blob(pblob, ctx, NULL, &xacl,
- (ndr_pull_flags_fn_t)ndr_pull_xattr_NTACL);
-
- if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
- DEBUG(5, ("parse_acl_blob: ndr_pull_xattr_NTACL failed: %s\n",
- ndr_errstr(ndr_err)));
- return ndr_map_error2ntstatus(ndr_err);;
- }
-
- if (xacl.version != 2) {
- return NT_STATUS_REVISION_MISMATCH;
- }
-
- *ppdesc = make_sec_desc(ctx, SEC_DESC_REVISION, xacl.info.sd_hs2->sd->type | SEC_DESC_SELF_RELATIVE,
- (security_info & OWNER_SECURITY_INFORMATION)
- ? xacl.info.sd_hs2->sd->owner_sid : NULL,
- (security_info & GROUP_SECURITY_INFORMATION)
- ? xacl.info.sd_hs2->sd->group_sid : NULL,
- (security_info & SACL_SECURITY_INFORMATION)
- ? xacl.info.sd_hs2->sd->sacl : NULL,
- (security_info & DACL_SECURITY_INFORMATION)
- ? xacl.info.sd_hs2->sd->dacl : NULL,
- &sd_size);
-
- TALLOC_FREE(xacl.info.sd);
-
- return (*ppdesc != NULL) ? NT_STATUS_OK : NT_STATUS_NO_MEMORY;
-}
-
-/*******************************************************************
- Pull a security descriptor into a DATA_BLOB from a tdb store.
-*******************************************************************/
-
-static NTSTATUS get_acl_blob(TALLOC_CTX *ctx,
+static NTSTATUS fget_acl_blob(TALLOC_CTX *ctx,
vfs_handle_struct *handle,
files_struct *fsp,
- const char *name,
DATA_BLOB *pblob)
{
- uint8 id_buf[16];
+ uint8_t id_buf[16];
TDB_DATA data;
struct file_id id;
- struct db_context *db;
- int ret = -1;
- SMB_STRUCT_STAT sbuf;
-
- SMB_VFS_HANDLE_GET_DATA(handle, db, struct db_context,
- return NT_STATUS_INTERNAL_DB_CORRUPTION);
+ struct db_context *db = acl_db;
+ NTSTATUS status = NT_STATUS_OK;
- if (fsp && fsp->fh->fd != -1) {
- ret = SMB_VFS_FSTAT(fsp, &sbuf);
- } else {
- if (fsp && fsp->posix_open) {
- ret = vfs_lstat_smb_fname(handle->conn, name, &sbuf);
- } else {
- ret = vfs_stat_smb_fname(handle->conn, name, &sbuf);
- }
- }
-
- if (ret == -1) {
- return map_nt_error_from_unix(errno);
+ status = vfs_stat_fsp(fsp);
+ if (!NT_STATUS_IS_OK(status)) {
+ return status;
}
- id = vfs_file_id_from_sbuf(handle->conn, &sbuf);
+ id = vfs_file_id_from_sbuf(handle->conn, &fsp->fsp_name->st);
/* For backwards compatibility only store the dev/inode. */
- push_file_id_16((char *)id_buf, &id);
+ push_file_id_16(id_buf, &id);
- if (db->fetch(db,
- ctx,
- make_tdb_data(id_buf, sizeof(id_buf)),
- &data) == -1) {
+ status = dbwrap_fetch(db,
+ ctx,
+ make_tdb_data(id_buf, sizeof(id_buf)),
+ &data);
+ if (!NT_STATUS_IS_OK(status)) {
return NT_STATUS_INTERNAL_DB_CORRUPTION;
}
pblob->data = data.dptr;
pblob->length = data.dsize;
- DEBUG(10,("get_acl_blob: returned %u bytes from file %s\n",
- (unsigned int)data.dsize, name ));
+ DBG_DEBUG("returned %u bytes from file %s\n",
+ (unsigned int)data.dsize,
+ fsp_str_dbg(fsp));
if (pblob->length == 0 || pblob->data == NULL) {
- return NT_STATUS_OBJECT_NAME_NOT_FOUND;
+ return NT_STATUS_NOT_FOUND;
}
return NT_STATUS_OK;
}
-/*******************************************************************
- Create a DATA_BLOB from a security descriptor.
-*******************************************************************/
-
-static NTSTATUS create_acl_blob(const struct security_descriptor *psd, DATA_BLOB *pblob)
-{
- struct xattr_NTACL xacl;
- struct security_descriptor_hash_v2 sd_hs2;
- enum ndr_err_code ndr_err;
- TALLOC_CTX *ctx = talloc_tos();
-
- ZERO_STRUCT(xacl);
- ZERO_STRUCT(sd_hs2);
-
- xacl.version = 2;
- xacl.info.sd_hs2 = &sd_hs2;
- xacl.info.sd_hs2->sd = CONST_DISCARD(struct security_descriptor *, psd);
- memset(&xacl.info.sd_hs2->hash[0], '\0', 16);
-
- ndr_err = ndr_push_struct_blob(
- pblob, ctx, NULL, &xacl,
- (ndr_push_flags_fn_t)ndr_push_xattr_NTACL);
-
- if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
- DEBUG(5, ("create_acl_blob: ndr_push_xattr_NTACL failed: %s\n",
- ndr_errstr(ndr_err)));
- return ndr_map_error2ntstatus(ndr_err);;
- }
-
- return NT_STATUS_OK;
-}
-
/*******************************************************************
Store a DATA_BLOB into a tdb record given an fsp pointer.
*******************************************************************/
files_struct *fsp,
DATA_BLOB *pblob)
{
- uint8 id_buf[16];
+ uint8_t id_buf[16];
struct file_id id;
- TDB_DATA data;
- struct db_context *db;
- struct db_record *rec;
- int ret = -1;
+ TDB_DATA data = { .dptr = pblob->data, .dsize = pblob->length };
+ struct db_context *db = acl_db;
+ NTSTATUS status;
DEBUG(10,("store_acl_blob_fsp: storing blob length %u on file %s\n",
(unsigned int)pblob->length, fsp_str_dbg(fsp)));
- SMB_VFS_HANDLE_GET_DATA(handle, db, struct db_context,
- return NT_STATUS_INTERNAL_DB_CORRUPTION);
-
- if (fsp->fh->fd != -1) {
- ret = SMB_VFS_FSTAT(fsp, &fsp->fsp_name->st);
- } else {
- if (fsp->posix_open) {
- ret = SMB_VFS_LSTAT(handle->conn, fsp->fsp_name);
- } else {
- ret = SMB_VFS_STAT(handle->conn, fsp->fsp_name);
- }
- }
-
- if (ret == -1) {
- return map_nt_error_from_unix(errno);
+ status = vfs_stat_fsp(fsp);
+ if (!NT_STATUS_IS_OK(status)) {
+ return status;
}
id = vfs_file_id_from_sbuf(handle->conn, &fsp->fsp_name->st);
/* For backwards compatibility only store the dev/inode. */
- push_file_id_16((char *)id_buf, &id);
- rec = db->fetch_locked(db, talloc_tos(),
- make_tdb_data(id_buf,
- sizeof(id_buf)));
- if (rec == NULL) {
- DEBUG(0, ("store_acl_blob_fsp_tdb: fetch_lock failed\n"));
- return NT_STATUS_INTERNAL_DB_CORRUPTION;
- }
- data.dptr = pblob->data;
- data.dsize = pblob->length;
- return rec->store(rec, data, 0);
-}
-
-/*******************************************************************
- Store a DATA_BLOB into a tdb record given a pathname.
-*******************************************************************/
-
-static NTSTATUS store_acl_blob_pathname(vfs_handle_struct *handle,
- const char *fname,
- DATA_BLOB *pblob)
-{
- uint8 id_buf[16];
- struct file_id id;
- TDB_DATA data;
- SMB_STRUCT_STAT sbuf;
- struct db_context *db;
- struct db_record *rec;
- int ret = -1;
-
- DEBUG(10,("store_acl_blob_pathname: storing blob "
- "length %u on file %s\n",
- (unsigned int)pblob->length, fname));
-
- SMB_VFS_HANDLE_GET_DATA(handle, db, struct db_context,
- return NT_STATUS_INTERNAL_DB_CORRUPTION);
-
- if (lp_posix_pathnames()) {
- ret = vfs_lstat_smb_fname(handle->conn, fname, &sbuf);
- } else {
- ret = vfs_stat_smb_fname(handle->conn, fname, &sbuf);
- }
-
- if (ret == -1) {
- return map_nt_error_from_unix(errno);
- }
-
- id = vfs_file_id_from_sbuf(handle->conn, &sbuf);
-
- /* For backwards compatibility only store the dev/inode. */
- push_file_id_16((char *)id_buf, &id);
-
- rec = db->fetch_locked(db, talloc_tos(),
- make_tdb_data(id_buf,
- sizeof(id_buf)));
- if (rec == NULL) {
- DEBUG(0, ("store_acl_blob_pathname_tdb: fetch_lock failed\n"));
- return NT_STATUS_INTERNAL_DB_CORRUPTION;
- }
- data.dptr = pblob->data;
- data.dsize = pblob->length;
- return rec->store(rec, data, 0);
-}
-
-/*******************************************************************
- Store a DATA_BLOB into an tdb given a pathname.
-*******************************************************************/
-
-static NTSTATUS get_nt_acl_tdb_internal(vfs_handle_struct *handle,
- files_struct *fsp,
- const char *name,
- uint32 security_info,
- struct security_descriptor **ppdesc)
-{
- TALLOC_CTX *ctx = talloc_tos();
- DATA_BLOB blob;
- NTSTATUS status;
-
- if (fsp && name == NULL) {
- name = fsp->fsp_name->base_name;
- }
-
- DEBUG(10, ("get_nt_acl_tdb_internal: name=%s\n", name));
+ push_file_id_16(id_buf, &id);
- status = get_acl_blob(ctx, handle, fsp, name, &blob);
- if (!NT_STATUS_IS_OK(status)) {
- DEBUG(10, ("get_acl_blob returned %s\n", nt_errstr(status)));
- return status;
- }
-
- status = parse_acl_blob(&blob, security_info, ppdesc);
- if (!NT_STATUS_IS_OK(status)) {
- DEBUG(10, ("parse_acl_blob returned %s\n",
- nt_errstr(status)));
- return status;
- }
-
- TALLOC_FREE(blob.data);
+ status = dbwrap_store(
+ db, make_tdb_data(id_buf, sizeof(id_buf)), data, 0);
return status;
}
/*********************************************************************
- Create a default security descriptor for a file in case no inheritance
- exists. All permissions to the owner and SYSTEM.
-*********************************************************************/
-
-static struct security_descriptor *default_file_sd(TALLOC_CTX *mem_ctx,
- SMB_STRUCT_STAT *psbuf)
-{
- struct dom_sid owner_sid, group_sid;
- size_t sd_size;
- struct security_ace *pace = NULL;
- struct security_acl *pacl = NULL;
-
- uid_to_sid(&owner_sid, psbuf->st_ex_uid);
- gid_to_sid(&group_sid, psbuf->st_ex_gid);
-
- pace = TALLOC_ARRAY(mem_ctx, struct security_ace, 2);
- if (!pace) {
- return NULL;
- }
-
- init_sec_ace(&pace[0], &owner_sid, SEC_ACE_TYPE_ACCESS_ALLOWED,
- SEC_RIGHTS_FILE_ALL, 0);
- init_sec_ace(&pace[1], &global_sid_System, SEC_ACE_TYPE_ACCESS_ALLOWED,
- SEC_RIGHTS_FILE_ALL, 0);
-
- pacl = make_sec_acl(mem_ctx,
- NT4_ACL_REVISION,
- 2,
- pace);
- if (!pacl) {
- return NULL;
- }
- return make_sec_desc(mem_ctx,
- SECURITY_DESCRIPTOR_REVISION_1,
- SEC_DESC_SELF_RELATIVE|SEC_DESC_DACL_PRESENT,
- &owner_sid,
- &group_sid,
- NULL,
- pacl,
- &sd_size);
-}
-
-/*********************************************************************
-*********************************************************************/
-
-static NTSTATUS inherit_new_acl(vfs_handle_struct *handle,
- struct smb_filename *smb_fname,
- files_struct *fsp,
- bool container)
-{
- TALLOC_CTX *ctx = talloc_tos();
- NTSTATUS status;
- struct security_descriptor *parent_desc = NULL;
- struct security_descriptor *psd = NULL;
- DATA_BLOB blob;
- size_t size;
- char *parent_name;
-
- if (!parent_dirname(ctx, smb_fname->base_name, &parent_name, NULL)) {
- return NT_STATUS_NO_MEMORY;
- }
-
- DEBUG(10,("inherit_new_acl: check directory %s\n",
- parent_name));
-
- status = get_nt_acl_tdb_internal(handle,
- NULL,
- parent_name,
- (OWNER_SECURITY_INFORMATION |
- GROUP_SECURITY_INFORMATION |
- DACL_SECURITY_INFORMATION),
- &parent_desc);
- if (NT_STATUS_IS_OK(status)) {
- /* Create an inherited descriptor from the parent. */
-
- if (DEBUGLEVEL >= 10) {
- DEBUG(10,("inherit_new_acl: parent acl is:\n"));
- NDR_PRINT_DEBUG(security_descriptor, parent_desc);
- }
-
- status = se_create_child_secdesc(ctx,
- &psd,
- &size,
- parent_desc,
- &handle->conn->server_info->ptok->user_sids[PRIMARY_USER_SID_INDEX],
- &handle->conn->server_info->ptok->user_sids[PRIMARY_GROUP_SID_INDEX],
- container);
- if (!NT_STATUS_IS_OK(status)) {
- return status;
- }
-
- if (DEBUGLEVEL >= 10) {
- DEBUG(10,("inherit_new_acl: child acl is:\n"));
- NDR_PRINT_DEBUG(security_descriptor, psd);
- }
-
- } else {
- DEBUG(10,("inherit_new_acl: directory %s failed "
- "to get acl %s\n",
- parent_name,
- nt_errstr(status) ));
- }
-
- if (!psd || psd->dacl == NULL) {
- int ret;
-
- TALLOC_FREE(psd);
- if (fsp && !fsp->is_directory && fsp->fh->fd != -1) {
- ret = SMB_VFS_FSTAT(fsp, &smb_fname->st);
- } else {
- if (fsp && fsp->posix_open) {
- ret = SMB_VFS_LSTAT(handle->conn, smb_fname);
- } else {
- ret = SMB_VFS_STAT(handle->conn, smb_fname);
- }
- }
- if (ret == -1) {
- return map_nt_error_from_unix(errno);
- }
- psd = default_file_sd(ctx, &smb_fname->st);
- if (!psd) {
- return NT_STATUS_NO_MEMORY;
- }
-
- if (DEBUGLEVEL >= 10) {
- DEBUG(10,("inherit_new_acl: default acl is:\n"));
- NDR_PRINT_DEBUG(security_descriptor, psd);
- }
- }
-
- status = create_acl_blob(psd, &blob);
- if (!NT_STATUS_IS_OK(status)) {
- return status;
- }
- if (fsp) {
- return store_acl_blob_fsp(handle, fsp, &blob);
- } else {
- return store_acl_blob_pathname(handle, smb_fname->base_name,
- &blob);
- }
-}
-
-/*********************************************************************
- Check ACL on open. For new files inherit from parent directory.
-*********************************************************************/
-
-static int open_acl_tdb(vfs_handle_struct *handle,
- struct smb_filename *smb_fname,
- files_struct *fsp,
- int flags,
- mode_t mode)
-{
- uint32_t access_granted = 0;
- struct security_descriptor *pdesc = NULL;
- bool file_existed = true;
- NTSTATUS status;
-
- status = get_nt_acl_tdb_internal(handle,
- NULL,
- smb_fname->base_name,
- (OWNER_SECURITY_INFORMATION |
- GROUP_SECURITY_INFORMATION |
- DACL_SECURITY_INFORMATION),
- &pdesc);
- if (NT_STATUS_IS_OK(status)) {
- /* See if we can access it. */
- status = smb1_file_se_access_check(pdesc,
- handle->conn->server_info->ptok,
- fsp->access_mask,
- &access_granted);
- if (!NT_STATUS_IS_OK(status)) {
- DEBUG(10,("open_acl_tdb: file %s open "
- "refused with error %s\n",
- smb_fname_str_dbg(smb_fname),
- nt_errstr(status) ));
- errno = map_errno_from_nt_status(status);
- return -1;
- }
- } else if (NT_STATUS_EQUAL(status,NT_STATUS_OBJECT_NAME_NOT_FOUND)) {
- file_existed = false;
- }
-
- DEBUG(10,("open_acl_tdb: get_nt_acl_attr_internal for "
- "file %s returned %s\n",
- smb_fname_str_dbg(smb_fname),
- nt_errstr(status) ));
-
- fsp->fh->fd = SMB_VFS_NEXT_OPEN(handle, smb_fname, fsp, flags, mode);
-
- if (!file_existed && fsp->fh->fd != -1) {
- /* File was created. Inherit from parent directory. */
- status = fsp_set_smb_fname(fsp, smb_fname);
- if (!NT_STATUS_IS_OK(status)) {
- errno = map_errno_from_nt_status(status);
- return -1;
- }
- inherit_new_acl(handle, smb_fname, fsp, false);
- }
- return fsp->fh->fd;
-}
-
-/*********************************************************************
- On unlink we need to delete the tdb record (if using tdb).
+ On unlinkat we need to delete the tdb record (if using tdb).
*********************************************************************/
-static int unlink_acl_tdb(vfs_handle_struct *handle,
- const struct smb_filename *smb_fname)
+static int unlinkat_acl_tdb(vfs_handle_struct *handle,
+ struct files_struct *dirfsp,
+ const struct smb_filename *smb_fname,
+ int flags)
{
struct smb_filename *smb_fname_tmp = NULL;
- struct db_context *db;
- NTSTATUS status;
+ struct db_context *db = acl_db;
int ret = -1;
- SMB_VFS_HANDLE_GET_DATA(handle, db, struct db_context, return -1);
-
- status = copy_smb_filename(talloc_tos(), smb_fname, &smb_fname_tmp);
- if (!NT_STATUS_IS_OK(status)) {
- errno = map_errno_from_nt_status(status);
+ smb_fname_tmp = cp_smb_filename_nostream(talloc_tos(), smb_fname);
+ if (smb_fname_tmp == NULL) {
+ errno = ENOMEM;
goto out;
}
- if (lp_posix_pathnames()) {
- ret = SMB_VFS_LSTAT(handle->conn, smb_fname_tmp);
- } else {
- ret = SMB_VFS_STAT(handle->conn, smb_fname_tmp);
- }
-
+ ret = vfs_stat(handle->conn, smb_fname_tmp);
if (ret == -1) {
goto out;
}
- ret = SMB_VFS_NEXT_UNLINK(handle, smb_fname_tmp);
+ if (flags & AT_REMOVEDIR) {
+ ret = rmdir_acl_common(handle,
+ dirfsp,
+ smb_fname_tmp);
+ } else {
+ ret = unlink_acl_common(handle,
+ dirfsp,
+ smb_fname_tmp,
+ flags);
+ }
if (ret == -1) {
goto out;
return ret;
}
-/*********************************************************************
- Store an inherited SD on mkdir.
-*********************************************************************/
-
-static int mkdir_acl_tdb(vfs_handle_struct *handle, const char *path, mode_t mode)
-{
- struct smb_filename *smb_fname = NULL;
- int ret = SMB_VFS_NEXT_MKDIR(handle, path, mode);
- NTSTATUS status;
-
- if (ret == -1) {
- return ret;
- }
-
- status = create_synthetic_smb_fname(talloc_tos(), path, NULL, NULL,
- &smb_fname);
- if (!NT_STATUS_IS_OK(status)) {
- errno = map_errno_from_nt_status(status);
- return -1;
- }
-
- /* New directory - inherit from parent. */
- inherit_new_acl(handle, smb_fname, NULL, true);
- TALLOC_FREE(smb_fname);
- return ret;
-}
-
-/*********************************************************************
- On rmdir we need to delete the tdb record (if using tdb).
-*********************************************************************/
-
-static int rmdir_acl_tdb(vfs_handle_struct *handle, const char *path)
-{
-
- SMB_STRUCT_STAT sbuf;
- struct db_context *db;
- int ret = -1;
-
- SMB_VFS_HANDLE_GET_DATA(handle, db, struct db_context, return -1);
-
- if (lp_posix_pathnames()) {
- ret = vfs_lstat_smb_fname(handle->conn, path, &sbuf);
- } else {
- ret = vfs_stat_smb_fname(handle->conn, path, &sbuf);
- }
-
- if (ret == -1) {
- return -1;
- }
-
- ret = SMB_VFS_NEXT_RMDIR(handle, path);
- if (ret == -1) {
- return -1;
- }
-
- acl_tdb_delete(handle, db, &sbuf);
- return 0;
-}
-
-/*********************************************************************
- Fetch a security descriptor given an fsp.
-*********************************************************************/
-
-static NTSTATUS fget_nt_acl_tdb(vfs_handle_struct *handle, files_struct *fsp,
- uint32 security_info, struct security_descriptor **ppdesc)
-{
- NTSTATUS status = get_nt_acl_tdb_internal(handle, fsp,
- NULL, security_info, ppdesc);
- if (NT_STATUS_IS_OK(status)) {
- if (DEBUGLEVEL >= 10) {
- DEBUG(10,("fget_nt_acl_tdb: returning tdb sd for file %s\n",
- fsp_str_dbg(fsp)));
- NDR_PRINT_DEBUG(security_descriptor, *ppdesc);
- }
- return NT_STATUS_OK;
- }
-
- DEBUG(10,("fget_nt_acl_tdb: failed to get tdb sd for file %s, Error %s\n",
- fsp_str_dbg(fsp), nt_errstr(status)));
-
- return SMB_VFS_NEXT_FGET_NT_ACL(handle, fsp,
- security_info, ppdesc);
-}
-
-/*********************************************************************
- Fetch a security descriptor given a pathname.
-*********************************************************************/
-
-static NTSTATUS get_nt_acl_tdb(vfs_handle_struct *handle,
- const char *name, uint32 security_info, struct security_descriptor **ppdesc)
-{
- NTSTATUS status = get_nt_acl_tdb_internal(handle, NULL,
- name, security_info, ppdesc);
- if (NT_STATUS_IS_OK(status)) {
- if (DEBUGLEVEL >= 10) {
- DEBUG(10,("get_nt_acl_tdb: returning tdb sd for file %s\n",
- name));
- NDR_PRINT_DEBUG(security_descriptor, *ppdesc);
- }
- return NT_STATUS_OK;
- }
-
- DEBUG(10,("get_nt_acl_tdb: failed to get tdb sd for file %s, Error %s\n",
- name,
- nt_errstr(status) ));
-
- return SMB_VFS_NEXT_GET_NT_ACL(handle, name,
- security_info, ppdesc);
-}
-
-/*********************************************************************
- Store a security descriptor given an fsp.
-*********************************************************************/
-
-static NTSTATUS fset_nt_acl_tdb(vfs_handle_struct *handle, files_struct *fsp,
- uint32 security_info_sent, const struct security_descriptor *psd)
-{
- NTSTATUS status;
- DATA_BLOB blob;
-
- if (DEBUGLEVEL >= 10) {
- DEBUG(10,("fset_nt_acl_tdb: incoming sd for file %s\n",
- fsp_str_dbg(fsp)));
- NDR_PRINT_DEBUG(security_descriptor,
- CONST_DISCARD(struct security_descriptor *,psd));
- }
-
- status = SMB_VFS_NEXT_FSET_NT_ACL(handle, fsp, security_info_sent, psd);
- if (!NT_STATUS_IS_OK(status)) {
- return status;
- }
-
- /* Ensure owner and group are set. */
- if (!psd->owner_sid || !psd->group_sid) {
- int ret;
- DOM_SID owner_sid, group_sid;
- struct security_descriptor *nc_psd = dup_sec_desc(talloc_tos(), psd);
-
- if (!nc_psd) {
- return NT_STATUS_OK;
- }
- if (fsp->is_directory || fsp->fh->fd == -1) {
- if (fsp->posix_open) {
- ret = SMB_VFS_LSTAT(fsp->conn, fsp->fsp_name);
- } else {
- ret = SMB_VFS_STAT(fsp->conn, fsp->fsp_name);
- }
- } else {
- ret = SMB_VFS_FSTAT(fsp, &fsp->fsp_name->st);
- }
- if (ret == -1) {
- /* Lower level acl set succeeded,
- * so still return OK. */
- return NT_STATUS_OK;
- }
- create_file_sids(&fsp->fsp_name->st, &owner_sid, &group_sid);
- /* This is safe as nc_psd is discarded at fn exit. */
- nc_psd->owner_sid = &owner_sid;
- nc_psd->group_sid = &group_sid;
- security_info_sent |= (OWNER_SECURITY_INFORMATION|GROUP_SECURITY_INFORMATION);
- psd = nc_psd;
- }
-
-#if 0
- if ((security_info_sent & DACL_SECURITY_INFORMATION) &&
- psd->dacl != NULL &&
- (psd->type & (SE_DESC_DACL_AUTO_INHERITED|
- SE_DESC_DACL_AUTO_INHERIT_REQ))==
- (SE_DESC_DACL_AUTO_INHERITED|
- SE_DESC_DACL_AUTO_INHERIT_REQ) ) {
- struct security_descriptor *new_psd = NULL;
- status = append_parent_acl(fsp, psd, &new_psd);
- if (!NT_STATUS_IS_OK(status)) {
- /* Lower level acl set succeeded,
- * so still return OK. */
- return NT_STATUS_OK;
- }
- psd = new_psd;
- }
-#endif
-
- if (DEBUGLEVEL >= 10) {
- DEBUG(10,("fset_nt_acl_tdb: storing tdb sd for file %s\n",
- fsp_str_dbg(fsp)));
- NDR_PRINT_DEBUG(security_descriptor,
- CONST_DISCARD(struct security_descriptor *,psd));
- }
- create_acl_blob(psd, &blob);
- store_acl_blob_fsp(handle, fsp, &blob);
-
- return NT_STATUS_OK;
-}
-
/*******************************************************************
Handle opening the storage tdb if so configured.
*******************************************************************/
const char *service,
const char *user)
{
- struct db_context *db;
- int res;
+ int ret = SMB_VFS_NEXT_CONNECT(handle, service, user);
+ bool ok;
+ struct acl_common_config *config = NULL;
- res = SMB_VFS_NEXT_CONNECT(handle, service, user);
- if (res < 0) {
- return res;
- }
+ if (ret < 0) {
+ return ret;
+ }
- if (!acl_tdb_init(&db)) {
+ if (!acl_tdb_init()) {
SMB_VFS_NEXT_DISCONNECT(handle);
return -1;
}
- SMB_VFS_HANDLE_SET_DATA(handle, db, free_acl_tdb_data,
- struct db_context, return -1);
-
- return 0;
-}
+ ok = init_acl_common_config(handle, ACL_MODULE_NAME);
+ if (!ok) {
+ DBG_ERR("init_acl_common_config failed\n");
+ return -1;
+ }
-/*********************************************************************
- Remove a Windows ACL - we're setting the underlying POSIX ACL.
-*********************************************************************/
+ /* Ensure we have the parameters correct if we're
+ * using this module. */
+ DEBUG(2,("connect_acl_tdb: setting 'inherit acls = true' "
+ "'dos filemode = true' and "
+ "'force unknown acl user = true' for service %s\n",
+ service ));
+
+ lp_do_parameter(SNUM(handle->conn), "inherit acls", "true");
+ lp_do_parameter(SNUM(handle->conn), "dos filemode", "true");
+ lp_do_parameter(SNUM(handle->conn), "force unknown acl user", "true");
+
+ SMB_VFS_HANDLE_GET_DATA(handle, config,
+ struct acl_common_config,
+ return -1);
+
+ if (config->ignore_system_acls) {
+ mode_t create_mask = lp_create_mask(SNUM(handle->conn));
+ char *create_mask_str = NULL;
+
+ if ((create_mask & 0666) != 0666) {
+ create_mask |= 0666;
+ create_mask_str = talloc_asprintf(handle, "0%o",
+ create_mask);
+ if (create_mask_str == NULL) {
+ DBG_ERR("talloc_asprintf failed\n");
+ return -1;
+ }
-static int sys_acl_set_file_tdb(vfs_handle_struct *handle,
- const char *path,
- SMB_ACL_TYPE_T type,
- SMB_ACL_T theacl)
-{
- SMB_STRUCT_STAT sbuf;
- struct db_context *db;
- int ret = -1;
+ DBG_NOTICE("setting 'create mask = %s'\n", create_mask_str);
- SMB_VFS_HANDLE_GET_DATA(handle, db, struct db_context, return -1);
+ lp_do_parameter (SNUM(handle->conn),
+ "create mask", create_mask_str);
- if (lp_posix_pathnames()) {
- ret = vfs_lstat_smb_fname(handle->conn, path, &sbuf);
- } else {
- ret = vfs_stat_smb_fname(handle->conn, path, &sbuf);
- }
+ TALLOC_FREE(create_mask_str);
+ }
- if (ret == -1) {
- return -1;
- }
+ DBG_NOTICE("setting 'directory mask = 0777', "
+ "'store dos attributes = yes' and all "
+ "'map ...' options to 'no'\n");
- ret = SMB_VFS_NEXT_SYS_ACL_SET_FILE(handle,
- path,
- type,
- theacl);
- if (ret == -1) {
- return -1;
+ lp_do_parameter(SNUM(handle->conn), "directory mask", "0777");
+ lp_do_parameter(SNUM(handle->conn), "map archive", "no");
+ lp_do_parameter(SNUM(handle->conn), "map hidden", "no");
+ lp_do_parameter(SNUM(handle->conn), "map readonly", "no");
+ lp_do_parameter(SNUM(handle->conn), "map system", "no");
+ lp_do_parameter(SNUM(handle->conn), "store dos attributes",
+ "yes");
}
- acl_tdb_delete(handle, db, &sbuf);
return 0;
}
static int sys_acl_set_fd_tdb(vfs_handle_struct *handle,
files_struct *fsp,
+ SMB_ACL_TYPE_T type,
SMB_ACL_T theacl)
{
- struct db_context *db;
+ struct acl_common_fsp_ext *ext = (struct acl_common_fsp_ext *)
+ VFS_FETCH_FSP_EXTENSION(handle, fsp);
+ struct db_context *db = acl_db;
+ NTSTATUS status;
int ret;
- SMB_VFS_HANDLE_GET_DATA(handle, db, struct db_context, return -1);
-
- if (fsp->is_directory || fsp->fh->fd == -1) {
- if (fsp->posix_open) {
- ret = SMB_VFS_LSTAT(fsp->conn, fsp->fsp_name);
- } else {
- ret = SMB_VFS_STAT(fsp->conn, fsp->fsp_name);
- }
- } else {
- ret = SMB_VFS_FSTAT(fsp, &fsp->fsp_name->st);
- }
- if (ret == -1) {
+ status = vfs_stat_fsp(fsp);
+ if (!NT_STATUS_IS_OK(status)) {
return -1;
}
ret = SMB_VFS_NEXT_SYS_ACL_SET_FD(handle,
- fsp,
- theacl);
+ fsp,
+ type,
+ theacl);
if (ret == -1) {
return -1;
}
+ if (ext != NULL && ext->setting_nt_acl) {
+ return 0;
+ }
+
acl_tdb_delete(handle, db, &fsp->fsp_name->st);
return 0;
}
+static NTSTATUS acl_tdb_fget_nt_acl(vfs_handle_struct *handle,
+ files_struct *fsp,
+ uint32_t security_info,
+ TALLOC_CTX *mem_ctx,
+ struct security_descriptor **ppdesc)
+{
+ NTSTATUS status;
+ status = fget_nt_acl_common(fget_acl_blob, handle, fsp,
+ security_info, mem_ctx, ppdesc);
+ return status;
+}
+
+static NTSTATUS acl_tdb_fset_nt_acl(vfs_handle_struct *handle,
+ files_struct *fsp,
+ uint32_t security_info_sent,
+ const struct security_descriptor *psd)
+{
+ NTSTATUS status;
+ status = fset_nt_acl_common(fget_acl_blob, store_acl_blob_fsp,
+ ACL_MODULE_NAME,
+ handle, fsp, security_info_sent, psd);
+ return status;
+}
+
static struct vfs_fn_pointers vfs_acl_tdb_fns = {
.connect_fn = connect_acl_tdb,
- .mkdir = mkdir_acl_tdb,
- .open = open_acl_tdb,
- .unlink = unlink_acl_tdb,
- .rmdir = rmdir_acl_tdb,
- .fget_nt_acl = fget_nt_acl_tdb,
- .get_nt_acl = get_nt_acl_tdb,
- .fset_nt_acl = fset_nt_acl_tdb,
- .sys_acl_set_file = sys_acl_set_file_tdb,
- .sys_acl_set_fd = sys_acl_set_fd_tdb
+ .disconnect_fn = disconnect_acl_tdb,
+ .unlinkat_fn = unlinkat_acl_tdb,
+ .fchmod_fn = fchmod_acl_module_common,
+ .fget_nt_acl_fn = acl_tdb_fget_nt_acl,
+ .fset_nt_acl_fn = acl_tdb_fset_nt_acl,
+ .sys_acl_set_fd_fn = sys_acl_set_fd_tdb
};
-NTSTATUS vfs_acl_tdb_init(void)
+static_decl_vfs;
+NTSTATUS vfs_acl_tdb_init(TALLOC_CTX *ctx)
{
return smb_register_vfs(SMB_VFS_INTERFACE_VERSION, "acl_tdb",
&vfs_acl_tdb_fns);
git.samba.org / samba.git / blobdiff