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

Improved open-search management

Browse source
This commit is contained in:
Tal Aloni 2017-01-17 21:17:56 +02:00
parent 049cb5b104
commit 26ca17c4b9
5 changed files with 61 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

1
SMBLibrary/SMBLibrary.csproj
View file

@ -106,6 +106,7 @@
<Compile Include="RPC\Structures\SyntaxID.cs" /> <Compile Include="RPC\Structures\SyntaxID.cs" />
<Compile Include="Server\ConnectionState\ConnectionState.cs" /> <Compile Include="Server\ConnectionState\ConnectionState.cs" />
<Compile Include="Server\ConnectionState\OpenFileObject.cs" /> <Compile Include="Server\ConnectionState\OpenFileObject.cs" />
<Compile Include="Server\ConnectionState\OpenSearch.cs" />
<Compile Include="Server\ConnectionState\ProcessStateObject.cs" /> <Compile Include="Server\ConnectionState\ProcessStateObject.cs" />
<Compile Include="Server\ConnectionState\SMB1ConnectionState.cs" /> <Compile Include="Server\ConnectionState\SMB1ConnectionState.cs" />
<Compile Include="Server\ConnectionState\SMB1Session.cs" /> <Compile Include="Server\ConnectionState\SMB1Session.cs" />

24
SMBLibrary/Server/ConnectionState/OpenSearch.cs Normal file
View file

@ -0,0 +1,24 @@
/* Copyright (C) 2014-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 Utilities;
namespace SMBLibrary.Server
{
public class OpenSearch
{
public List<FileSystemEntry> Entries;
public int EnumerationLocation;
public OpenSearch(List<FileSystemEntry> entries, int enumerationLocation)
{
Entries = entries;
EnumerationLocation = enumerationLocation;
}
}
}

27
SMBLibrary/Server/ConnectionState/SMB1Session.cs
View file

@ -26,7 +26,7 @@ namespace SMBLibrary.Server
private Dictionary<ushort, OpenFileObject> m_openFiles = new Dictionary<ushort, OpenFileObject>(); private Dictionary<ushort, OpenFileObject> m_openFiles = new Dictionary<ushort, OpenFileObject>();
// Key is search handle a.k.a. Search ID // Key is search handle a.k.a. Search ID
public Dictionary<ushort, List<FileSystemEntry>> OpenSearches = new Dictionary<ushort, List<FileSystemEntry>>(); private Dictionary<ushort, OpenSearch> m_openSearches = new Dictionary<ushort, OpenSearch>();
private ushort m_nextSearchHandle = 1; private ushort m_nextSearchHandle = 1;
public SMB1Session(SMB1ConnectionState connection, ushort userID, string userName) public SMB1Session(SMB1ConnectionState connection, ushort userID, string userName)
@ -102,7 +102,7 @@ namespace SMBLibrary.Server
m_openFiles.Remove(fileID); m_openFiles.Remove(fileID);
} }
public ushort? AllocateSearchHandle() private ushort? AllocateSearchHandle()
{ {
for (ushort offset = 0; offset < UInt16.MaxValue; offset++) for (ushort offset = 0; offset < UInt16.MaxValue; offset++)
{ {
@ -111,7 +111,7 @@ namespace SMBLibrary.Server
{ {
continue; continue;
} }
if (!OpenSearches.ContainsKey(searchHandle)) if (!m_openSearches.ContainsKey(searchHandle))
{ {
m_nextSearchHandle = (ushort)(searchHandle + 1); m_nextSearchHandle = (ushort)(searchHandle + 1);
return searchHandle; return searchHandle;
@ -120,12 +120,27 @@ namespace SMBLibrary.Server
return null; return null;
} }
public void ReleaseSearchHandle(ushort searchHandle) public ushort? AddOpenSearch(List<FileSystemEntry> entries, int enumerationLocation)
{ {
if (OpenSearches.ContainsKey(searchHandle)) ushort? searchHandle = AllocateSearchHandle();
if (searchHandle.HasValue)
{ {
OpenSearches.Remove(searchHandle); OpenSearch openSearch = new OpenSearch(entries, enumerationLocation);
m_openSearches.Add(searchHandle.Value, openSearch);
} }
return searchHandle;
}
public OpenSearch GetOpenSearch(ushort searchHandle)
{
OpenSearch openSearch;
m_openSearches.TryGetValue(searchHandle, out openSearch);
return openSearch;
}
public void RemoveOpenSearch(ushort searchHandle)
{
m_openSearches.Remove(searchHandle);
} }
public ushort UserID public ushort UserID

2
SMBLibrary/Server/SMB1/ServerResponseHelper.cs
View file

@ -45,7 +45,7 @@ namespace SMBLibrary.Server.SMB1
internal static SMB1Command GetFindClose2Request(SMB1Header header, FindClose2Request request, SMB1ConnectionState state) internal static SMB1Command GetFindClose2Request(SMB1Header header, FindClose2Request request, SMB1ConnectionState state)
{ {
SMB1Session session = state.GetSession(header.UID); SMB1Session session = state.GetSession(header.UID);
session.ReleaseSearchHandle(request.SearchHandle); session.RemoveOpenSearch(request.SearchHandle);
return new FindClose2Response(); return new FindClose2Response();
} }

26
SMBLibrary/Server/SMB1/Transaction2SubcommandHelper.cs
View file

@ -110,7 +110,7 @@ namespace SMBLibrary.Server.SMB1
int returnCount = findInformationList.Count; int returnCount = findInformationList.Count;
Transaction2FindFirst2Response response = new Transaction2FindFirst2Response(); Transaction2FindFirst2Response response = new Transaction2FindFirst2Response();
response.SetFindInformationList(findInformationList, header.UnicodeFlag); response.SetFindInformationList(findInformationList, header.UnicodeFlag);
response.EndOfSearch = (returnCount == entries.Count) && (entries.Count <= subcommand.SearchCount); response.EndOfSearch = (returnCount == entries.Count);
bool closeAtEndOfSearch = (subcommand.Flags & FindFlags.SMB_FIND_CLOSE_AT_EOS) > 0; bool closeAtEndOfSearch = (subcommand.Flags & FindFlags.SMB_FIND_CLOSE_AT_EOS) > 0;
bool closeAfterRequest = (subcommand.Flags & FindFlags.SMB_FIND_CLOSE_AFTER_REQUEST) > 0; bool closeAfterRequest = (subcommand.Flags & FindFlags.SMB_FIND_CLOSE_AFTER_REQUEST) > 0;
// If [..] the search fit within a single response and SMB_FIND_CLOSE_AT_EOS is set in the Flags field, // If [..] the search fit within a single response and SMB_FIND_CLOSE_AT_EOS is set in the Flags field,
@ -123,15 +123,13 @@ namespace SMBLibrary.Server.SMB1
} }
else else
{ {
ushort? searchHandle = session.AllocateSearchHandle(); ushort? searchHandle = session.AddOpenSearch(entries, returnCount);
if (!searchHandle.HasValue) if (!searchHandle.HasValue)
{ {
header.Status = NTStatus.STATUS_OS2_NO_MORE_SIDS; header.Status = NTStatus.STATUS_OS2_NO_MORE_SIDS;
return null; return null;
} }
response.SID = searchHandle.Value; response.SID = searchHandle.Value;
entries.RemoveRange(0, returnCount);
session.OpenSearches.Add(response.SID, entries);
} }
return response; return response;
} }
@ -197,34 +195,38 @@ namespace SMBLibrary.Server.SMB1
internal static Transaction2FindNext2Response GetSubcommandResponse(SMB1Header header, Transaction2FindNext2Request subcommand, FileSystemShare share, SMB1ConnectionState state) internal static Transaction2FindNext2Response GetSubcommandResponse(SMB1Header header, Transaction2FindNext2Request subcommand, FileSystemShare share, SMB1ConnectionState state)
{ {
SMB1Session session = state.GetSession(header.UID); SMB1Session session = state.GetSession(header.UID);
if (!session.OpenSearches.ContainsKey(subcommand.SID)) OpenSearch openSearch = session.GetOpenSearch(subcommand.SID);
if (openSearch == null)
{ {
header.Status = NTStatus.STATUS_INVALID_HANDLE; header.Status = NTStatus.STATUS_INVALID_HANDLE;
return null; return null;
} }
bool returnResumeKeys = (subcommand.Flags & FindFlags.SMB_FIND_RETURN_RESUME_KEYS) > 0; bool returnResumeKeys = (subcommand.Flags & FindFlags.SMB_FIND_RETURN_RESUME_KEYS) > 0;
List<FileSystemEntry> entries = session.OpenSearches[subcommand.SID];
FindInformationList findInformationList = new FindInformationList(); FindInformationList findInformationList = new FindInformationList();
for (int index = 0; index < entries.Count; index++) for (int index = openSearch.EnumerationLocation; index < openSearch.Entries.Count; index++)
{ {
FindInformation infoEntry = InfoHelper.FromFileSystemEntry(entries[index], subcommand.InformationLevel, header.UnicodeFlag, returnResumeKeys); FindInformation infoEntry = InfoHelper.FromFileSystemEntry(openSearch.Entries[index], subcommand.InformationLevel, header.UnicodeFlag, returnResumeKeys);
findInformationList.Add(infoEntry); findInformationList.Add(infoEntry);
if (findInformationList.GetLength(header.UnicodeFlag) > state.GetMaxDataCount(header.PID)) if (findInformationList.GetLength(header.UnicodeFlag) > state.GetMaxDataCount(header.PID))
{ {
findInformationList.RemoveAt(findInformationList.Count - 1); findInformationList.RemoveAt(findInformationList.Count - 1);
break; break;
} }
if (findInformationList.Count == subcommand.SearchCount)
{
break;
}
} }
int returnCount = findInformationList.Count; int returnCount = findInformationList.Count;
Transaction2FindNext2Response response = new Transaction2FindNext2Response(); Transaction2FindNext2Response response = new Transaction2FindNext2Response();
response.SetFindInformationList(findInformationList, header.UnicodeFlag); response.SetFindInformationList(findInformationList, header.UnicodeFlag);
entries.RemoveRange(0, returnCount); openSearch.EnumerationLocation += returnCount;
session.OpenSearches[subcommand.SID] = entries; response.EndOfSearch = (openSearch.EnumerationLocation == openSearch.Entries.Count);
response.EndOfSearch = (returnCount == entries.Count) && (entries.Count <= subcommand.SearchCount);
if (response.EndOfSearch) if (response.EndOfSearch)
{ {
session.ReleaseSearchHandle(subcommand.SID); session.RemoveOpenSearch(subcommand.SID);
} }
return response; return response;
} }