ruby_smb 2.0.10 → 3.0.0

data/spec/lib/ruby_smb/dcerpc/srvsvc/net_share_enum_all_spec.rb

@@ -1,189 +1,228 @@
-RSpec.describe RubySMB::Dcerpc::Srvsvc::NetShareEnumAll do
-  subject(:packet) { described_class.new(host: '1.2.3.4') }
-
-  it { is_expected.to respond_to :referent_id }
-  it { is_expected.to respond_to :max_count }
-  it { is_expected.to respond_to :offset }
-  it { is_expected.to respond_to :actual_count }
-  it { is_expected.to respond_to :server_unc }
-  it { is_expected.to respond_to :pad }
-  it { is_expected.to respond_to :level }
-  it { is_expected.to respond_to :ctr }
-  it { is_expected.to respond_to :ctr_referent_id }
-  it { is_expected.to respond_to :ctr_count }
-  it { is_expected.to respond_to :pointer_to_array }
-  it { is_expected.to respond_to :max_buffer }
-  it { is_expected.to respond_to :resume_referent_id }
+RSpec.describe RubySMB::Dcerpc::Srvsvc::NetShareEnumAllRequest do
+  subject(:packet) { described_class.new }
+
+  it { is_expected.to respond_to :server_name }
+  it { is_expected.to respond_to :info_struct }
+  it { is_expected.to respond_to :prefered_maximum_length }
   it { is_expected.to respond_to :resume_handle }
-  it { is_expected.to respond_to :opnum }
 
   it 'is little endian' do
     expect(described_class.fields.instance_variable_get(:@hints)[:endian]).to eq :little
   end
 
-  context 'when \'host\' parameter is not provided' do
-    it 'raises an ArgumentError' do
-      expect { described_class.new }.to raise_error(ArgumentError)
+  describe '#server_name' do
+    it 'is a SrvsvcHandle' do
+      expect(packet.server_name).to be_a RubySMB::Dcerpc::Srvsvc::SrvsvcHandle
+    end
+  end
+
+  describe '#info_struct' do
+    it 'is a LpshareEnumStruct' do
+      expect(packet.info_struct).to be_a RubySMB::Dcerpc::Srvsvc::LpshareEnumStruct
     end
   end
 
-  describe '#referent_id' do
-    it 'should be a 32-bit unsigned integer' do
-      expect(packet.referent_id).to be_a BinData::Uint32le
+  describe '#prefered_maximum_length' do
+    it 'is a NdrUint32' do
+      expect(packet.prefered_maximum_length).to be_a RubySMB::Dcerpc::Ndr::NdrUint32
     end
 
-    it 'should have a default value of 1' do
-      expect(packet.referent_id).to eq 1
+    it 'has a default value of 0xFFFFFFFF' do
+      expect(packet.prefered_maximum_length).to eq(0xFFFFFFFF)
     end
   end
 
-  describe '#max_count' do
-    it 'should be a 32-bit unsigned integer' do
-      expect(packet.max_count).to be_a BinData::Uint32le
+  describe '#resume_handle' do
+    it 'is a NdrUint32Ptr' do
+      expect(packet.resume_handle).to be_a RubySMB::Dcerpc::Ndr::NdrUint32Ptr
     end
 
-    it 'should be the number of unicode characters in the #server_unc field' do
-      expect(packet.max_count).to eq(packet.server_unc.do_num_bytes / 2)
+    it 'has a default value of 0' do
+      expect(packet.resume_handle).to eq(0)
     end
   end
 
-  describe '#offset' do
-    it 'should be a 32-bit unsigned integer' do
-      expect(packet.offset).to be_a BinData::Uint32le
+  describe '#initialize_instance' do
+    it 'sets #opnum to NET_SHARE_ENUM_ALL constant' do
+      expect(packet.opnum).to eq(RubySMB::Dcerpc::Srvsvc::NET_SHARE_ENUM_ALL)
     end
+  end
+end
 
-    it 'should have a default value of 0' do
-      expect(packet.offset).to eq 0
-    end
+RSpec.describe RubySMB::Dcerpc::Srvsvc::NetShareEnumAllResponse do
+  subject(:packet) { described_class.new }
+
+  it { is_expected.to respond_to :info_struct }
+  it { is_expected.to respond_to :total_entries }
+  it { is_expected.to respond_to :resume_handle }
+  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 '#actual_count' do
-    it 'should be a 32-bit unsigned integer' do
-      expect(packet.actual_count).to be_a BinData::Uint32le
+  describe '#info_struct' do
+    it 'is a LpshareEnumStruct' do
+      expect(packet.info_struct).to be_a RubySMB::Dcerpc::Srvsvc::LpshareEnumStruct
     end
+  end
 
-    it 'should be the same value than #max_count' do
-      expect(packet.actual_count).to eq(packet.max_count)
+  describe '#total_entries' do
+    it 'is a NdrUint32' do
+      expect(packet.total_entries).to be_a RubySMB::Dcerpc::Ndr::NdrUint32
     end
   end
 
-  describe '#server_unc' do
-    it 'is a Stringz16' do
-      expect(packet.server_unc).to be_a RubySMB::Field::Stringz16
+  describe '#resume_handle' do
+    it 'is a NdrUint32Ptr' do
+      expect(packet.resume_handle).to be_a RubySMB::Dcerpc::Ndr::NdrUint32Ptr
     end
+  end
 
-    it 'uses the #host parameter value to create the UNC unicode string' do
-      expect(packet.server_unc).to eq("\\\\#{"1.2.3.4".encode('utf-8')}".encode('utf-16le'))
+  describe '#error_status' do
+    it 'is a NdrUint32' do
+      expect(packet.error_status).to be_a RubySMB::Dcerpc::Ndr::NdrUint32
     end
   end
 
-  describe '#pad' do
-    it 'should keep #level 4-byte aligned' do
-      expect(packet.level.abs_offset % 4).to eq 0
+  describe '#initialize_instance' do
+    it 'sets #opnum to NET_SHARE_ENUM_ALL constant' do
+      expect(packet.opnum).to eq(RubySMB::Dcerpc::Srvsvc::NET_SHARE_ENUM_ALL)
     end
   end
+end
+
+RSpec.describe RubySMB::Dcerpc::Srvsvc::LpshareEnumStruct do
+  it 'is a NdrStruct' do
+    expect(described_class).to be < RubySMB::Dcerpc::Ndr::NdrStruct
+  end
+
+  subject(:packet) { described_class.new }
+
+  it { is_expected.to respond_to :level }
+  it { is_expected.to respond_to :switch_value }
+  it { is_expected.to respond_to :share_info }
 
   describe '#level' do
-    it 'should be a 32-bit unsigned integer' do
-      expect(packet.level).to be_a BinData::Uint32le
+    it 'is a NdrUint32' do
+      expect(packet.level).to be_a RubySMB::Dcerpc::Ndr::NdrUint32
     end
 
-    it 'should have a default value of 1' do
+    it 'has a default value of 1' do
       expect(packet.level).to eq 1
     end
   end
 
-  describe '#ctr' do
-    it 'should be a 32-bit unsigned integer' do
-      expect(packet.ctr).to be_a BinData::Uint32le
+  describe '#switch_value' do
+    it 'is a NdrUint32' do
+      expect(packet.switch_value).to be_a RubySMB::Dcerpc::Ndr::NdrUint32
     end
 
-    it 'should have a default value of 1' do
-      expect(packet.ctr).to eq 1
+    it 'has a default value set to the #level value' do
+      expect(packet.switch_value).to eq packet.level
     end
-  end
 
-  describe '#ctr_referent_id' do
-    it 'should be a 32-bit unsigned integer' do
-      expect(packet.ctr_referent_id).to be_a BinData::Uint32le
-    end
-
-    it 'should have a default value of 1' do
-      expect(packet.ctr_referent_id).to eq 1
+    it 'is an hidden field' do
+      expect(packet.snapshot).to_not have_key(:switch_value)
     end
   end
 
-  describe '#ctr_count' do
-    it 'should be a 32-bit unsigned integer' do
-      expect(packet.ctr_count).to be_a BinData::Uint32le
+  describe '#share_info' do
+    it 'is a BinData::Choice' do
+      expect(packet.share_info).to be_a BinData::Choice
     end
 
-    it 'should have a default value of 0' do
-      expect(packet.ctr_count).to eq 0
+    it 'selects a structure according to :level value and set the default value' do
+      expect(packet.share_info.snapshot).to eq({ entries_read: 0, buffer: :null })
+      # Trying to with a non existing enum value, since only Level 1 is implemented so far
+      packet.level = 0
+      expect { packet.share_info.snapshot }.to raise_error(IndexError)
     end
   end
+end
 
-  describe '#pointer_to_array' do
-    it 'should be a 32-bit unsigned integer' do
-      expect(packet.pointer_to_array).to be_a BinData::Uint32le
-    end
+RSpec.describe RubySMB::Dcerpc::Srvsvc::LpshareInfo1Container do
+  it 'is a ShareInfo1Container' do
+    expect(described_class).to be < RubySMB::Dcerpc::Srvsvc::ShareInfo1Container
+  end
+  it 'is a NDR pointer' do
+    expect(described_class.new).to be_a RubySMB::Dcerpc::Ndr::PointerPlugin
+  end
+end
 
-    it 'should have a default value of 0' do
-      expect(packet.pointer_to_array).to eq 0
-    end
+RSpec.describe RubySMB::Dcerpc::Srvsvc::ShareInfo1Container do
+  it 'is a NdrStruct' do
+    expect(described_class).to be < RubySMB::Dcerpc::Ndr::NdrStruct
   end
 
-  describe '#max_buffer' do
-    it 'should be a 32-bit unsigned integer' do
-      expect(packet.max_buffer).to be_a BinData::Uint32le
-    end
+  subject(:packet) { described_class.new }
+
+  it { is_expected.to respond_to :entries_read }
+  it { is_expected.to respond_to :buffer }
 
-    it 'should have a default value of 4294967295' do
-      expect(packet.max_buffer).to eq 4294967295
+  describe '#entries_read' do
+    it 'is a NdrUint32' do
+      expect(packet.entries_read).to be_a RubySMB::Dcerpc::Ndr::NdrUint32
     end
   end
 
-  describe '#resume_referent_id' do
-    it 'should be a 32-bit unsigned integer' do
-      expect(packet.resume_referent_id).to be_a BinData::Uint32le
+  describe '#buffer' do
+    it 'is a LpshareInfo1' do
+      expect(packet.buffer).to be_a RubySMB::Dcerpc::Srvsvc::LpshareInfo1
     end
+  end
+end
 
-    it 'should have a default value of 1' do
-      expect(packet.resume_referent_id).to eq 1
-    end
+RSpec.describe RubySMB::Dcerpc::Srvsvc::LpshareInfo1 do
+  it 'is a ShareInfo1' do
+    expect(described_class).to be < RubySMB::Dcerpc::Srvsvc::ShareInfo1
+  end
+  it 'is a NDR pointer' do
+    expect(described_class.new).to be_a RubySMB::Dcerpc::Ndr::PointerPlugin
   end
+end
 
-  describe '#resume_handle' do
-    it 'should be a 32-bit unsigned integer' do
-      expect(packet.resume_handle).to be_a BinData::Uint32le
-    end
+RSpec.describe RubySMB::Dcerpc::Srvsvc::ShareInfo1 do
+  it 'is a NdrConfArray' do
+    expect(described_class.new).to be_a RubySMB::Dcerpc::Ndr::NdrConfArray
+  end
+  it 'contains element of type ShareInfo1Element' do
+    expect(described_class.default_parameters[:type]).to eq(:share_info1_element)
+  end
+end
 
-    it 'should have a default value of 0' do
-      expect(packet.resume_handle).to eq 0
-    end
+RSpec.describe RubySMB::Dcerpc::Srvsvc::ShareInfo1Element do
+  it 'is a NdrStruct' do
+    expect(described_class).to be < RubySMB::Dcerpc::Ndr::NdrStruct
   end
 
-  describe '#initialize_instance' do
-    it 'sets #opnum to REG_CLOSE_KEY constant' do
-      expect(packet.opnum).to eq(RubySMB::Dcerpc::Srvsvc::NET_SHARE_ENUM_ALL)
+  subject(:packet) { described_class.new }
+
+  it { is_expected.to respond_to :shi1_netname }
+  it { is_expected.to respond_to :shi1_type }
+  it { is_expected.to respond_to :shi1_remark }
+
+  describe '#shi1_netname' do
+    it 'is a NdrConfVarWideStringz' do
+      expect(packet.shi1_netname).to be_a RubySMB::Dcerpc::Ndr::NdrConfVarWideStringz
     end
   end
 
-  describe '#pad_length' do
-    it 'returns 0 when #level is already 4-byte aligned' do
-      expect(packet.pad_length).to eq 0
+  describe '#shi1_type' do
+    it 'is a NdrUint32' do
+      expect(packet.shi1_type).to be_a RubySMB::Dcerpc::Ndr::NdrUint32
     end
+  end
 
-    it 'returns 2 when #level is only 2-byte aligned' do
-      packet.server_unc = packet.server_unc + 'A'.encode('utf-16le')
-      expect(packet.pad_length).to eq 2
+  describe '#shi1_remark' do
+    it 'is a NdrConfVarWideStringz' do
+      expect(packet.shi1_remark).to be_a RubySMB::Dcerpc::Ndr::NdrConfVarWideStringz
     end
   end
+end
 
-  describe 'class method self.parse_response' do
-    # TODO: this class method will be refactored to use proper BinData NDR
-    # fields once they are ready (see https://github.com/rapid7/ruby_smb/issues/124)
+RSpec.describe RubySMB::Dcerpc::Srvsvc::SrvsvcHandle do
+  it 'is a NdrWideStringzPtr' do
+    expect(described_class).to be < RubySMB::Dcerpc::Ndr::NdrWideStringzPtr
   end
 end
-
-

data/spec/lib/ruby_smb/dcerpc/srvsvc_spec.rb

@@ -11,20 +11,30 @@ RSpec.describe RubySMB::Dcerpc::Srvsvc do
     let(:host)            { '1.2.3.4' }
     let(:request_packet)  { double('NetShareEnumAll request packet') }
     let(:dcerpc_response) { double('DCERPC response') }
+    let(:response)        { double('NetShareEnumAllResponse') }
     let(:shares) do
       [
-        ["C$", "DISK", "Default share"],
-        ["Shared", "DISK", ""],
-        ["IPC$", "IPC", "Remote IPC"],
-        ["ADMIN$", "DISK", "Remote Admin"]
+        RubySMB::Dcerpc::Srvsvc::ShareInfo1Element.new({:shi1_netname=>'C$', :shi1_type=>0, :shi1_remark=>'Default share'}),
+        RubySMB::Dcerpc::Srvsvc::ShareInfo1Element.new({:shi1_netname=>'Shared', :shi1_type=>0, :shi1_remark=>''}),
+        RubySMB::Dcerpc::Srvsvc::ShareInfo1Element.new({:shi1_netname=>'IPC$', :shi1_type=>2147483651, :shi1_remark=>'Remote IPC'}),
+        RubySMB::Dcerpc::Srvsvc::ShareInfo1Element.new({:shi1_netname=>'ADMIN$', :shi1_type=>2147483648, :shi1_remark=>'Remote Admin'})
+      ]
+    end
+    let(:result) do
+      [
+        {name: 'C$', type: 'DISK', comment: 'Default share'},
+        {name: 'Shared', type: 'DISK', comment: ''},
+        {name: 'IPC$', type: 'IPC|SPECIAL', comment: 'Remote IPC'},
+        {name: 'ADMIN$', type: 'DISK|SPECIAL', comment: 'Remote Admin'}
       ]
     end
 
     before :example do
       allow(srvsvc).to receive(:bind)
-      allow(RubySMB::Dcerpc::Srvsvc::NetShareEnumAll).to receive(:new).and_return(request_packet)
+      allow(RubySMB::Dcerpc::Srvsvc::NetShareEnumAllRequest).to receive(:new).and_return(request_packet)
       allow(srvsvc).to receive(:dcerpc_request).and_return(dcerpc_response)
-      allow(RubySMB::Dcerpc::Srvsvc::NetShareEnumAll).to receive(:parse_response).and_return(shares)
+      allow(RubySMB::Dcerpc::Srvsvc::NetShareEnumAllResponse).to receive(:read).and_return(response)
+      allow(response).to receive_message_chain(:info_struct, :share_info, :buffer).and_return(shares)
     end
 
     it 'calls #bind with the expected arguments' do
@@ -32,9 +42,9 @@ RSpec.describe RubySMB::Dcerpc::Srvsvc do
       expect(srvsvc).to have_received(:bind).with(endpoint: RubySMB::Dcerpc::Srvsvc)
     end
 
-    it 'creates the expected NetShareEnumAll packet' do
+    it 'creates the expected NetShareEnumAllRequest packet' do
       srvsvc.net_share_enum_all(host)
-      expect(RubySMB::Dcerpc::Srvsvc::NetShareEnumAll).to have_received(:new).with(host: host)
+      expect(RubySMB::Dcerpc::Srvsvc::NetShareEnumAllRequest).to have_received(:new).with(server_name: "\\\\#{host}")
     end
 
     it 'calls #request with the expected arguments' do
@@ -42,19 +52,13 @@ RSpec.describe RubySMB::Dcerpc::Srvsvc do
       expect(srvsvc).to have_received(:dcerpc_request).with(request_packet)
     end
 
-    it 'parse the response with NetShareEnumAll #parse_response method' do
+    it 'parse the response with NetShareEnumAllResponse' do
       srvsvc.net_share_enum_all(host)
-      expect(RubySMB::Dcerpc::Srvsvc::NetShareEnumAll).to have_received(:parse_response).with(dcerpc_response)
+      expect(RubySMB::Dcerpc::Srvsvc::NetShareEnumAllResponse).to have_received(:read).with(dcerpc_response)
     end
 
     it 'returns the remote shares' do
-      output = [
-        {:name=>"C$", :type=>"DISK", :comment=>"Default share"},
-        {:name=>"Shared", :type=>"DISK", :comment=>""},
-        {:name=>"IPC$", :type=>"IPC", :comment=>"Remote IPC"},
-        {:name=>"ADMIN$", :type=>"DISK", :comment=>"Remote Admin"},
-      ]
-      expect(srvsvc.net_share_enum_all(host)).to eq(output)
+      expect(srvsvc.net_share_enum_all(host)).to eq(result)
     end
   end
 end

data/spec/lib/ruby_smb/dcerpc/svcctl/change_service_config_w_request_spec.rb

@@ -6,17 +6,12 @@ RSpec.describe RubySMB::Dcerpc::Svcctl::ChangeServiceConfigWRequest do
   it { is_expected.to respond_to :dw_start_type }
   it { is_expected.to respond_to :dw_error_control }
   it { is_expected.to respond_to :lp_binary_path_name }
-  it { is_expected.to respond_to :pad1 }
   it { is_expected.to respond_to :lp_load_order_group }
-  it { is_expected.to respond_to :pad2 }
   it { is_expected.to respond_to :dw_tag_id }
   it { is_expected.to respond_to :lp_dependencies }
-  it { is_expected.to respond_to :pad3 }
   it { is_expected.to respond_to :dw_depend_size }
   it { is_expected.to respond_to :lp_service_start_name }
-  it { is_expected.to respond_to :pad4 }
   it { is_expected.to respond_to :lp_password }
-  it { is_expected.to respond_to :pad5 }
   it { is_expected.to respond_to :dw_pw_size }
   it { is_expected.to respond_to :lp_display_name }
 
@@ -31,134 +26,116 @@ RSpec.describe RubySMB::Dcerpc::Svcctl::ChangeServiceConfigWRequest do
   end
 
   describe '#dw_service_type' do
-    it 'is a 32-bit unsigned integer' do
-      expect(packet.dw_service_type).to be_a BinData::Uint32le
+    it 'is a NdrUint32' do
+      expect(packet.dw_service_type).to be_a RubySMB::Dcerpc::Ndr::NdrUint32
     end
   end
 
   describe '#dw_start_type' do
-    it 'is a 32-bit unsigned integer' do
-      expect(packet.dw_start_type).to be_a BinData::Uint32le
+    it 'is a NdrUint32' do
+      expect(packet.dw_start_type).to be_a RubySMB::Dcerpc::Ndr::NdrUint32
     end
   end
 
   describe '#dw_start_type' do
-    it 'is a 32-bit unsigned integer' do
-      expect(packet.dw_start_type).to be_a BinData::Uint32le
+    it 'is a NdrUint32' do
+      expect(packet.dw_start_type).to be_a RubySMB::Dcerpc::Ndr::NdrUint32
     end
   end
 
   describe '#lp_binary_path_name' do
-    it 'is a NdrLpStr structure' do
-      expect(packet.lp_binary_path_name).to be_a RubySMB::Dcerpc::Ndr::NdrLpStr
-    end
-  end
-
-  describe '#pad1' do
-    it 'is a string' do
-      expect(packet.pad1).to be_a BinData::String
-    end
-
-    it 'should keep #lp_load_order_group 4-byte aligned' do
-      packet.lp_binary_path_name = "test"
-      expect(packet.lp_load_order_group.abs_offset % 4).to eq 0
+    it 'is a NdrWideStringPtr structure' do
+      expect(packet.lp_binary_path_name).to be_a RubySMB::Dcerpc::Ndr::NdrWideStringPtr
     end
   end
 
   describe '#lp_load_order_group' do
-    it 'is a NdrLpStr structure' do
-      expect(packet.lp_load_order_group).to be_a RubySMB::Dcerpc::Ndr::NdrLpStr
-    end
-  end
-
-  describe '#pad2' do
-    it 'is a string' do
-      expect(packet.pad1).to be_a BinData::String
-    end
-
-    it 'should keep #dw_tag_id 4-byte aligned' do
-      packet.lp_load_order_group = "test"
-      expect(packet.dw_tag_id.abs_offset % 4).to eq 0
+    it 'is a NdrWideStringPtr structure' do
+      expect(packet.lp_load_order_group).to be_a RubySMB::Dcerpc::Ndr::NdrWideStringPtr
     end
   end
 
   describe '#dw_tag_id' do
-    it 'is a NdrLpDword structure' do
-      expect(packet.dw_tag_id).to be_a RubySMB::Dcerpc::Ndr::NdrLpDword
+    it 'is a NdrUint32Ptr structure' do
+      expect(packet.dw_tag_id).to be_a RubySMB::Dcerpc::Ndr::NdrUint32Ptr
     end
   end
 
   describe '#lp_dependencies' do
-    it 'is a NdrLpByte structure' do
-      expect(packet.lp_dependencies).to be_a RubySMB::Dcerpc::Ndr::NdrLpByte
+    it 'is a Ndr::NdrConfArray of Uint8 elements' do
+      expect(packet.lp_dependencies).to be_a RubySMB::Dcerpc::Ndr::NdrConfArray
+      expect(packet.lp_dependencies[0]).to be_a BinData::Uint8
     end
   end
 
-  describe '#pad3' do
-    it 'is a string' do
-      expect(packet.pad1).to be_a BinData::String
-    end
-
-    it 'should keep #dw_depend_size 4-byte aligned' do
-      packet.lp_dependencies = [1, 2, 3, 4]
-      expect(packet.dw_depend_size.abs_offset % 4).to eq 0
+  describe '#dw_depend_size' do
+    it 'is a NdrUint32' do
+      expect(packet.dw_depend_size).to be_a RubySMB::Dcerpc::Ndr::NdrUint32
     end
   end
 
-  describe '#dw_depend_size' do
-    it 'is a 32-bit unsigned integer' do
-      expect(packet.dw_depend_size).to be_a BinData::Uint32le
+  describe '#lp_service_start_name' do
+    it 'is a NdrWideStringPtr structure' do
+      expect(packet.lp_service_start_name).to be_a RubySMB::Dcerpc::Ndr::NdrWideStringPtr
     end
   end
 
-  describe '#lp_service_start_name' do
-    it 'is a NdrLpStr structure' do
-      expect(packet.lp_service_start_name).to be_a RubySMB::Dcerpc::Ndr::NdrLpStr
+  describe '#lp_password' do
+    it 'is a Ndr::NdrConfArray of Uint8 elements' do
+      expect(packet.lp_password).to be_a RubySMB::Dcerpc::Ndr::NdrConfArray
+      expect(packet.lp_password[0]).to be_a BinData::Uint8
     end
   end
 
-  describe '#pad4' do
-    it 'is a string' do
-      expect(packet.pad1).to be_a BinData::String
+  describe '#dw_pw_size' do
+    it 'is a NdrUint32' do
+      expect(packet.dw_pw_size).to be_a RubySMB::Dcerpc::Ndr::NdrUint32
     end
 
-    it 'should keep #lp_password 4-byte aligned' do
-      packet.lp_service_start_name = "test"
-      expect(packet.lp_password.abs_offset % 4).to eq 0
+    it 'is set to the number of elements in #lp_password array' do
+      packet.lp_password = [1, 2, 3, 4, 5]
+      expect(packet.dw_pw_size).to eq(5)
     end
   end
 
-  describe '#lp_password' do
-    it 'is a NdrLpByte structure' do
-      expect(packet.lp_password).to be_a RubySMB::Dcerpc::Ndr::NdrLpByte
+  describe '#lp_display_name' do
+    it 'is a NdrWideStringPtr structure' do
+      expect(packet.lp_display_name).to be_a RubySMB::Dcerpc::Ndr::NdrWideStringPtr
     end
   end
 
-  describe '#pad5' do
-    it 'is a string' do
-      expect(packet.pad1).to be_a BinData::String
+  it 'should keep #lp_load_order_group 4-byte aligned' do
+    5.times do |i|
+      packet.lp_binary_path_name = "A" * i
+      expect(packet.lp_load_order_group.abs_offset % 4).to eq 0
     end
+  end
 
-    it 'should keep #dw_pw_size 4-byte aligned' do
-      packet.lp_password = [1, 2, 3, 4]
-      expect(packet.dw_pw_size.abs_offset % 4).to eq 0
+  it 'should keep #dw_tag_id 4-byte aligned' do
+    5.times do |i|
+      packet.lp_load_order_group = "A" * i
+      expect(packet.dw_tag_id.abs_offset % 4).to eq 0
     end
   end
 
-  describe '#dw_pw_size' do
-    it 'is a 32-bit unsigned integer' do
-      expect(packet.dw_pw_size).to be_a BinData::Uint32le
+  it 'should keep #dw_depend_size 4-byte aligned' do
+    5.times do |i|
+      packet.lp_dependencies = [1] * i
+      expect(packet.dw_depend_size.abs_offset % 4).to eq 0
     end
+  end
 
-    it 'has a value set to #lp_password.max_count' do
-      packet.lp_password.max_count = 33
-      expect(packet.dw_pw_size).to eq(33)
+  it 'should keep #lp_password 4-byte aligned' do
+    5.times do |i|
+      packet.lp_service_start_name = "A" * i
+      expect(packet.lp_password.abs_offset % 4).to eq 0
     end
   end
 
-  describe '#lp_display_name' do
-    it 'is a NdrLpStr structure' do
-      expect(packet.lp_display_name).to be_a RubySMB::Dcerpc::Ndr::NdrLpStr
+  it 'should keep #dw_pw_size 4-byte aligned' do
+    5.times do |i|
+      packet.lp_password = [1] * i
+      expect(packet.dw_pw_size.abs_offset % 4).to eq 0
     end
   end
 

data/spec/lib/ruby_smb/dcerpc/svcctl/change_service_config_w_response_spec.rb

@@ -9,14 +9,14 @@ RSpec.describe RubySMB::Dcerpc::Svcctl::ChangeServiceConfigWResponse do
   end
 
   describe '#dw_tag_id' do
-    it 'is a NdrLpDword structure' do
-      expect(packet.dw_tag_id).to be_a RubySMB::Dcerpc::Ndr::NdrLpDword
+    it 'is a NdrUint32Ptr structure' do
+      expect(packet.dw_tag_id).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
 

data/spec/lib/ruby_smb/dcerpc/svcctl/close_service_handle_response_spec.rb

@@ -15,8 +15,8 @@ RSpec.describe RubySMB::Dcerpc::Svcctl::CloseServiceHandleResponse do
   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