ruby_smb 0.0.19 → 0.0.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8937795d135978de5a71c04da91bdd44ac2d44ce
-  data.tar.gz: 37563d2e539ae97ae98a9fc5df32eeb4d51a408e
+  metadata.gz: b4dff3ea0843193837a2e7ca9f8f0ab4a7fd2eea
+  data.tar.gz: 7b8e7321255ff7da69f8aba3658c3f5f6769325e
 SHA512:
-  metadata.gz: 106b8d06d0d2a269d18cb1c92234cc8f885d4c869cb2893fa4ec945045a95decb6b8a1b597c3c20341dac3e22c649d6da06480e75413cdea10988ec4b8c7a481
-  data.tar.gz: 74c2e0a872f71a60b297c42b34c1abf3c15d33377f23b86ba4491c91251970d7b21febb93003ecfbb0a931313610207e8b389f2f5b21c37344399cb6e346171c
+  metadata.gz: 129e91974e7487ed551eb69506ecd7c7adb92a1b528b135a3bece8387fcb45acde5abde401475c03d469732a94dfd38aaa1f30b810acf641796e7860797b0b3c
+  data.tar.gz: 1233ed26721566ce8f86ea7e8eea3572b959251ae9db1faa6d1f84b324fc9c06a392c823b2551d2161972aaebb190920b465869e6bd97046ca67ec6dc4fb96db

data/README.md

@@ -8,10 +8,9 @@ A native Ruby implementation of the SMB Protocol Family. It currently supports
  1. [[MS-SMB]](https://msdn.microsoft.com/en-us/library/cc246231.aspx)
  1. [[MS-SMB2]](http://msdn.microsoft.com/en-us/library/cc246482.aspx)
 
-This library currently include both a Client level, and Packet level support. A user can aprse and manipulate raw
-SMB packets, or simply use the simple client to perform SMB operations.
+This library currently include both a client level, and packet level support. A user can parse and manipulate raw SMB packets, or use the simple client to perform SMB operations.
 
-See the Wiki for more information on this porject's long-term goals, style guide, and developer tips.
+See the Wiki for more information on this project's long-term goals, style guide, and developer tips.
 
 ## Installation
 
@@ -33,20 +32,21 @@ Or install it yourself as:
 
 ### Defining a packet
 
-All packets are done in a declarative style with BinData. Nested data structures are used where appropriate to give users
-the easiest method of adjusting data, all the way down to the bit level in case of bit masks.
+All packets are implemented in a declarative style with BinData. Nested data
+structures are used where appropriate to give users an easy method of adjusting
+data.
 
 #### SMB1
 SMB1 Packets are made up of three basic components:
  1. **The SMB Header** - This is a standard SMB Header. All SMB1 packets use the same SMB header.
- 1. **The Parameter Block** - This is where function parameters are passed across the wire in the packet. Parameter Blocks will always 
+ 1. **The Parameter Block** - This is where function parameters are passed across the wire in the packet. Parameter Blocks will always
  have a 'Word Count' field that gives the size of the Parameter Block in words(2-bytes)
  1. **The Data Block** - This is the data section of the packet. the Data Block will always have a 'byte count' field that gives the size of
  the Data block in bytes.
-  
+
 The SMB Header can always just be declared as a field in the BinData DSL for the packet class, because its structure never changes.
 For the ParameterBlock and DataBlocks, we always define subclasses for this particular packet. They inherit the 'Word Count' and
-'Byte Count' fields, along with the auto-calculation routines for those fields, from their ancestors. Any other fields are then 
+'Byte Count' fields, along with the auto-calculation routines for those fields, from their ancestors. Any other fields are then
 defined in our subclass before we start the DSL declarations for the packet.
 
 Example:
@@ -165,7 +165,7 @@ Example:
 
 #### Reading from a Binary Blob
 
-Sometimes you need to read a binary blob and apply one of the packet structures to it. 
+Sometimes you need to read a binary blob and apply one of the packet structures to it.
 For example, when you are reading a response packet off of the wire, you will need to read the raw response
 string into an actual packet class. This is done using the #read class method.
 
@@ -230,7 +230,7 @@ Anonymous Example:
 ```ruby
       sock = TCPSocket.new address, 445
       dispatcher = RubySMB::Dispatcher::Socket.new(sock)
-    
+
       client = RubySMB::Client.new(dispatcher, smb1: true, smb2: false, username: '', password: '')
       client.negotiate
       client.authenticate
@@ -238,7 +238,7 @@ Anonymous Example:
 
 #### Connecting to a Tree
 
-While there is one Client, that has branching code-paths for SMB1 and SMB2, once you connect to a 
+While there is one Client, that has branching code-paths for SMB1 and SMB2, once you connect to a
 Tree you will be given a protocol specific Tree object. This Tree object will be responsible for all file operations
 that are to be conducted on that Tree.
 
@@ -247,26 +247,26 @@ Example:
 ```ruby
       sock = TCPSocket.new address, 445
       dispatcher = RubySMB::Dispatcher::Socket.new(sock)
-    
+
       client = RubySMB::Client.new(dispatcher, smb1: true, smb2: false, username: 'msfadmin', password: 'msfadmin')
       client.negotiate
       client.authenticate
-      
+
       begin
         tree = client.tree_connect('TEST_SHARE')
         puts "Connected to #{path} successfully!"
       rescue StandardError => e
         puts "Failed to connect to #{path}: #{e.message}"
       end
-      
+
       files = tree.list(directory: 'subdir1')
-      
+
       files.each do |file|
         create_time = file.create_time.to_datetime.to_s
         access_time = file.last_access.to_datetime.to_s
         change_time = file.last_change.to_datetime.to_s
         file_name   = file.file_name.encode("UTF-8")
-      
+
         puts "FILE: #{file_name}\n\tSIZE(BYTES):#{file.end_of_file}\n\tSIZE_ON_DISK(BYTES):#{file.allocation_size}\n\tCREATED:#{create_time}\n\tACCESSED:#{access_time}\n\tCHANGED:#{change_time}\n\n"
       end
 ```

data/lib/ruby_smb/client.rb

@@ -146,12 +146,18 @@ module RubySMB
     #   @return [String]
     attr_accessor :user_id
 
-    # The maximum size of a SMB message that the Client accepts (in bytes)
-    # Its default value is equal to {MAX_BUFFER_SIZE}.
+    # The maximum size SMB message that the Client accepts (in bytes)
+    # The default value is equal to {MAX_BUFFER_SIZE}.
     # @!attribute [rw] max_buffer_size
     #   @return [Integer]
     attr_accessor :max_buffer_size
 
+    # The maximum size SMB message that the Server accepts (in bytes)
+    # The default value is small by default
+    # @!attribute [rw] max_buffer_size
+    #   @return [Integer]
+    attr_accessor :server_max_buffer_size
+
     # @param dispatcher [RubySMB::Dispacther::Socket] the packet dispatcher to use
     # @param smb1 [Boolean] whether or not to enable SMB1 support
     # @param smb2 [Boolean] whether or not to enable SMB2 support
@@ -172,6 +178,7 @@ module RubySMB
       @smb2              = smb2
       @username          = username.encode('utf-8') || ''.encode('utf-8')
       @max_buffer_size   = MAX_BUFFER_SIZE
+      @server_max_buffer_size = MAX_BUFFER_SIZE
 
       negotiate_version_flag = 0x02000000
       flags = Net::NTLM::Client::DEFAULT_FLAGS |
@@ -185,7 +192,7 @@ module RubySMB
         domain: @domain,
         flags: flags
       )
-      
+
       @tree_connects = []
       @open_files = {}
 
@@ -253,7 +260,7 @@ module RubySMB
       flags = Net::NTLM::Client::DEFAULT_FLAGS |
         Net::NTLM::FLAGS[:TARGET_INFO] |
         negotiate_version_flag
-      
+
       @ntlm_client = Net::NTLM::Client.new(
           @username,
           @password,
@@ -334,7 +341,7 @@ module RubySMB
         smb1_net_share_enum_all(host)
       end
     end
-    
+
     #
     # SMB2 Methods
     #

data/lib/ruby_smb/client/negotiation.rb

@@ -80,24 +80,19 @@ module RubySMB
         when RubySMB::SMB1::Packet::NegotiateResponseExtended
           self.smb1 = true
           self.smb2 = false
-          if packet.parameter_block.security_mode.security_signatures_required == 1
-            self.signing_required = true
-          else
-            self.signing_required = false
-          end
+          self.signing_required = packet.parameter_block.security_mode.security_signatures_required == 1
           self.dialect = packet.negotiated_dialect.to_s
+          self.server_max_buffer_size = packet.parameter_block.max_buffer_size
           'SMB1'
         when RubySMB::SMB2::Packet::NegotiateResponse
           self.smb1 = false
           self.smb2 = true
-          self.signing_required = if packet.security_mode.signing_required == 1
-                                    true
-                                  else
-                                    false
-                                  end
+          self.signing_required = packet.security_mode.signing_required == 1
           self.dialect = "0x%04x" % packet.dialect_revision
+          self.server_max_buffer_size = 16644
           'SMB2'
         end
+
       end
 
       # Create a {RubySMB::SMB1::Packet::NegotiateRequest} packet with the

data/lib/ruby_smb/dispatcher/socket.rb

@@ -38,8 +38,15 @@ module RubySMB
         bytes_written = 0
         begin
           while bytes_written < data.size
-            bytes_written += @tcp_socket.write(data[bytes_written..-1])
+            retval = @tcp_socket.write(data[bytes_written..-1])
+
+            if retval == nil
+              raise RubySMB::Error::CommunicationError
+            else
+              bytes_written += retval
+            end
           end
+
         rescue IOError, Errno::ECONNABORTED, Errno::ECONNRESET => e
           raise RubySMB::Error::CommunicationError, "An error occured writing to the Socket: #{e.message}"
         end

data/lib/ruby_smb/version.rb

@@ -1,3 +1,3 @@
 module RubySMB
-  VERSION = '0.0.19'.freeze
+  VERSION = '0.0.20'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby_smb
 version: !ruby/object:Gem::Version
-  version: 0.0.19
+  version: 0.0.20
 platform: ruby
 authors:
 - David Maloney
@@ -89,7 +89,7 @@ cert_chain:
   G+Hmcg1v810agasPdoydE0RTVZgEOOMoQ07qu7JFXVWZ9ZQpHT7qJATWL/b2csFG
   8mVuTXnyJOKRJA==
   -----END CERTIFICATE-----
-date: 2018-02-21 00:00:00.000000000 Z
+date: 2018-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redcarpet