ruby_smb 0.0.21 → 0.0.22

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

@@ -195,7 +195,7 @@ RSpec.describe RubySMB::SMB2::File do
       end
     end
   end
-  
+
   describe '#rename_packet' do
     it 'creates a new SetInfoRequest packet' do
       expect(RubySMB::SMB2::Packet::SetInfoRequest).to receive(:new).and_call_original
@@ -231,3 +231,4 @@ RSpec.describe RubySMB::SMB2::File do
     end
   end
 end
+

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

@@ -61,4 +61,199 @@ RSpec.describe RubySMB::SMB2::Pipe do
     end
   end
 
-end
+  context 'with DCERPC' do
+    describe '#net_share_enum_all' do
+      let(:host) { '1.2.3.4' }
+      let(:dcerpc_response) { RubySMB::Dcerpc::Response.new }
+
+      before :example do
+        allow(pipe).to receive(:bind)
+        allow(pipe).to receive(:request).and_return(dcerpc_response)
+        allow(RubySMB::Dcerpc::Srvsvc::NetShareEnumAll).to receive(:parse_response).and_return([])
+      end
+
+      it 'calls #bind with the expected arguments' do
+        expect(pipe).to receive(:bind).with(endpoint: RubySMB::Dcerpc::Srvsvc)
+        pipe.net_share_enum_all(host)
+      end
+
+      it 'calls #request with the expected arguments' do
+        expect(pipe).to receive(:request).with(RubySMB::Dcerpc::Srvsvc::NET_SHARE_ENUM_ALL, host: host)
+        pipe.net_share_enum_all(host)
+      end
+
+      it 'parse the response with NetShareEnumAll #parse_response method' do
+        stub = 'ABCD'
+        dcerpc_response.alloc_hint = stub.size
+        dcerpc_response.stub = stub
+        expect(RubySMB::Dcerpc::Srvsvc::NetShareEnumAll).to receive(:parse_response).with(stub)
+        pipe.net_share_enum_all(host)
+      end
+
+      it 'returns the remote shares' do
+        shares = [
+          ["C$", "DISK", "Default share"],
+          ["Shared", "DISK", ""],
+          ["IPC$", "IPC", "Remote IPC"],
+          ["ADMIN$", "DISK", "Remote Admin"]
+        ]
+        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"},
+        ]
+        allow(RubySMB::Dcerpc::Srvsvc::NetShareEnumAll).to receive(:parse_response).and_return(shares)
+        expect(pipe.net_share_enum_all(host)).to eq(output)
+      end
+    end
+
+    describe '#bind' do
+      let(:options) { { endpoint: RubySMB::Dcerpc::Srvsvc } }
+      let(:bind_packet) { RubySMB::Dcerpc::Bind.new(options) }
+      let(:ioctl_response) { RubySMB::SMB2::Packet::IoctlResponse.new }
+      let(:bind_ack_packet) { RubySMB::Dcerpc::BindAck.new }
+
+      before :example do
+        allow(RubySMB::Dcerpc::Bind).to receive(:new).and_return(bind_packet)
+        allow(pipe).to receive(:ioctl_send_recv).and_return(ioctl_response)
+        bind_ack_packet.p_result_list.n_results = 1
+        bind_ack_packet.p_result_list.p_results[0].result = RubySMB::Dcerpc::BindAck::ACCEPTANCE
+        allow(RubySMB::Dcerpc::BindAck).to receive(:read).and_return(bind_ack_packet)
+      end
+
+      it 'creates a Bind packet' do
+        expect(RubySMB::Dcerpc::Bind).to receive(:new).with(options).and_return(bind_packet)
+        pipe.bind(options)
+      end
+
+      it 'calls #ioctl_send_recv' do
+        expect(pipe).to receive(:ioctl_send_recv).with(bind_packet, options)
+        pipe.bind(options)
+      end
+
+      it 'creates a BindAck packet from the response' do
+        expect(RubySMB::Dcerpc::BindAck).to receive(:read).with(ioctl_response.output_data).and_return(bind_ack_packet)
+        pipe.bind(options)
+      end
+
+      it 'raises the expected exception when an invalid packet is received' do
+        allow(RubySMB::Dcerpc::BindAck).to receive(:read).and_raise(IOError)
+        expect { pipe.bind(options) }.to raise_error(RubySMB::Dcerpc::Error::InvalidPacket)
+      end
+
+      it 'raises the expected exception when it is not a BindAck packet' do
+        response = RubySMB::Dcerpc::Bind.new
+        allow(RubySMB::Dcerpc::BindAck).to receive(:read).and_return(response)
+        expect { pipe.bind(options) }.to raise_error(RubySMB::Dcerpc::Error::BindError)
+      end
+
+      it 'raises an exception when no result is returned' do
+        bind_ack_packet.p_result_list.n_results = 0
+        expect { pipe.bind(options) }.to raise_error(RubySMB::Dcerpc::Error::BindError)
+      end
+
+      it 'raises an exception when result is not ACCEPTANCE' do
+        bind_ack_packet.p_result_list.p_results[0].result = RubySMB::Dcerpc::BindAck::USER_REJECTION
+        expect { pipe.bind(options) }.to raise_error(RubySMB::Dcerpc::Error::BindError)
+      end
+
+      it 'returns the expected BindAck packet' do
+        expect(pipe.bind(options)).to eq(bind_ack_packet)
+      end
+    end
+
+    describe '#request' do
+      let(:options) { { host: '1.2.3.4' } }
+      let(:opnum) { RubySMB::Dcerpc::Srvsvc::NET_SHARE_ENUM_ALL }
+      let(:req_packet) { RubySMB::Dcerpc::Request.new({ :opnum => opnum }, options) }
+      let(:ioctl_response) { RubySMB::SMB2::Packet::IoctlResponse.new }
+      let(:res_packet) { RubySMB::Dcerpc::Response.new }
+
+      before :example do
+        allow(RubySMB::Dcerpc::Request).to receive(:new).and_return(req_packet)
+        allow(pipe).to receive(:ioctl_send_recv).and_return(ioctl_response)
+        allow(RubySMB::Dcerpc::Response).to receive(:read).and_return(res_packet)
+      end
+
+      it 'creates a Request packet' do
+        expect(RubySMB::Dcerpc::Request).to receive(:new).and_return(req_packet)
+        pipe.request(opnum, options)
+      end
+
+      it 'calls #ioctl_send_recv' do
+        expect(pipe).to receive(:ioctl_send_recv).with(req_packet, options)
+        pipe.request(opnum, options)
+      end
+
+      it 'creates a DCERPC Response packet from the response' do
+        expect(RubySMB::Dcerpc::Response).to receive(:read).with(ioctl_response.output_data)
+        pipe.request(opnum, options)
+      end
+
+      it 'raises the expected exception when an invalid packet is received' do
+        allow(RubySMB::Dcerpc::Response).to receive(:read).and_raise(IOError)
+        expect { pipe.request(opnum, options) }.to raise_error(RubySMB::Dcerpc::Error::InvalidPacket)
+      end
+
+      it 'raises the expected exception when it is not a BindAck packet' do
+        response = RubySMB::Dcerpc::Request.new
+        allow(RubySMB::Dcerpc::Response).to receive(:read).and_return(response)
+        expect { pipe.bind(options) }.to raise_error(RubySMB::Dcerpc::Error::InvalidPacket)
+      end
+
+      it 'returns the expected DCERPC Response' do
+        expect(pipe.request(opnum, options)).to eq(res_packet)
+      end
+    end
+
+    describe '#ioctl_send_recv' do
+      let(:action) { RubySMB::Dcerpc::Request.new({ :opnum => RubySMB::Dcerpc::Srvsvc::NET_SHARE_ENUM_ALL }, host: '1.2.3.4') }
+      let(:options) { {} }
+      let(:ioctl_request) { RubySMB::SMB2::Packet::IoctlRequest.new(options) }
+      let(:ioctl_response) { RubySMB::SMB2::Packet::IoctlResponse.new }
+
+      before :example do
+        allow(client).to receive(:send_recv).and_return(ioctl_response.to_binary_s)
+      end
+
+      it 'calls #set_header_fields' do
+        expect(pipe).to receive(:set_header_fields).with(ioctl_request).and_call_original
+        pipe.ioctl_send_recv(action, options)
+      end
+
+      it 'calls Client #send_recv with the expected request' do
+        expect(client).to receive(:send_recv) do |req|
+          expect(req.ctl_code).to eq(0x0011C017)
+          expect(req.flags.is_fsctl).to eq(0x00000001)
+          expect(req.buffer).to eq(action.to_binary_s)
+          ioctl_response.to_binary_s
+        end
+        pipe.ioctl_send_recv(action, options)
+      end
+
+      it 'creates a IoctlResponse packet from the response' do
+        expect(RubySMB::SMB2::Packet::IoctlResponse).to receive(:read).with(ioctl_response.to_binary_s).and_call_original
+        pipe.ioctl_send_recv(action, options)
+      end
+
+      it 'raises the expected exception when it is not a IoctlResponse packet' do
+        response = RubySMB::SMB2::Packet::LogoffResponse.new
+        allow(RubySMB::SMB2::Packet::IoctlResponse).to receive(:read).and_return(response)
+        expect { pipe.ioctl_send_recv(action, options) }.to raise_error(RubySMB::Error::InvalidPacket)
+      end
+
+      it 'raises the expected exception when the status code is not STATUS_SUCCESS' do
+        ioctl_response_packet = RubySMB::SMB2::Packet::IoctlResponse.new
+        ioctl_response_packet.smb2_header.nt_status = WindowsError::NTStatus::STATUS_INVALID_HANDLE.value
+        allow(RubySMB::SMB2::Packet::IoctlResponse).to receive(:read).with(ioctl_response.to_binary_s).and_return(ioctl_response_packet)
+        expect { pipe.ioctl_send_recv(action, options) }.to raise_error(RubySMB::Error::UnexpectedStatusCode)
+      end
+
+      it 'returns the expected DCERPC Response' do
+        expect(pipe.ioctl_send_recv(action, options)).to eq(ioctl_response)
+      end
+    end
+  end
+end
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby_smb
 version: !ruby/object:Gem::Version
-  version: 0.0.21
+  version: 0.0.22
 platform: ruby
 authors:
 - David Maloney
@@ -89,7 +89,7 @@ cert_chain:
   G+Hmcg1v810agasPdoydE0RTVZgEOOMoQ07qu7JFXVWZ9ZQpHT7qJATWL/b2csFG
   8mVuTXnyJOKRJA==
   -----END CERTIFICATE-----
-date: 2018-03-05 00:00:00.000000000 Z
+date: 2018-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redcarpet
@@ -244,8 +244,12 @@ files:
 - lib/ruby_smb/client/utils.rb
 - lib/ruby_smb/dcerpc.rb
 - lib/ruby_smb/dcerpc/bind.rb
-- lib/ruby_smb/dcerpc/handle.rb
+- lib/ruby_smb/dcerpc/bind_ack.rb
+- lib/ruby_smb/dcerpc/error.rb
 - lib/ruby_smb/dcerpc/ndr.rb
+- lib/ruby_smb/dcerpc/p_syntax_id_t.rb
+- lib/ruby_smb/dcerpc/pdu_header.rb
+- lib/ruby_smb/dcerpc/ptypes.rb
 - lib/ruby_smb/dcerpc/request.rb
 - lib/ruby_smb/dcerpc/response.rb
 - lib/ruby_smb/dcerpc/srvsvc.rb
@@ -310,12 +314,12 @@ files:
 - lib/ruby_smb/smb1/bit_field/smb_ext_file_attributes.rb
 - lib/ruby_smb/smb1/bit_field/smb_file_attributes.rb
 - lib/ruby_smb/smb1/bit_field/smb_nmpipe_status.rb
-- lib/ruby_smb/smb1/bit_field/trans2_flags.rb
 - 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/dcerpc.rb
 - lib/ruby_smb/smb1/dialect.rb
 - lib/ruby_smb/smb1/file.rb
 - lib/ruby_smb/smb1/oplock_levels.rb
@@ -351,6 +355,8 @@ files:
 - lib/ruby_smb/smb1/packet/trans/request.rb
 - lib/ruby_smb/smb1/packet/trans/response.rb
 - lib/ruby_smb/smb1/packet/trans/subcommands.rb
+- lib/ruby_smb/smb1/packet/trans/transact_nmpipe_request.rb
+- lib/ruby_smb/smb1/packet/trans/transact_nmpipe_response.rb
 - lib/ruby_smb/smb1/packet/trans2.rb
 - lib/ruby_smb/smb1/packet/trans2/data_block.rb
 - lib/ruby_smb/smb1/packet/trans2/find_first2_request.rb
@@ -391,6 +397,7 @@ 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/dcerpc.rb
 - lib/ruby_smb/smb2/file.rb
 - lib/ruby_smb/smb2/info_type.rb
 - lib/ruby_smb/smb2/packet.rb
@@ -427,11 +434,13 @@ files:
 - lib/ruby_smb/version.rb
 - ruby_smb.gemspec
 - spec/lib/ruby_smb/client_spec.rb
+- spec/lib/ruby_smb/dcerpc/bind_ack_spec.rb
 - spec/lib/ruby_smb/dcerpc/bind_spec.rb
-- spec/lib/ruby_smb/dcerpc/handle_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/request_spec.rb
 - spec/lib/ruby_smb/dcerpc/response_spec.rb
-- spec/lib/ruby_smb/dcerpc/srvsvc_spec.rb
+- spec/lib/ruby_smb/dcerpc/srvsvc/net_share_enum_all_spec.rb
 - spec/lib/ruby_smb/dcerpc/uuid_spec.rb
 - spec/lib/ruby_smb/dispatcher/base_spec.rb
 - spec/lib/ruby_smb/dispatcher/socket_spec.rb
@@ -479,7 +488,6 @@ files:
 - spec/lib/ruby_smb/smb1/bit_field/smb_ext_file_attributes_spec.rb
 - spec/lib/ruby_smb/smb1/bit_field/smb_file_attributes_spec.rb
 - spec/lib/ruby_smb/smb1/bit_field/smb_nmpipe_status_spec.rb
-- spec/lib/ruby_smb/smb1/bit_field/trans2_flags_spec.rb
 - spec/lib/ruby_smb/smb1/bit_field/trans_flags_spec.rb
 - spec/lib/ruby_smb/smb1/bit_field/tree_connect_flags_spec.rb
 - spec/lib/ruby_smb/smb1/data_block_spec.rb
@@ -507,10 +515,13 @@ files:
 - spec/lib/ruby_smb/smb1/packet/session_setup_legacy_response_spec.rb
 - spec/lib/ruby_smb/smb1/packet/session_setup_request_spec.rb
 - spec/lib/ruby_smb/smb1/packet/session_setup_response_spec.rb
+- spec/lib/ruby_smb/smb1/packet/trans/data_block_spec.rb
 - spec/lib/ruby_smb/smb1/packet/trans/peek_nmpipe_request_spec.rb
 - spec/lib/ruby_smb/smb1/packet/trans/peek_nmpipe_response_spec.rb
 - spec/lib/ruby_smb/smb1/packet/trans/request_spec.rb
 - spec/lib/ruby_smb/smb1/packet/trans/response_spec.rb
+- spec/lib/ruby_smb/smb1/packet/trans/transact_nmpipe_request_spec.rb
+- spec/lib/ruby_smb/smb1/packet/trans/transact_nmpipe_response_spec.rb
 - spec/lib/ruby_smb/smb1/packet/trans2/find_first2_request_spec.rb
 - spec/lib/ruby_smb/smb1/packet/trans2/find_first2_response_spec.rb
 - spec/lib/ruby_smb/smb1/packet/trans2/find_information_level/find_file_full_directory_info_spec.rb
@@ -601,11 +612,13 @@ specification_version: 4
 summary: A pure Ruby implementation of the SMB Protocol Family
 test_files:
 - spec/lib/ruby_smb/client_spec.rb
+- spec/lib/ruby_smb/dcerpc/bind_ack_spec.rb
 - spec/lib/ruby_smb/dcerpc/bind_spec.rb
-- spec/lib/ruby_smb/dcerpc/handle_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/request_spec.rb
 - spec/lib/ruby_smb/dcerpc/response_spec.rb
-- spec/lib/ruby_smb/dcerpc/srvsvc_spec.rb
+- spec/lib/ruby_smb/dcerpc/srvsvc/net_share_enum_all_spec.rb
 - spec/lib/ruby_smb/dcerpc/uuid_spec.rb
 - spec/lib/ruby_smb/dispatcher/base_spec.rb
 - spec/lib/ruby_smb/dispatcher/socket_spec.rb
@@ -653,7 +666,6 @@ test_files:
 - spec/lib/ruby_smb/smb1/bit_field/smb_ext_file_attributes_spec.rb
 - spec/lib/ruby_smb/smb1/bit_field/smb_file_attributes_spec.rb
 - spec/lib/ruby_smb/smb1/bit_field/smb_nmpipe_status_spec.rb
-- spec/lib/ruby_smb/smb1/bit_field/trans2_flags_spec.rb
 - spec/lib/ruby_smb/smb1/bit_field/trans_flags_spec.rb
 - spec/lib/ruby_smb/smb1/bit_field/tree_connect_flags_spec.rb
 - spec/lib/ruby_smb/smb1/data_block_spec.rb
@@ -681,10 +693,13 @@ test_files:
 - spec/lib/ruby_smb/smb1/packet/session_setup_legacy_response_spec.rb
 - spec/lib/ruby_smb/smb1/packet/session_setup_request_spec.rb
 - spec/lib/ruby_smb/smb1/packet/session_setup_response_spec.rb
+- spec/lib/ruby_smb/smb1/packet/trans/data_block_spec.rb
 - spec/lib/ruby_smb/smb1/packet/trans/peek_nmpipe_request_spec.rb
 - spec/lib/ruby_smb/smb1/packet/trans/peek_nmpipe_response_spec.rb
 - spec/lib/ruby_smb/smb1/packet/trans/request_spec.rb
 - spec/lib/ruby_smb/smb1/packet/trans/response_spec.rb
+- spec/lib/ruby_smb/smb1/packet/trans/transact_nmpipe_request_spec.rb
+- spec/lib/ruby_smb/smb1/packet/trans/transact_nmpipe_response_spec.rb
 - spec/lib/ruby_smb/smb1/packet/trans2/find_first2_request_spec.rb
 - spec/lib/ruby_smb/smb1/packet/trans2/find_first2_response_spec.rb
 - spec/lib/ruby_smb/smb1/packet/trans2/find_information_level/find_file_full_directory_info_spec.rb

data/lib/ruby_smb/dcerpc/handle.rb

@@ -1,60 +0,0 @@
-module RubySMB
-  module Dcerpc
-    class Handle
-
-      attr_accessor :pipe
-      attr_accessor :last_msg
-      attr_accessor :response
-
-      PTYPES = [
-          RubySMB::Dcerpc::Request,
-          nil,
-          RubySMB::Dcerpc::Response
-      ]
-
-      # @param [RubySMB::SMB2::File] named_pipe
-      # @return [RubySMB::Dcerpc::Handle]
-      def initialize(named_pipe)
-        @pipe = named_pipe
-      end
-
-      # @param [Class] endpoint
-      def bind(options={})
-        ioctl_request(RubySMB::Dcerpc::Bind.new(options))
-      end
-
-      # @param [Hash] options
-      def request(opnum:, stub:, options:{})
-        ioctl_request(
-            RubySMB::Dcerpc::Request.new(
-                opnum: opnum,
-                stub: stub.new(options).to_binary_s
-            )
-        )
-      end
-
-      # @param [BinData::Record] action
-      # @param [Hash] options
-      def ioctl_request(action, options={})
-        request = @pipe.set_header_fields(RubySMB::SMB2::Packet::IoctlRequest.new(options))
-        request.ctl_code = 0x0011C017
-        request.flags.is_fsctl = 0x00000001
-        request.buffer = action.to_binary_s
-        @last_msg = @pipe.tree.client.send_recv(request)
-        handle_msg(RubySMB::SMB2::Packet::IoctlResponse.read(@last_msg))
-      end
-
-      # @param [BinData::Record] msg
-      def handle_msg(msg)
-        data = msg.buffer.to_binary_s
-        headz = RubySMB::Dcerpc::PduHeader.read(data)
-        pdu = PTYPES[headz.ptype]
-        if pdu
-          dcerpc_response_stub = pdu.read(msg.output_data).stub
-          @response = dcerpc_response_stub.to_binary_s
-        end
-        data
-      end
-    end
-  end
-end

data/lib/ruby_smb/smb1/bit_field/trans2_flags.rb

@@ -1,15 +0,0 @@
-module RubySMB
-  module SMB1
-    module BitField
-      # The Flags bit-field for a Trans2 Request Packet
-      # [2.2.4.46.1 Request](https://msdn.microsoft.com/en-us/library/ee442192.aspx)
-      class Trans2Flags < BinData::Record
-        endian  :little
-        bit6    :reserved,              label: 'Reserved Space',             initial_value: 0
-        bit1    :no_response,           label: 'Do Not reply',               initial_value: 0
-        bit1    :disconnect,            label: 'Disconnect Tree',            initial_value: 0
-        bit8    :reserved2,             label: 'Reserved Space',             initial_value: 0
-      end
-    end
-  end
-end

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

@@ -1,31 +0,0 @@
-require 'spec_helper'
-
-RSpec.describe RubySMB::Dcerpc::Handle do
-
-  describe 'A dce/rpc handle' do
-    let(:output){double('Output')}
-    let(:tree){double('Tree')}
-    let(:response){double('Response')}
-    let(:file){double('File')}
-    let(:handle){described_class.new(file)}
-    let(:endpoint){ RubySMB::Dcerpc::Srvsvc }
-    let(:ioctl_response){ double('IoctlResponse') }
-
-    it 'should #bind' do
-      expect(handle).to receive(:ioctl_request)#.with([response_socket], nil, nil, timeout)
-      handle.bind(endpoint: endpoint)
-    end
-
-    it 'should #request' do
-      expect(handle).to receive(:ioctl_request)#.with([response_socket], nil, nil, timeout)
-      handle.request(opnum: 15, stub: RubySMB::Dcerpc::Srvsvc::NetShareEnumAll, options: {host: '127.0.0.1'})
-    end
-
-    it 'should #handle_msg' do
-      expect(ioctl_response).to receive(:buffer).and_return RubySMB::Dcerpc::Response.new.stub
-      expect(RubySMB::Dcerpc::PduHeader).to receive(:read).and_return(RubySMB::Dcerpc::PduHeader.new(ptype: 1))
-      expect(handle.handle_msg(ioctl_response)).to eq(RubySMB::Dcerpc::Response.new.stub.to_binary_s)
-    end
-  end
-  
-end