{
char *ret, *p, *p_start;
size_t len;
- int num_components=0;
name->original_name = talloc_strdup(name, cifs_name);
name->stream_name = NULL;
return NT_STATUS_ILLEGAL_CHARACTER;
}
*p = '/';
- num_components++;
break;
case ':':
if (!(flags & PVFS_RESOLVE_STREAMS)) {
case '|':
return NT_STATUS_ILLEGAL_CHARACTER;
case '.':
- if (p[1] != '.' ||
- (p[2] != '\\' && p[2] != 0) ||
- (p != p_start && p[-1] != '/')) {
- break;
+ /* see if it is definately a .. or
+ . component. If it is then fail here, and
+ let the next layer up try again after
+ pvfs_reduce_name() if it wants to. This is
+ much more efficient on average than always
+ scanning for these separately */
+ if (p[1] == '.' &&
+ (p[2] == 0 || p[2] == '\\') &&
+ (p == p_start || p[-1] == '/')) {
+ return NT_STATUS_OBJECT_PATH_SYNTAX_BAD;
}
- /* its definately a .. component */
- num_components--;
- if (num_components <= 0) {
+ if ((p[1] == 0 || p[1] == '\\') &&
+ (p == p_start || p[-1] == '/')) {
return NT_STATUS_OBJECT_PATH_SYNTAX_BAD;
}
break;
}
+/*
+ reduce a name that contains .. components or repeated \ separators
+ return NULL if it can't be reduced
+*/
+const char *pvfs_reduce_name(TALLOC_CTX *mem_ctx, const char *fname)
+{
+ codepoint_t c;
+ size_t c_size, len;
+ int i, num_components;
+ char **components;
+ char *p, *s, *ret;
+
+ s = talloc_strdup(mem_ctx, fname);
+ if (s == NULL) return NULL;
+
+ for (num_components=1, p=s; *p; p += c_size) {
+ c = next_codepoint(p, &c_size);
+ if (c == '\\') num_components++;
+ }
+ if (num_components < 2) {
+ talloc_free(s);
+ return NULL;
+ }
+
+ components = talloc_array_p(s, char *, num_components+1);
+ if (components == NULL) {
+ talloc_free(s);
+ return NULL;
+ }
+
+ components[0] = s;
+ for (i=0, p=s; *p; p += c_size) {
+ c = next_codepoint(p, &c_size);
+ if (c == '\\') {
+ *p = 0;
+ components[++i] = p+1;
+ }
+ }
+ components[i+1] = NULL;
+
+ /* remove any null components */
+ for (i=0;components[i];i++) {
+ if (strcmp(components[i], "") == 0 ||
+ strcmp(components[i], ".") == 0) {
+ memmove(&components[i], &components[i+1],
+ sizeof(char *)*(num_components-i));
+ i--;
+ }
+ if (strcmp(components[i], "..") == 0) {
+ if (i < 1) return NULL;
+ memmove(&components[i-1], &components[i+1],
+ sizeof(char *)*(num_components-(i+1)));
+ i -= 2;
+ }
+ }
+
+ if (components[0] == NULL) {
+ talloc_free(s);
+ return talloc_strdup(mem_ctx, "\\");
+ }
+
+ for (len=i=0;components[i];i++) {
+ len += strlen(components[i]) + 1;
+ }
+
+ /* rebuild the name */
+ ret = talloc(mem_ctx, len+1);
+ if (ret == NULL) {
+ talloc_free(s);
+ return NULL;
+ }
+
+ for (len=0,i=0;components[i];i++) {
+ size_t len1 = strlen(components[i]);
+ ret[len] = '\\';
+ memcpy(ret+len+1, components[i], len1);
+ len += len1 + 1;
+ }
+ ret[len] = 0;
+
+ talloc_free(s);
+
+ return ret;
+}
+
+
/*
resolve a name from relative client format to a struct pvfs_filename
the memory for the filename is made as a talloc child of 'name'
/* do the basic conversion to a unix formatted path,
also checking for allowable characters */
status = pvfs_unix_path(pvfs, cifs_name, flags, *name);
+
+ if (NT_STATUS_EQUAL(status, NT_STATUS_OBJECT_PATH_SYNTAX_BAD)) {
+ /* it might contain .. components which need to be reduced */
+ cifs_name = pvfs_reduce_name(*name, cifs_name);
+ if (cifs_name) {
+ status = pvfs_unix_path(pvfs, cifs_name, flags, *name);
+ }
+ }
+
if (!NT_STATUS_IS_OK(status)) {
return status;
}
struct utimbuf unix_times;
struct pvfs_file *f;
uint32_t create_options;
+ struct pvfs_filename newstats;
+ NTSTATUS status;
f = pvfs_find_fd(pvfs, req, info->generic.file.fnum);
if (!f) {
return NT_STATUS_INVALID_HANDLE;
}
+ /* update the file information */
+ status = pvfs_resolve_name_fd(pvfs, f->fd, f->name);
+ if (!NT_STATUS_IS_OK(status)) {
+ return status;
+ }
+
+ /* we take a copy of the current file stats, then update
+ newstats in each of the elements below. At the end we
+ compare, and make any changes needed */
+ newstats = *f->name;
+
switch (info->generic.level) {
- case RAW_SFILEINFO_END_OF_FILE_INFO:
- case RAW_SFILEINFO_END_OF_FILE_INFORMATION:
- if (ftruncate(f->fd,
- info->end_of_file_info.in.size) == -1) {
- return pvfs_map_errno(pvfs, errno);
+ case RAW_SFILEINFO_SETATTR:
+ if (!null_time(info->setattr.in.write_time)) {
+ unix_to_nt_time(&newstats.dos.write_time, info->setattr.in.write_time);
}
- break;
+ if (info->setattr.in.attrib != FILE_ATTRIBUTE_NORMAL) {
+ newstats.dos.attrib = info->setattr.in.attrib;
+ }
+ break;
case RAW_SFILEINFO_SETATTRE:
- unix_times.actime = info->setattre.in.access_time;
- unix_times.modtime = info->setattre.in.write_time;
-
- if (unix_times.actime == 0 && unix_times.modtime == 0) {
- break;
- }
-
- /* set modify time = to access time if modify time was 0 */
- if (unix_times.actime != 0 && unix_times.modtime == 0) {
- unix_times.modtime = unix_times.actime;
+ case RAW_SFILEINFO_STANDARD:
+ if (!null_time(info->setattre.in.create_time)) {
+ unix_to_nt_time(&newstats.dos.create_time, info->setattre.in.create_time);
+ }
+ if (!null_time(info->setattre.in.access_time)) {
+ unix_to_nt_time(&newstats.dos.access_time, info->setattre.in.access_time);
}
+ if (!null_time(info->setattre.in.write_time)) {
+ unix_to_nt_time(&newstats.dos.write_time, info->setattre.in.write_time);
+ }
+ break;
- /* Set the date on this file */
- if (utime(f->name->full_name, &unix_times) == -1) {
- return pvfs_map_errno(pvfs, errno);
+ case RAW_SFILEINFO_BASIC_INFO:
+ case RAW_SFILEINFO_BASIC_INFORMATION:
+ if (info->basic_info.in.create_time) {
+ newstats.dos.create_time = info->basic_info.in.create_time;
+ }
+ if (info->basic_info.in.access_time) {
+ newstats.dos.access_time = info->basic_info.in.access_time;
+ }
+ if (info->basic_info.in.write_time) {
+ newstats.dos.write_time = info->basic_info.in.write_time;
+ }
+ if (info->basic_info.in.change_time) {
+ newstats.dos.change_time = info->basic_info.in.change_time;
+ }
+ if (info->basic_info.in.attrib != FILE_ATTRIBUTE_NORMAL) {
+ newstats.dos.attrib = info->basic_info.in.attrib;
}
break;
}
return pvfs_change_create_options(pvfs, req, f, create_options);
+ case RAW_SFILEINFO_ALLOCATION_INFO:
+ case RAW_SFILEINFO_ALLOCATION_INFORMATION:
+ newstats.dos.alloc_size = info->allocation_info.in.alloc_size;
+ break;
+
+ case RAW_SFILEINFO_END_OF_FILE_INFO:
+ case RAW_SFILEINFO_END_OF_FILE_INFORMATION:
+ newstats.st.st_size = info->end_of_file_info.in.size;
+ break;
+
case RAW_SFILEINFO_POSITION_INFORMATION:
f->position = info->position_information.in.position;
break;
+
+ default:
+ return NT_STATUS_INVALID_LEVEL;
+ }
+
+ /* possibly change the file size */
+ if (newstats.st.st_size != f->name->st.st_size) {
+ if (ftruncate(f->fd, newstats.st.st_size) == -1) {
+ return pvfs_map_errno(pvfs, errno);
+ }
+ }
+
+ /* possibly change the file timestamps */
+ ZERO_STRUCT(unix_times);
+ if (newstats.dos.access_time != f->name->dos.access_time) {
+ unix_times.actime = nt_time_to_unix(newstats.dos.access_time);
+ }
+ if (newstats.dos.write_time != f->name->dos.write_time) {
+ unix_times.modtime = nt_time_to_unix(newstats.dos.write_time);
+ }
+ if (unix_times.actime != 0 || unix_times.modtime != 0) {
+ if (utime(f->name->full_name, &unix_times) == -1) {
+ return pvfs_map_errno(pvfs, errno);
+ }
+ }
+
+ /* possibly change the attribute */
+ if (newstats.dos.attrib != f->name->dos.attrib) {
+ mode_t mode = pvfs_fileperms(pvfs, newstats.dos.attrib);
+ if (fchmod(f->fd, mode) == -1) {
+ return pvfs_map_errno(pvfs, errno);
+ }
}
+
return NT_STATUS_OK;
}
{
struct pvfs_state *pvfs = ntvfs->private_data;
struct pvfs_filename *name;
+ struct pvfs_filename newstats;
NTSTATUS status;
struct utimbuf unix_times;
return NT_STATUS_OBJECT_NAME_NOT_FOUND;
}
+
+ /* we take a copy of the current file stats, then update
+ newstats in each of the elements below. At the end we
+ compare, and make any changes needed */
+ newstats = *name;
+
switch (info->generic.level) {
- case RAW_SFILEINFO_END_OF_FILE_INFO:
- case RAW_SFILEINFO_END_OF_FILE_INFORMATION:
- if (truncate(name->full_name,
- info->end_of_file_info.in.size) == -1) {
- return pvfs_map_errno(pvfs, errno);
+ case RAW_SFILEINFO_SETATTR:
+ if (!null_time(info->setattr.in.write_time)) {
+ unix_to_nt_time(&newstats.dos.write_time, info->setattr.in.write_time);
}
- break;
+ if (info->setattr.in.attrib != FILE_ATTRIBUTE_NORMAL) {
+ newstats.dos.attrib = info->setattr.in.attrib;
+ }
+ break;
case RAW_SFILEINFO_SETATTRE:
- unix_times.actime = info->setattre.in.access_time;
- unix_times.modtime = info->setattre.in.write_time;
-
- if (unix_times.actime == 0 && unix_times.modtime == 0) {
- break;
- }
-
- /* set modify time = to access time if modify time was 0 */
- if (unix_times.actime != 0 && unix_times.modtime == 0) {
- unix_times.modtime = unix_times.actime;
+ case RAW_SFILEINFO_STANDARD:
+ if (!null_time(info->setattre.in.create_time)) {
+ unix_to_nt_time(&newstats.dos.create_time, info->setattre.in.create_time);
+ }
+ if (!null_time(info->setattre.in.access_time)) {
+ unix_to_nt_time(&newstats.dos.access_time, info->setattre.in.access_time);
}
+ if (!null_time(info->setattre.in.write_time)) {
+ unix_to_nt_time(&newstats.dos.write_time, info->setattre.in.write_time);
+ }
+ break;
- /* Set the date on this file */
- if (utime(name->full_name, &unix_times) == -1) {
- return NT_STATUS_ACCESS_DENIED;
+ case RAW_SFILEINFO_BASIC_INFO:
+ case RAW_SFILEINFO_BASIC_INFORMATION:
+ if (info->basic_info.in.create_time) {
+ newstats.dos.create_time = info->basic_info.in.create_time;
+ }
+ if (info->basic_info.in.access_time) {
+ newstats.dos.access_time = info->basic_info.in.access_time;
+ }
+ if (info->basic_info.in.write_time) {
+ newstats.dos.write_time = info->basic_info.in.write_time;
+ }
+ if (info->basic_info.in.change_time) {
+ newstats.dos.change_time = info->basic_info.in.change_time;
+ }
+ if (info->basic_info.in.attrib != FILE_ATTRIBUTE_NORMAL) {
+ newstats.dos.attrib = info->basic_info.in.attrib;
}
break;
+ case RAW_SFILEINFO_ALLOCATION_INFO:
+ case RAW_SFILEINFO_ALLOCATION_INFORMATION:
+ newstats.dos.alloc_size = info->allocation_info.in.alloc_size;
+ break;
+
+ case RAW_SFILEINFO_END_OF_FILE_INFO:
+ case RAW_SFILEINFO_END_OF_FILE_INFORMATION:
+ newstats.st.st_size = info->end_of_file_info.in.size;
+ break;
+
case RAW_SFILEINFO_DISPOSITION_INFO:
case RAW_SFILEINFO_DISPOSITION_INFORMATION:
- return NT_STATUS_INVALID_PARAMETER;
-
case RAW_SFILEINFO_POSITION_INFORMATION:
return NT_STATUS_OK;
+
+ default:
+ return NT_STATUS_INVALID_LEVEL;
}
- return NT_STATUS_INVALID_LEVEL;
+ /* possibly change the file size */
+ if (newstats.st.st_size != name->st.st_size) {
+ if (truncate(name->full_name, newstats.st.st_size) == -1) {
+ return pvfs_map_errno(pvfs, errno);
+ }
+ }
+
+ /* possibly change the file timestamps */
+ ZERO_STRUCT(unix_times);
+ if (newstats.dos.access_time != name->dos.access_time) {
+ unix_times.actime = nt_time_to_unix(newstats.dos.access_time);
+ }
+ if (newstats.dos.write_time != name->dos.write_time) {
+ unix_times.modtime = nt_time_to_unix(newstats.dos.write_time);
+ }
+ if (unix_times.actime != 0 || unix_times.modtime != 0) {
+ if (utime(name->full_name, &unix_times) == -1) {
+ return pvfs_map_errno(pvfs, errno);
+ }
+ }
+
+ /* possibly change the attribute */
+ if (newstats.dos.attrib != name->dos.attrib) {
+ mode_t mode = pvfs_fileperms(pvfs, newstats.dos.attrib);
+ if (chmod(name->full_name, mode) == -1) {
+ return pvfs_map_errno(pvfs, errno);
+ }
+ }
+
+ return NT_STATUS_OK;
}
git.samba.org / jelmer / samba4-debian.git / commitdiff