ruby_smb 0.0.23 → 0.0.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 59b2f5a2d37d1e42e0bd674e58841e7209e9877f
-  data.tar.gz: 6cad39d8512753e877e9abf458ceaa21cfb201b9
+  metadata.gz: d60db7afb256116a28efdf92fcf911b6b418efda
+  data.tar.gz: ba1b78916ec040e37d15ec02d9c6a3d1f09af9a4
 SHA512:
-  metadata.gz: cbff69d36da828c531c8cf8d62ce6ad98cd0966cf9cae2b20c65cc649ca37f3ec08fac85a346b65caeaaa0f65cf0d24c9dc2218992fabe70965082df456ec58c
-  data.tar.gz: b0ea5ea13caeb32f0b787c280062f87f6d87c20179cd4e446f28f94290350f2710eef62b089f75c6bcdb215db07e75ae1f4d84ec3c905f20abacf3ac9f2f95af
+  metadata.gz: dc4b60306e19613bdf20deb63d473b796aed95d5abed3e509e14ee5b622c1e012680d803bd9fa57554e5fc44279d810f064248dd127d5ebf2cfcfb3d15a0abdb
+  data.tar.gz: b1dfd5273575d64e242199655305cf22bfc76c5e1cfdadaf7bd074c9b4dcc53d0a2045b5d90414838fdc91b86bd5cd95889aa7d6e5c3161188d32fa9768545a6

data/lib/ruby_smb/client/utils.rb

@@ -24,7 +24,7 @@ module RubySMB
         last_tree.id
       end
 
-      def open(path, disposition=RubySMB::Dispositions::FILE_OPEN, access, write: false, read: true)
+      def open(path, disposition=RubySMB::Dispositions::FILE_OPEN, write: false, read: true)
          file = last_tree.open_file(filename: path, write: write, read: read, disposition: disposition)
          @last_file_id = if file.respond_to?(:guid)
            file.guid.to_binary_s
@@ -32,10 +32,11 @@ module RubySMB
            file.fid.to_binary_s
          end
          @open_files[@last_file_id] = file
+         @last_file_id
       end
 
       def create_pipe(path, disposition=RubySMB::Dispositions::FILE_OPEN_IF, impersonation)
-        open(path.gsub(/\\/, ''), disposition, nil, write: true, read: true)
+        open(path.gsub(/\\/, ''), disposition, write: true, read: true)
       end
       
       #Writes data to an open file handle
@@ -43,15 +44,13 @@ module RubySMB
         @open_files[file_id].send_recv_write(data: data, offset: offset)
       end
 
-      def read(file_id, offset = 0, length = last_file.size_on_disk)
-        offset = 0
-        length = last_file.size_on_disk
+      def read(file_id, offset = 0, length = last_file.size)
         data = @open_files[file_id].send_recv_read(read_length: length, offset: offset)
         data.bytes
       end
 
       def close(file_id, tree_id)
-       @open_files[file_id.to_binary_s].close
+       @open_files[file_id].close
       end
 
       def tree_disconnect(share)

data/lib/ruby_smb/generic_packet.rb

@@ -42,7 +42,7 @@ module RubySMB
     def self.read(val)
       begin
         super(val)
-      rescue EOFError => e
+      rescue IOError => e
         case self.to_s
           when /EmptyPacket|ErrorPacket/
             raise e

data/lib/ruby_smb/smb1/file.rb

@@ -233,6 +233,7 @@ module RubySMB
       
       def send_recv_write(data:'', offset: 0)
         pkt = write_packet(data: data, offset: offset)
+        pkt.set_64_bit_offset(true)
         raw_response = @tree.client.send_recv(pkt)
         response = RubySMB::SMB1::Packet::WriteAndxResponse.read(raw_response)
         response.parameter_block.count_low

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

@@ -8,8 +8,8 @@ module RubySMB
         class ParameterBlock < RubySMB::SMB1::ParameterBlock
           and_x_block                :andx_block
           optional_support           :optional_support
-          directory_access_mask      :access_rights,       label: 'Maximal Share Access Rights'
-          directory_access_mask      :guest_access_rights, label: 'Guest Share Access Rights'
+          directory_access_mask      :access_rights,       label: 'Maximal Share Access Rights', onlyif: -> { word_count >= 5 }
+          directory_access_mask      :guest_access_rights, label: 'Guest Share Access Rights',   onlyif: -> { word_count == 7 }
         end
 
         # Represents the specific layout of the DataBlock for a {SessionSetupResponse} Packet.

data/lib/ruby_smb/smb2/file.rb

@@ -140,7 +140,8 @@ module RubySMB
         response = RubySMB::SMB2::Packet::ReadResponse.read(raw_response)
         if response.status_code == WindowsError::NTStatus::STATUS_PENDING
           sleep 1
-          return send_recv_read(read_length: read_length, offset: offset)
+          raw_response = tree.client.dispatcher.recv_packet
+          response = RubySMB::SMB2::Packet::ReadResponse.read(raw_response)
         elsif response.status_code != WindowsError::NTStatus::STATUS_SUCCESS
           raise RubySMB::Error::UnexpectedStatusCode, response.status_code.name
         end
@@ -219,7 +220,11 @@ module RubySMB
         pkt = write_packet(data: data, offset: offset)
         raw_response = tree.client.send_recv(pkt)
         response = RubySMB::SMB2::Packet::WriteResponse.read(raw_response)
-        if response.status_code != WindowsError::NTStatus::STATUS_SUCCESS
+        if response.status_code == WindowsError::NTStatus::STATUS_PENDING
+          sleep 1
+          raw_response = tree.client.dispatcher.recv_packet
+          response = RubySMB::SMB2::Packet::WriteResponse.read(raw_response)
+        elsif response.status_code != WindowsError::NTStatus::STATUS_SUCCESS
           raise RubySMB::Error::UnexpectedStatusCode, response.status_code.name
         end
         response.write_count

data/lib/ruby_smb/smb2/tree.rb

@@ -90,6 +90,10 @@ module RubySMB
         raw_response  = client.send_recv(create_request)
         response      = RubySMB::SMB2::Packet::CreateResponse.read(raw_response)
 
+        if response.is_a?(RubySMB::SMB2::Packet::ErrorPacket)
+          raise RubySMB::Error::RubySMBError
+        end
+
         case @share_type
         when 0x01
           RubySMB::SMB2::File.new(name: filename, tree: self, response: response)

data/lib/ruby_smb/version.rb

@@ -1,3 +1,3 @@
 module RubySMB
-  VERSION = '0.0.23'.freeze
+  VERSION = '0.0.24'.freeze
 end

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

@@ -34,6 +34,32 @@ RSpec.describe RubySMB::SMB1::Packet::TreeConnectResponse do
     it 'has an AndXBlock' do
       expect(parameter_block.andx_block).to be_a RubySMB::SMB1::AndXBlock
     end
+
+    context 'when #word_count is less than 5' do
+      before :example do
+        parameter_block.word_count = 3
+      end
+
+      it 'has #access_rights and #guest_access_rights fields disabled' do
+        expect(parameter_block.andx_block?). to be true
+        expect(parameter_block.optional_support?). to be true
+        expect(parameter_block.access_rights?). to be false
+        expect(parameter_block.guest_access_rights?). to be false
+      end
+    end
+
+    context 'when #word_count is 5' do
+      before :example do
+        parameter_block.word_count = 5
+      end
+
+      it 'has the #guest_access_rights field disabled' do
+        expect(parameter_block.andx_block?). to be true
+        expect(parameter_block.optional_support?). to be true
+        expect(parameter_block.access_rights?). to be true
+        expect(parameter_block.guest_access_rights?). to be false
+      end
+    end
   end
 
   describe '#data_block' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby_smb
 version: !ruby/object:Gem::Version
-  version: 0.0.23
+  version: 0.0.24
 platform: ruby
 authors:
 - David Maloney
@@ -91,7 +91,7 @@ cert_chain:
   G+Hmcg1v810agasPdoydE0RTVZgEOOMoQ07qu7JFXVWZ9ZQpHT7qJATWL/b2csFG
   8mVuTXnyJOKRJA==
   -----END CERTIFICATE-----
-date: 2018-03-13 00:00:00.000000000 Z
+date: 2018-04-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redcarpet

metadata.gz.sig

@@ -1 +1,3 @@
-Rz����P�}8�_�QѰ����;ah��l��v�a��
�����DB�G_5a	�*��
+M2[

+��g��
+%��8C+����0�*b�L���`�*� ��p�G>��G��J]���w�&�U߮�Ri�ҿ�ĠF�M/���ۘ�W�/v9Z�(������򆫠�hp�����