ruby_smb 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d89696524ee8ae603c50be9ffd9fe6bbcb1f217f
-  data.tar.gz: 6fcbab915f26646e9981caf65f5d75de64cea4d1
+  metadata.gz: 3fe1b1b7bdd2516bd388f86c020a9fa99b70faa0
+  data.tar.gz: aa11ed030f543c0d83b61929d10c35eea20a8455
 SHA512:
-  metadata.gz: 7cd15fadb1d5b251fd73a20914830a26eae38363d3e622bf3219cf46dfa2f0fa72716ff7ff2bd49fa503eaac922676c193b5002bd107f6a9502310c4cadcdda5
-  data.tar.gz: 5bdef20abe76ea38602ff99092c15ae19d3bda1d799ae5bda38fd0d2e7110b2115275a962b3df113e31b2a7b29d35ef0e5577bd9c47301fa059205f5f4bd3a11
+  metadata.gz: 92cc9708588a610104f8bacc8430fedd537f2ba283bb323b791ff45005a43417cf9570ce63f658b7a38c566570c2b651adb17b6750b3b117279552efaf138cab
+  data.tar.gz: 071db1651283d080b2adc728cd1f2225e051d52f86608f9f54dd6d79d39330127c3b5179d143ec9e5e155d132af1e128c4c9ca42744264caec8b249e0b0c86ec

data/.travis.yml

@@ -1,5 +1,8 @@
 language: ruby
 sudo: false
 rvm:
-  - '2.2'
+  - '2.3.8'
+  - '2.4.5'
+  - '2.5.3'
+  - '2.6.1'
   - 'jruby-9000'

data/README.md

@@ -4,11 +4,12 @@
 [![Code Climate](https://codeclimate.com/github/rapid7/ruby_smb.png)](https://codeclimate.com/github/rapid7/ruby_smb)
 [![Coverage Status](https://coveralls.io/repos/github/rapid7/ruby_smb/badge.svg?branch=master)](https://coveralls.io/github/rapid7/ruby_smb?branch=master)
 
-A native Ruby implementation of the SMB Protocol Family. It currently supports
+This is 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 parse and manipulate raw SMB packets, or use the simple client to perform SMB operations.
+The RubySMB library provides client-level and packet-level support for the protocol. A user can parse and manipulate raw SMB packets, or use the client to perform higher-level SMB operations.
 
 See the Wiki for more information on this project's long-term goals, style guide, and developer tips.
 
@@ -32,22 +33,17 @@ Or install it yourself as:
 
 ### Defining a packet
 
-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.
+All packets are implemented in a declarative style with BinData. Nested data structures are used where appropriate to give users an easy method of manipulating individual fields inside of a packet.
 
 #### 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
- 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.
+ 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
-defined in our subclass before we start the DSL declarations for the packet.
+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 Parameter block and data blocks, 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 defined in our subclass before we start the DSL declarations for the packet.
 
 Example:
 
@@ -90,8 +86,7 @@ end
 
 #### SMB2
 
-SMB2 Packets are far simpler than their older SMB1 counterparts. We still abstract out the SMB2 header since it is the same
-structure used for every packet. Beyond that, the SMB2 packet is relatively flat in comparison to SMB1.
+SMB2 Packets are far simpler than their older SMB1 counterparts. We still abstract out the SMB2 header since it is the same structure used for every packet. Beyond that, the SMB2 packet is relatively flat in comparison to SMB1.
 
 Example:
 ```ruby
@@ -127,8 +122,7 @@ end
 ### Using a Packet class
 
 #### Manually
-You can instantiate an instance of a particular packet class, and then reach into the data structure to set or read explicit
-values in a fairly straightforward manner.
+You can create an instance of any particular packet class, and then reach into the data structure to set or read explicit values in a fairly straightforward manner.
 
 Example:
 ```ruby
@@ -152,8 +146,7 @@ Example:
 2.3.3 :009 >
 ```
 
-You can also pass field/value pairs into the packet constructor as arguments, prefilling out certain fields
-if you wish.
+You can also pass field/value pairs into the packet constructor as arguments, defaulting individual fields as desired.
 
 Example:
 ```ruby
@@ -165,9 +158,7 @@ Example:
 
 #### Reading from a Binary Blob
 
-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.
+Sometimes you need to read a binary data and apply one of the packet structures to it.  For example, when you are reading a response packet, you will need to read the raw response string into an actual packet class. This is done using the #read class method.
 
 ```ruby
 2.3.3 :014 > blob = "\xFFSMB+\x00\x00\x00\x00\x98\x01`\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x01\x00\x00\x00\x00"
@@ -178,8 +169,7 @@ string into an actual packet class. This is done using the #read class method.
 ```
 
 #### Outputting to a Binary Blob
-Any structure or packet in rubySMB can also be output back into a binary blob using
-BinData's #to_binary_s method.
+Any structure or packet in RubySMB can also be converted back into a binary blob using BinData's #to_binary_s method.
 
 Example:
 ```ruby
@@ -190,38 +180,35 @@ Example:
 ```
 ### Using the Client
 
-Sitting on top of the packet layer in RubySMB is the RubySMB::Client. This is the level msot users will interact with.
-It provides fairly simple conveience methods for performing SMB actions. It handles the creation, sending and receiving of packets
-for the user, relying on reasonable defaults in many cases.
+Sitting on top of the packet layer in RubySMB is the RubySMB::Client class. This is the abstraction that most users of RubySMB will interact with. It provides simple conveience methods for performing SMB actions. It handles the creation, sending and receiving of packets for the user, providing reasonable defaults in many cases.
 
 #### Negotiation
 
-The RubySMB Client is capabale of multi-protocol negotiation. The user simply specifies whether SMB1 and/or SMB2 should be supported, and
-the client will negotiate the propper protocol and dialect behind the scenes.
+The RubySMB client is capable of multi-protocol negotiation. The user simply specifies whether SMB1 and/or SMB2 should be supported, and the client negotiates the protocol and dialect behind the scenes.
 
-In the below example, we tell the client that both SMb1 and SMB2 should be supported. The Client will then Negotiate with the
-server on which version should be used. The user does not have to ever worry about which version was negotiated.
-Example:
+In the following example, we tell the client that both SMB1 and SMB2 should be supported. The client will then negotiate with the server which version should be used.
+
+Negotiation 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 = RubySMB::Client.new(dispatcher, username: 'msfadmin', password: 'msfadmin')
   client.negotiate
 ```
 
 #### Authentication
 
-Authentication is achieved via the [ruby ntlm gem](https://rubygems.org/gems/rubyntlm). While the client
-will not currently attempt older basic authentication on its own, it will attempt an anonymous login, if no
-user credentials are supplied:
+RubySMB uses the [Ruby NTLM gem](https://rubygems.org/gems/rubyntlm) for authentication. While the client
+will not currently attempt older basic authentication on its own, it will attempt an anonymous login if no
+user credentials are supplied.
 
 Authenticated 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 = RubySMB::Client.new(dispatcher, username: 'msfadmin', password: 'msfadmin')
   client.negotiate
   client.authenticate
 ```
@@ -231,24 +218,23 @@ Anonymous Example:
       sock = TCPSocket.new address, 445
       dispatcher = RubySMB::Dispatcher::Socket.new(sock)
 
-      client = RubySMB::Client.new(dispatcher, smb1: true, smb2: false, username: '', password: '')
+      client = RubySMB::Client.new(dispatcher, username: '', password: '')
       client.negotiate
       client.authenticate
 ```
 
 #### Connecting to a Tree
 
-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.
+While there is one RubySMB::Client object that supports both SMB1 and SMB2, once the library connects to an SMB tree, it returns a protocol-specific RubySMB::Tree object. This Tree object executes all subsequent file operations on the tree.
+
+In the below example we see a simple script to connect to a remote tree, and list all files in a given sub-directory.
 
-In the below example we see a simple script to connect to a remote Tree, and list all files in a given sub-directory.
 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 = RubySMB::Client.new(dispatcher, username: 'msfadmin', password: 'msfadmin')
       client.negotiate
       client.authenticate
 
@@ -273,28 +259,30 @@ Example:
 
 
 ## Developer tips
-You'll want to have Wireshark and perhaps a tool like Impacket (which provides a small SMB client in one of its examples) installed to help with your work:
+
+It is useful to have Wireshark and a reference SMB client, such as Impacket's installed to help debug and compare output:
 
 ### Wireshark
+
+Configure Wireshark in Debian-based systems to be able to capture traffic without root user privileges:
+
 - `sudo apt-get install wireshark`
 - `sudo dpkg-reconfigure wireshark-common`
 - `sudo addgroup wireshark`
 - `sudo usermod -a -G wireshark <USERNAME>`
 
 ### Impacket
+
 - `sudo apt-get install python-setuptools`
 - `sudo easy_install pyasn1 pycrypto`
 - Download from GitHub (https://github.com/coresecurity/impacket)
 - `sudo python setup.py install`
 - `cd examples && python smbclient.py <USER>:<PASS>@<WINDOWS HOST IP>`
 
-
-
 ## License
 
 `ruby_smb` is released under a 3-clause BSD license. See [LICENSE.txt](LICENSE.txt) for full text.
 
-
 ## Contributing
 
 1. Fork it ( https://github.com/rapid7/ruby_smb/fork )

data/examples/enum_registry_key.rb

@@ -0,0 +1,28 @@
+#!/usr/bin/ruby
+
+# This example script is used for testing Winreg registry key enumeration functionality
+# It will attempt to connect to a host and enumerate registry subkeys of a specified registry key.
+# Example usage: ruby enum_registry_key.rb 192.168.172.138 msfadmin msfadmin HKLM\\My\\Key
+# This will try to connect to \\192.168.172.138 with the msfadmin:msfadmin credentialas and enumerate HKLM\\My\\Key subkeys.
+
+require 'bundler/setup'
+require 'ruby_smb'
+
+address  = ARGV[0]
+username = ARGV[1]
+password = ARGV[2]
+registry_key = ARGV[3]
+
+sock = TCPSocket.new address, 445
+dispatcher = RubySMB::Dispatcher::Socket.new(sock, read_timeout: 60)
+
+client = RubySMB::Client.new(dispatcher, smb1: true, smb2: true, username: username, password: password)
+protocol = client.negotiate
+status = client.authenticate
+
+puts "#{protocol} : #{status}"
+
+enum_result = client.enum_registry_key(address, registry_key)
+puts enum_result
+
+client.disconnect!

data/examples/enum_registry_values.rb

@@ -0,0 +1,30 @@
+#!/usr/bin/ruby
+
+# This example script is used for testing values enumeration of a specific Winreg registry.
+# It will attempt to connect to a host and enumerate values of a specified registry key.
+# Example usage: ruby enum_registry_values.rb 192.168.172.138 msfadmin msfadmin HKLM\\My\\Key
+# This will try to connect to \\192.168.172.138 with the msfadmin:msfadmin credentialas and enumerate HKLM\\My\\Key values.
+
+require 'bundler/setup'
+require 'ruby_smb'
+
+address  = ARGV[0]
+username = ARGV[1]
+password = ARGV[2]
+registry_key = ARGV[3]
+
+sock = TCPSocket.new address, 445
+dispatcher = RubySMB::Dispatcher::Socket.new(sock, read_timeout: 60)
+
+client = RubySMB::Client.new(dispatcher, smb1: true, smb2: true, username: username, password: password)
+protocol = client.negotiate
+status = client.authenticate
+
+puts "#{protocol} : #{status}"
+
+enum_result = client.enum_registry_values(address, registry_key)
+puts enum_result
+
+client.disconnect!
+
+

data/examples/pipes.rb

@@ -33,7 +33,8 @@ end
 
 client.authenticate
 client.tree_connect("\\\\#{address}\\IPC$")
-pipe = client.create_pipe(pipename, nil)
+client.create_pipe(pipename)
+pipe = client.last_file
 
 puts "Available:       #{pipe.peek_available}"
 puts "PipeState:       #{pipe.peek_state}" # 3 == OK

data/examples/read_registry_key_value.rb

@@ -0,0 +1,32 @@
+#!/usr/bin/ruby
+
+# This example script is used for testing the Winreg registry key value read functionality.
+# It will attempt to connect to a host and reads the value of a specified registry key.
+# Example usage: ruby enum_registry_key.rb 192.168.172.138 msfadmin msfadmin HKLM\\My\\Key ValueName
+# This will try to connect to \\192.168.172.138 with the msfadmin:msfadmin credentialas and reads the ValueName data corresponding to the HKLM\\My\\Key registry key.
+
+require 'bundler/setup'
+require 'ruby_smb'
+
+address  = ARGV[0]
+username = ARGV[1]
+password = ARGV[2]
+registry_key = ARGV[3]
+value_name = ARGV[4]
+
+sock = TCPSocket.new address, 445
+dispatcher = RubySMB::Dispatcher::Socket.new(sock, read_timeout: 60)
+
+client = RubySMB::Client.new(dispatcher, smb1: true, smb2: true, username: username, password: password)
+protocol = client.negotiate
+status = client.authenticate
+
+puts "#{protocol}: #{status}"
+puts "Key:   #{registry_key}"
+puts "Value: #{value_name}"
+
+key_value = client.read_registry_key_value(address, registry_key, value_name)
+puts key_value
+
+client.disconnect!
+

data/lib/ruby_smb/client/authentication.rb

@@ -54,14 +54,15 @@ module RubySMB
       end
 
       def smb1_anonymous_auth_response(raw_response)
-        begin
-          packet = RubySMB::SMB1::Packet::SessionSetupLegacyResponse.read(raw_response)
-        rescue
-          packet = RubySMB::SMB1::Packet::EmptyPacket.read(raw_response)
-        end
-
-        unless packet.smb_header.command == RubySMB::SMB1::Commands::SMB_COM_SESSION_SETUP
-          raise RubySMB::Error::InvalidPacket, "Command was #{packet.smb_header.command} and not #{RubySMB::SMB1::Commands::SMB_COM_SESSION_SETUP}"
+        packet = RubySMB::SMB1::Packet::SessionSetupLegacyResponse.read(raw_response)
+
+        unless packet.valid?
+          raise RubySMB::Error::InvalidPacket.new(
+            expected_proto: RubySMB::SMB1::SMB_PROTOCOL_ID,
+            expected_cmd:   RubySMB::SMB1::Packet::SessionSetupLegacyResponse::COMMAND,
+            received_proto: packet.smb_header.protocol,
+            received_cmd:   packet.smb_header.command
+          )
         end
         packet
       end
@@ -147,14 +148,15 @@ module RubySMB
 
       # Takes the raw binary string and returns a {RubySMB::SMB1::Packet::SessionSetupResponse}
       def smb1_ntlmssp_final_packet(raw_response)
-        begin
-          packet = RubySMB::SMB1::Packet::SessionSetupResponse.read(raw_response)
-        rescue
-          packet = RubySMB::SMB1::Packet::EmptyPacket.read(raw_response)
-        end
+        packet = RubySMB::SMB1::Packet::SessionSetupResponse.read(raw_response)
 
-        unless packet.smb_header.command == RubySMB::SMB1::Commands::SMB_COM_SESSION_SETUP
-          raise RubySMB::Error::InvalidPacket, "Command was #{packet.smb_header.command} and not #{RubySMB::SMB1::Commands::SMB_COM_SESSION_SETUP}"
+        unless packet.valid?
+          raise RubySMB::Error::InvalidPacket.new(
+            expected_proto: RubySMB::SMB1::SMB_PROTOCOL_ID,
+            expected_cmd:   RubySMB::SMB1::Packet::SessionSetupResponse::COMMAND,
+            received_proto: packet.smb_header.protocol,
+            received_cmd:   packet.smb_header.command
+          )
         end
         packet
       end
@@ -162,15 +164,20 @@ module RubySMB
       # Takes the raw binary string and returns a {RubySMB::SMB1::Packet::SessionSetupResponse}
       def smb1_ntlmssp_challenge_packet(raw_response)
         packet = RubySMB::SMB1::Packet::SessionSetupResponse.read(raw_response)
-        status_code = packet.status_code
+        unless packet.valid?
+          raise RubySMB::Error::InvalidPacket.new(
+            expected_proto: RubySMB::SMB1::SMB_PROTOCOL_ID,
+            expected_cmd:   RubySMB::SMB1::Packet::SessionSetupResponse::COMMAND,
+            received_proto: packet.smb_header.protocol,
+            received_cmd:   packet.smb_header.command
+          )
+        end
 
+        status_code = packet.status_code
         unless status_code.name == 'STATUS_MORE_PROCESSING_REQUIRED'
           raise RubySMB::Error::UnexpectedStatusCode, status_code.to_s
         end
 
-        unless packet.smb_header.command == RubySMB::SMB1::Commands::SMB_COM_SESSION_SETUP
-          raise RubySMB::Error::InvalidPacket, "Command was #{packet.smb_header.command} and not #{RubySMB::SMB1::Commands::SMB_COM_SESSION_SETUP}"
-        end
         packet
       end
 
@@ -212,23 +219,34 @@ module RubySMB
       # Takes the raw binary string and returns a {RubySMB::SMB2::Packet::SessionSetupResponse}
       def smb2_ntlmssp_final_packet(raw_response)
         packet = RubySMB::SMB2::Packet::SessionSetupResponse.read(raw_response)
-        unless packet.smb2_header.command == RubySMB::SMB2::Commands::SESSION_SETUP
-          raise RubySMB::Error::InvalidPacket, "Command was #{packet.smb2_header.command} and not #{RubySMB::SMB2::Commands::SESSION_SETUP}"
+        unless packet.valid?
+          raise RubySMB::Error::InvalidPacket.new(
+            expected_proto: RubySMB::SMB2::SMB2_PROTOCOL_ID,
+            expected_cmd:   RubySMB::SMB2::Packet::SessionSetupResponse::COMMAND,
+            received_proto: packet.smb2_header.protocol,
+            received_cmd:   packet.smb2_header.command
+          )
         end
+
         packet
       end
 
       # Takes the raw binary string and returns a {RubySMB::SMB2::Packet::SessionSetupResponse}
       def smb2_ntlmssp_challenge_packet(raw_response)
         packet = RubySMB::SMB2::Packet::SessionSetupResponse.read(raw_response)
+        unless packet.valid?
+          raise RubySMB::Error::InvalidPacket.new(
+            expected_proto: RubySMB::SMB2::SMB2_PROTOCOL_ID,
+            expected_cmd:   RubySMB::SMB2::Packet::SessionSetupResponse::COMMAND,
+            received_proto: packet.smb2_header.protocol,
+            received_cmd:   packet.smb2_header.command
+          )
+        end
+
         status_code = packet.status_code
         unless status_code.name == 'STATUS_MORE_PROCESSING_REQUIRED'
           raise RubySMB::Error::UnexpectedStatusCode, status_code.to_s
         end
-
-        unless packet.smb2_header.command == RubySMB::SMB2::Commands::SESSION_SETUP
-          raise RubySMB::Error::InvalidPacket, "Command was #{packet.smb2_header.command} and not #{RubySMB::SMB2::Commands::SESSION_SETUP}"
-        end
         packet
       end
 

data/lib/ruby_smb/client/echo.rb

@@ -16,7 +16,16 @@ module RubySMB
         (count - 1).times do
           raw_response = dispatcher.recv_packet
         end
-        RubySMB::SMB1::Packet::EchoResponse.read(raw_response)
+        response = RubySMB::SMB1::Packet::EchoResponse.read(raw_response)
+        unless response.valid?
+          raise RubySMB::Error::InvalidPacket.new(
+            expected_proto: RubySMB::SMB1::SMB_PROTOCOL_ID,
+            expected_cmd:   RubySMB::SMB1::Packet::EchoResponse::COMMAND,
+            received_proto: response.smb_header.protocol,
+            received_cmd:   response.smb_header.command
+          )
+        end
+        response
       end
 
       # Sends an ECHO request packet and returns the
@@ -26,7 +35,16 @@ module RubySMB
       def smb2_echo
         request      = RubySMB::SMB2::Packet::EchoRequest.new
         raw_response = send_recv(request)
-        RubySMB::SMB2::Packet::EchoResponse.read(raw_response)
+        response = RubySMB::SMB2::Packet::EchoResponse.read(raw_response)
+        unless response.valid?
+          raise RubySMB::Error::InvalidPacket.new(
+            expected_proto: RubySMB::SMB2::SMB2_PROTOCOL_ID,
+            expected_cmd:   RubySMB::SMB2::Packet::EchoResponse::COMMAND,
+            received_proto: response.smb2_header.protocol,
+            received_cmd:   response.smb2_header.command
+          )
+        end
+        response
       end
     end
   end

data/lib/ruby_smb/client/negotiation.rb

@@ -47,23 +47,38 @@ module RubySMB
       def negotiate_response(raw_data)
         response = nil
         if smb1
-          begin
-            packet = RubySMB::SMB1::Packet::NegotiateResponseExtended.read raw_data
-          rescue StandardError => e
-            raise RubySMB::Error::InvalidPacket, "Not a Valid SMB1 Negoitate Response #{e.message}"
-          end
+          packet = RubySMB::SMB1::Packet::NegotiateResponseExtended.read raw_data
           response = packet if packet.valid?
         end
         if smb2 && response.nil?
-          begin
-            packet = RubySMB::SMB2::Packet::NegotiateResponse.read raw_data
-          rescue StandardError => e
-            raise RubySMB::Error::InvalidPacket, "Not a Valid SMB2 Negoitate Response #{e.message}"
-          end
-          response = packet
+          packet = RubySMB::SMB2::Packet::NegotiateResponse.read raw_data
+          response = packet if packet.valid?
         end
         if response.nil?
-          raise RubySMB::Error::InvalidPacket, 'No Valid Negotiate Response found'
+          if packet.packet_smb_version == 'SMB1'
+            extended_security = if packet.is_a? RubySMB::SMB1::Packet::NegotiateResponseExtended
+              packet.parameter_block.capabilities.extended_security
+            else
+              "n/a"
+            end
+            raise RubySMB::Error::InvalidPacket.new(
+              expected_proto:  RubySMB::SMB1::SMB_PROTOCOL_ID,
+              expected_cmd:    RubySMB::SMB1::Packet::NegotiateResponseExtended::COMMAND,
+              expected_custom: "extended_security=1",
+              received_proto:  packet.smb_header.protocol,
+              received_cmd:    packet.smb_header.command,
+              received_custom: "extended_security=#{extended_security}"
+            )
+          elsif packet.packet_smb_version == 'SMB2'
+            raise RubySMB::Error::InvalidPacket.new(
+              expected_proto:  RubySMB::SMB2::SMB2_PROTOCOL_ID,
+              expected_cmd:    RubySMB::SMB2::Packet::NegotiateResponse::COMMAND,
+              received_proto:  packet.smb2_header.protocol,
+              received_cmd:    packet.smb2_header.command
+            )
+          else
+            raise RubySMB::Error::InvalidPacket, 'Unknown SMB protocol version'
+          end
         end
         response
       end

data/lib/ruby_smb/client/tree_connect.rb

@@ -17,11 +17,7 @@ module RubySMB
         request.smb_header.tid = 65_535
         request.data_block.path = share
         raw_response = send_recv(request)
-        begin
-          response = RubySMB::SMB1::Packet::TreeConnectResponse.read(raw_response)
-        rescue EOFError
-          response = RubySMB::SMB1::Packet::EmptyPacket.read(raw_response)
-        end
+        response = RubySMB::SMB1::Packet::TreeConnectResponse.read(raw_response)
         smb1_tree_from_response(share, response)
       end
 
@@ -30,9 +26,16 @@ module RubySMB
       # @param share [String] the share path to connect to
       # @param response [RubySMB::SMB1::Packet::TreeConnectResponse] the response packet to parse into our Tree
       # @return [RubySMB::SMB1::Tree]
+      # @raise [RubySMB::Error::InvalidPacket] if the response command is not a TreeConnectResponse packet
+      # @raise [RubySMB::Error::UnexpectedStatusCode] if the response status code is not STATUS_SUCCESS
       def smb1_tree_from_response(share, response)
-        unless response.smb_header.command == RubySMB::SMB1::Commands::SMB_COM_TREE_CONNECT
-          raise RubySMB::Error::InvalidPacket, 'Not a TreeConnectResponse'
+        unless response.valid?
+          raise RubySMB::Error::InvalidPacket.new(
+            expected_proto: RubySMB::SMB1::SMB_PROTOCOL_ID,
+            expected_cmd:   RubySMB::SMB1::Packet::TreeConnectResponse::COMMAND,
+            received_proto: response.smb_header.protocol,
+            received_cmd:   response.smb_header.command
+          )
         end
         unless response.status_code == WindowsError::NTStatus::STATUS_SUCCESS
           raise RubySMB::Error::UnexpectedStatusCode, response.status_code.name
@@ -54,11 +57,7 @@ module RubySMB
         request.smb2_header.tree_id = 65_535
         request.encode_path(share)
         raw_response = send_recv(request)
-        begin
-          response = RubySMB::SMB2::Packet::TreeConnectResponse.read(raw_response)
-        rescue EOFError
-          response = RubySMB::SMB2::Packet::ErrorPacket.read(raw_response)
-        end
+        response = RubySMB::SMB2::Packet::TreeConnectResponse.read(raw_response)
         smb2_tree_from_response(share, response)
       end
 
@@ -67,9 +66,16 @@ module RubySMB
       # @param share [String] the share path to connect to
       # @param response [RubySMB::SMB2::Packet::TreeConnectResponse] the response packet to parse into our Tree
       # @return [RubySMB::SMB2::Tree]
+      # @raise [RubySMB::Error::InvalidPacket] if the response command is not a TreeConnectResponse packet
+      # @raise [RubySMB::Error::UnexpectedStatusCode] if the response status code is not STATUS_SUCCESS
       def smb2_tree_from_response(share, response)
-        unless response.smb2_header.command == RubySMB::SMB2::Commands::TREE_CONNECT
-          raise RubySMB::Error::InvalidPacket, 'Not a TreeConnectResponse'
+        unless response.valid?
+          raise RubySMB::Error::InvalidPacket.new(
+            expected_proto: RubySMB::SMB2::SMB2_PROTOCOL_ID,
+            expected_cmd:   RubySMB::SMB2::Packet::TreeConnectResponse::COMMAND,
+            received_proto: response.smb2_header.protocol,
+            received_cmd:   response.smb2_header.command
+          )
         end
         unless response.status_code == WindowsError::NTStatus::STATUS_SUCCESS
           raise RubySMB::Error::UnexpectedStatusCode, response.status_code.name

data/lib/ruby_smb/client/utils.rb

@@ -25,7 +25,7 @@ module RubySMB
       end
 
       def open(path, disposition=RubySMB::Dispositions::FILE_OPEN, write: false, read: true)
-         file = last_tree.open_file(filename: path.gsub(/\\/, ''), write: write, read: read, disposition: disposition)
+         file = last_tree.open_file(filename: path.sub(/^\\/, ''), write: write, read: read, disposition: disposition)
          @last_file_id = if file.respond_to?(:guid)
            file.guid.to_binary_s
          elsif file.respond_to?(:fid)
@@ -50,7 +50,7 @@ module RubySMB
       end
 
       def delete(path)
-        file = last_tree.open_file(filename: path.gsub(/\\/, ''), delete: true)
+        file = last_tree.open_file(filename: path.sub(/^\\/, ''), delete: true)
         file.delete
         file.close
       end