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

Added a SecurityContext class which will be passes to the underlying object store

Browse source
This commit is contained in:
Tal Aloni 2017-02-11 19:25:14 +02:00
parent 3e158fb855
commit 4842c17f78
27 changed files with 158 additions and 89 deletions
Download patch file Download diff file Expand all files Collapse all files

2
SMBLibrary/NTFileStore/Adapter/NTFileSystemAdapter.cs
View file

@ -25,7 +25,7 @@ namespace SMBLibrary
m_fileSystem = fileSystem; m_fileSystem = fileSystem;
} }
public NTStatus CreateFile(out object handle, out FileStatus fileStatus, string path, AccessMask desiredAccess, ShareAccess shareAccess, CreateDisposition createDisposition, CreateOptions createOptions) public NTStatus CreateFile(out object handle, out FileStatus fileStatus, string path, AccessMask desiredAccess, ShareAccess shareAccess, CreateDisposition createDisposition, CreateOptions createOptions, SecurityContext securityContext)
{ {
handle = null; handle = null;
fileStatus = FileStatus.FILE_DOES_NOT_EXIST; fileStatus = FileStatus.FILE_DOES_NOT_EXIST;

2
SMBLibrary/NTFileStore/INTFileStore.cs
View file

@ -16,7 +16,7 @@ namespace SMBLibrary
/// </summary> /// </summary>
public interface INTFileStore public interface INTFileStore
{ {
NTStatus CreateFile(out object handle, out FileStatus fileStatus, string path, AccessMask desiredAccess, ShareAccess shareAccess, CreateDisposition createDisposition, CreateOptions createOptions); NTStatus CreateFile(out object handle, out FileStatus fileStatus, string path, AccessMask desiredAccess, ShareAccess shareAccess, CreateDisposition createDisposition, CreateOptions createOptions, SecurityContext securityContext);
NTStatus CloseFile(object handle); NTStatus CloseFile(object handle);

4
SMBLibrary/NTFileStore/NTFileStoreHelper.cs
View file

@ -99,11 +99,11 @@ namespace SMBLibrary
return result; return result;
} }
public static FileNetworkOpenInformation GetNetworkOpenInformation(INTFileStore fileStore, string path) public static FileNetworkOpenInformation GetNetworkOpenInformation(INTFileStore fileStore, string path, SecurityContext securityContext)
{ {
object handle; object handle;
FileStatus fileStatus; FileStatus fileStatus;
NTStatus openStatus = fileStore.CreateFile(out handle, out fileStatus, path, FileAccessMask.FILE_READ_ATTRIBUTES, ShareAccess.FILE_SHARE_READ | ShareAccess.FILE_SHARE_WRITE, CreateDisposition.FILE_OPEN, 0); NTStatus openStatus = fileStore.CreateFile(out handle, out fileStatus, path, FileAccessMask.FILE_READ_ATTRIBUTES, ShareAccess.FILE_SHARE_READ | ShareAccess.FILE_SHARE_WRITE, CreateDisposition.FILE_OPEN, 0, securityContext);
if (openStatus != NTStatus.STATUS_SUCCESS) if (openStatus != NTStatus.STATUS_SUCCESS)
{ {
return null; return null;

2
SMBLibrary/NTFileStore/NamedPipeStore.cs
View file

@ -22,7 +22,7 @@ namespace SMBLibrary
m_services = services; m_services = services;
} }
public NTStatus CreateFile(out object handle, out FileStatus fileStatus, string path, AccessMask desiredAccess, ShareAccess shareAccess, CreateDisposition createDisposition, CreateOptions createOptions) public NTStatus CreateFile(out object handle, out FileStatus fileStatus, string path, AccessMask desiredAccess, ShareAccess shareAccess, CreateDisposition createDisposition, CreateOptions createOptions, SecurityContext securityContext)
{ {
fileStatus = FileStatus.FILE_DOES_NOT_EXIST; fileStatus = FileStatus.FILE_DOES_NOT_EXIST;
// It is possible to have a named pipe that does not use RPC (e.g. MS-WSP), // It is possible to have a named pipe that does not use RPC (e.g. MS-WSP),

1
SMBLibrary/SMBLibrary.csproj
View file

@ -176,6 +176,7 @@
<Compile Include="Server\ConnectionState\OpenFileObject.cs" /> <Compile Include="Server\ConnectionState\OpenFileObject.cs" />
<Compile Include="Server\ConnectionState\OpenSearch.cs" /> <Compile Include="Server\ConnectionState\OpenSearch.cs" />
<Compile Include="Server\ConnectionState\ProcessStateObject.cs" /> <Compile Include="Server\ConnectionState\ProcessStateObject.cs" />
<Compile Include="Server\ConnectionState\SecurityContext.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" />
<Compile Include="Server\ConnectionState\SMB2ConnectionState.cs" /> <Compile Include="Server\ConnectionState\SMB2ConnectionState.cs" />

8
SMBLibrary/Server/ConnectionState/SMB1ConnectionState.cs
View file

@ -52,20 +52,20 @@ namespace SMBLibrary.Server
return null; return null;
} }
public SMB1Session CreateSession(ushort userID, string userName) public SMB1Session CreateSession(ushort userID, string userName, string machineName)
{ {
SMB1Session session = new SMB1Session(this, userID, userName); SMB1Session session = new SMB1Session(this, userID, userName, machineName);
m_sessions.Add(userID, session); m_sessions.Add(userID, session);
return session; return session;
} }
/// <returns>null if all UserID values have already been allocated</returns> /// <returns>null if all UserID values have already been allocated</returns>
public SMB1Session CreateSession(string userName) public SMB1Session CreateSession(string userName, string machineName)
{ {
ushort? userID = AllocateUserID(); ushort? userID = AllocateUserID();
if (userID.HasValue) if (userID.HasValue)
{ {
return CreateSession(userID.Value, userName); return CreateSession(userID.Value, userName, machineName);
} }
return null; return null;
} }

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

@ -17,7 +17,7 @@ namespace SMBLibrary.Server
private SMB1ConnectionState m_connection; private SMB1ConnectionState m_connection;
private ushort m_userID; private ushort m_userID;
private string m_userName; private SecurityContext m_securityContext;
// Key is TID // Key is TID
private Dictionary<ushort, ISMBShare> m_connectedTrees = new Dictionary<ushort, ISMBShare>(); private Dictionary<ushort, ISMBShare> m_connectedTrees = new Dictionary<ushort, ISMBShare>();
@ -29,11 +29,11 @@ namespace SMBLibrary.Server
private Dictionary<ushort, OpenSearch> m_openSearches = new Dictionary<ushort, OpenSearch>(); 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, string machineName)
{ {
m_connection = connection; m_connection = connection;
m_userID = userID; m_userID = userID;
m_userName = userName; m_securityContext = new SecurityContext(userName, machineName, connection.ClientEndPoint);
} }
public ushort? AddConnectedTree(ISMBShare share) public ushort? AddConnectedTree(ISMBShare share)
@ -141,11 +141,19 @@ namespace SMBLibrary.Server
} }
} }
public SecurityContext SecurityContext
{
get
{
return m_securityContext;
}
}
public string UserName public string UserName
{ {
get get
{ {
return m_userName; return m_securityContext.UserName;
} }
} }
} }

4
SMBLibrary/Server/ConnectionState/SMB2ConnectionState.cs
View file

@ -44,9 +44,9 @@ namespace SMBLibrary.Server
return null; return null;
} }
public SMB2Session CreateSession(ulong sessionID, string userName) public SMB2Session CreateSession(ulong sessionID, string userName, string machineName)
{ {
SMB2Session session = new SMB2Session(this, sessionID, userName); SMB2Session session = new SMB2Session(this, sessionID, userName, machineName);
m_sessions.Add(sessionID, session); m_sessions.Add(sessionID, session);
return session; return session;
} }

16
SMBLibrary/Server/ConnectionState/SMB2Session.cs
View file

@ -16,7 +16,7 @@ namespace SMBLibrary.Server
{ {
private SMB2ConnectionState m_connection; private SMB2ConnectionState m_connection;
private ulong m_sessionID; private ulong m_sessionID;
private string m_userName; private SecurityContext m_securityContext;
// Key is TreeID // Key is TreeID
private Dictionary<uint, ISMBShare> m_connectedTrees = new Dictionary<uint, ISMBShare>(); private Dictionary<uint, ISMBShare> m_connectedTrees = new Dictionary<uint, ISMBShare>();
@ -28,11 +28,11 @@ namespace SMBLibrary.Server
// Key is the persistent portion of the FileID // Key is the persistent portion of the FileID
private Dictionary<ulong, OpenSearch> m_openSearches = new Dictionary<ulong, OpenSearch>(); private Dictionary<ulong, OpenSearch> m_openSearches = new Dictionary<ulong, OpenSearch>();
public SMB2Session(SMB2ConnectionState connecton, ulong sessionID, string userName) public SMB2Session(SMB2ConnectionState connecton, ulong sessionID, string userName, string machineName)
{ {
m_connection = connecton; m_connection = connecton;
m_sessionID = sessionID; m_sessionID = sessionID;
m_userName = userName; m_securityContext = new SecurityContext(userName, machineName, connecton.ClientEndPoint);
} }
private uint? AllocateTreeID() private uint? AllocateTreeID()
@ -138,11 +138,19 @@ namespace SMBLibrary.Server
m_openSearches.Remove(fileID); m_openSearches.Remove(fileID);
} }
public SecurityContext SecurityContext
{
get
{
return m_securityContext;
}
}
public string UserName public string UserName
{ {
get get
{ {
return m_userName; return m_securityContext.UserName;
} }
} }
} }

50
SMBLibrary/Server/ConnectionState/SecurityContext.cs Normal file
View file

@ -0,0 +1,50 @@
/* 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.Net;
namespace SMBLibrary
{
public class SecurityContext
{
private string m_userName;
private string m_machineName;
private IPEndPoint m_clientEndPoint;
public SecurityContext(string userName, string machineName, IPEndPoint clientEndPoint)
{
m_userName = userName;
m_machineName = machineName;
m_clientEndPoint = clientEndPoint;
}
public string UserName
{
get
{
return m_userName;
}
}
public string MachineName
{
get
{
return m_machineName;
}
}
public IPEndPoint ClientEndPoint
{
get
{
return m_clientEndPoint;
}
}
}
}

32
SMBLibrary/Server/SMB1/FileStoreResponseHelper.cs
View file

@ -20,14 +20,14 @@ namespace SMBLibrary.Server.SMB1
SMB1Session session = state.GetSession(header.UID); SMB1Session session = state.GetSession(header.UID);
if (share is FileSystemShare) if (share is FileSystemShare)
{ {
if (!((FileSystemShare)share).HasWriteAccess(session.UserName, request.DirectoryName, state.ClientEndPoint)) if (!((FileSystemShare)share).HasWriteAccess(session.SecurityContext, request.DirectoryName))
{ {
header.Status = NTStatus.STATUS_ACCESS_DENIED; header.Status = NTStatus.STATUS_ACCESS_DENIED;
return new ErrorResponse(request.CommandName); return new ErrorResponse(request.CommandName);
} }
} }
header.Status = SMB1FileStoreHelper.CreateDirectory(share.FileStore, request.DirectoryName); header.Status = SMB1FileStoreHelper.CreateDirectory(share.FileStore, request.DirectoryName, session.SecurityContext);
if (header.Status != NTStatus.STATUS_SUCCESS) if (header.Status != NTStatus.STATUS_SUCCESS)
{ {
return new ErrorResponse(request.CommandName); return new ErrorResponse(request.CommandName);
@ -41,14 +41,14 @@ namespace SMBLibrary.Server.SMB1
SMB1Session session = state.GetSession(header.UID); SMB1Session session = state.GetSession(header.UID);
if (share is FileSystemShare) if (share is FileSystemShare)
{ {
if (!((FileSystemShare)share).HasWriteAccess(session.UserName, request.DirectoryName, state.ClientEndPoint)) if (!((FileSystemShare)share).HasWriteAccess(session.SecurityContext, request.DirectoryName))
{ {
header.Status = NTStatus.STATUS_ACCESS_DENIED; header.Status = NTStatus.STATUS_ACCESS_DENIED;
return new ErrorResponse(request.CommandName); return new ErrorResponse(request.CommandName);
} }
} }
header.Status = SMB1FileStoreHelper.DeleteDirectory(share.FileStore, request.DirectoryName); header.Status = SMB1FileStoreHelper.DeleteDirectory(share.FileStore, request.DirectoryName, session.SecurityContext);
if (header.Status != NTStatus.STATUS_SUCCESS) if (header.Status != NTStatus.STATUS_SUCCESS)
{ {
return new ErrorResponse(request.CommandName); return new ErrorResponse(request.CommandName);
@ -61,7 +61,7 @@ namespace SMBLibrary.Server.SMB1
SMB1Session session = state.GetSession(header.UID); SMB1Session session = state.GetSession(header.UID);
if (share is FileSystemShare) if (share is FileSystemShare)
{ {
if (!((FileSystemShare)share).HasWriteAccess(session.UserName, request.FileName, state.ClientEndPoint)) if (!((FileSystemShare)share).HasWriteAccess(session.SecurityContext, request.FileName))
{ {
header.Status = NTStatus.STATUS_ACCESS_DENIED; header.Status = NTStatus.STATUS_ACCESS_DENIED;
return new ErrorResponse(request.CommandName); return new ErrorResponse(request.CommandName);
@ -69,7 +69,7 @@ namespace SMBLibrary.Server.SMB1
} }
// [MS-CIFS] This command cannot delete directories or volumes. // [MS-CIFS] This command cannot delete directories or volumes.
header.Status = SMB1FileStoreHelper.DeleteFile(share.FileStore, request.FileName); header.Status = SMB1FileStoreHelper.DeleteFile(share.FileStore, request.FileName, session.SecurityContext);
if (header.Status != NTStatus.STATUS_SUCCESS) if (header.Status != NTStatus.STATUS_SUCCESS)
{ {
return new ErrorResponse(request.CommandName); return new ErrorResponse(request.CommandName);
@ -82,19 +82,19 @@ namespace SMBLibrary.Server.SMB1
SMB1Session session = state.GetSession(header.UID); SMB1Session session = state.GetSession(header.UID);
if (share is FileSystemShare) if (share is FileSystemShare)
{ {
if (!((FileSystemShare)share).HasWriteAccess(session.UserName, request.OldFileName, state.ClientEndPoint)) if (!((FileSystemShare)share).HasWriteAccess(session.SecurityContext, request.OldFileName))
{ {
header.Status = NTStatus.STATUS_ACCESS_DENIED; header.Status = NTStatus.STATUS_ACCESS_DENIED;
return new ErrorResponse(request.CommandName); return new ErrorResponse(request.CommandName);
} }
if (!((FileSystemShare)share).HasWriteAccess(session.UserName, request.NewFileName, state.ClientEndPoint)) if (!((FileSystemShare)share).HasWriteAccess(session.SecurityContext, request.NewFileName))
{ {
header.Status = NTStatus.STATUS_ACCESS_DENIED; header.Status = NTStatus.STATUS_ACCESS_DENIED;
return new ErrorResponse(request.CommandName); return new ErrorResponse(request.CommandName);
} }
} }
header.Status = SMB1FileStoreHelper.Rename(share.FileStore, request.OldFileName, request.NewFileName, request.SearchAttributes); header.Status = SMB1FileStoreHelper.Rename(share.FileStore, request.OldFileName, request.NewFileName, request.SearchAttributes, session.SecurityContext);
if (header.Status != NTStatus.STATUS_SUCCESS) if (header.Status != NTStatus.STATUS_SUCCESS)
{ {
return new ErrorResponse(request.CommandName); return new ErrorResponse(request.CommandName);
@ -107,14 +107,14 @@ namespace SMBLibrary.Server.SMB1
SMB1Session session = state.GetSession(header.UID); SMB1Session session = state.GetSession(header.UID);
if (share is FileSystemShare) if (share is FileSystemShare)
{ {
if (!((FileSystemShare)share).HasReadAccess(session.UserName, request.DirectoryName, state.ClientEndPoint)) if (!((FileSystemShare)share).HasReadAccess(session.SecurityContext, request.DirectoryName))
{ {
header.Status = NTStatus.STATUS_ACCESS_DENIED; header.Status = NTStatus.STATUS_ACCESS_DENIED;
return new ErrorResponse(request.CommandName); return new ErrorResponse(request.CommandName);
} }
} }
header.Status = SMB1FileStoreHelper.CheckDirectory(share.FileStore, request.DirectoryName); header.Status = SMB1FileStoreHelper.CheckDirectory(share.FileStore, request.DirectoryName, session.SecurityContext);
if (header.Status != NTStatus.STATUS_SUCCESS) if (header.Status != NTStatus.STATUS_SUCCESS)
{ {
return new ErrorResponse(request.CommandName); return new ErrorResponse(request.CommandName);
@ -128,7 +128,7 @@ namespace SMBLibrary.Server.SMB1
SMB1Session session = state.GetSession(header.UID); SMB1Session session = state.GetSession(header.UID);
if (share is FileSystemShare) if (share is FileSystemShare)
{ {
if (!((FileSystemShare)share).HasReadAccess(session.UserName, request.FileName, state.ClientEndPoint)) if (!((FileSystemShare)share).HasReadAccess(session.SecurityContext, request.FileName))
{ {
header.Status = NTStatus.STATUS_ACCESS_DENIED; header.Status = NTStatus.STATUS_ACCESS_DENIED;
return new ErrorResponse(request.CommandName); return new ErrorResponse(request.CommandName);
@ -136,7 +136,7 @@ namespace SMBLibrary.Server.SMB1
} }
FileNetworkOpenInformation fileInfo; FileNetworkOpenInformation fileInfo;
header.Status = SMB1FileStoreHelper.QueryInformation(out fileInfo, share.FileStore, request.FileName); header.Status = SMB1FileStoreHelper.QueryInformation(out fileInfo, share.FileStore, request.FileName, session.SecurityContext);
if (header.Status != NTStatus.STATUS_SUCCESS) if (header.Status != NTStatus.STATUS_SUCCESS)
{ {
return new ErrorResponse(request.CommandName); return new ErrorResponse(request.CommandName);
@ -154,14 +154,14 @@ namespace SMBLibrary.Server.SMB1
SMB1Session session = state.GetSession(header.UID); SMB1Session session = state.GetSession(header.UID);
if (share is FileSystemShare) if (share is FileSystemShare)
{ {
if (!((FileSystemShare)share).HasWriteAccess(session.UserName, request.FileName, state.ClientEndPoint)) if (!((FileSystemShare)share).HasWriteAccess(session.SecurityContext, request.FileName))
{ {
header.Status = NTStatus.STATUS_ACCESS_DENIED; header.Status = NTStatus.STATUS_ACCESS_DENIED;
return new ErrorResponse(request.CommandName); return new ErrorResponse(request.CommandName);
} }
} }
header.Status = SMB1FileStoreHelper.SetInformation(share.FileStore, request.FileName, request.FileAttributes, request.LastWriteTime); header.Status = SMB1FileStoreHelper.SetInformation(share.FileStore, request.FileName, request.FileAttributes, request.LastWriteTime, session.SecurityContext);
if (header.Status != NTStatus.STATUS_SUCCESS) if (header.Status != NTStatus.STATUS_SUCCESS)
{ {
return new ErrorResponse(request.CommandName); return new ErrorResponse(request.CommandName);
@ -182,7 +182,7 @@ namespace SMBLibrary.Server.SMB1
if (share is FileSystemShare) if (share is FileSystemShare)
{ {
if (!((FileSystemShare)share).HasWriteAccess(session.UserName, openFile.Path, state.ClientEndPoint)) if (!((FileSystemShare)share).HasWriteAccess(session.SecurityContext, openFile.Path))
{ {
header.Status = NTStatus.STATUS_ACCESS_DENIED; header.Status = NTStatus.STATUS_ACCESS_DENIED;
return new ErrorResponse(request.CommandName); return new ErrorResponse(request.CommandName);

4
SMBLibrary/Server/SMB1/NTCreateHelper.cs
View file

@ -24,7 +24,7 @@ namespace SMBLibrary.Server.SMB1
FileAccess createAccess = NTFileStoreHelper.ToCreateFileAccess(request.DesiredAccess, request.CreateDisposition); FileAccess createAccess = NTFileStoreHelper.ToCreateFileAccess(request.DesiredAccess, request.CreateDisposition);
if (share is FileSystemShare) if (share is FileSystemShare)
{ {
if (!((FileSystemShare)share).HasAccess(session.UserName, path, createAccess, state.ClientEndPoint)) if (!((FileSystemShare)share).HasAccess(session.SecurityContext, path, createAccess))
{ {
header.Status = NTStatus.STATUS_ACCESS_DENIED; header.Status = NTStatus.STATUS_ACCESS_DENIED;
return new ErrorResponse(request.CommandName); return new ErrorResponse(request.CommandName);
@ -33,7 +33,7 @@ namespace SMBLibrary.Server.SMB1
object handle; object handle;
FileStatus fileStatus; FileStatus fileStatus;
NTStatus createStatus = share.FileStore.CreateFile(out handle, out fileStatus, path, request.DesiredAccess, request.ShareAccess, request.CreateDisposition, request.CreateOptions); NTStatus createStatus = share.FileStore.CreateFile(out handle, out fileStatus, path, request.DesiredAccess, request.ShareAccess, request.CreateDisposition, request.CreateOptions, session.SecurityContext);
if (createStatus != NTStatus.STATUS_SUCCESS) if (createStatus != NTStatus.STATUS_SUCCESS)
{ {
header.Status = createStatus; header.Status = createStatus;

4
SMBLibrary/Server/SMB1/OpenAndXHelper.cs
View file

@ -41,7 +41,7 @@ namespace SMBLibrary.Server.SMB1
FileAccess fileAccess = ToFileAccess(request.AccessMode.AccessMode); FileAccess fileAccess = ToFileAccess(request.AccessMode.AccessMode);
if (share is FileSystemShare) if (share is FileSystemShare)
{ {
if (!((FileSystemShare)share).HasAccess(session.UserName, path, fileAccess, state.ClientEndPoint)) if (!((FileSystemShare)share).HasAccess(session.SecurityContext, path, fileAccess))
{ {
header.Status = NTStatus.STATUS_ACCESS_DENIED; header.Status = NTStatus.STATUS_ACCESS_DENIED;
return new ErrorResponse(request.CommandName); return new ErrorResponse(request.CommandName);
@ -50,7 +50,7 @@ namespace SMBLibrary.Server.SMB1
object handle; object handle;
FileStatus fileStatus; FileStatus fileStatus;
header.Status = share.FileStore.CreateFile(out handle, out fileStatus, path, desiredAccess, shareAccess, createDisposition, createOptions); header.Status = share.FileStore.CreateFile(out handle, out fileStatus, path, desiredAccess, shareAccess, createDisposition, createOptions, session.SecurityContext);
if (header.Status != NTStatus.STATUS_SUCCESS) if (header.Status != NTStatus.STATUS_SUCCESS)
{ {
return new ErrorResponse(request.CommandName); return new ErrorResponse(request.CommandName);

8
SMBLibrary/Server/SMB1/ReadWriteResponseHelper.cs
View file

@ -29,7 +29,7 @@ namespace SMBLibrary.Server.SMB1
if (share is FileSystemShare) if (share is FileSystemShare)
{ {
if (!((FileSystemShare)share).HasReadAccess(session.UserName, openFile.Path, state.ClientEndPoint)) if (!((FileSystemShare)share).HasReadAccess(session.SecurityContext, openFile.Path))
{ {
header.Status = NTStatus.STATUS_ACCESS_DENIED; header.Status = NTStatus.STATUS_ACCESS_DENIED;
return new ErrorResponse(request.CommandName); return new ErrorResponse(request.CommandName);
@ -61,7 +61,7 @@ namespace SMBLibrary.Server.SMB1
if (share is FileSystemShare) if (share is FileSystemShare)
{ {
if (!((FileSystemShare)share).HasReadAccess(session.UserName, openFile.Path, state.ClientEndPoint)) if (!((FileSystemShare)share).HasReadAccess(session.SecurityContext, openFile.Path))
{ {
header.Status = NTStatus.STATUS_ACCESS_DENIED; header.Status = NTStatus.STATUS_ACCESS_DENIED;
return new ErrorResponse(request.CommandName); return new ErrorResponse(request.CommandName);
@ -102,7 +102,7 @@ namespace SMBLibrary.Server.SMB1
if (share is FileSystemShare) if (share is FileSystemShare)
{ {
if (!((FileSystemShare)share).HasWriteAccess(session.UserName, openFile.Path, state.ClientEndPoint)) if (!((FileSystemShare)share).HasWriteAccess(session.SecurityContext, openFile.Path))
{ {
header.Status = NTStatus.STATUS_ACCESS_DENIED; header.Status = NTStatus.STATUS_ACCESS_DENIED;
return new ErrorResponse(request.CommandName); return new ErrorResponse(request.CommandName);
@ -132,7 +132,7 @@ namespace SMBLibrary.Server.SMB1
if (share is FileSystemShare) if (share is FileSystemShare)
{ {
if (!((FileSystemShare)share).HasWriteAccess(session.UserName, openFile.Path, state.ClientEndPoint)) if (!((FileSystemShare)share).HasWriteAccess(session.SecurityContext, openFile.Path))
{ {
header.Status = NTStatus.STATUS_ACCESS_DENIED; header.Status = NTStatus.STATUS_ACCESS_DENIED;
return new ErrorResponse(request.CommandName); return new ErrorResponse(request.CommandName);

4
SMBLibrary/Server/SMB1/SMB1FileStoreHelper.Query.cs
View file

@ -14,11 +14,11 @@ namespace SMBLibrary.Server.SMB1
{ {
public partial class SMB1FileStoreHelper public partial class SMB1FileStoreHelper
{ {
public static NTStatus GetFileInformation(out QueryInformation result, INTFileStore fileStore, string path, QueryInformationLevel informationLevel) public static NTStatus GetFileInformation(out QueryInformation result, INTFileStore fileStore, string path, QueryInformationLevel informationLevel, SecurityContext securityContext)
{ {
object handle; object handle;
FileStatus fileStatus; FileStatus fileStatus;
NTStatus openStatus = fileStore.CreateFile(out handle, out fileStatus, path, FileAccessMask.FILE_READ_ATTRIBUTES, ShareAccess.FILE_SHARE_READ | ShareAccess.FILE_SHARE_WRITE, CreateDisposition.FILE_OPEN, 0); NTStatus openStatus = fileStore.CreateFile(out handle, out fileStatus, path, FileAccessMask.FILE_READ_ATTRIBUTES, ShareAccess.FILE_SHARE_READ | ShareAccess.FILE_SHARE_WRITE, CreateDisposition.FILE_OPEN, 0, securityContext);
if (openStatus != NTStatus.STATUS_SUCCESS) if (openStatus != NTStatus.STATUS_SUCCESS)
{ {
result = null; result = null;

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

@ -22,7 +22,7 @@ namespace SMBLibrary.Server.SMB1
// '\Directory\exefile"*' (cmd.exe will use this syntax when entering an exe without its extension, explorer will use this opening a directory from the run menu) // '\Directory\exefile"*' (cmd.exe will use this syntax when entering an exe without its extension, explorer will use this opening a directory from the run menu)
/// <param name="fileNamePattern">The filename pattern to search for. This field MAY contain wildcard characters</param> /// <param name="fileNamePattern">The filename pattern to search for. This field MAY contain wildcard characters</param>
/// <exception cref="System.UnauthorizedAccessException"></exception> /// <exception cref="System.UnauthorizedAccessException"></exception>
public static NTStatus QueryDirectory(out List<QueryDirectoryFileInformation> result, INTFileStore fileStore, string fileNamePattern, FileInformationClass fileInformation) public static NTStatus QueryDirectory(out List<QueryDirectoryFileInformation> result, INTFileStore fileStore, string fileNamePattern, FileInformationClass fileInformation, SecurityContext securityContext)
{ {
int separatorIndex = fileNamePattern.LastIndexOf('\\'); int separatorIndex = fileNamePattern.LastIndexOf('\\');
if (separatorIndex >= 0) if (separatorIndex >= 0)
@ -31,7 +31,7 @@ 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, ShareAccess.FILE_SHARE_READ | ShareAccess.FILE_SHARE_WRITE, CreateDisposition.FILE_OPEN, CreateOptions.FILE_DIRECTORY_FILE); NTStatus createStatus = fileStore.CreateFile(out handle, out fileStatus, path, DirectoryAccessMask.FILE_LIST_DIRECTORY | DirectoryAccessMask.FILE_TRAVERSE, ShareAccess.FILE_SHARE_READ | ShareAccess.FILE_SHARE_WRITE, CreateDisposition.FILE_OPEN, CreateOptions.FILE_DIRECTORY_FILE, securityContext);
if (createStatus != NTStatus.STATUS_SUCCESS) if (createStatus != NTStatus.STATUS_SUCCESS)
{ {
result = null; result = null;

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

@ -14,11 +14,11 @@ namespace SMBLibrary.Server.SMB1
{ {
public partial class SMB1FileStoreHelper public partial class SMB1FileStoreHelper
{ {
public static NTStatus CreateDirectory(INTFileStore fileStore, string path) public static NTStatus CreateDirectory(INTFileStore fileStore, string path, SecurityContext securityContext)
{ {
object handle; object handle;
FileStatus fileStatus; FileStatus fileStatus;
NTStatus createStatus = fileStore.CreateFile(out handle, out fileStatus, path, DirectoryAccessMask.FILE_ADD_SUBDIRECTORY, ShareAccess.FILE_SHARE_READ | ShareAccess.FILE_SHARE_WRITE, CreateDisposition.FILE_CREATE, CreateOptions.FILE_DIRECTORY_FILE); NTStatus createStatus = fileStore.CreateFile(out handle, out fileStatus, path, DirectoryAccessMask.FILE_ADD_SUBDIRECTORY, ShareAccess.FILE_SHARE_READ | ShareAccess.FILE_SHARE_WRITE, CreateDisposition.FILE_CREATE, CreateOptions.FILE_DIRECTORY_FILE, securityContext);
if (createStatus != NTStatus.STATUS_SUCCESS) if (createStatus != NTStatus.STATUS_SUCCESS)
{ {
return createStatus; return createStatus;
@ -27,21 +27,21 @@ namespace SMBLibrary.Server.SMB1
return createStatus; return createStatus;
} }
public static NTStatus DeleteDirectory(INTFileStore fileStore, string path) public static NTStatus DeleteDirectory(INTFileStore fileStore, string path, SecurityContext securityContext)
{ {
return Delete(fileStore, path, CreateOptions.FILE_DIRECTORY_FILE); return Delete(fileStore, path, CreateOptions.FILE_DIRECTORY_FILE, securityContext);
} }
public static NTStatus DeleteFile(INTFileStore fileStore, string path) public static NTStatus DeleteFile(INTFileStore fileStore, string path, SecurityContext securityContext)
{ {
return Delete(fileStore, path, CreateOptions.FILE_NON_DIRECTORY_FILE); return Delete(fileStore, path, CreateOptions.FILE_NON_DIRECTORY_FILE, securityContext);
} }
public static NTStatus Delete(INTFileStore fileStore, string path, CreateOptions createOptions) public static NTStatus Delete(INTFileStore fileStore, string path, CreateOptions createOptions, SecurityContext securityContext)
{ {
object handle; object handle;
FileStatus fileStatus; FileStatus fileStatus;
NTStatus openStatus = fileStore.CreateFile(out handle, out fileStatus, path, DirectoryAccessMask.DELETE, 0, CreateDisposition.FILE_OPEN, createOptions); NTStatus openStatus = fileStore.CreateFile(out handle, out fileStatus, path, DirectoryAccessMask.DELETE, 0, CreateDisposition.FILE_OPEN, createOptions, securityContext);
if (openStatus != NTStatus.STATUS_SUCCESS) if (openStatus != NTStatus.STATUS_SUCCESS)
{ {
return openStatus; return openStatus;
@ -57,7 +57,7 @@ namespace SMBLibrary.Server.SMB1
return closeStatus; return closeStatus;
} }
public static NTStatus Rename(INTFileStore fileStore, string oldName, string newName, SMBFileAttributes searchAttributes) public static NTStatus Rename(INTFileStore fileStore, string oldName, string newName, SMBFileAttributes searchAttributes, SecurityContext securityContext)
{ {
object handle; object handle;
FileStatus fileStatus; FileStatus fileStatus;
@ -70,7 +70,7 @@ namespace SMBLibrary.Server.SMB1
{ {
createOptions = CreateOptions.FILE_DIRECTORY_FILE; createOptions = CreateOptions.FILE_DIRECTORY_FILE;
} }
NTStatus openStatus = fileStore.CreateFile(out handle, out fileStatus, oldName, DirectoryAccessMask.DELETE, 0, CreateDisposition.FILE_OPEN, createOptions); NTStatus openStatus = fileStore.CreateFile(out handle, out fileStatus, oldName, DirectoryAccessMask.DELETE, 0, CreateDisposition.FILE_OPEN, createOptions, securityContext);
if (openStatus != NTStatus.STATUS_SUCCESS) if (openStatus != NTStatus.STATUS_SUCCESS)
{ {
return openStatus; return openStatus;
@ -87,11 +87,11 @@ namespace SMBLibrary.Server.SMB1
return closeStatus; return closeStatus;
} }
public static NTStatus CheckDirectory(INTFileStore fileStore, string path) public static NTStatus CheckDirectory(INTFileStore fileStore, string path, SecurityContext securityContext)
{ {
object handle; object handle;
FileStatus fileStatus; FileStatus fileStatus;
NTStatus openStatus = fileStore.CreateFile(out handle, out fileStatus, path, (AccessMask)0, ShareAccess.FILE_SHARE_READ | ShareAccess.FILE_SHARE_WRITE, CreateDisposition.FILE_OPEN, CreateOptions.FILE_DIRECTORY_FILE); NTStatus openStatus = fileStore.CreateFile(out handle, out fileStatus, path, (AccessMask)0, ShareAccess.FILE_SHARE_READ | ShareAccess.FILE_SHARE_WRITE, CreateDisposition.FILE_OPEN, CreateOptions.FILE_DIRECTORY_FILE, securityContext);
if (openStatus != NTStatus.STATUS_SUCCESS) if (openStatus != NTStatus.STATUS_SUCCESS)
{ {
return openStatus; return openStatus;
@ -101,11 +101,11 @@ namespace SMBLibrary.Server.SMB1
return NTStatus.STATUS_SUCCESS; return NTStatus.STATUS_SUCCESS;
} }
public static NTStatus QueryInformation(out FileNetworkOpenInformation fileInfo, INTFileStore fileStore, string path) public static NTStatus QueryInformation(out FileNetworkOpenInformation fileInfo, INTFileStore fileStore, string path, SecurityContext securityContext)
{ {
object handle; object handle;
FileStatus fileStatus; FileStatus fileStatus;
NTStatus openStatus = fileStore.CreateFile(out handle, out fileStatus, path, FileAccessMask.FILE_READ_ATTRIBUTES, ShareAccess.FILE_SHARE_READ | ShareAccess.FILE_SHARE_WRITE, CreateDisposition.FILE_OPEN, 0); NTStatus openStatus = fileStore.CreateFile(out handle, out fileStatus, path, FileAccessMask.FILE_READ_ATTRIBUTES, ShareAccess.FILE_SHARE_READ | ShareAccess.FILE_SHARE_WRITE, CreateDisposition.FILE_OPEN, 0, securityContext);
if (openStatus != NTStatus.STATUS_SUCCESS) if (openStatus != NTStatus.STATUS_SUCCESS)
{ {
fileInfo = null; fileInfo = null;
@ -116,11 +116,11 @@ namespace SMBLibrary.Server.SMB1
return NTStatus.STATUS_SUCCESS; return NTStatus.STATUS_SUCCESS;
} }
public static NTStatus SetInformation(INTFileStore fileStore, string path, SMBFileAttributes fileAttributes, DateTime? lastWriteTime) public static NTStatus SetInformation(INTFileStore fileStore, string path, SMBFileAttributes fileAttributes, DateTime? lastWriteTime, SecurityContext securityContext)
{ {
object handle; object handle;
FileStatus fileStatus; FileStatus fileStatus;
NTStatus openStatus = fileStore.CreateFile(out handle, out fileStatus, path, FileAccessMask.FILE_WRITE_ATTRIBUTES, ShareAccess.FILE_SHARE_READ | ShareAccess.FILE_SHARE_WRITE, CreateDisposition.FILE_OPEN, 0); NTStatus openStatus = fileStore.CreateFile(out handle, out fileStatus, path, FileAccessMask.FILE_WRITE_ATTRIBUTES, ShareAccess.FILE_SHARE_READ | ShareAccess.FILE_SHARE_WRITE, CreateDisposition.FILE_OPEN, 0, securityContext);
if (openStatus != NTStatus.STATUS_SUCCESS) if (openStatus != NTStatus.STATUS_SUCCESS)
{ {
return openStatus; return openStatus;

8
SMBLibrary/Server/SMB1/SessionSetupHelper.cs
View file

@ -40,7 +40,7 @@ namespace SMBLibrary.Server.SMB1
if (loginSuccess) if (loginSuccess)
{ {
state.LogToServer(Severity.Information, "User '{0}' authenticated successfully", message.UserName); state.LogToServer(Severity.Information, "User '{0}' authenticated successfully", message.UserName);
SMB1Session session = state.CreateSession(message.UserName); SMB1Session session = state.CreateSession(message.UserName, message.WorkStation);
if (session == null) if (session == null)
{ {
header.Status = NTStatus.STATUS_TOO_MANY_SESSIONS; header.Status = NTStatus.STATUS_TOO_MANY_SESSIONS;
@ -52,7 +52,7 @@ namespace SMBLibrary.Server.SMB1
else if (users.FallbackToGuest(message.UserName)) else if (users.FallbackToGuest(message.UserName))
{ {
state.LogToServer(Severity.Information, "User '{0}' failed authentication. logged in as guest", message.UserName); state.LogToServer(Severity.Information, "User '{0}' failed authentication. logged in as guest", message.UserName);
SMB1Session session = state.CreateSession("Guest"); SMB1Session session = state.CreateSession("Guest", message.WorkStation);
if (session == null) if (session == null)
{ {
header.Status = NTStatus.STATUS_TOO_MANY_SESSIONS; header.Status = NTStatus.STATUS_TOO_MANY_SESSIONS;
@ -145,12 +145,12 @@ namespace SMBLibrary.Server.SMB1
if (loginSuccess) if (loginSuccess)
{ {
state.LogToServer(Severity.Information, "User '{0}' authenticated successfully", authenticateMessage.UserName); state.LogToServer(Severity.Information, "User '{0}' authenticated successfully", authenticateMessage.UserName);
state.CreateSession(header.UID, authenticateMessage.UserName); state.CreateSession(header.UID, authenticateMessage.UserName, authenticateMessage.WorkStation);
} }
else if (users.FallbackToGuest(authenticateMessage.UserName)) else if (users.FallbackToGuest(authenticateMessage.UserName))
{ {
state.LogToServer(Severity.Information, "User '{0}' failed authentication. logged in as guest", authenticateMessage.UserName); state.LogToServer(Severity.Information, "User '{0}' failed authentication. logged in as guest", authenticateMessage.UserName);
state.CreateSession(header.UID, "Guest"); state.CreateSession(header.UID, "Guest", authenticateMessage.WorkStation);
response.Action = SessionSetupAction.SetupGuest; response.Action = SessionSetupAction.SetupGuest;
} }
else else

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

@ -32,7 +32,7 @@ namespace SMBLibrary.Server.SMB1
return null; return null;
} }
NTStatus searchStatus = SMB1FileStoreHelper.QueryDirectory(out entries, share.FileStore, fileNamePattern, informationClass); NTStatus searchStatus = SMB1FileStoreHelper.QueryDirectory(out entries, share.FileStore, fileNamePattern, informationClass, session.SecurityContext);
if (searchStatus != NTStatus.STATUS_SUCCESS) if (searchStatus != NTStatus.STATUS_SUCCESS)
{ {
state.LogToServer(Severity.Verbose, "FindFirst2: Searched for '{0}', NTStatus: {1}", fileNamePattern, searchStatus.ToString()); state.LogToServer(Severity.Verbose, "FindFirst2: Searched for '{0}', NTStatus: {1}", fileNamePattern, searchStatus.ToString());
@ -120,7 +120,7 @@ namespace SMBLibrary.Server.SMB1
SMB1Session session = state.GetSession(header.UID); SMB1Session session = state.GetSession(header.UID);
if (share is FileSystemShare) if (share is FileSystemShare)
{ {
if (!((FileSystemShare)share).HasReadAccess(session.UserName, @"\", state.ClientEndPoint)) if (!((FileSystemShare)share).HasReadAccess(session.SecurityContext, @"\"))
{ {
header.Status = NTStatus.STATUS_ACCESS_DENIED; header.Status = NTStatus.STATUS_ACCESS_DENIED;
return null; return null;
@ -146,7 +146,7 @@ namespace SMBLibrary.Server.SMB1
string path = subcommand.FileName; string path = subcommand.FileName;
if (share is FileSystemShare) if (share is FileSystemShare)
{ {
if (!((FileSystemShare)share).HasReadAccess(session.UserName, path, state.ClientEndPoint)) if (!((FileSystemShare)share).HasReadAccess(session.SecurityContext, path))
{ {
header.Status = NTStatus.STATUS_ACCESS_DENIED; header.Status = NTStatus.STATUS_ACCESS_DENIED;
return null; return null;
@ -178,7 +178,7 @@ namespace SMBLibrary.Server.SMB1
if (share is FileSystemShare) if (share is FileSystemShare)
{ {
if (!((FileSystemShare)share).HasReadAccess(session.UserName, openFile.Path, state.ClientEndPoint)) if (!((FileSystemShare)share).HasReadAccess(session.SecurityContext, openFile.Path))
{ {
header.Status = NTStatus.STATUS_ACCESS_DENIED; header.Status = NTStatus.STATUS_ACCESS_DENIED;
return null; return null;
@ -210,7 +210,7 @@ namespace SMBLibrary.Server.SMB1
if (share is FileSystemShare) if (share is FileSystemShare)
{ {
if (!((FileSystemShare)share).HasWriteAccess(session.UserName, openFile.Path, state.ClientEndPoint)) if (!((FileSystemShare)share).HasWriteAccess(session.SecurityContext, openFile.Path))
{ {
header.Status = NTStatus.STATUS_ACCESS_DENIED; header.Status = NTStatus.STATUS_ACCESS_DENIED;
return null; return null;

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

@ -36,7 +36,7 @@ namespace SMBLibrary.Server.SMB1
return new ErrorResponse(request.CommandName); return new ErrorResponse(request.CommandName);
} }
if (!((FileSystemShare)share).HasReadAccess(session.UserName, @"\", state.ClientEndPoint)) if (!((FileSystemShare)share).HasReadAccess(session.SecurityContext, @"\"))
{ {
header.Status = NTStatus.STATUS_ACCESS_DENIED; header.Status = NTStatus.STATUS_ACCESS_DENIED;
return new ErrorResponse(request.CommandName); return new ErrorResponse(request.CommandName);

4
SMBLibrary/Server/SMB2/CreateHelper.cs
View file

@ -26,7 +26,7 @@ namespace SMBLibrary.Server.SMB2
FileAccess createAccess = NTFileStoreHelper.ToCreateFileAccess(request.DesiredAccess, request.CreateDisposition); FileAccess createAccess = NTFileStoreHelper.ToCreateFileAccess(request.DesiredAccess, request.CreateDisposition);
if (share is FileSystemShare) if (share is FileSystemShare)
{ {
if (!((FileSystemShare)share).HasAccess(session.UserName, path, createAccess, state.ClientEndPoint)) if (!((FileSystemShare)share).HasAccess(session.SecurityContext, path, createAccess))
{ {
return new ErrorResponse(request.CommandName, NTStatus.STATUS_ACCESS_DENIED); return new ErrorResponse(request.CommandName, NTStatus.STATUS_ACCESS_DENIED);
} }
@ -34,7 +34,7 @@ namespace SMBLibrary.Server.SMB2
object handle; object handle;
FileStatus fileStatus; FileStatus fileStatus;
NTStatus createStatus = share.FileStore.CreateFile(out handle, out fileStatus, path, request.DesiredAccess, request.ShareAccess, request.CreateDisposition, request.CreateOptions); NTStatus createStatus = share.FileStore.CreateFile(out handle, out fileStatus, path, request.DesiredAccess, request.ShareAccess, request.CreateDisposition, request.CreateOptions, session.SecurityContext);
if (createStatus != NTStatus.STATUS_SUCCESS) if (createStatus != NTStatus.STATUS_SUCCESS)
{ {
return new ErrorResponse(request.CommandName, createStatus); return new ErrorResponse(request.CommandName, createStatus);

2
SMBLibrary/Server/SMB2/QueryDirectoryHelper.cs
View file

@ -23,7 +23,7 @@ namespace SMBLibrary.Server.SMB2
return new ErrorResponse(request.CommandName, NTStatus.STATUS_FILE_CLOSED); return new ErrorResponse(request.CommandName, NTStatus.STATUS_FILE_CLOSED);
} }
if (!((FileSystemShare)share).HasReadAccess(session.UserName, openFile.Path, state.ClientEndPoint)) if (!((FileSystemShare)share).HasReadAccess(session.SecurityContext, openFile.Path))
{ {
return new ErrorResponse(request.CommandName, NTStatus.STATUS_ACCESS_DENIED); return new ErrorResponse(request.CommandName, NTStatus.STATUS_ACCESS_DENIED);
} }

4
SMBLibrary/Server/SMB2/QueryInfoHelper.cs
View file

@ -27,7 +27,7 @@ namespace SMBLibrary.Server.SMB2
if (share is FileSystemShare) if (share is FileSystemShare)
{ {
if (!((FileSystemShare)share).HasReadAccess(session.UserName, openFile.Path, state.ClientEndPoint)) if (!((FileSystemShare)share).HasReadAccess(session.SecurityContext, openFile.Path))
{ {
return new ErrorResponse(request.CommandName, NTStatus.STATUS_ACCESS_DENIED); return new ErrorResponse(request.CommandName, NTStatus.STATUS_ACCESS_DENIED);
} }
@ -49,7 +49,7 @@ namespace SMBLibrary.Server.SMB2
{ {
if (share is FileSystemShare) if (share is FileSystemShare)
{ {
if (!((FileSystemShare)share).HasReadAccess(session.UserName, @"\", state.ClientEndPoint)) if (!((FileSystemShare)share).HasReadAccess(session.SecurityContext, @"\"))
{ {
return new ErrorResponse(request.CommandName, NTStatus.STATUS_ACCESS_DENIED); return new ErrorResponse(request.CommandName, NTStatus.STATUS_ACCESS_DENIED);
} }

4
SMBLibrary/Server/SMB2/SessionSetupHelper.cs
View file

@ -76,12 +76,12 @@ namespace SMBLibrary.Server.SMB2
if (loginSuccess) if (loginSuccess)
{ {
state.LogToServer(Severity.Information, "User '{0}' authenticated successfully", authenticateMessage.UserName); state.LogToServer(Severity.Information, "User '{0}' authenticated successfully", authenticateMessage.UserName);
state.CreateSession(request.Header.SessionID, authenticateMessage.UserName); state.CreateSession(request.Header.SessionID, authenticateMessage.UserName, authenticateMessage.WorkStation);
} }
else if (users.FallbackToGuest(authenticateMessage.UserName)) else if (users.FallbackToGuest(authenticateMessage.UserName))
{ {
state.LogToServer(Severity.Information, "User '{0}' failed authentication. logged in as guest", authenticateMessage.UserName); state.LogToServer(Severity.Information, "User '{0}' failed authentication. logged in as guest", authenticateMessage.UserName);
state.CreateSession(request.Header.SessionID, "Guest"); state.CreateSession(request.Header.SessionID, "Guest", authenticateMessage.WorkStation);
response.SessionFlags = SessionFlags.IsGuest; response.SessionFlags = SessionFlags.IsGuest;
} }
else else

2
SMBLibrary/Server/SMB2/SetInfoHelper.cs
View file

@ -27,7 +27,7 @@ namespace SMBLibrary.Server.SMB2
if (share is FileSystemShare) if (share is FileSystemShare)
{ {
if (!((FileSystemShare)share).HasWriteAccess(session.UserName, openFile.Path, state.ClientEndPoint)) if (!((FileSystemShare)share).HasWriteAccess(session.SecurityContext, openFile.Path))
{ {
return new ErrorResponse(request.CommandName, NTStatus.STATUS_ACCESS_DENIED); return new ErrorResponse(request.CommandName, NTStatus.STATUS_ACCESS_DENIED);
} }

2
SMBLibrary/Server/SMB2/TreeConnectHelper.cs
View file

@ -37,7 +37,7 @@ namespace SMBLibrary.Server.SMB2
return new ErrorResponse(request.CommandName, NTStatus.STATUS_OBJECT_PATH_NOT_FOUND); return new ErrorResponse(request.CommandName, NTStatus.STATUS_OBJECT_PATH_NOT_FOUND);
} }
if (!((FileSystemShare)share).HasReadAccess(session.UserName, @"\", state.ClientEndPoint)) if (!((FileSystemShare)share).HasReadAccess(session.SecurityContext, @"\"))
{ {
return new ErrorResponse(request.CommandName, NTStatus.STATUS_ACCESS_DENIED); return new ErrorResponse(request.CommandName, NTStatus.STATUS_ACCESS_DENIED);
} }

16
SMBLibrary/Server/Shares/FileSystemShare.cs
View file

@ -18,14 +18,16 @@ namespace SMBLibrary.Server
public string UserName; public string UserName;
public string Path; public string Path;
public FileAccess RequestedAccess; public FileAccess RequestedAccess;
public string MachineName;
public IPEndPoint ClientEndPoint; public IPEndPoint ClientEndPoint;
public bool Allow = true; public bool Allow = true;
public AccessRequestArgs(string userName, string path, FileAccess requestedAccess, IPEndPoint clientEndPoint) public AccessRequestArgs(string userName, string path, FileAccess requestedAccess, string machineName, IPEndPoint clientEndPoint)
{ {
UserName = userName; UserName = userName;
Path = path; Path = path;
RequestedAccess = requestedAccess; RequestedAccess = requestedAccess;
MachineName = machineName;
ClientEndPoint = clientEndPoint; ClientEndPoint = clientEndPoint;
} }
} }
@ -49,23 +51,23 @@ namespace SMBLibrary.Server
m_fileSystem = new NTFileSystemAdapter(fileSystem); m_fileSystem = new NTFileSystemAdapter(fileSystem);
} }
public bool HasReadAccess(string userName, string path, IPEndPoint clientEndPoint) public bool HasReadAccess(SecurityContext securityContext, string path)
{ {
return HasAccess(userName, path, FileAccess.Read, clientEndPoint); return HasAccess(securityContext, path, FileAccess.Read);
} }
public bool HasWriteAccess(string userName, string path, IPEndPoint clientEndPoint) public bool HasWriteAccess(SecurityContext securityContext, string path)
{ {
return HasAccess(userName, path, FileAccess.Write, clientEndPoint); return HasAccess(securityContext, path, FileAccess.Write);
} }
public bool HasAccess(string userName, string path, FileAccess requestedAccess, IPEndPoint clientEndPoint) public bool HasAccess(SecurityContext securityContext, string path, FileAccess requestedAccess)
{ {
// To be thread-safe we must capture the delegate reference first // To be thread-safe we must capture the delegate reference first
EventHandler<AccessRequestArgs> handler = OnAccessRequest; EventHandler<AccessRequestArgs> handler = OnAccessRequest;
if (handler != null) if (handler != null)
{ {
AccessRequestArgs args = new AccessRequestArgs(userName, path, requestedAccess, clientEndPoint); AccessRequestArgs args = new AccessRequestArgs(securityContext.UserName, path, requestedAccess, securityContext.MachineName, securityContext.ClientEndPoint);
handler(this, args); handler(this, args);
return args.Allow; return args.Allow;
} }