zydronium/SMBLibrary
1
0
Fork 0
mirror of https://github.com/TalAloni/SMBLibrary.git synced 2025-07-22 01:05:54 +02:00
Code Issues Projects Releases Packages Wiki Activity

SMB2: Corrected CREATE request implementation

Browse source
This commit is contained in:
Tal Aloni 2017-10-01 01:05:17 +03:00
parent ccabba61d6
commit e5a0106ed0
1 changed files with 12 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

21
SMBLibrary/SMB2/Commands/CreateRequest.cs
View file

@ -31,9 +31,9 @@ namespace SMBLibrary.SMB2
public CreateOptions CreateOptions; public CreateOptions CreateOptions;
private ushort NameOffset; private ushort NameOffset;
private ushort NameLength; private ushort NameLength;
public string Name; private uint CreateContextsOffset; // 8-byte aligned
private uint CreateContextsOffsets;
private uint CreateContextsLength; private uint CreateContextsLength;
public string Name;
public List<CreateContext> CreateContexts = new List<CreateContext>(); public List<CreateContext> CreateContexts = new List<CreateContext>();
public CreateRequest() : base(SMB2CommandName.Create) public CreateRequest() : base(SMB2CommandName.Create)
@ -56,12 +56,12 @@ namespace SMBLibrary.SMB2
CreateOptions = (CreateOptions)LittleEndianConverter.ToUInt32(buffer, offset + SMB2Header.Length + 40); CreateOptions = (CreateOptions)LittleEndianConverter.ToUInt32(buffer, offset + SMB2Header.Length + 40);
NameOffset = LittleEndianConverter.ToUInt16(buffer, offset + SMB2Header.Length + 44); NameOffset = LittleEndianConverter.ToUInt16(buffer, offset + SMB2Header.Length + 44);
NameLength = LittleEndianConverter.ToUInt16(buffer, offset + SMB2Header.Length + 46); NameLength = LittleEndianConverter.ToUInt16(buffer, offset + SMB2Header.Length + 46);
CreateContextsOffsets = LittleEndianConverter.ToUInt32(buffer, offset + SMB2Header.Length + 48); CreateContextsOffset = LittleEndianConverter.ToUInt32(buffer, offset + SMB2Header.Length + 48);
CreateContextsLength = LittleEndianConverter.ToUInt32(buffer, offset + SMB2Header.Length + 52); CreateContextsLength = LittleEndianConverter.ToUInt32(buffer, offset + SMB2Header.Length + 52);
Name = ByteReader.ReadUTF16String(buffer, offset + NameOffset, NameLength / 2); Name = ByteReader.ReadUTF16String(buffer, offset + NameOffset, NameLength / 2);
if (CreateContextsLength > 0) if (CreateContextsLength > 0)
{ {
CreateContexts = CreateContext.ReadCreateContextList(buffer, (int)CreateContextsOffsets); CreateContexts = CreateContext.ReadCreateContextList(buffer, (int)CreateContextsOffset);
} }
} }
@ -73,12 +73,12 @@ namespace SMBLibrary.SMB2
{ {
NameOffset = SMB2Header.Length + FixedLength; NameOffset = SMB2Header.Length + FixedLength;
} }
CreateContextsOffsets = 0; CreateContextsOffset = 0;
CreateContextsLength = 0; CreateContextsLength = 0;
int paddedNameLength = (int)Math.Ceiling((double)(Name.Length * 2) / 8) * 8; int paddedNameLength = (int)Math.Ceiling((double)(Name.Length * 2) / 8) * 8;
if (CreateContexts.Count > 0) if (CreateContexts.Count > 0)
{ {
CreateContextsOffsets = (uint)(SMB2Header.Length + 56 + paddedNameLength); CreateContextsOffset = (uint)(SMB2Header.Length + 56 + paddedNameLength);
CreateContextsLength = (uint)CreateContext.GetCreateContextListLength(CreateContexts); CreateContextsLength = (uint)CreateContext.GetCreateContextListLength(CreateContexts);
} }
LittleEndianWriter.WriteUInt16(buffer, offset + 0, StructureSize); LittleEndianWriter.WriteUInt16(buffer, offset + 0, StructureSize);
@ -94,7 +94,7 @@ namespace SMBLibrary.SMB2
LittleEndianWriter.WriteUInt32(buffer, offset + 40, (uint)CreateOptions); LittleEndianWriter.WriteUInt32(buffer, offset + 40, (uint)CreateOptions);
LittleEndianWriter.WriteUInt16(buffer, offset + 44, NameOffset); LittleEndianWriter.WriteUInt16(buffer, offset + 44, NameOffset);
LittleEndianWriter.WriteUInt16(buffer, offset + 46, NameLength); LittleEndianWriter.WriteUInt16(buffer, offset + 46, NameLength);
LittleEndianWriter.WriteUInt32(buffer, offset + 48, CreateContextsOffsets); LittleEndianWriter.WriteUInt32(buffer, offset + 48, CreateContextsOffset);
LittleEndianWriter.WriteUInt32(buffer, offset + 52, CreateContextsLength); LittleEndianWriter.WriteUInt32(buffer, offset + 52, CreateContextsLength);
ByteWriter.WriteUTF16String(buffer, offset + 56, Name); ByteWriter.WriteUTF16String(buffer, offset + 56, Name);
CreateContext.WriteCreateContextList(buffer, offset + 56 + paddedNameLength, CreateContexts); CreateContext.WriteCreateContextList(buffer, offset + 56 + paddedNameLength, CreateContexts);
@ -104,15 +104,18 @@ namespace SMBLibrary.SMB2
{ {
get get
{ {
int bufferLength;
if (CreateContexts.Count == 0) if (CreateContexts.Count == 0)
{ {
return FixedLength + Name.Length * 2; bufferLength = Name.Length * 2;
} }
else else
{ {
int paddedNameLength = (int)Math.Ceiling((double)(Name.Length * 2) / 8) * 8; int paddedNameLength = (int)Math.Ceiling((double)(Name.Length * 2) / 8) * 8;
return FixedLength + paddedNameLength + CreateContext.GetCreateContextListLength(CreateContexts); bufferLength = paddedNameLength + CreateContext.GetCreateContextListLength(CreateContexts);
} }
// [MS-SMB2] The Buffer field MUST be at least one byte in length.
return FixedLength + Math.Max(bufferLength, 1);
} }
} }
} }