ruby_smb 1.0.4 → 1.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7d5e35bee112d4186cdb919a1041dbd54c72739d
-  data.tar.gz: 002b2dcada90c5617d15d472f5d06c5f1474619d
+  metadata.gz: 104c5f0cf4f597bf65427cf15ab08461943a38aa
+  data.tar.gz: e2f05f2857a898cd253afd829babecb715011c12
 SHA512:
-  metadata.gz: 8516db67fb88bb248314f69eefef87f8021fcc409fa637e43a1b97474665d28e8d24fe470283d895c65374479d13d372d9eed346814eebd6bf144b63805b8bf2
-  data.tar.gz: 21632505b70f1af84724a613eb2344fda82e7c60f63255eb92569bef752fd0dcdf1e0fcb58f7f3cf21200b79fdfc3e592fde3643a42b0b5002db963d5f54e3ba
+  metadata.gz: 5070ad2e2008739b1b47407c618e0014bc98e7031d72d2cb94daf61c7d21754a8480ef37f8099f90fe31ef0ac95563943951d00ad4bcea110d465c80c6fcf0f8
+  data.tar.gz: eb91ae8bff05249dc9ec88c3fa9e18df4b8db979d9e7e9ac702c6f7af237b36c39d9d420dd0e95680e4004480dede90493fc6d58f942f45d08d3a812977a4066

data/lib/ruby_smb/smb1/packet/empty_packet.rb

@@ -1,7 +1,7 @@
 module RubySMB
   module SMB1
     module Packet
-      # This packet represent an SMB1 Response Packet when the parameter and
+      # This packet represent an SMB1 Error Response Packet when the parameter and
       # data blocks will be empty.
       class EmptyPacket < RubySMB::GenericPacket
         attr_accessor :original_command
@@ -12,7 +12,9 @@ module RubySMB
 
         def valid?
           return smb_header.protocol == RubySMB::SMB1::SMB_PROTOCOL_ID &&
-            smb_header.command == @original_command
+                 smb_header.command == @original_command &&
+                 parameter_block.word_count == 0 &&
+                 data_block.byte_count == 0
         end
       end
     end

data/lib/ruby_smb/smb2/packet/error_packet.rb

@@ -1,18 +1,25 @@
 module RubySMB
   module SMB2
     module Packet
-      # An SMB2 Error packet for when an incomplete response comes back
+      # This class represents an SMB2 Error Response Packet as defined in
+      # [2.2.2 SMB2 ERROR Response](https://msdn.microsoft.com/en-us/library/cc246530.aspx)
       class ErrorPacket < RubySMB::GenericPacket
         attr_accessor :original_command
 
         endian       :little
         smb2_header  :smb2_header
-        uint16       :structure_size, label: 'Structure Size', initial_value: 4
-        uint8        :error_data
+        uint16       :structure_size,      label: 'Structure Size', initial_value: 9
+        uint8        :error_context_count, label: 'ErrorContextCount'
+        uint8        :reserved
+        uint32       :byte_count,          label: 'Byte Count of ErrorData',
+                                           initial_value: -> { error_data.num_bytes == 1 ? 0 : error_data.num_bytes }
+        string       :error_data,          label: 'Error Data', initial_value: "\x00",
+                                           read_length: -> { byte_count == 0 ? 1 : byte_count }
 
         def valid?
           return smb2_header.protocol == RubySMB::SMB2::SMB2_PROTOCOL_ID &&
-            smb2_header.command == @original_command
+                 smb2_header.command == @original_command &&
+                 structure_size == 9
         end
       end
     end

data/lib/ruby_smb/version.rb

@@ -1,3 +1,3 @@
 module RubySMB
-  VERSION = '1.0.4'.freeze
+  VERSION = '1.0.5'.freeze
 end

data/spec/lib/ruby_smb/smb1/packet/empty_packet_spec.rb

@@ -54,5 +54,15 @@ RSpec.describe RubySMB::SMB1::Packet::EmptyPacket do
       packet.smb_header.command = RubySMB::SMB1::Commands::SMB_COM_NEGOTIATE
       expect(packet).to_not be_valid
     end
+
+    it 'returns false if the packet parameter block size is not 0' do
+      packet.parameter_block.word_count = 10
+      expect(packet).to_not be_valid
+    end
+
+    it 'returns false if the packet data block size is not 0' do
+      packet.data_block.byte_count = 10
+      expect(packet).to_not be_valid
+    end
   end
 end

data/spec/lib/ruby_smb/smb2/packet/error_packet_spec.rb

@@ -19,11 +19,54 @@ RSpec.describe RubySMB::SMB2::Packet::ErrorPacket do
     it 'should be a 16-bit unsigned integer' do
       expect(packet.structure_size).to be_a BinData::Uint16le
     end
+
+    it 'should be 9 by default' do
+      expect(packet.structure_size).to eq 9
+    end
   end
 
-  describe '#error_data' do
+  describe '#error_context_count' do
     it 'should be a 8-bit unsigned integer' do
-      expect(packet.error_data).to be_a BinData::Uint8
+      expect(packet.error_context_count).to be_a BinData::Uint8
+    end
+  end
+
+  describe '#byte_count' do
+    it 'should be a 32-bit unsigned integer' do
+      expect(packet.byte_count).to be_a BinData::Uint32le
+    end
+
+    it 'should be the number of bytes in #error_data' do
+      str = 'testing'
+      packet.error_data = str
+      expect(packet.byte_count).to eq str.size
+    end
+
+    it 'should be 0 when #error_data is 1-byte long' do
+      packet.error_data = "\x00"
+      expect(packet.byte_count).to eq 0
+    end
+  end
+
+  describe '#error_data' do
+    it 'should be a String' do
+      expect(packet.error_data).to be_a BinData::String
+    end
+
+    it 'should be \x00 by default' do
+      expect(packet.error_data).to eq "\x00"
+    end
+
+    it 'should read 1 byte when #byte_count is 0' do
+      packet.error_data = 'test'
+      packet.byte_count = 0
+      expect(described_class.read(packet.to_binary_s).error_data.size).to eq 1
+    end
+
+    it 'should read #byte_count bytes when #byte_count is not 0' do
+      packet.error_data = 'test'
+      packet.byte_count = 4
+      expect(described_class.read(packet.to_binary_s).error_data.size).to eq 4
     end
   end
 
@@ -46,6 +89,11 @@ RSpec.describe RubySMB::SMB2::Packet::ErrorPacket do
       packet.smb2_header.command = RubySMB::SMB2::Commands::NEGOTIATE
       expect(packet).to_not be_valid
     end
+
+    it 'returns false if the packet #structure_size is wrong' do
+      packet.structure_size = 10
+      expect(packet).to_not be_valid
+    end
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby_smb
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.5
 platform: ruby
 authors:
 - David Maloney
@@ -91,7 +91,7 @@ cert_chain:
   G+Hmcg1v810agasPdoydE0RTVZgEOOMoQ07qu7JFXVWZ9ZQpHT7qJATWL/b2csFG
   8mVuTXnyJOKRJA==
   -----END CERTIFICATE-----
-date: 2018-09-12 00:00:00.000000000 Z
+date: 2018-10-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redcarpet