ruby_smb 2.0.2 → 3.0.0

data/spec/lib/ruby_smb/dcerpc/winreg/query_info_key_response_spec.rb

@@ -2,7 +2,6 @@ RSpec.describe RubySMB::Dcerpc::Winreg::QueryInfoKeyResponse do
   subject(:packet) { described_class.new }
 
   it { is_expected.to respond_to :lp_class }
-  it { is_expected.to respond_to :pad }
   it { is_expected.to respond_to :lpc_sub_keys }
   it { is_expected.to respond_to :lpc_max_sub_key_len }
   it { is_expected.to respond_to :lpc_max_class_len }
@@ -23,73 +22,62 @@ RSpec.describe RubySMB::Dcerpc::Winreg::QueryInfoKeyResponse do
       expect(packet.lp_class).to be_a RubySMB::Dcerpc::RrpUnicodeString
     end
 
-    it 'has an initial value of 0' do
-      expect(packet.lp_class).to eq(0)
-    end
-  end
-
-  describe '#pad' do
-    it 'is a string' do
-      expect(packet.pad).to be_a BinData::String
-    end
-
-    it 'should keep #lpc_sub_keys 4-byte aligned' do
-      packet.lp_class = 'test'
-      expect(packet.lpc_sub_keys.abs_offset % 4).to eq 0
+    it 'has the expected initial value' do
+      expect(packet.lp_class).to eq({:buffer_length=>0, :maximum_length=>0, :buffer=>:null})
     end
   end
 
   describe '#lpc_sub_keys' do
-    it 'is a 32-bit unsigned integer' do
-      expect(packet.lpc_sub_keys).to be_a BinData::Uint32le
+    it 'is a NdrUint32' do
+      expect(packet.lpc_sub_keys).to be_a RubySMB::Dcerpc::Ndr::NdrUint32
     end
   end
 
   describe '#lpc_max_sub_key_len' do
-    it 'is a 32-bit unsigned integer' do
-      expect(packet.lpc_max_sub_key_len).to be_a BinData::Uint32le
+    it 'is a NdrUint32' do
+      expect(packet.lpc_max_sub_key_len).to be_a RubySMB::Dcerpc::Ndr::NdrUint32
     end
   end
 
   describe '#lpc_max_class_len' do
-    it 'is a 32-bit unsigned integer' do
-      expect(packet.lpc_max_class_len).to be_a BinData::Uint32le
+    it 'is a NdrUint32' do
+      expect(packet.lpc_max_class_len).to be_a RubySMB::Dcerpc::Ndr::NdrUint32
     end
   end
 
   describe '#lpc_values' do
-    it 'is a 32-bit unsigned integer' do
-      expect(packet.lpc_values).to be_a BinData::Uint32le
+    it 'is a NdrUint32' do
+      expect(packet.lpc_values).to be_a RubySMB::Dcerpc::Ndr::NdrUint32
     end
   end
 
   describe '#lpcb_max_value_name_len' do
-    it 'is a 32-bit unsigned integer' do
-      expect(packet.lpcb_max_value_name_len).to be_a BinData::Uint32le
+    it 'is a NdrUint32' do
+      expect(packet.lpcb_max_value_name_len).to be_a RubySMB::Dcerpc::Ndr::NdrUint32
     end
   end
 
   describe '#lpcb_max_value_len' do
-    it 'is a 32-bit unsigned integer' do
-      expect(packet.lpcb_max_value_len).to be_a BinData::Uint32le
+    it 'is a NdrUint32' do
+      expect(packet.lpcb_max_value_len).to be_a RubySMB::Dcerpc::Ndr::NdrUint32
     end
   end
 
   describe '#lpcb_security_descriptor' do
-    it 'is a 32-bit unsigned integer' do
-      expect(packet.lpcb_security_descriptor).to be_a BinData::Uint32le
+    it 'is a NdrUint32' do
+      expect(packet.lpcb_security_descriptor).to be_a RubySMB::Dcerpc::Ndr::NdrUint32
     end
   end
 
   describe '#lpft_last_write_time' do
-    it 'is a FileTime structure' do
-      expect(packet.lpft_last_write_time).to be_a RubySMB::Field::FileTime
+    it 'is a NdrFileTime structure' do
+      expect(packet.lpft_last_write_time).to be_a RubySMB::Dcerpc::Ndr::NdrFileTime
     end
   end
 
   describe '#error_status' do
-    it 'is a 32-bit unsigned integer' do
-      expect(packet.error_status).to be_a BinData::Uint32le
+    it 'is a NdrUint32' do
+      expect(packet.error_status).to be_a RubySMB::Dcerpc::Ndr::NdrUint32
     end
   end
 
@@ -98,16 +86,4 @@ RSpec.describe RubySMB::Dcerpc::Winreg::QueryInfoKeyResponse do
       expect(packet.opnum).to eq(RubySMB::Dcerpc::Winreg::REG_QUERY_INFO_KEY)
     end
   end
-
-  describe '#pad_length' do
-    it 'returns 0 when #lpc_sub_keys is already 4-byte aligned' do
-      packet.lp_class = 'align'
-      expect(packet.pad_length).to eq 0
-    end
-
-    it 'returns 2 when #lpc_sub_keys is only 2-byte aligned' do
-      packet.lp_class = 'align' + 'A'
-      expect(packet.pad_length).to eq 2
-    end
-  end
 end

data/spec/lib/ruby_smb/dcerpc/winreg/query_value_request_spec.rb

@@ -9,7 +9,6 @@ RSpec.describe RubySMB::Dcerpc::Winreg::QueryValueRequest do
 
   it { is_expected.to respond_to :hkey }
   it { is_expected.to respond_to :lp_value_name }
-  it { is_expected.to respond_to :pad }
   it { is_expected.to respond_to :lp_type }
   it { is_expected.to respond_to :lp_data }
   it { is_expected.to respond_to :lpcb_data }
@@ -32,38 +31,27 @@ RSpec.describe RubySMB::Dcerpc::Winreg::QueryValueRequest do
     end
   end
 
-  describe '#pad' do
-    it 'is a string' do
-      expect(packet.pad).to be_a BinData::String
-    end
-
-    it 'should keep #lp_type 4-byte aligned' do
-      packet.lp_value_name = 'test'
-      expect(packet.lp_type.abs_offset % 4).to eq 0
-    end
-  end
-
   describe '#lp_type' do
-    it 'is a NdrLpDword structure' do
-      expect(packet.lp_type).to be_a RubySMB::Dcerpc::Ndr::NdrLpDword
+    it 'is a Ndr::NdrUint32Ptr structure' do
+      expect(packet.lp_type).to be_a RubySMB::Dcerpc::Ndr::NdrUint32Ptr
     end
   end
 
   describe '#lp_data' do
-    it 'is a NdrLpByte structure' do
-      expect(packet.lp_data).to be_a RubySMB::Dcerpc::Ndr::NdrLpByte
+    it 'is a Ndr::NdrByteArrayPtr structure' do
+      expect(packet.lp_data).to be_a RubySMB::Dcerpc::Ndr::NdrByteArrayPtr
     end
   end
 
   describe '#lpcb_data' do
-    it 'is a NdrLpDword structure' do
-      expect(packet.lpcb_data).to be_a RubySMB::Dcerpc::Ndr::NdrLpDword
+    it 'is a Ndr::NdrUint32Ptr structure' do
+      expect(packet.lpcb_data).to be_a RubySMB::Dcerpc::Ndr::NdrUint32Ptr
     end
   end
 
   describe '#lpcb_len' do
-    it 'is a NdrLpDword structure' do
-      expect(packet.lpcb_len).to be_a RubySMB::Dcerpc::Ndr::NdrLpDword
+    it 'is a Ndr::NdrUint32Ptr structure' do
+      expect(packet.lpcb_len).to be_a RubySMB::Dcerpc::Ndr::NdrUint32Ptr
     end
   end
 
@@ -72,17 +60,5 @@ RSpec.describe RubySMB::Dcerpc::Winreg::QueryValueRequest do
       expect(packet.opnum).to eq(RubySMB::Dcerpc::Winreg::REG_QUERY_VALUE)
     end
   end
-
-  describe '#pad_length' do
-    it 'returns 0 when #lp_type is already 4-byte aligned' do
-      packet.lp_value_name = 'align'
-      expect(packet.pad_length).to eq 0
-    end
-
-    it 'returns 2 when #lp_type is only 2-byte aligned' do
-      packet.lp_value_name = 'align' + 'A'
-      expect(packet.pad_length).to eq 2
-    end
-  end
 end
 

data/spec/lib/ruby_smb/dcerpc/winreg/query_value_response_spec.rb

@@ -3,7 +3,6 @@ RSpec.describe RubySMB::Dcerpc::Winreg::QueryValueResponse do
 
   it { is_expected.to respond_to :lp_type }
   it { is_expected.to respond_to :lp_data }
-  it { is_expected.to respond_to :pad }
   it { is_expected.to respond_to :lpcb_data }
   it { is_expected.to respond_to :lpcb_len }
   it { is_expected.to respond_to :error_status }
@@ -14,43 +13,32 @@ RSpec.describe RubySMB::Dcerpc::Winreg::QueryValueResponse do
   end
 
   describe '#lp_type' do
-    it 'is a NdrLpDword structure' do
-      expect(packet.lp_type).to be_a RubySMB::Dcerpc::Ndr::NdrLpDword
+    it 'is a Ndr::NdrUint32Ptr structure' do
+      expect(packet.lp_type).to be_a RubySMB::Dcerpc::Ndr::NdrUint32Ptr
     end
   end
 
   describe '#lp_data' do
-    it 'is a NdrLpByte structure' do
-      expect(packet.lp_data).to be_a RubySMB::Dcerpc::Ndr::NdrLpByte
-    end
-  end
-
-  describe '#pad' do
-    it 'is a string' do
-      expect(packet.pad).to be_a BinData::String
-    end
-
-    it 'should keep #lpcb_data 4-byte aligned' do
-      packet.lp_data.bytes = 'spec_test'.bytes
-      expect(packet.lpcb_data.abs_offset % 4).to eq 0
+    it 'is a NdrNdrByteArrayPtr structure' do
+      expect(packet.lp_data).to be_a RubySMB::Dcerpc::Ndr::NdrByteArrayPtr
     end
   end
 
   describe '#lpcb_data' do
-    it 'is a NdrLpDword structure' do
-      expect(packet.lpcb_data).to be_a RubySMB::Dcerpc::Ndr::NdrLpDword
+    it 'is a Ndr::NdrUint32Ptr structure' do
+      expect(packet.lpcb_data).to be_a RubySMB::Dcerpc::Ndr::NdrUint32Ptr
     end
   end
 
   describe '#lpcb_len' do
-    it 'is a NdrLpDword structure' do
-      expect(packet.lpcb_len).to be_a RubySMB::Dcerpc::Ndr::NdrLpDword
+    it 'is a Ndr::NdrUint32Ptr structure' do
+      expect(packet.lpcb_len).to be_a RubySMB::Dcerpc::Ndr::NdrUint32Ptr
     end
   end
 
   describe '#error_status' do
-    it 'is a 32-bit unsigned integer' do
-      expect(packet.error_status).to be_a BinData::Uint32le
+    it 'is a NdrUint32' do
+      expect(packet.error_status).to be_a RubySMB::Dcerpc::Ndr::NdrUint32
     end
   end
 
@@ -60,24 +48,12 @@ RSpec.describe RubySMB::Dcerpc::Winreg::QueryValueResponse do
     end
   end
 
-  describe '#pad_length' do
-    it 'returns 0 when #lpcb_data is already 4-byte aligned' do
-      packet.lp_data.bytes = 'aligned.'.bytes
-      expect(packet.pad_length).to eq 0
-    end
-
-    it 'returns 2 when #lpcb_data is only 2-byte aligned' do
-      packet.lp_data.bytes = 'not aligned'.bytes
-      expect(packet.pad_length).to eq 1
-    end
-  end
-
   describe '#data' do
     context 'when #lp_type is 1 (unicode null-terminated string)' do
       it 'returns the expected value' do
         str = 'spec test string'.encode('utf-16le')
         packet.lp_type = 1
-        packet.lp_data.bytes = str.bytes
+        packet.lp_data = str.bytes
         expect(packet.data).to eq(str)
       end
     end
@@ -86,7 +62,7 @@ RSpec.describe RubySMB::Dcerpc::Winreg::QueryValueResponse do
       it 'returns the expected value' do
         str = '/%PATH%/foo'.encode('utf-16le')
         packet.lp_type = 2
-        packet.lp_data.bytes = str.bytes
+        packet.lp_data = str.bytes
         expect(packet.data).to eq(str)
       end
     end
@@ -95,7 +71,7 @@ RSpec.describe RubySMB::Dcerpc::Winreg::QueryValueResponse do
       it 'returns the expected value' do
         bytes = [0xFF, 0xEE, 0xDD, 0xCC].pack('C*')
         packet.lp_type = 3
-        packet.lp_data.bytes = bytes.bytes
+        packet.lp_data = bytes.bytes
         expect(packet.data).to eq(bytes)
       end
     end
@@ -104,7 +80,7 @@ RSpec.describe RubySMB::Dcerpc::Winreg::QueryValueResponse do
       it 'returns the expected value' do
         number = 12345
         packet.lp_type = 4
-        packet.lp_data.bytes = [number].pack('V').bytes
+        packet.lp_data = [number].pack('V').bytes
         expect(packet.data).to eq(number)
       end
     end
@@ -113,7 +89,7 @@ RSpec.describe RubySMB::Dcerpc::Winreg::QueryValueResponse do
       it 'returns the expected value' do
         number = 12345
         packet.lp_type = 5
-        packet.lp_data.bytes = [number].pack('N').bytes
+        packet.lp_data = [number].pack('N').bytes
         expect(packet.data).to eq(number)
       end
     end
@@ -124,7 +100,7 @@ RSpec.describe RubySMB::Dcerpc::Winreg::QueryValueResponse do
         null_byte = "\0".encode('utf-16le')
         str = (str_array + [null_byte]).join(null_byte)
         packet.lp_type = 7
-        packet.lp_data.bytes = str.bytes
+        packet.lp_data = str.bytes
         expect(packet.data).to eq(str_array)
       end
     end
@@ -133,7 +109,7 @@ RSpec.describe RubySMB::Dcerpc::Winreg::QueryValueResponse do
       it 'returns the expected value' do
         number = 0x1234567812345678
         packet.lp_type = 11
-        packet.lp_data.bytes = [number].pack('Q<').bytes
+        packet.lp_data = [number].pack('Q<').bytes
         expect(packet.data).to eq(number)
       end
     end
@@ -142,7 +118,7 @@ RSpec.describe RubySMB::Dcerpc::Winreg::QueryValueResponse do
       it 'returns an empty string' do
         str = 'test'
         packet.lp_type = 6
-        packet.lp_data.bytes = str.bytes
+        packet.lp_data = str.bytes
         expect(packet.data).to eq('')
       end
     end

data/spec/lib/ruby_smb/dcerpc/winreg/regsam_spec.rb

@@ -29,4 +29,8 @@ RSpec.describe RubySMB::Dcerpc::Winreg::Regsam do
   it 'is little endian' do
     expect(described_class.fields.instance_variable_get(:@hints)[:endian]).to eq :little
   end
+
+  it 'it is a Ndr::NdrStruct' do
+    expect(described_class).to be < RubySMB::Dcerpc::Ndr::NdrStruct
+  end
 end

data/spec/lib/ruby_smb/dcerpc/winreg/save_key_request_spec.rb

@@ -0,0 +1,45 @@
+RSpec.describe RubySMB::Dcerpc::Winreg::RpcHkey do
+  subject(:packet) { described_class.new }
+
+  it 'is NdrContextHandle subclass' do
+    expect(described_class).to be < RubySMB::Dcerpc::Ndr::NdrContextHandle
+  end
+end
+
+RSpec.describe RubySMB::Dcerpc::Winreg::SaveKeyRequest do
+  subject(:packet) { described_class.new }
+
+
+  it 'is little endian' do
+    expect(described_class.fields.instance_variable_get(:@hints)[:endian]).to eq :little
+  end
+
+  it { is_expected.to respond_to :hkey }
+  it { is_expected.to respond_to :lp_file }
+  it { is_expected.to respond_to :lp_security_attributes }
+
+  describe '#hkey' do
+    it 'is a RpcHkey structure' do
+      expect(packet.hkey).to be_a RubySMB::Dcerpc::Winreg::RpcHkey
+    end
+  end
+
+  describe '#lp_file' do
+    it 'is a RrpUnicodeString structure' do
+      expect(packet.lp_file).to be_a RubySMB::Dcerpc::RrpUnicodeString
+    end
+  end
+
+  describe '#lp_security_attributes' do
+    it 'is a PrpcSecurityAttributes structure' do
+      expect(packet.lp_security_attributes).to be_a RubySMB::Dcerpc::PrpcSecurityAttributes
+    end
+  end
+
+  describe '#initialize_instance' do
+    it 'sets #opnum to REG_SAVE_KEY constant' do
+      expect(packet.opnum).to eq(RubySMB::Dcerpc::Winreg::REG_SAVE_KEY)
+    end
+  end
+end
+

data/spec/lib/ruby_smb/dcerpc/winreg/save_key_response_spec.rb

@@ -0,0 +1,22 @@
+RSpec.describe RubySMB::Dcerpc::Winreg::SaveKeyResponse do
+  subject(:packet) { described_class.new }
+
+  it { is_expected.to respond_to :error_status }
+
+  it 'is little endian' do
+    expect(described_class.fields.instance_variable_get(:@hints)[:endian]).to eq :little
+  end
+
+  describe '#error_status' do
+    it 'is a NdrUint32' do
+      expect(packet.error_status).to be_a RubySMB::Dcerpc::Ndr::NdrUint32
+    end
+  end
+
+  describe '#initialize_instance' do
+    it 'sets #opnum to REG_CREATE_KEY constant' do
+      expect(packet.opnum).to eq(RubySMB::Dcerpc::Winreg::REG_CREATE_KEY)
+    end
+  end
+end
+