Public/winfsp
1
0
Fork 0
mirror of https://github.com/winfsp/winfsp.git synced 2025-04-22 16:33:02 -05:00
Code Issues Packages Projects Releases Wiki Activity

inc: fsctl: HasTrailingBackslash: allows for better checking user mode

Browse Source
This commit is contained in:
Bill Zissimopoulos 2016-12-24 11:28:59 -08:00
parent 9bf0d5d46d
commit bec91873fe
4 changed files with 24 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
inc/winfsp/fsctl.h
View File

@ -232,7 +232,8 @@ typedef struct
UINT32 HasRestorePrivilege:1; /* requestor has TOKEN_HAS_RESTORE_PRIVILEGE */ UINT32 HasRestorePrivilege:1; /* requestor has TOKEN_HAS_RESTORE_PRIVILEGE */
UINT32 OpenTargetDirectory:1; /* open target dir and report FILE_{EXISTS,DOES_NOT_EXIST} */ UINT32 OpenTargetDirectory:1; /* open target dir and report FILE_{EXISTS,DOES_NOT_EXIST} */
UINT32 CaseSensitive:1; /* FileName comparisons should be case-sensitive */ UINT32 CaseSensitive:1; /* FileName comparisons should be case-sensitive */
UINT32 ReservedFlags:26; UINT32 HasTrailingBackslash:1; /* FileName had trailing backslash */
UINT32 ReservedFlags:25;
UINT16 NamedStream; /* request targets named stream; colon offset in FileName */ UINT16 NamedStream; /* request targets named stream; colon offset in FileName */
} Create; } Create;
struct struct

18
src/dll/fsop.c
View File

@ -189,7 +189,10 @@ NTSTATUS FspFileSystemCreateCheck(FSP_FILE_SYSTEM *FileSystem,
ParentDesiredAccess = FILE_ADD_SUBDIRECTORY; ParentDesiredAccess = FILE_ADD_SUBDIRECTORY;
else else
ParentDesiredAccess = FILE_ADD_FILE; ParentDesiredAccess = FILE_ADD_FILE;
if ((Request->Req.Create.FileAttributes & FILE_ATTRIBUTE_READONLY) && if (Request->Req.Create.HasTrailingBackslash &&
!(Request->Req.Create.CreateOptions & FILE_DIRECTORY_FILE))
Result = STATUS_OBJECT_NAME_INVALID;
else if ((Request->Req.Create.FileAttributes & FILE_ATTRIBUTE_READONLY) &&
(Request->Req.Create.CreateOptions & FILE_DELETE_ON_CLOSE)) (Request->Req.Create.CreateOptions & FILE_DELETE_ON_CLOSE))
Result = STATUS_CANNOT_DELETE; Result = STATUS_CANNOT_DELETE;
else else
@ -209,11 +212,14 @@ NTSTATUS FspFileSystemCreateCheck(FSP_FILE_SYSTEM *FileSystem,
{ {
*PSecurityDescriptor = 0; *PSecurityDescriptor = 0;
Result = FspAccessCheckEx(FileSystem, Request, TRUE, AllowTraverseCheck, if (Request->Req.Create.HasTrailingBackslash)
Request->Req.Create.DesiredAccess | Result = STATUS_OBJECT_NAME_INVALID;
FILE_WRITE_DATA | else
((Request->Req.Create.CreateOptions & FILE_DELETE_ON_CLOSE) ? DELETE : 0), Result = FspAccessCheckEx(FileSystem, Request, TRUE, AllowTraverseCheck,
&GrantedAccess, 0); Request->Req.Create.DesiredAccess |
FILE_WRITE_DATA |
((Request->Req.Create.CreateOptions & FILE_DELETE_ON_CLOSE) ? DELETE : 0),
&GrantedAccess, 0);
if (STATUS_REPARSE == Result) if (STATUS_REPARSE == Result)
Result = FspFileSystemCallResolveReparsePoints(FileSystem, Request, Response, GrantedAccess); Result = FspFileSystemCallResolveReparsePoints(FileSystem, Request, Response, GrantedAccess);
else if (NT_SUCCESS(Result)) else if (NT_SUCCESS(Result))

7
src/dll/security.c
View File

@ -191,6 +191,13 @@ FSP_API NTSTATUS FspAccessCheckEx(FSP_FILE_SYSTEM *FileSystem,
if (!NT_SUCCESS(Result) || STATUS_REPARSE == Result) if (!NT_SUCCESS(Result) || STATUS_REPARSE == Result)
goto exit; goto exit;
if (!CheckParentOrMain && Request->Req.Create.HasTrailingBackslash &&
!(FileAttributes & FILE_ATTRIBUTE_DIRECTORY))
{
Result = STATUS_OBJECT_NAME_INVALID;
goto exit;
}
if (Request->Req.Create.UserMode && 0 < SecurityDescriptorSize) if (Request->Req.Create.UserMode && 0 < SecurityDescriptorSize)
{ {
if (0 == DesiredAccess) if (0 == DesiredAccess)

9
src/sys/create.c
View File

@ -193,6 +193,7 @@ static NTSTATUS FspFsvolCreateNoLock(
BooleanFlagOn(AccessState->Flags, TOKEN_HAS_BACKUP_PRIVILEGE); BooleanFlagOn(AccessState->Flags, TOKEN_HAS_BACKUP_PRIVILEGE);
BOOLEAN HasRestorePrivilege = BOOLEAN HasRestorePrivilege =
BooleanFlagOn(AccessState->Flags, TOKEN_HAS_RESTORE_PRIVILEGE); BooleanFlagOn(AccessState->Flags, TOKEN_HAS_RESTORE_PRIVILEGE);
BOOLEAN HasTrailingBackslash = FALSE;
FSP_FILE_NODE *FileNode, *RelatedFileNode; FSP_FILE_NODE *FileNode, *RelatedFileNode;
FSP_FILE_DESC *FileDesc; FSP_FILE_DESC *FileDesc;
UNICODE_STRING MainFileName = { 0 }, StreamPart = { 0 }; UNICODE_STRING MainFileName = { 0 }, StreamPart = { 0 };
@ -350,12 +351,7 @@ static NTSTATUS FspFsvolCreateNoLock(
if (sizeof(WCHAR) * 2/* not empty or root */ <= FileNode->FileName.Length && if (sizeof(WCHAR) * 2/* not empty or root */ <= FileNode->FileName.Length &&
L'\\' == FileNode->FileName.Buffer[FileNode->FileName.Length / sizeof(WCHAR) - 1]) L'\\' == FileNode->FileName.Buffer[FileNode->FileName.Length / sizeof(WCHAR) - 1])
{ {
if (!FlagOn(CreateOptions, FILE_DIRECTORY_FILE)) HasTrailingBackslash = TRUE;
{
FspFileNodeDereference(FileNode);
return STATUS_OBJECT_NAME_INVALID;
}
FileNode->FileName.Length -= sizeof(WCHAR); FileNode->FileName.Length -= sizeof(WCHAR);
} }
@ -507,6 +503,7 @@ static NTSTATUS FspFsvolCreateNoLock(
Request->Req.Create.HasRestorePrivilege = HasRestorePrivilege; Request->Req.Create.HasRestorePrivilege = HasRestorePrivilege;
Request->Req.Create.OpenTargetDirectory = BooleanFlagOn(Flags, SL_OPEN_TARGET_DIRECTORY); Request->Req.Create.OpenTargetDirectory = BooleanFlagOn(Flags, SL_OPEN_TARGET_DIRECTORY);
Request->Req.Create.CaseSensitive = CaseSensitive; Request->Req.Create.CaseSensitive = CaseSensitive;
Request->Req.Create.HasTrailingBackslash = HasTrailingBackslash;
Request->Req.Create.NamedStream = MainFileName.Length; Request->Req.Create.NamedStream = MainFileName.Length;
ASSERT( ASSERT(