zydronium/SMBLibrary
1
0
Fork 0
mirror of https://github.com/TalAloni/SMBLibrary.git synced 2025-08-06 07:44:57 +02:00
Code Issues Projects Releases Packages Wiki Activity

SMB2: Honor SMB2_CLOSE_FLAG_POSTQUERY_ATTRIB flag

Browse source
This commit is contained in:
Tal Aloni 2017-02-01 23:05:42 +02:00
parent 092869efa1
commit 88204faf9b
5 changed files with 64 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

8
SMBLibrary/SMB2/Commands/CloseRequest.cs
View file

@ -43,6 +43,14 @@ namespace SMBLibrary.SMB2
FileId.WriteBytes(buffer, offset + 8);
}
public bool PostQueryAttributes
{
get
{
return ((this.Flags & CloseFlags.PostQueryAttributes) > 0);
}
}
public override int CommandLength
{
get

2
SMBLibrary/SMB2/Enums/Close/CloseFlags.cs
View file

@ -5,6 +5,6 @@ namespace SMBLibrary.SMB2
[Flags]
public enum CloseFlags : byte
{
PostQueryAttribute = 0x0001, // SMB2_CLOSE_FLAG_POSTQUERY_ATTRIB
PostQueryAttributes = 0x0001, // SMB2_CLOSE_FLAG_POSTQUERY_ATTRIB
}
}

1
SMBLibrary/SMBLibrary.csproj
View file

@ -153,6 +153,7 @@
<Compile Include="Server\SMB1\TransactionHelper.cs" />
<Compile Include="Server\SMB1\TransactionSubcommandHelper.cs" />
<Compile Include="Server\SMB1\TreeConnectHelper.cs" />
<Compile Include="Server\SMB2\CloseHelper.cs" />
<Compile Include="Server\SMB2\CreateHelper.cs" />
<Compile Include="Server\SMB2\IOCtlHelper.cs" />
<Compile Include="Server\SMB2\NegotiateHelper.cs" />

53
SMBLibrary/Server/SMB2/CloseHelper.cs Normal file
View file

@ -0,0 +1,53 @@
/* Copyright (C) 2017 Tal Aloni <tal.aloni.il@gmail.com>. All rights reserved.
*
* You can redistribute this program and/or modify it under the terms of
* the GNU Lesser Public License as published by the Free Software Foundation,
* either version 3 of the License, or (at your option) any later version.
*/
using System;
using System.Collections.Generic;
using System.IO;
using SMBLibrary.SMB2;
using Utilities;
namespace SMBLibrary.Server.SMB2
{
public class CloseHelper
{
internal static SMB2Command GetCloseResponse(CloseRequest request, ISMBShare share, SMB2ConnectionState state)
{
SMB2Session session = state.GetSession(request.Header.SessionID);
OpenFileObject openFile = session.GetOpenFileObject(request.FileId.Persistent);
if (openFile == null)
{
return new ErrorResponse(request.CommandName, NTStatus.STATUS_FILE_CLOSED);
}
string path = openFile.Path;
session.RemoveOpenFile(request.FileId.Persistent);
CloseResponse response = new CloseResponse();
if (request.PostQueryAttributes)
{
if (share is NamedPipeShare)
{
response.FileAttributes = FileAttributes.Temporary;
}
else // FileSystemShare
{
IFileSystem fileSystem = ((FileSystemShare)share).FileSystem;
FileSystemEntry entry = fileSystem.GetEntry(path);
if (entry != null)
{
response.CreationTime = entry.CreationTime;
response.LastAccessTime = entry.LastAccessTime;
response.LastWriteTime = entry.LastWriteTime;
response.ChangeTime = entry.LastWriteTime;
response.AllocationSize = NTFileSystemHelper.GetAllocationSize(entry.Size);
response.EndofFile = entry.Size;
response.FileAttributes = NTFileSystemHelper.GetFileAttributes(entry);
}
}
}
return response;
}
}
}

9
SMBLibrary/Server/SMBServer.SMB2.cs
View file

@ -155,14 +155,7 @@ namespace SMBLibrary.Server
}
else if (command is CloseRequest)
{
CloseRequest request = (CloseRequest)command;
OpenFileObject openFile = session.GetOpenFileObject(request.FileId.Persistent);
if (openFile == null)
{
return new ErrorResponse(request.CommandName, NTStatus.STATUS_FILE_CLOSED);
}
session.RemoveOpenFile(request.FileId.Persistent);
return new CloseResponse();
return CloseHelper.GetCloseResponse((CloseRequest)command, share, state);
}
else if (command is IOCtlRequest)
{