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

SMB1: Retrieve SessionKey from GSS mechanism and store it in SMB1Session

Browse source
This commit is contained in:
Tal Aloni 2017-03-04 11:23:44 +02:00
parent 174e43f792
commit e3dafa524f
3 changed files with 13 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

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, string machineName, object accessToken) public SMB1Session CreateSession(ushort userID, string userName, string machineName, byte[] sessionKey, object accessToken)
{ {
SMB1Session session = new SMB1Session(this, userID, userName, machineName, accessToken); SMB1Session session = new SMB1Session(this, userID, userName, machineName, sessionKey, accessToken);
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, string machineName, object accessToken) public SMB1Session CreateSession(string userName, string machineName, byte[] sessionKey, object accessToken)
{ {
ushort? userID = AllocateUserID(); ushort? userID = AllocateUserID();
if (userID.HasValue) if (userID.HasValue)
{ {
return CreateSession(userID.Value, userName, machineName, accessToken); return CreateSession(userID.Value, userName, machineName, sessionKey, accessToken);
} }
return null; return null;
} }

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

@ -17,6 +17,7 @@ namespace SMBLibrary.Server
private SMB1ConnectionState m_connection; private SMB1ConnectionState m_connection;
private ushort m_userID; private ushort m_userID;
private byte[] m_sessionKey;
private SecurityContext m_securityContext; private SecurityContext m_securityContext;
// Key is TID // Key is TID
@ -29,10 +30,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, string machineName, object accessToken) public SMB1Session(SMB1ConnectionState connection, ushort userID, string userName, string machineName, byte[] sessionKey, object accessToken)
{ {
m_connection = connection; m_connection = connection;
m_userID = userID; m_userID = userID;
m_sessionKey = sessionKey;
m_securityContext = new SecurityContext(userName, machineName, connection.ClientEndPoint, connection.AuthenticationContext, accessToken); m_securityContext = new SecurityContext(userName, machineName, connection.ClientEndPoint, connection.AuthenticationContext, accessToken);
} }

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

@ -33,18 +33,19 @@ namespace SMBLibrary.Server.SMB1
return new ErrorResponse(request.CommandName); return new ErrorResponse(request.CommandName);
} }
byte[] sessionKey = securityProvider.GetContextAttribute(state.AuthenticationContext, GSSAttributeName.SessionKey) as byte[];
object accessToken = securityProvider.GetContextAttribute(state.AuthenticationContext, GSSAttributeName.AccessToken); object accessToken = securityProvider.GetContextAttribute(state.AuthenticationContext, GSSAttributeName.AccessToken);
bool? isGuest = securityProvider.GetContextAttribute(state.AuthenticationContext, GSSAttributeName.IsGuest) as bool?; bool? isGuest = securityProvider.GetContextAttribute(state.AuthenticationContext, GSSAttributeName.IsGuest) as bool?;
SMB1Session session; SMB1Session session;
if (!isGuest.HasValue || !isGuest.Value) if (!isGuest.HasValue || !isGuest.Value)
{ {
state.LogToServer(Severity.Information, "User '{0}' authenticated successfully.", message.UserName); state.LogToServer(Severity.Information, "User '{0}' authenticated successfully.", message.UserName);
session = state.CreateSession(message.UserName, message.WorkStation, accessToken); session = state.CreateSession(message.UserName, message.WorkStation, sessionKey, accessToken);
} }
else else
{ {
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);
session = state.CreateSession("Guest", message.WorkStation, accessToken); session = state.CreateSession("Guest", message.WorkStation, sessionKey, accessToken);
response.Action = SessionSetupAction.SetupGuest; response.Action = SessionSetupAction.SetupGuest;
} }
@ -110,17 +111,18 @@ namespace SMBLibrary.Server.SMB1
{ {
string userName = securityProvider.GetContextAttribute(state.AuthenticationContext, GSSAttributeName.UserName) as string; string userName = securityProvider.GetContextAttribute(state.AuthenticationContext, GSSAttributeName.UserName) as string;
string machineName = securityProvider.GetContextAttribute(state.AuthenticationContext, GSSAttributeName.MachineName) as string; string machineName = securityProvider.GetContextAttribute(state.AuthenticationContext, GSSAttributeName.MachineName) as string;
byte[] sessionKey = securityProvider.GetContextAttribute(state.AuthenticationContext, GSSAttributeName.SessionKey) as byte[];
object accessToken = securityProvider.GetContextAttribute(state.AuthenticationContext, GSSAttributeName.AccessToken); object accessToken = securityProvider.GetContextAttribute(state.AuthenticationContext, GSSAttributeName.AccessToken);
bool? isGuest = securityProvider.GetContextAttribute(state.AuthenticationContext, GSSAttributeName.IsGuest) as bool?; bool? isGuest = securityProvider.GetContextAttribute(state.AuthenticationContext, GSSAttributeName.IsGuest) as bool?;
if (!isGuest.HasValue || !isGuest.Value) if (!isGuest.HasValue || !isGuest.Value)
{ {
state.LogToServer(Severity.Information, "User '{0}' authenticated successfully.", userName); state.LogToServer(Severity.Information, "User '{0}' authenticated successfully.", userName);
state.CreateSession(header.UID, userName, machineName, accessToken); state.CreateSession(header.UID, userName, machineName, sessionKey, accessToken);
} }
else else
{ {
state.LogToServer(Severity.Information, "User '{0}' failed authentication, logged in as guest.", userName); state.LogToServer(Severity.Information, "User '{0}' failed authentication, logged in as guest.", userName);
state.CreateSession(header.UID, "Guest", machineName, accessToken); state.CreateSession(header.UID, "Guest", machineName, sessionKey, accessToken);
response.Action = SessionSetupAction.SetupGuest; response.Action = SessionSetupAction.SetupGuest;
} }
} }