ruby_smb 3.0.0 → 3.0.4

data/spec/lib/ruby_smb/server/share/provider/pipe_spec.rb

@@ -0,0 +1,31 @@
+RSpec.describe RubySMB::Server::Share::Provider::Pipe do
+  let(:name) { 'share' }
+  subject(:share_provider) { described_class.new(name) }
+
+  it { is_expected.to respond_to :name }
+  it { is_expected.to respond_to :type }
+
+  describe '#TYPE' do
+    it 'is TYPE_PIPE' do
+      expect(described_class::TYPE).to eq RubySMB::Server::Share::TYPE_PIPE
+    end
+  end
+
+  describe '#initialize' do
+    it 'sets the name' do
+      expect(share_provider.name).to eq name
+    end
+
+    it 'sets the type correctly' do
+      expect(share_provider.type).to eq RubySMB::Server::Share::TYPE_PIPE
+    end
+  end
+end
+
+RSpec.describe RubySMB::Server::Share::Provider::Pipe::Processor do
+  let(:session) { RubySMB::Server::Session.new(rand(0xffffffff)) }
+  let(:share_provider) { RubySMB::Server::Share::Provider::Pipe.new('share') }
+  subject(:share_processor) { described_class.new(share_provider, nil, session) }
+
+  it { is_expected.to respond_to :provider }
+end

data/spec/lib/ruby_smb/server/share/provider_spec.rb

@@ -0,0 +1,13 @@
+RSpec.describe RubySMB::Server::Share::Provider::Base do
+  let(:name) { 'share' }
+  subject(:share_provider) { described_class.new(name) }
+
+  it { is_expected.to respond_to :name }
+  it { is_expected.to respond_to :type }
+
+  describe '#initialize' do
+    it 'sets the name' do
+      expect(share_provider.name).to eq name
+    end
+  end
+end

data/spec/lib/ruby_smb/smb1/tree_spec.rb

@@ -495,17 +495,17 @@ RSpec.describe RubySMB::SMB1::Tree do
   describe '#open_pipe' do
     let(:opts) { { filename: 'test', write: true } }
     before :example do
-      allow(tree).to receive(:open_file)
+      allow(tree).to receive(:_open)
     end
 
     it 'calls #open_file with the provided options' do
       opts[:filename] ='\\test'
-      expect(tree).to receive(:open_file).with(opts)
+      expect(tree).to receive(:_open).with(opts)
       tree.open_pipe(**opts)
     end
 
     it 'prepends the filename with \\ if needed' do
-      expect(tree).to receive(:open_file).with(filename: '\\test', write: true)
+      expect(tree).to receive(:_open).with(filename: '\\test', write: true)
       tree.open_pipe(**opts)
     end
 

data/spec/lib/ruby_smb/smb2/bit_field/header_flags_spec.rb

@@ -44,8 +44,14 @@ RSpec.describe RubySMB::SMB2::BitField::Smb2HeaderFlags do
   end
 
   describe '#reserved3' do
-    it 'should be a 4-bit field per the SMB spec' do
-      expect(flags.reserved3).to be_a BinData::Bit4
+    it 'should be a 1-bit field per the SMB spec' do
+      expect(flags.reserved3).to be_a BinData::Bit1
+    end
+  end
+
+  describe '#priority' do
+    it 'should be a 3-bit field per the SMB spec' do
+      expect(flags.priority).to be_a BinData::Bit3
     end
   end
 

data/spec/lib/ruby_smb/smb2/{create_context_spec.rb → create_context/create_context_request_spec.rb}

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-RSpec.describe RubySMB::SMB2::CreateContext do
+RSpec.describe RubySMB::SMB2::CreateContext::CreateContextRequest do
   subject(:struct) { described_class.new }
 
   it { is_expected.to respond_to :next_offset }

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

@@ -80,22 +80,22 @@ RSpec.describe RubySMB::SMB2::Packet::CreateRequest do
     expect(packet.name_offset).to eq packet.name.abs_offset
   end
 
-  it 'tracks the offset to #context in #context_offset' do
-    expect(packet.context_offset).to eq packet.context.abs_offset
+  it 'tracks the offset to #context in #contexts_offset' do
+    expect(packet.contexts_offset).to eq packet.contexts.abs_offset
   end
 
   it 'tracks the length of #name in #name_length' do
     expect(packet.name_length).to eq packet.name.length
   end
 
-  it 'tracks the length of #context in #context_length' do
-    expect(packet.context_length).to eq packet.context.do_num_bytes
+  it 'tracks the length of #context in #contexts_length' do
+    expect(packet.contexts_length).to eq packet.contexts.do_num_bytes
   end
 
   describe '#name' do
     it 'encodes any input into UTF-16LE' do
       packet.name = 'Hello'
-      expect(packet.name.to_binary_s).to eq "H\x00e\x00l\x00l\x00o\x00"
+      expect(packet.name.to_binary_s { |name| name.abs_offset = 0; name.write_now! }).to eq "H\x00e\x00l\x00l\x00o\x00"
     end
   end
 end

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

@@ -54,11 +54,15 @@ RSpec.describe RubySMB::SMB2::Packet::CreateResponse do
     expect(packet.file_id).to be_a RubySMB::Field::Smb2Fileid
   end
 
-  it 'tracks the offset to #context in #context_offset' do
-    expect(packet.context_offset).to eq packet.context.abs_offset
-  end
+  describe '#contexts' do
+    # with no context, the offset and length should be 0
+    # see: https://docs.microsoft.com/en-us/openspecs/windows_protocols/ms-smb2/d166aa9e-0b53-410e-b35e-3933d8131927
+    it 'should have the contexts_offset set to 0' do
+      expect(packet.contexts_offset).to eq 0
+    end
 
-  it 'tracks the length of #context in #context_length' do
-    expect(packet.context_length).to eq packet.context.do_num_bytes
+    it 'should have the contexts_length set to ' do
+      expect(packet.contexts_length).to eq 0
+    end
   end
 end

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

@@ -30,8 +30,9 @@ RSpec.describe RubySMB::SMB2::Packet::QueryDirectoryResponse do
     expect(packet.structure_size).to eq 9
   end
 
-  it 'has an offset pointer to the buffer field' do
-    expect(packet.buffer_offset).to eq packet.buffer.abs_offset
+  it 'has an offset pointer of 0 for an empty buffer field' do
+    expect(packet.buffer).to be_empty
+    expect(packet.buffer_offset).to eq 0
   end
 
   it 'has a length value for the buffer field' do

data/spec/lib/ruby_smb/smb2/tree_spec.rb

@@ -535,17 +535,17 @@ RSpec.describe RubySMB::SMB2::Tree do
   describe '#open_pipe' do
     let(:opts) { { filename: '\\test', write: true } }
     before :example do
-      allow(tree).to receive(:open_file)
+      allow(tree).to receive(:_open)
     end
 
     it 'calls #open_file with the provided options' do
       opts[:filename] ='test'
-      expect(tree).to receive(:open_file).with(**opts)
+      expect(tree).to receive(:_open).with(**opts)
       tree.open_pipe(**opts)
     end
 
     it 'remove the leading \\ from the filename if needed' do
-      expect(tree).to receive(:open_file).with(filename: 'test', write: true)
+      expect(tree).to receive(:_open).with(filename: 'test', write: true)
       tree.open_pipe(**opts)
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby_smb
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.0.4
 platform: ruby
 authors:
 - Metasploit Hackers
@@ -97,7 +97,7 @@ cert_chain:
   EknWpNgVhohbot1lfVAMmIhdtOVaRVcQQixWPwprDj/ydB8ryDMDosIMcw+fkoXU
   9GJsSaSRRYQ9UUkVL27b64okU8D48m8=
   -----END CERTIFICATE-----
-date: 2022-01-05 00:00:00.000000000 Z
+date: 2022-02-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redcarpet
@@ -189,14 +189,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.1.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.1.3
 - !ruby/object:Gem::Dependency
   name: bindata
   requirement: !ruby/object:Gem::Requirement
@@ -265,6 +265,7 @@ files:
 - examples/enum_domain_users.rb
 - examples/enum_registry_key.rb
 - examples/enum_registry_values.rb
+- examples/file_server.rb
 - examples/get_computer_info.rb
 - examples/list_directory.rb
 - examples/negotiate.rb
@@ -289,6 +290,7 @@ files:
 - lib/ruby_smb/client/winreg.rb
 - lib/ruby_smb/compression.rb
 - lib/ruby_smb/compression/lznt1.rb
+- lib/ruby_smb/create_actions.rb
 - lib/ruby_smb/crypto.rb
 - lib/ruby_smb/dcerpc.rb
 - lib/ruby_smb/dcerpc/bind.rb
@@ -306,6 +308,11 @@ files:
 - lib/ruby_smb/dcerpc/drsr/drs_get_nc_changes_response.rb
 - lib/ruby_smb/dcerpc/drsr/drs_unbind_request.rb
 - lib/ruby_smb/dcerpc/drsr/drs_unbind_response.rb
+- lib/ruby_smb/dcerpc/encrypting_file_system.rb
+- lib/ruby_smb/dcerpc/encrypting_file_system/efs_rpc_encrypt_file_srv_request.rb
+- lib/ruby_smb/dcerpc/encrypting_file_system/efs_rpc_encrypt_file_srv_response.rb
+- lib/ruby_smb/dcerpc/encrypting_file_system/efs_rpc_open_file_raw_request.rb
+- lib/ruby_smb/dcerpc/encrypting_file_system/efs_rpc_open_file_raw_response.rb
 - lib/ruby_smb/dcerpc/epm.rb
 - lib/ruby_smb/dcerpc/epm/epm_ept_map_request.rb
 - lib/ruby_smb/dcerpc/epm/epm_ept_map_response.rb
@@ -321,6 +328,13 @@ files:
 - lib/ruby_smb/dcerpc/netlogon/netr_server_req_challenge_response.rb
 - lib/ruby_smb/dcerpc/p_syntax_id_t.rb
 - lib/ruby_smb/dcerpc/pdu_header.rb
+- lib/ruby_smb/dcerpc/print_system.rb
+- lib/ruby_smb/dcerpc/print_system/rpc_add_printer_driver_ex_request.rb
+- lib/ruby_smb/dcerpc/print_system/rpc_add_printer_driver_ex_response.rb
+- lib/ruby_smb/dcerpc/print_system/rpc_enum_printer_drivers_request.rb
+- lib/ruby_smb/dcerpc/print_system/rpc_enum_printer_drivers_response.rb
+- lib/ruby_smb/dcerpc/print_system/rpc_get_printer_driver_directory_request.rb
+- lib/ruby_smb/dcerpc/print_system/rpc_get_printer_driver_directory_response.rb
 - lib/ruby_smb/dcerpc/ptypes.rb
 - lib/ruby_smb/dcerpc/request.rb
 - lib/ruby_smb/dcerpc/response.rb
@@ -420,11 +434,17 @@ files:
 - lib/ruby_smb/fscc/file_information/file_both_directory_information.rb
 - lib/ruby_smb/fscc/file_information/file_directory_information.rb
 - lib/ruby_smb/fscc/file_information/file_disposition_information.rb
+- lib/ruby_smb/fscc/file_information/file_ea_information.rb
 - lib/ruby_smb/fscc/file_information/file_full_directory_information.rb
 - lib/ruby_smb/fscc/file_information/file_id_both_directory_information.rb
 - lib/ruby_smb/fscc/file_information/file_id_full_directory_information.rb
 - lib/ruby_smb/fscc/file_information/file_names_information.rb
+- lib/ruby_smb/fscc/file_information/file_network_open_information.rb
 - lib/ruby_smb/fscc/file_information/file_rename_information.rb
+- lib/ruby_smb/fscc/file_information/file_stream_information.rb
+- lib/ruby_smb/fscc/file_system_information.rb
+- lib/ruby_smb/fscc/file_system_information/file_fs_attribute_information.rb
+- lib/ruby_smb/fscc/file_system_information/file_fs_volume_information.rb
 - lib/ruby_smb/generic_packet.rb
 - lib/ruby_smb/gss.rb
 - lib/ruby_smb/gss/provider.rb
@@ -441,6 +461,14 @@ files:
 - lib/ruby_smb/server/server_client.rb
 - lib/ruby_smb/server/server_client/negotiation.rb
 - lib/ruby_smb/server/server_client/session_setup.rb
+- lib/ruby_smb/server/server_client/share_io.rb
+- lib/ruby_smb/server/server_client/tree_connect.rb
+- lib/ruby_smb/server/session.rb
+- lib/ruby_smb/server/share.rb
+- lib/ruby_smb/server/share/provider.rb
+- lib/ruby_smb/server/share/provider/disk.rb
+- lib/ruby_smb/server/share/provider/pipe.rb
+- lib/ruby_smb/server/share/provider/processor.rb
 - lib/ruby_smb/signing.rb
 - lib/ruby_smb/smb1.rb
 - lib/ruby_smb/smb1/andx_block.rb
@@ -465,7 +493,6 @@ files:
 - lib/ruby_smb/smb1/bit_field/trans_flags.rb
 - lib/ruby_smb/smb1/bit_field/tree_connect_flags.rb
 - lib/ruby_smb/smb1/commands.rb
-- lib/ruby_smb/smb1/create_actions.rb
 - lib/ruby_smb/smb1/data_block.rb
 - lib/ruby_smb/smb1/dialect.rb
 - lib/ruby_smb/smb1/file.rb
@@ -544,6 +571,8 @@ files:
 - lib/ruby_smb/smb2/bit_field/smb2_security_mode_single.rb
 - lib/ruby_smb/smb2/commands.rb
 - lib/ruby_smb/smb2/create_context.rb
+- lib/ruby_smb/smb2/create_context/request.rb
+- lib/ruby_smb/smb2/create_context/response.rb
 - lib/ruby_smb/smb2/file.rb
 - lib/ruby_smb/smb2/info_type.rb
 - lib/ruby_smb/smb2/negotiate_context.rb
@@ -564,6 +593,8 @@ files:
 - lib/ruby_smb/smb2/packet/negotiate_response.rb
 - lib/ruby_smb/smb2/packet/query_directory_request.rb
 - lib/ruby_smb/smb2/packet/query_directory_response.rb
+- lib/ruby_smb/smb2/packet/query_info_request.rb
+- lib/ruby_smb/smb2/packet/query_info_response.rb
 - lib/ruby_smb/smb2/packet/read_request.rb
 - lib/ruby_smb/smb2/packet/read_response.rb
 - lib/ruby_smb/smb2/packet/session_setup_request.rb
@@ -580,6 +611,7 @@ files:
 - lib/ruby_smb/smb2/pipe.rb
 - lib/ruby_smb/smb2/smb2_header.rb
 - lib/ruby_smb/smb2/tree.rb
+- lib/ruby_smb/smb_error.rb
 - lib/ruby_smb/version.rb
 - ruby_smb.gemspec
 - spec/lib/ruby_smb/client_spec.rb
@@ -589,6 +621,10 @@ files:
 - spec/lib/ruby_smb/dcerpc/bind_spec.rb
 - spec/lib/ruby_smb/dcerpc/client_spec.rb
 - spec/lib/ruby_smb/dcerpc/drsr_spec.rb
+- spec/lib/ruby_smb/dcerpc/encrypting_file_system/efs_rpc_encrypt_file_srv_request_spec.rb
+- spec/lib/ruby_smb/dcerpc/encrypting_file_system/efs_rpc_encrypt_file_srv_response_spec.rb
+- spec/lib/ruby_smb/dcerpc/encrypting_file_system/efs_rpc_open_file_raw_request_spec.rb
+- spec/lib/ruby_smb/dcerpc/encrypting_file_system/efs_rpc_open_file_raw_response_spec.rb
 - spec/lib/ruby_smb/dcerpc/ndr_spec.rb
 - spec/lib/ruby_smb/dcerpc/netlogon/netr_server_authenticate3_request_spec.rb
 - spec/lib/ruby_smb/dcerpc/netlogon/netr_server_authenticate3_response_spec.rb
@@ -598,6 +634,14 @@ files:
 - spec/lib/ruby_smb/dcerpc/netlogon/netr_server_req_challenge_response_spec.rb
 - spec/lib/ruby_smb/dcerpc/p_syntax_id_t_spec.rb
 - spec/lib/ruby_smb/dcerpc/pdu_header_spec.rb
+- spec/lib/ruby_smb/dcerpc/print_system/driver_container_spec.rb
+- spec/lib/ruby_smb/dcerpc/print_system/driver_info2_spec.rb
+- spec/lib/ruby_smb/dcerpc/print_system/rpc_add_printer_driver_ex_request_spec.rb
+- spec/lib/ruby_smb/dcerpc/print_system/rpc_add_printer_driver_ex_response_spec.rb
+- spec/lib/ruby_smb/dcerpc/print_system/rpc_enum_printer_drivers_request_spec.rb
+- spec/lib/ruby_smb/dcerpc/print_system/rpc_enum_printer_drivers_response_spec.rb
+- spec/lib/ruby_smb/dcerpc/print_system/rpc_get_printer_driver_directory_request_spec.rb
+- spec/lib/ruby_smb/dcerpc/print_system/rpc_get_printer_driver_directory_response_spec.rb
 - spec/lib/ruby_smb/dcerpc/request_spec.rb
 - spec/lib/ruby_smb/dcerpc/response_spec.rb
 - spec/lib/ruby_smb/dcerpc/rpc_auth3_spec.rb
@@ -699,6 +743,10 @@ files:
 - spec/lib/ruby_smb/nbss/session_header_spec.rb
 - spec/lib/ruby_smb/nbss/session_request_spec.rb
 - spec/lib/ruby_smb/server/server_client_spec.rb
+- spec/lib/ruby_smb/server/session_spec.rb
+- spec/lib/ruby_smb/server/share/provider/disk_spec.rb
+- spec/lib/ruby_smb/server/share/provider/pipe_spec.rb
+- spec/lib/ruby_smb/server/share/provider_spec.rb
 - spec/lib/ruby_smb/server_spec.rb
 - spec/lib/ruby_smb/smb1/andx_block_spec.rb
 - spec/lib/ruby_smb/smb1/bit_field/capabilities_spec.rb
@@ -782,7 +830,7 @@ files:
 - spec/lib/ruby_smb/smb2/bit_field/share_flags_spec.rb
 - spec/lib/ruby_smb/smb2/bit_field/smb2_capabilities_spec.rb
 - spec/lib/ruby_smb/smb2/bit_field/smb_secruity_mode_spec.rb
-- spec/lib/ruby_smb/smb2/create_context_spec.rb
+- spec/lib/ruby_smb/smb2/create_context/create_context_request_spec.rb
 - spec/lib/ruby_smb/smb2/file_spec.rb
 - spec/lib/ruby_smb/smb2/negotiate_context_spec.rb
 - spec/lib/ruby_smb/smb2/packet/close_request_spec.rb
@@ -853,6 +901,10 @@ test_files:
 - spec/lib/ruby_smb/dcerpc/bind_spec.rb
 - spec/lib/ruby_smb/dcerpc/client_spec.rb
 - spec/lib/ruby_smb/dcerpc/drsr_spec.rb
+- spec/lib/ruby_smb/dcerpc/encrypting_file_system/efs_rpc_encrypt_file_srv_request_spec.rb
+- spec/lib/ruby_smb/dcerpc/encrypting_file_system/efs_rpc_encrypt_file_srv_response_spec.rb
+- spec/lib/ruby_smb/dcerpc/encrypting_file_system/efs_rpc_open_file_raw_request_spec.rb
+- spec/lib/ruby_smb/dcerpc/encrypting_file_system/efs_rpc_open_file_raw_response_spec.rb
 - spec/lib/ruby_smb/dcerpc/ndr_spec.rb
 - spec/lib/ruby_smb/dcerpc/netlogon/netr_server_authenticate3_request_spec.rb
 - spec/lib/ruby_smb/dcerpc/netlogon/netr_server_authenticate3_response_spec.rb
@@ -862,6 +914,14 @@ test_files:
 - spec/lib/ruby_smb/dcerpc/netlogon/netr_server_req_challenge_response_spec.rb
 - spec/lib/ruby_smb/dcerpc/p_syntax_id_t_spec.rb
 - spec/lib/ruby_smb/dcerpc/pdu_header_spec.rb
+- spec/lib/ruby_smb/dcerpc/print_system/driver_container_spec.rb
+- spec/lib/ruby_smb/dcerpc/print_system/driver_info2_spec.rb
+- spec/lib/ruby_smb/dcerpc/print_system/rpc_add_printer_driver_ex_request_spec.rb
+- spec/lib/ruby_smb/dcerpc/print_system/rpc_add_printer_driver_ex_response_spec.rb
+- spec/lib/ruby_smb/dcerpc/print_system/rpc_enum_printer_drivers_request_spec.rb
+- spec/lib/ruby_smb/dcerpc/print_system/rpc_enum_printer_drivers_response_spec.rb
+- spec/lib/ruby_smb/dcerpc/print_system/rpc_get_printer_driver_directory_request_spec.rb
+- spec/lib/ruby_smb/dcerpc/print_system/rpc_get_printer_driver_directory_response_spec.rb
 - spec/lib/ruby_smb/dcerpc/request_spec.rb
 - spec/lib/ruby_smb/dcerpc/response_spec.rb
 - spec/lib/ruby_smb/dcerpc/rpc_auth3_spec.rb
@@ -963,6 +1023,10 @@ test_files:
 - spec/lib/ruby_smb/nbss/session_header_spec.rb
 - spec/lib/ruby_smb/nbss/session_request_spec.rb
 - spec/lib/ruby_smb/server/server_client_spec.rb
+- spec/lib/ruby_smb/server/session_spec.rb
+- spec/lib/ruby_smb/server/share/provider/disk_spec.rb
+- spec/lib/ruby_smb/server/share/provider/pipe_spec.rb
+- spec/lib/ruby_smb/server/share/provider_spec.rb
 - spec/lib/ruby_smb/server_spec.rb
 - spec/lib/ruby_smb/smb1/andx_block_spec.rb
 - spec/lib/ruby_smb/smb1/bit_field/capabilities_spec.rb
@@ -1046,7 +1110,7 @@ test_files:
 - spec/lib/ruby_smb/smb2/bit_field/share_flags_spec.rb
 - spec/lib/ruby_smb/smb2/bit_field/smb2_capabilities_spec.rb
 - spec/lib/ruby_smb/smb2/bit_field/smb_secruity_mode_spec.rb
-- spec/lib/ruby_smb/smb2/create_context_spec.rb
+- spec/lib/ruby_smb/smb2/create_context/create_context_request_spec.rb
 - spec/lib/ruby_smb/smb2/file_spec.rb
 - spec/lib/ruby_smb/smb2/negotiate_context_spec.rb
 - spec/lib/ruby_smb/smb2/packet/close_request_spec.rb

data/lib/ruby_smb/smb1/create_actions.rb

@@ -1,20 +0,0 @@
-module RubySMB
-  module SMB1
-    # This module holds the Create Actions used in NT_TRANSACT_CREATE and
-    # SMB_COM_NT_CREATE_ANDX responses. The definitions for these values can be found at
-    # [2.2.7.1.2 Response](https://msdn.microsoft.com/en-us/library/ee441961.aspx)
-    module CreateActions
-      # An existing file was deleted and a new file was created in its place.
-      FILE_SUPERSEDED = 0x00000000
-
-      # An existing file was opened.
-      FILE_OPENED = 0x00000001
-
-      # A new file was created.
-      FILE_CREATED       = 0x00000002
-
-      # An existing file was overwritten.
-      FILE_OVERWRITEN    = 0x00000003
-    end
-  end
-end