packetgen-plugin-smb 0.5.0 → 0.6.3

data/lib/packetgen/plugin/smb.rb

@@ -1,26 +1,26 @@
+# frozen_string_literal: true
+
 # This file is part of packetgen-plugin-smb.
 # See https://github.com/sdaubert/packetgen-plugin-smb for more informations
 # Copyright (C) 2018 Sylvain Daubert <sylvain.daubert@laposte.net>
 # This program is published under MIT license.
 
-# frozen_string_literal: true
-
 module PacketGen::Plugin
   # Server Message Block (SMB) header.
   # @author Sylvain Daubert
   class SMB < PacketGen::Header::Base
     # Known commands
     COMMANDS = {
-      'delete_dir'     => 0x01,
-      'close'          => 0x04,
-      'delete'         => 0x06,
-      'query_info2'    => 0x23,
-      'trans'          => 0x25,
-      'echo'           => 0x2b,
-      'open_and_x'     => 0x2d,
-      'read_and_x'     => 0x2e,
-      'write_and_x'    => 0x2f,
-      'trans2'         => 0x32,
+      'delete_dir' => 0x01,
+      'close' => 0x04,
+      'delete' => 0x06,
+      'query_info2' => 0x23,
+      'trans' => 0x25,
+      'echo' => 0x2b,
+      'open_and_x' => 0x2d,
+      'read_and_x' => 0x2e,
+      'write_and_x' => 0x2f,
+      'trans2' => 0x32,
       'tree_disconnect' => 0x71,
       'negotiate' => 0x72,
       'session_setup_and_x' => 0x73,

data/lib/packetgen/plugin/smb2/base.rb

@@ -1,10 +1,10 @@
+# frozen_string_literal: true
+
 # This file is part of packetgen-plugin-smb.
 # See https://github.com/sdaubert/packetgen-plugin-smb for more informations
 # Copyright (C) 2018 Sylvain Daubert <sylvain.daubert@laposte.net>
 # This program is published under MIT license.
 
-# frozen_string_literal: true
-
 require_relative 'guid'
 
 module PacketGen::Plugin
@@ -26,4 +26,4 @@ module PacketGen::Plugin
       end
     end
   end
-end
+end

data/lib/packetgen/plugin/smb2/error.rb

@@ -1,10 +1,10 @@
+# frozen_string_literal: true
+
 # This file is part of packetgen-plugin-smb.
 # See https://github.com/sdaubert/packetgen-plugin-smb for more informations
 # Copyright (C) 2018 Sylvain Daubert <sylvain.daubert@laposte.net>
 # This program is published under MIT license.
 
-# frozen_string_literal: true
-
 module PacketGen::Plugin
   class SMB2
     # SMB2 Error response structure
@@ -45,6 +45,5 @@ module PacketGen::Plugin
     end
   end
   PacketGen::Header.add_class SMB2::ErrorResponse
-  SMB2.bind SMB2::ErrorResponse, status: ->(v) { v > 0 }
+  SMB2.bind SMB2::ErrorResponse, status: ->(v) { v.positive? }
 end
-

data/lib/packetgen/plugin/smb2/guid.rb

@@ -1,10 +1,10 @@
+# frozen_string_literal: true
+
 # This file is part of packetgen-plugin-smb.
 # See https://github.com/sdaubert/packetgen-plugin-smb for more informations
 # Copyright (C) 2018 Sylvain Daubert <sylvain.daubert@laposte.net>
 # This program is published under MIT license.
 
-# frozen_string_literal: true
-
 module PacketGen::Plugin
   class SMB2
     # GUID, also known as UUID, is a 16-byte structure, intended to serve
@@ -22,6 +22,8 @@ module PacketGen::Plugin
     #   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
     # @author Sylvain Daubert
     class GUID < PacketGen::Types::Fields
+      include PacketGen::Types::Fieldable
+
       # @!attribute data1
       #  32-bit little-endian data1
       #  @return [Integer]
@@ -66,4 +68,3 @@ module PacketGen::Plugin
     end
   end
 end
-

data/lib/packetgen/plugin/smb2/negotiate/context.rb

@@ -1,10 +1,10 @@
+# frozen_string_literal: true
+
 # This file is part of packetgen-plugin-smb.
 # See https://github.com/sdaubert/packetgen-plugin-smb for more informations
 # Copyright (C) 2018 Sylvain Daubert <sylvain.daubert@laposte.net>
 # This program is published under MIT license.
 
-# frozen_string_literal: true
-
 module PacketGen::Plugin
   class SMB2
     module Negotiate
@@ -47,7 +47,7 @@ module PacketGen::Plugin
         # @!attribute pad
         #  Padding to align next context on a 8-byte offset
         #  @return [String]
-        define_field :pad, PacketGen::Types::String, builder: ->(h, t) { t.new(length_from: -> { (8 - (h.offset_of(:data) + h.data_length) % 8) % 8 }) }
+        define_field :pad, PacketGen::Types::String, builder: ->(h, t) { t.new(length_from: -> { 8 - (h.offset_of(:data) + h.data_length) % 8 }) }
 
         # @private
         alias old_read read

data/lib/packetgen/plugin/smb2/negotiate/request.rb

@@ -1,10 +1,10 @@
+# frozen_string_literal: true
+
 # This file is part of packetgen-plugin-smb.
 # See https://github.com/sdaubert/packetgen-plugin-smb for more informations
 # Copyright (C) 2018 Sylvain Daubert <sylvain.daubert@laposte.net>
 # This program is published under MIT license.
 
-# frozen_string_literal: true
-
 module PacketGen::Plugin
   class SMB2
     module Negotiate
@@ -161,9 +161,7 @@ module PacketGen::Plugin
           self[:pad].read SMB2::MAX_PADDING
 
           self.context_offset = 0
-          unless context_list.empty?
-            self.context_offset = SMB2::HEADER_SIZE + offset_of(:context_list)
-          end
+          self.context_offset = SMB2::HEADER_SIZE + offset_of(:context_list) unless context_list.empty?
           context_list.each { |ctx| ctx.calc_length if ctx.respond_to? :calc_length }
         end
       end

data/lib/packetgen/plugin/smb2/negotiate/response.rb

@@ -1,10 +1,10 @@
+# frozen_string_literal: true
+
 # This file is part of packetgen-plugin-smb.
 # See https://github.com/sdaubert/packetgen-plugin-smb for more informations
 # Copyright (C) 2018 Sylvain Daubert <sylvain.daubert@laposte.net>
 # This program is published under MIT license.
 
-# frozen_string_literal: true
-
 module PacketGen::Plugin
   class SMB2
     module Negotiate
@@ -140,7 +140,7 @@ module PacketGen::Plugin
         define_field :context_offset, PacketGen::Types::Int32le
         # @!attribute buffer
         #  @return [GSSAPI]
-        define_field :buffer, GSSAPI, token: :init, optional: ->(h) { h.buffer_offset > 0 }
+        define_field :buffer, GSSAPI, token: :init, optional: ->(h) { h.buffer_offset.positive? }
         # @!attribute pad
         #  Optional padding between the end of the {#buffer} field and the first negotiate
         #  context in {#context_list} so that the first negotiate context is 8-byte aligned
@@ -184,13 +184,15 @@ module PacketGen::Plugin
         def calc_length
           self[:pad].read SMB2::MAX_PADDING
 
-          self.buffer_offset = SMB2::HEADER_SIZE + offset_of(:buffer)
           self.buffer_length = self[:buffer].sz
+          self.buffer_offset = if self.buffer_length.zero?
+                                 0
+                               else
+                                 SMB2::HEADER_SIZE + offset_of(:buffer)
+                               end
 
           self.context_offset = 0
-          unless context_list.empty?
-            self.context_offset = SMB2::HEADER_SIZE + offset_of(:context_list)
-          end
+          self.context_offset = SMB2::HEADER_SIZE + offset_of(:context_list) unless context_list.empty?
           context_list.each { |ctx| ctx.calc_length if ctx.respond_to? :calc_length }
         end
       end

data/lib/packetgen/plugin/smb2/negotiate.rb

@@ -1,10 +1,10 @@
+# frozen_string_literal: true
+
 # This file is part of packetgen-plugin-smb.
 # See https://github.com/sdaubert/packetgen-plugin-smb for more informations
 # Copyright (C) 2018 Sylvain Daubert <sylvain.daubert@laposte.net>
 # This program is published under MIT license.
 
-# frozen_string_literal: true
-
 require_relative 'guid'
 
 module PacketGen::Plugin

data/lib/packetgen/plugin/smb2/session_setup/request.rb

@@ -1,10 +1,10 @@
+# frozen_string_literal: true
+
 # This file is part of packetgen-plugin-smb.
 # See https://github.com/sdaubert/packetgen-plugin-smb for more informations
 # Copyright (C) 2018 Sylvain Daubert <sylvain.daubert@laposte.net>
 # This program is published under MIT license.
 
-# frozen_string_literal: true
-
 module PacketGen::Plugin
   class SMB2
     module SessionSetup
@@ -79,13 +79,17 @@ module PacketGen::Plugin
         define_field :prev_session_id, PacketGen::Types::Int64le
         # @!attribute buffer
         #  @return [GSSAPI]
-        define_field :buffer, GSSAPI, token: :response, optional: ->(h) { h.buffer_offset > 0 }
+        define_field :buffer, GSSAPI, token: :response, optional: ->(h) { h.buffer_offset.positive? }
 
         # Calculate and set {#buffer_length} and {#buffer_offset} fields.
         # @return [void]
         def calc_length
-          self.buffer_offset = SMB2.new.sz + offset_of(:buffer)
           self.buffer_length = self[:buffer].sz
+          self.buffer_offset = if self.buffer_length.zero?
+                                 0
+                               else
+                                 SMB2.new.sz + offset_of(:buffer)
+                               end
         end
 
         # Protocol name
@@ -96,4 +100,4 @@ module PacketGen::Plugin
       end
     end
   end
-end
+end

data/lib/packetgen/plugin/smb2/session_setup/response.rb

@@ -1,10 +1,10 @@
+# frozen_string_literal: true
+
 # This file is part of packetgen-plugin-smb.
 # See https://github.com/sdaubert/packetgen-plugin-smb for more informations
 # Copyright (C) 2018 Sylvain Daubert <sylvain.daubert@laposte.net>
 # This program is published under MIT license.
 
-# frozen_string_literal: true
-
 module PacketGen::Plugin
   class SMB2
     module SessionSetup
@@ -39,7 +39,7 @@ module PacketGen::Plugin
         #  @return [Boolean]
         # @!attribute flags_is_guest?
         #  @return [Boolean]
-        define_bit_fields_on :flags, :flags_rsv, 13,:flags_encrypt_data, :flags_is_null, :flags_is_guest
+        define_bit_fields_on :flags, :flags_rsv, 13, :flags_encrypt_data, :flags_is_null, :flags_is_guest
         # @!attribute buffer_offset
         #  The offset, from the beginning of the SMB2 header of the {#buffer}.
         #  @return [Integer]
@@ -50,13 +50,17 @@ module PacketGen::Plugin
         define_field :buffer_length, PacketGen::Types::Int16le
         # @!attribute buffer
         #  @return [GSSAPI]
-        define_field :buffer, GSSAPI, token: :response, optional: ->(h) { h.buffer_offset > 0 }
+        define_field :buffer, GSSAPI, token: :response, optional: ->(h) { h.buffer_offset.positive? }
 
         # Calculate and set {#buffer_length} and {#buffer_offset} fields.
         # @return [void]
         def calc_length
-          self.buffer_offset = SMB2.new.sz + offset_of(:buffer)
           self.buffer_length = self[:buffer].sz
+          self.buffer_offset = if self.buffer_length.zero?
+                                 0
+                               else
+                                 SMB2.new.sz + offset_of(:buffer)
+                               end
         end
 
         # Protocol name
@@ -67,4 +71,4 @@ module PacketGen::Plugin
       end
     end
   end
-end
+end

data/lib/packetgen/plugin/smb2/session_setup.rb

@@ -1,10 +1,10 @@
+# frozen_string_literal: true
+
 # This file is part of packetgen-plugin-smb.
 # See https://github.com/sdaubert/packetgen-plugin-smb for more informations
 # Copyright (C) 2018 Sylvain Daubert <sylvain.daubert@laposte.net>
 # This program is published under MIT license.
 
-# frozen_string_literal: true
-
 require_relative 'guid'
 
 module PacketGen::Plugin

data/lib/packetgen/plugin/smb2.rb

@@ -1,10 +1,10 @@
+# frozen_string_literal: true
+
 # This file is part of packetgen-plugin-smb.
 # See https://github.com/sdaubert/packetgen-plugin-smb for more informations
 # Copyright (C) 2018 Sylvain Daubert <sylvain.daubert@laposte.net>
 # This program is published under MIT license.
 
-# frozen_string_literal: true
-
 module PacketGen::Plugin
   # Server Message Block version 2 and 3 (SMB2) header.
   # @author Sylvain Daubert
@@ -84,7 +84,7 @@ module PacketGen::Plugin
     #  64-bit unique ID that is created by the server to handle operations
     #  asynchronously. Only present for asynchronous messages.
     #  @return [Integer]
-    define_field :async_id, PacketGen::Types::Int64le, optional: ->(h) { h.flags & 2  == 2}
+    define_field :async_id, PacketGen::Types::Int64le, optional: ->(h) { h.flags & 2 == 2 }
     # @!attribute reserved
     #  32-bit reserved field.
     #  Only present for synchronous messages.

data/lib/packetgen/plugin/smb_version.rb

@@ -1,5 +1,7 @@
+# frozen_string_literal: true
+
 module PacketGen
   module Plugin
-    SMB_VERSION = "0.5.0"
+    SMB_VERSION = '0.6.3'
   end
 end

data/lib/packetgen-plugin-smb.rb

@@ -1,10 +1,10 @@
+# frozen_string_literal: true
+
 # This file is part of packetgen-plugin-smb.
 # See https://github.com/sdaubert/packetgen-plugin-smb for more informations
 # Copyright (C) 2018 Sylvain Daubert <sylvain.daubert@laposte.net>
 # This program is published under MIT license.
 
-# frozen_string_literal: true
-
 require 'packetgen'
 require_relative 'packetgen/plugin/smb_version'
 require_relative 'packetgen/plugin/gssapi'
@@ -12,3 +12,4 @@ require_relative 'packetgen/plugin/netbios'
 require_relative 'packetgen/plugin/smb'
 require_relative 'packetgen/plugin/smb2'
 require_relative 'packetgen/plugin/llmnr'
+require_relative 'packetgen/plugin/ntlm'

data/packetgen-plugin-smb.gemspec

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'packetgen/plugin/smb_version'
@@ -14,16 +16,12 @@ Gem::Specification.new do |spec|
   spec.files         = `git ls-files -z`.split("\x0").reject do |f|
     f.match(%r{^(test|spec|features)/})
   end
-  spec.require_paths = ['lib']
-
-  spec.required_ruby_version = '>= 2.3.0'
+  spec.bindir = 'bin'
+  spec.executables = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
+  spec.require_paths = %w[lib]
 
-  spec.add_dependency 'packetgen', '~>3.0', '>= 3.0.2'
-  spec.add_dependency 'rasn1', '~>0.6', '>= 0.6.8'
+  spec.required_ruby_version = '>= 2.5.0'
 
-  spec.add_development_dependency 'bundler', '~> 1.16'
-  spec.add_development_dependency 'rake', '~> 10.0'
-  spec.add_development_dependency 'rspec', '~> 3.7'
-  spec.add_development_dependency 'simplecov', '~> 0.16'
-  spec.add_development_dependency 'yard', '~> 0.9'
+  spec.add_dependency 'packetgen', '~>3.2', '>=3.2.1'
+  spec.add_dependency 'rasn1', '~>0.8', '>= 0.8.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: packetgen-plugin-smb
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.3
 platform: ruby
 authors:
 - Sylvain Daubert
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-18 00:00:00.000000000 Z
+date: 2022-01-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: packetgen
@@ -16,110 +16,40 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.2
+        version: 3.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.2
+        version: 3.2.1
 - !ruby/object:Gem::Dependency
   name: rasn1
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: '0.8'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.6.8
+        version: 0.8.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: '0.8'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.6.8
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.16'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.16'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '10.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '10.0'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.7'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.7'
-- !ruby/object:Gem::Dependency
-  name: simplecov
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.16'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.16'
-- !ruby/object:Gem::Dependency
-  name: yard
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.9'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.9'
+        version: 0.8.0
 description: 
 email:
 - sylvain.daubert@laposte.net
@@ -127,13 +57,15 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/specs.yml"
 - ".gitignore"
 - ".rubocop.yml"
-- ".travis.yml"
 - Gemfile
 - LICENSE
 - README.md
 - Rakefile
+- examples/llmnr-responder
+- examples/smb-responder
 - lib/packetgen-plugin-smb.rb
 - lib/packetgen/plugin/gssapi.rb
 - lib/packetgen/plugin/llmnr.rb
@@ -141,6 +73,12 @@ files:
 - lib/packetgen/plugin/netbios/datagram.rb
 - lib/packetgen/plugin/netbios/name.rb
 - lib/packetgen/plugin/netbios/session.rb
+- lib/packetgen/plugin/ntlm.rb
+- lib/packetgen/plugin/ntlm/authenticate.rb
+- lib/packetgen/plugin/ntlm/av_pair.rb
+- lib/packetgen/plugin/ntlm/challenge.rb
+- lib/packetgen/plugin/ntlm/negotiate.rb
+- lib/packetgen/plugin/ntlm/ntlmv2_response.rb
 - lib/packetgen/plugin/smb.rb
 - lib/packetgen/plugin/smb/blocks.rb
 - lib/packetgen/plugin/smb/browser.rb
@@ -186,15 +124,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.3.0
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.2.5
 signing_key: 
 specification_version: 4
 summary: SMB plugin for packetgen.

data/.travis.yml

@@ -1,12 +0,0 @@
-language: ruby
-rvm:
-  - 2.3
-  - 2.4
-  - 2.5
-
-install:
-  - sudo apt-get update -qq
-  - sudo apt-get install libpcap-dev -qq
-  - bundle install --path vendor/bundle --jobs=3 --retry=3
-script:
-  - bundle exec rake