zydronium/SMBLibrary
1
0
Fork 0
mirror of https://github.com/TalAloni/SMBLibrary.git synced 2025-04-30 10:47:48 +02:00
Code Issues Projects Releases Packages Wiki Activity

SMB2: Enable message signing if client request it

Browse source
This commit is contained in:
Tal Aloni 2017-03-02 16:56:43 +02:00
parent 3e4d40b7ad
commit 8067925ea2
2 changed files with 24 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -39,6 +39,7 @@ namespace SMBLibrary.Server.SMB2
{ {
throw new ArgumentException("SMB2 dialect is not present"); throw new ArgumentException("SMB2 dialect is not present");
} }
response.SecurityMode = SecurityMode.SigningEnabled;
response.ServerGuid = serverGuid; response.ServerGuid = serverGuid;
response.MaxTransactSize = 65536; response.MaxTransactSize = 65536;
response.MaxReadSize = 65536; response.MaxReadSize = 65536;
@ -66,6 +67,7 @@ namespace SMBLibrary.Server.SMB2
{ {
return new ErrorResponse(request.CommandName, NTStatus.STATUS_NOT_SUPPORTED); return new ErrorResponse(request.CommandName, NTStatus.STATUS_NOT_SUPPORTED);
} }
response.SecurityMode = SecurityMode.SigningEnabled;
response.ServerGuid = serverGuid; response.ServerGuid = serverGuid;
response.MaxTransactSize = 65536; response.MaxTransactSize = 65536;
response.MaxReadSize = 65536; response.MaxReadSize = 65536;

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

@ -232,8 +232,25 @@ namespace SMBLibrary.Server
public static void TrySendResponseChain(ConnectionState state, List<SMB2Command> responseChain) public static void TrySendResponseChain(ConnectionState state, List<SMB2Command> responseChain)
{ {
byte[] sessionKey = null;
if (state is SMB2ConnectionState)
{
// Note: multiple sessions MAY be multiplexed on the same connection, so theoretically
// we could have compounding unrelated requests from different sessions.
// In practice however this is not a real problem.
ulong sessionID = responseChain[0].Header.SessionID;
if (sessionID != 0)
{
SMB2Session session = ((SMB2ConnectionState)state).GetSession(sessionID);
if (session != null)
{
sessionKey = session.SessionKey;
}
}
}
SessionMessagePacket packet = new SessionMessagePacket(); SessionMessagePacket packet = new SessionMessagePacket();
packet.Trailer = SMB2Command.GetCommandChainBytes(responseChain); packet.Trailer = SMB2Command.GetCommandChainBytes(responseChain, sessionKey);
TrySendPacket(state, packet); TrySendPacket(state, packet);
state.LogToServer(Severity.Verbose, "SMB2 response chain sent: Response count: {0}, First response: {1}, Packet length: {2}", responseChain.Count, responseChain[0].CommandName.ToString(), packet.Length); state.LogToServer(Severity.Verbose, "SMB2 response chain sent: Response count: {0}, First response: {1}, Packet length: {2}", responseChain.Count, responseChain[0].CommandName.ToString(), packet.Length);
} }
@ -244,6 +261,10 @@ namespace SMBLibrary.Server
response.Header.CreditCharge = request.Header.CreditCharge; response.Header.CreditCharge = request.Header.CreditCharge;
response.Header.Credits = Math.Max((ushort)1, request.Header.Credits); response.Header.Credits = Math.Max((ushort)1, request.Header.Credits);
response.Header.IsRelatedOperations = request.Header.IsRelatedOperations; response.Header.IsRelatedOperations = request.Header.IsRelatedOperations;
// [MS-SMB2] The server SHOULD sign the message [..] if the request was signed by the client,
// and the response is not an interim response to an asynchronously processed request.
bool isInterimResponse = (request.Header.IsAsync && request.Header.Status == NTStatus.STATUS_PENDING);
response.Header.IsSigned = request.Header.IsSigned && !isInterimResponse;
response.Header.Reserved = request.Header.Reserved; response.Header.Reserved = request.Header.Reserved;
if (response.Header.SessionID == 0) if (response.Header.SessionID == 0)
{ {