first draft of named attributes
This commit is contained in:
parent
1c5935865b
commit
6eea9faa2e
11 changed files with 572 additions and 89 deletions
|
|
@ -298,6 +298,7 @@ const char* opcode2string(DWORD opcode)
|
|||
case NFS41_FILE_QUERY: return "NFS41_FILE_QUERY";
|
||||
case NFS41_FILE_SET: return "NFS41_FILE_SET";
|
||||
case NFS41_EA_SET: return "NFS41_EA_SET";
|
||||
case NFS41_EA_GET: return "NFS41_EA_GET";
|
||||
case NFS41_SYMLINK: return "NFS41_SYMLINK";
|
||||
case NFS41_VOLUME_QUERY: return "NFS41_VOLUME_QUERY";
|
||||
case NFS41_ACL_QUERY: return "NFS41_ACL_QUERY";
|
||||
|
|
|
|||
|
|
@ -195,6 +195,20 @@ typedef struct _FILE_LINK_INFORMATION {
|
|||
WCHAR FileName[1];
|
||||
} FILE_LINK_INFORMATION, *PFILE_LINK_INFORMATION;
|
||||
|
||||
typedef struct _FILE_FULL_EA_INFORMATION {
|
||||
ULONG NextEntryOffset;
|
||||
UCHAR Flags;
|
||||
UCHAR EaNameLength;
|
||||
USHORT EaValueLength;
|
||||
CHAR EaName[1];
|
||||
} FILE_FULL_EA_INFORMATION, *PFILE_FULL_EA_INFORMATION;
|
||||
|
||||
typedef struct _FILE_GET_EA_INFORMATION {
|
||||
ULONG NextEntryOffset;
|
||||
UCHAR EaNameLength;
|
||||
CHAR EaName[1];
|
||||
} FILE_GET_EA_INFORMATION, *PFILE_GET_EA_INFORMATION;
|
||||
|
||||
/* wdm.h */
|
||||
typedef enum _FSINFOCLASS {
|
||||
FileFsVolumeInformation = 1,
|
||||
|
|
|
|||
183
daemon/getattr.c
183
daemon/getattr.c
|
|
@ -26,7 +26,9 @@
|
|||
|
||||
#include <Windows.h>
|
||||
#include <stdio.h>
|
||||
#include <strsafe.h>
|
||||
#include "from_kernel.h"
|
||||
#include "delegation.h"
|
||||
#include "daemon_debug.h"
|
||||
#include "nfs41_ops.h"
|
||||
#include "name_cache.h"
|
||||
|
|
@ -167,8 +169,189 @@ out:
|
|||
}
|
||||
|
||||
|
||||
static int parse_getexattr(unsigned char *buffer, uint32_t length, nfs41_upcall *upcall)
|
||||
{
|
||||
int status;
|
||||
getexattr_upcall_args *args = &upcall->args.getexattr;
|
||||
|
||||
status = get_name(&buffer, &length, &args->path);
|
||||
if (status) goto out;
|
||||
status = safe_read(&buffer, &length, &args->eaindex, sizeof(args->eaindex));
|
||||
if (status) goto out;
|
||||
status = safe_read(&buffer, &length, &args->restart, sizeof(args->restart));
|
||||
if (status) goto out;
|
||||
status = safe_read(&buffer, &length, &args->single, sizeof(args->single));
|
||||
if (status) goto out;
|
||||
status = safe_read(&buffer, &length, &args->ealist_len, sizeof(args->ealist_len));
|
||||
if (status) goto out;
|
||||
args->ealist = buffer;
|
||||
|
||||
dprintf(1, "parsing NFS41_EA_QUERY: buf_len=%d Initial %d Restart %d "
|
||||
"Single %d\n", args->buf_len,args->eaindex, args->restart, args->single);
|
||||
out:
|
||||
return status;
|
||||
}
|
||||
|
||||
static int marshall_getexattr(unsigned char *buffer, uint32_t *length, nfs41_upcall *upcall)
|
||||
{
|
||||
int status = NO_ERROR;
|
||||
getexattr_upcall_args *args = &upcall->args.getexattr;
|
||||
uint32_t len = args->buf_len;
|
||||
|
||||
status = safe_write(&buffer, length, &len, sizeof(len));
|
||||
if (status) goto out;
|
||||
status = safe_write(&buffer, length, args->buf, len);
|
||||
if (status) goto out;
|
||||
out:
|
||||
free(args->buf);
|
||||
return status;
|
||||
}
|
||||
|
||||
|
||||
static int handle_getexattr(nfs41_upcall *upcall)
|
||||
{
|
||||
int status = 0;
|
||||
getexattr_upcall_args *args = &upcall->args.getexattr;
|
||||
PFILE_GET_EA_INFORMATION gea =
|
||||
(PFILE_GET_EA_INFORMATION)args->ealist, prev = NULL;
|
||||
PFILE_FULL_EA_INFORMATION eainfo, entry_pos;
|
||||
unsigned char *entry_buf, buf[NFS4_EASIZE] = { 0 };
|
||||
nfs41_open_state *state = upcall->state_ref;
|
||||
nfs41_path_fh parent, file;
|
||||
open_claim4 claim;
|
||||
stateid4 open_stateid;
|
||||
stateid_arg stateid;
|
||||
nfs41_component dst_name;
|
||||
open_delegation4 delegation = { 0 };
|
||||
bool_t eof;
|
||||
uint32_t bytes_read = 0;
|
||||
ULONG buflen = 0, needed = 0;
|
||||
|
||||
status = nfs41_rpc_openattr(state->session, &state->file, FALSE, &parent.fh);
|
||||
if (status){
|
||||
dprintf(1, "nfs41_rpc_openattr() failed with error %s.\n",
|
||||
nfs_error_string(status));
|
||||
status = nfs_to_windows_error(status, ERROR_NOT_SUPPORTED);
|
||||
goto out;
|
||||
}
|
||||
|
||||
entry_buf = malloc(UPCALL_BUF_SIZE);
|
||||
if (entry_buf == NULL) {
|
||||
status = GetLastError();
|
||||
goto out;
|
||||
}
|
||||
|
||||
entry_pos = eainfo = (PFILE_FULL_EA_INFORMATION)entry_buf;
|
||||
|
||||
while (gea != prev) {
|
||||
dst_name.name = gea->EaName;
|
||||
dst_name.len = gea->EaNameLength;
|
||||
claim.claim = CLAIM_NULL;
|
||||
claim.u.null.filename = &dst_name;
|
||||
status = nfs41_open(state->session, &parent, &file, &state->owner,
|
||||
&claim, OPEN4_SHARE_ACCESS_READ, OPEN4_SHARE_DENY_BOTH,
|
||||
OPEN4_NOCREATE, UNCHECKED4, 0, TRUE, &open_stateid,
|
||||
&delegation, NULL);
|
||||
if (status) {
|
||||
dprintf(1, "nfs41_open() failed with error %s.\n",
|
||||
nfs_error_string(status));
|
||||
status = nfs_to_windows_error(status, ERROR_NOT_SUPPORTED);
|
||||
goto out_free;
|
||||
}
|
||||
|
||||
stateid.stateid = open_stateid;
|
||||
stateid.stateid.seqid = 0;
|
||||
status = nfs41_read(state->session, &file, &stateid, 0, NFS4_EASIZE,
|
||||
buf, &bytes_read, &eof);
|
||||
if (status) {
|
||||
dprintf(2, "nfs41_rpc_read EA attribute failed\n");
|
||||
status = nfs_to_windows_error(status, ERROR_NET_WRITE_FAULT);
|
||||
nfs41_close(state->session, &file, &stateid);
|
||||
goto out_free;
|
||||
}
|
||||
|
||||
if (eof) {
|
||||
dprintf(1, "read thread reached eof: bytes_read %d\n", bytes_read);
|
||||
eainfo->EaNameLength = gea->EaNameLength;
|
||||
if (FAILED(StringCchCopy((LPSTR)eainfo->EaName, gea->EaNameLength + 1,
|
||||
(LPCSTR)gea->EaName))) {
|
||||
status = ERROR_BUFFER_OVERFLOW;
|
||||
nfs41_close(state->session, &file, &stateid);
|
||||
goto out_free;
|
||||
}
|
||||
|
||||
if (FAILED(StringCchCopy((LPSTR)eainfo->EaName +
|
||||
eainfo->EaNameLength + 1, bytes_read + 1, (LPCSTR)buf))) {
|
||||
status = ERROR_BUFFER_OVERFLOW;
|
||||
nfs41_close(state->session, &file, &stateid);
|
||||
goto out_free;
|
||||
}
|
||||
|
||||
memset(buf, 0, NFS4_EASIZE);
|
||||
eainfo->EaValueLength = (USHORT) bytes_read;
|
||||
needed = (eainfo->EaNameLength + eainfo->EaValueLength) +
|
||||
FIELD_OFFSET(FILE_FULL_EA_INFORMATION, EaName);
|
||||
|
||||
if (needed % 4)
|
||||
needed = needed + (4 - (needed % 4));
|
||||
|
||||
eainfo->NextEntryOffset = needed;
|
||||
eainfo->Flags = 0;
|
||||
|
||||
buflen = buflen + needed;
|
||||
prev = gea;
|
||||
|
||||
if (gea->NextEntryOffset != 0) {
|
||||
gea = (PFILE_GET_EA_INFORMATION)
|
||||
((PBYTE) gea + gea->NextEntryOffset);
|
||||
eainfo = (PFILE_FULL_EA_INFORMATION)
|
||||
((PBYTE) eainfo + eainfo->NextEntryOffset);
|
||||
}
|
||||
|
||||
status = nfs41_close(state->session, &file, &stateid);
|
||||
if (status) {
|
||||
dprintf(1, "nfs41_close() failed with error %s.\n",
|
||||
nfs_error_string(status));
|
||||
status = nfs_to_windows_error(status, ERROR_NOT_SUPPORTED);
|
||||
goto out_free;
|
||||
}
|
||||
} else {
|
||||
dprintf(2, "Size of the EA value is greater than %d\n", NFS4_EASIZE);
|
||||
status = nfs41_close(state->session, &file, &stateid);
|
||||
if (status) {
|
||||
dprintf(1, "nfs41_rpc_openattr() failed with error %s.\n",
|
||||
nfs_error_string(status));
|
||||
status = nfs_to_windows_error(status, ERROR_NOT_SUPPORTED);
|
||||
}
|
||||
/* treating extended attribute values larger than NFS4_EASIZE as failure */
|
||||
status = ERROR_INVALID_DATA;
|
||||
goto out_free;
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
eainfo->NextEntryOffset = 0;
|
||||
args->buf = (unsigned char *)entry_pos;
|
||||
args->buf_len = buflen;
|
||||
goto out;
|
||||
|
||||
out_free:
|
||||
free(entry_buf);
|
||||
out:
|
||||
return status;
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
const nfs41_upcall_op nfs41_op_getattr = {
|
||||
parse_getattr,
|
||||
handle_getattr,
|
||||
marshall_getattr
|
||||
};
|
||||
|
||||
const nfs41_upcall_op nfs41_op_getexattr = {
|
||||
parse_getexattr,
|
||||
handle_getexattr,
|
||||
marshall_getexattr
|
||||
};
|
||||
|
|
@ -36,6 +36,9 @@
|
|||
#define NFS4_OPAQUE_LIMIT 1024
|
||||
#define NFS4_SESSIONID_SIZE 16
|
||||
#define NFS4_STATEID_OTHER 12
|
||||
#define NFS4_EASIZE 256
|
||||
#define NFS4_EANAME_SIZE 128
|
||||
|
||||
|
||||
#define NFS41_MAX_FILEIO_SIZE (1024 * 1024)
|
||||
#define NFS41_MAX_SERVER_CACHE 1024
|
||||
|
|
|
|||
|
|
@ -507,6 +507,10 @@ int nfs41_open(
|
|||
if (compound_error(status = compound.res.status))
|
||||
goto out;
|
||||
|
||||
if (dir_info.type == NF4ATTRDIR)
|
||||
goto out;
|
||||
|
||||
|
||||
/* fill in the file handle's fileid and superblock */
|
||||
file->fh.fileid = info->fileid;
|
||||
status = nfs41_superblock_for_fh(session, &info->fsid, &parent->fh, file);
|
||||
|
|
@ -761,6 +765,10 @@ int nfs41_write(
|
|||
eprintf("WRITE succeeded with count=0; returning %s\n",
|
||||
nfs_error_string(status));
|
||||
}
|
||||
|
||||
if (info.type == NF4NAMEDATTR)
|
||||
goto out;
|
||||
|
||||
nfs41_superblock_space_changed(file->fh.superblock);
|
||||
out:
|
||||
return status;
|
||||
|
|
|
|||
|
|
@ -497,8 +497,13 @@ static int parse_setexattr(unsigned char *buffer, uint32_t length, nfs41_upcall
|
|||
int status;
|
||||
setexattr_upcall_args *args = &upcall->args.setexattr;
|
||||
|
||||
status = get_name(&buffer, &length, &args->path);
|
||||
if (status) goto out;
|
||||
status = safe_read(&buffer, &length, &args->mode, sizeof(args->mode));
|
||||
if (status) goto out;
|
||||
status = safe_read(&buffer, &length, &args->buf_len, sizeof(args->buf_len));
|
||||
if (status) goto out;
|
||||
args->buf = buffer;
|
||||
|
||||
dprintf(1, "parsing NFS41_EA_SET: mode=%o\n", args->mode);
|
||||
out:
|
||||
|
|
@ -512,24 +517,97 @@ static int handle_setexattr(nfs41_upcall *upcall)
|
|||
nfs41_open_state *state = upcall->state_ref;
|
||||
stateid_arg stateid;
|
||||
nfs41_file_info info = { 0 };
|
||||
PFILE_FULL_EA_INFORMATION eainfo =
|
||||
(PFILE_FULL_EA_INFORMATION)args->buf, prev = NULL;
|
||||
nfs41_path_fh parent, file;
|
||||
open_claim4 claim;
|
||||
stateid4 open_stateid;
|
||||
nfs41_component dst_name;
|
||||
nfs41_write_verf verf;
|
||||
uint32_t bytes_written;
|
||||
UCHAR *buf;
|
||||
open_delegation4 delegation = { 0 };
|
||||
|
||||
/* break read delegations before SETATTR */
|
||||
nfs41_delegation_return(state->session, &state->file,
|
||||
OPEN_DELEGATE_READ, FALSE);
|
||||
|
||||
nfs41_open_stateid_arg(state, &stateid);
|
||||
|
||||
if ((strncmp("NfsV3Attributes", eainfo->EaName, eainfo->EaNameLength) == 0 &&
|
||||
strlen("NfsV3Attributes") == eainfo->EaNameLength) ||
|
||||
(strncmp("NfsActOnLink", eainfo->EaName, eainfo->EaNameLength)== 0 &&
|
||||
strlen("NfsActOnLink") == eainfo->EaNameLength)) {
|
||||
info.mode = args->mode;
|
||||
info.attrmask.arr[1] |= FATTR4_WORD1_MODE;
|
||||
info.attrmask.count = 2;
|
||||
status = nfs41_setattr(state->session, &state->file, &stateid, &info);
|
||||
if (status) {
|
||||
dprintf(1, "nfs41_setattr() failed with error %s.\n",
|
||||
nfs_error_string(status));
|
||||
return nfs_to_windows_error(status, ERROR_NOT_SUPPORTED);
|
||||
}
|
||||
} else {
|
||||
status = nfs41_rpc_openattr(state->session, &state->file, TRUE, &parent.fh);
|
||||
if (status) {
|
||||
dprintf(1, "handle_setexattr: nfs41_rpc_openattr() failed with error %s.\n",
|
||||
nfs_error_string(status));
|
||||
return nfs_to_windows_error(status, ERROR_NOT_SUPPORTED);
|
||||
}
|
||||
|
||||
/* mode */
|
||||
info.mode = args->mode;
|
||||
info.attrmask.arr[1] |= FATTR4_WORD1_MODE;
|
||||
info.attrmask.count = 2;
|
||||
while (eainfo != prev) {
|
||||
/* we don't allow for extended attribute values to be larger than NFS4_EASIZE.
|
||||
* thus, let's not allow setting such.
|
||||
*/
|
||||
if (eainfo->EaValueLength > NFS4_EASIZE) {
|
||||
dprintf(1, "trying to write extended attribute value of size %d"
|
||||
"max allowed %d\n", eainfo->EaValueLength, NFS4_EASIZE);
|
||||
status = ERROR_INVALID_DATA;
|
||||
goto out;
|
||||
}
|
||||
dst_name.name = eainfo->EaName;
|
||||
dst_name.len = eainfo->EaNameLength;
|
||||
claim.claim = CLAIM_NULL;
|
||||
claim.u.null.filename = &dst_name;
|
||||
status = nfs41_open(state->session, &parent, &file, &state->owner, &claim,
|
||||
OPEN4_SHARE_ACCESS_WRITE, OPEN4_SHARE_DENY_BOTH, OPEN4_CREATE,
|
||||
UNCHECKED4, 0664, TRUE, &open_stateid, &delegation, NULL);
|
||||
if (status) {
|
||||
dprintf(1, "handle_setexattr: nfs41_rpc_open() failed with error %s.\n",
|
||||
nfs_error_string(status));
|
||||
status = nfs_to_windows_error(status, ERROR_NOT_SUPPORTED);
|
||||
goto out;
|
||||
}
|
||||
|
||||
status = nfs41_setattr(state->session, &state->file, &stateid, &info);
|
||||
if (status)
|
||||
dprintf(1, "nfs41_setattr() failed with error %s.\n",
|
||||
nfs_error_string(status));
|
||||
stateid.stateid = open_stateid;
|
||||
stateid.stateid.seqid = 0;
|
||||
buf = (UCHAR *) eainfo->EaName + eainfo->EaNameLength + 1;
|
||||
status = nfs41_write(state->session, &file, &stateid, buf,
|
||||
eainfo->EaValueLength, 0, FILE_SYNC4, &bytes_written, &verf);
|
||||
if (status) {
|
||||
dprintf(1, "handle_setexattr: nfs41_write() failed w/error %s.\n",
|
||||
nfs_error_string(status));
|
||||
status = nfs_to_windows_error(status, ERROR_NOT_SUPPORTED);
|
||||
nfs41_close(state->session, &file, &stateid);
|
||||
goto out;
|
||||
}
|
||||
|
||||
return nfs_to_windows_error(status, ERROR_NOT_SUPPORTED);
|
||||
status = nfs41_close(state->session, &file, &stateid);
|
||||
if (status) {
|
||||
dprintf(1, "handle_setexattr: nfs41_close() failed w/error %s.\n",
|
||||
nfs_error_string(status));
|
||||
status = nfs_to_windows_error(status, ERROR_NOT_SUPPORTED);
|
||||
goto out;
|
||||
}
|
||||
|
||||
bytes_written = 0;
|
||||
prev = eainfo;
|
||||
eainfo = (FILE_FULL_EA_INFORMATION *) ((ULONG_PTR) eainfo +
|
||||
eainfo->NextEntryOffset);
|
||||
}
|
||||
}
|
||||
out:
|
||||
return status;
|
||||
}
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -42,6 +42,7 @@ extern const nfs41_upcall_op nfs41_op_unlock;
|
|||
extern const nfs41_upcall_op nfs41_op_readdir;
|
||||
extern const nfs41_upcall_op nfs41_op_getattr;
|
||||
extern const nfs41_upcall_op nfs41_op_setattr;
|
||||
extern const nfs41_upcall_op nfs41_op_getexattr;
|
||||
extern const nfs41_upcall_op nfs41_op_setexattr;
|
||||
extern const nfs41_upcall_op nfs41_op_symlink;
|
||||
extern const nfs41_upcall_op nfs41_op_volume;
|
||||
|
|
@ -60,6 +61,7 @@ static const nfs41_upcall_op *g_upcall_op_table[] = {
|
|||
&nfs41_op_readdir,
|
||||
&nfs41_op_getattr,
|
||||
&nfs41_op_setattr,
|
||||
&nfs41_op_getexattr,
|
||||
&nfs41_op_setexattr,
|
||||
&nfs41_op_symlink,
|
||||
&nfs41_op_volume,
|
||||
|
|
|
|||
|
|
@ -102,7 +102,22 @@ typedef struct __setattr_upcall_args {
|
|||
int set_class;
|
||||
} setattr_upcall_args;
|
||||
|
||||
typedef struct __getexattr_upcall_args {
|
||||
const char *path;
|
||||
unsigned char *buf;
|
||||
uint32_t buf_len;
|
||||
ULONG eaindex;
|
||||
unsigned char *ealist;
|
||||
uint32_t ealist_len;
|
||||
BOOLEAN single;
|
||||
BOOLEAN restart;
|
||||
} getexattr_upcall_args;
|
||||
|
||||
|
||||
typedef struct __setexattr_upcall_args {
|
||||
const char *path;
|
||||
unsigned char *buf;
|
||||
uint32_t buf_len;
|
||||
uint32_t mode;
|
||||
} setexattr_upcall_args;
|
||||
|
||||
|
|
@ -155,6 +170,7 @@ typedef union __upcall_args {
|
|||
lock_upcall_args lock;
|
||||
unlock_upcall_args unlock;
|
||||
getattr_upcall_args getattr;
|
||||
getexattr_upcall_args getexattr;
|
||||
setattr_upcall_args setattr;
|
||||
setexattr_upcall_args setexattr;
|
||||
readdir_upcall_args readdir;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue