zydronium/SMBLibrary
1
0
Fork 0
mirror of https://github.com/TalAloni/SMBLibrary.git synced 2025-05-15 17:06:59 +02:00
Code Issues Projects Releases Packages Wiki Activity

SMB1FileStoreHelper: QueryInformation / SetInformation / QueryDirectory: Bugfix: Temporary handle was not closed

Browse source
This commit is contained in:
Tal Aloni 2017-07-18 15:03:22 +03:00
parent 2457d2c246
commit fd9a845fa2
2 changed files with 13 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

10
SMBLibrary/Server/SMB1/SMB1FileStoreHelper.QueryDirectory.cs
View file

@ -31,13 +31,15 @@ namespace SMBLibrary.Server.SMB1
string fileName = fileNamePattern.Substring(separatorIndex + 1); string fileName = fileNamePattern.Substring(separatorIndex + 1);
object handle; object handle;
FileStatus fileStatus; FileStatus fileStatus;
NTStatus createStatus = fileStore.CreateFile(out handle, out fileStatus, path, DirectoryAccessMask.FILE_LIST_DIRECTORY | DirectoryAccessMask.FILE_TRAVERSE, 0, ShareAccess.FILE_SHARE_READ | ShareAccess.FILE_SHARE_WRITE, CreateDisposition.FILE_OPEN, CreateOptions.FILE_DIRECTORY_FILE, securityContext); NTStatus status = fileStore.CreateFile(out handle, out fileStatus, path, DirectoryAccessMask.FILE_LIST_DIRECTORY | DirectoryAccessMask.FILE_TRAVERSE, 0, ShareAccess.FILE_SHARE_READ | ShareAccess.FILE_SHARE_WRITE, CreateDisposition.FILE_OPEN, CreateOptions.FILE_DIRECTORY_FILE, securityContext);
if (createStatus != NTStatus.STATUS_SUCCESS) if (status != NTStatus.STATUS_SUCCESS)
{ {
result = null; result = null;
return createStatus; return status;
} }
return fileStore.QueryDirectory(out result, handle, fileName, fileInformation); status = fileStore.QueryDirectory(out result, handle, fileName, fileInformation);
fileStore.CloseFile(handle);
return status;
} }
else else
{ {

11
SMBLibrary/Server/SMB1/SMB1FileStoreHelper.cs
View file

@ -111,6 +111,7 @@ namespace SMBLibrary.Server.SMB1
} }
fileInfo = NTFileStoreHelper.GetNetworkOpenInformation(fileStore, handle); fileInfo = NTFileStoreHelper.GetNetworkOpenInformation(fileStore, handle);
fileStore.CloseFile(handle);
return NTStatus.STATUS_SUCCESS; return NTStatus.STATUS_SUCCESS;
} }
@ -118,10 +119,10 @@ namespace SMBLibrary.Server.SMB1
{ {
object handle; object handle;
FileStatus fileStatus; FileStatus fileStatus;
NTStatus openStatus = fileStore.CreateFile(out handle, out fileStatus, path, FileAccessMask.FILE_WRITE_ATTRIBUTES, (FileAttributes)0, ShareAccess.FILE_SHARE_READ | ShareAccess.FILE_SHARE_WRITE, CreateDisposition.FILE_OPEN, 0, securityContext); NTStatus status = fileStore.CreateFile(out handle, out fileStatus, path, FileAccessMask.FILE_WRITE_ATTRIBUTES, (FileAttributes)0, ShareAccess.FILE_SHARE_READ | ShareAccess.FILE_SHARE_WRITE, CreateDisposition.FILE_OPEN, 0, securityContext);
if (openStatus != NTStatus.STATUS_SUCCESS) if (status != NTStatus.STATUS_SUCCESS)
{ {
return openStatus; return status;
} }
FileBasicInformation basicInfo = new FileBasicInformation(); FileBasicInformation basicInfo = new FileBasicInformation();
@ -142,7 +143,9 @@ namespace SMBLibrary.Server.SMB1
basicInfo.FileAttributes |= FileAttributes.Archive; basicInfo.FileAttributes |= FileAttributes.Archive;
} }
return fileStore.SetFileInformation(handle, basicInfo); status = fileStore.SetFileInformation(handle, basicInfo);
fileStore.CloseFile(handle);
return status;
} }
public static NTStatus SetInformation2(INTFileStore fileStore, object handle, DateTime? creationTime, DateTime? lastAccessTime, DateTime? lastWriteTime) public static NTStatus SetInformation2(INTFileStore fileStore, object handle, DateTime? creationTime, DateTime? lastAccessTime, DateTime? lastWriteTime)