rubyntlm 0.6.1 → 0.6.2

data/lib/net/ntlm/security_buffer.rb

@@ -1,48 +1,48 @@
-
-module Net
-  module NTLM
-
-    class SecurityBuffer < FieldSet
-
-      int16LE   :length,        {:value => 0}
-      int16LE   :allocated,     {:value => 0}
-      int32LE   :offset,        {:value => 0}
-
-      attr_accessor :active
-      def initialize(opts={})
-        super()
-        @value  = opts[:value]
-        @active = opts[:active].nil? ? true : opts[:active]
-        @size = 8
-      end
-
-      def parse(str, offset=0)
-        if @active and str.size >= offset + @size
-          super(str, offset)
-          @value = str[self.offset, self.length]
-          @size
-        else
-          0
-        end
-      end
-
-      def serialize
-        super if @active
-      end
-
-      def value
-        @value
-      end
-
-      def value=(val)
-        @value = val
-        self.length = self.allocated = val.size
-      end
-
-      def data_size
-        @active ? @value.size : 0
-      end
-    end
-
-  end
+
+module Net
+  module NTLM
+
+    class SecurityBuffer < FieldSet
+
+      int16LE   :length,        {:value => 0}
+      int16LE   :allocated,     {:value => 0}
+      int32LE   :offset,        {:value => 0}
+
+      attr_accessor :active
+      def initialize(opts={})
+        super()
+        @value  = opts[:value]
+        @active = opts[:active].nil? ? true : opts[:active]
+        @size = 8
+      end
+
+      def parse(str, offset=0)
+        if @active and str.size >= offset + @size
+          super(str, offset)
+          @value = str[self.offset, self.length]
+          @size
+        else
+          0
+        end
+      end
+
+      def serialize
+        super if @active
+      end
+
+      def value
+        @value
+      end
+
+      def value=(val)
+        @value = val
+        self.length = self.allocated = val.size
+      end
+
+      def data_size
+        @active ? @value.size : 0
+      end
+    end
+
+  end
 end

data/lib/net/ntlm/string.rb

@@ -1,35 +1,35 @@
-module Net
-  module NTLM
-
-    class String < Field
-      def initialize(opts)
-        super(opts)
-        @size = opts[:size]
-      end
-
-      def parse(str, offset=0)
-        if @active and str.size >= offset + @size
-          @value = str[offset, @size]
-          @size
-        else
-          0
-        end
-      end
-
-      def serialize
-        if @active
-          @value.to_s
-        else
-          ""
-        end
-      end
-
-      def value=(val)
-        @value = val
-        @size = @value.nil? ? 0 : @value.size
-        @active = (@size > 0)
-      end
-    end
-
-  end
+module Net
+  module NTLM
+
+    class String < Field
+      def initialize(opts)
+        super(opts)
+        @size = opts[:size]
+      end
+
+      def parse(str, offset=0)
+        if @active and str.size >= offset + @size
+          @value = str[offset, @size]
+          @size
+        else
+          0
+        end
+      end
+
+      def serialize
+        if @active
+          @value.to_s
+        else
+          ""
+        end
+      end
+
+      def value=(val)
+        @value = val
+        @size = @value.nil? ? 0 : @value.size
+        @active = (@size > 0)
+      end
+    end
+
+  end
 end

data/lib/net/ntlm/target_info.rb

@@ -1,89 +1,89 @@
-module Net
-  module NTLM
-
-    # Represents a list of AV_PAIR structures
-    # @see https://msdn.microsoft.com/en-us/library/cc236646.aspx
-    class TargetInfo
-
-      # Allowed AvId values for an AV_PAIR
-      MSV_AV_EOL               = "\x00\x00".freeze
-      MSV_AV_NB_COMPUTER_NAME  = "\x01\x00".freeze
-      MSV_AV_NB_DOMAIN_NAME    = "\x02\x00".freeze
-      MSV_AV_DNS_COMPUTER_NAME = "\x03\x00".freeze
-      MSV_AV_DNS_DOMAIN_NAME   = "\x04\x00".freeze
-      MSV_AV_DNS_TREE_NAME     = "\x05\x00".freeze
-      MSV_AV_FLAGS             = "\x06\x00".freeze
-      MSV_AV_TIMESTAMP         = "\x07\x00".freeze
-      MSV_AV_SINGLE_HOST       = "\x08\x00".freeze
-      MSV_AV_TARGET_NAME       = "\x09\x00".freeze
-      MSV_AV_CHANNEL_BINDINGS  = "\x0A\x00".freeze
-
-      # @param av_pair_sequence [String] AV_PAIR list from challenge message
-      def initialize(av_pair_sequence)
-        @av_pairs = read_pairs(av_pair_sequence)
-      end
-
-      attr_reader :av_pairs
-
-      def to_s
-        result = ''
-        av_pairs.each do |k,v|
-          result << k
-          result << [v.length].pack('S')
-          result << v
-        end
-        result << Net::NTLM::TargetInfo::MSV_AV_EOL
-        result << [0].pack('S')
-        result.force_encoding(Encoding::ASCII_8BIT)
-      end
-
-      private
-
-      VALID_PAIR_ID = [
-          MSV_AV_EOL,
-          MSV_AV_NB_COMPUTER_NAME,
-          MSV_AV_NB_DOMAIN_NAME,
-          MSV_AV_DNS_COMPUTER_NAME,
-          MSV_AV_DNS_DOMAIN_NAME,
-          MSV_AV_DNS_TREE_NAME,
-          MSV_AV_FLAGS,
-          MSV_AV_TIMESTAMP,
-          MSV_AV_SINGLE_HOST,
-          MSV_AV_TARGET_NAME,
-          MSV_AV_CHANNEL_BINDINGS
-      ].freeze
-
-      def read_pairs(av_pair_sequence)
-        offset = 0
-        result = {}
-        return result if av_pair_sequence.nil?
-
-        until offset >= av_pair_sequence.length
-          id = av_pair_sequence[offset..offset+1]
-
-          unless VALID_PAIR_ID.include?(id)
-            raise Net::NTLM::InvalidTargetDataError.new( 
-              "Invalid AvId #{to_hex(id)} in AV_PAIR structure",
-              av_pair_sequence
-            )
-          end
-
-          length = av_pair_sequence[offset+2..offset+3].unpack('S')[0].to_i
-          if length > 0
-            value = av_pair_sequence[offset+4..offset+4+length-1]
-            result[id] = value
-          end
-
-          offset += 4 + length
-        end
-
-        result
-      end
-
-      def to_hex(str)
-        return nil if str.nil?
-        str.bytes.map {|b| '0x' + b.to_s(16).rjust(2,'0').upcase}.join('-')
-      end
-    end
-  end
-end
+module Net
+  module NTLM
+
+    # Represents a list of AV_PAIR structures
+    # @see https://msdn.microsoft.com/en-us/library/cc236646.aspx
+    class TargetInfo
+
+      # Allowed AvId values for an AV_PAIR
+      MSV_AV_EOL               = "\x00\x00".freeze
+      MSV_AV_NB_COMPUTER_NAME  = "\x01\x00".freeze
+      MSV_AV_NB_DOMAIN_NAME    = "\x02\x00".freeze
+      MSV_AV_DNS_COMPUTER_NAME = "\x03\x00".freeze
+      MSV_AV_DNS_DOMAIN_NAME   = "\x04\x00".freeze
+      MSV_AV_DNS_TREE_NAME     = "\x05\x00".freeze
+      MSV_AV_FLAGS             = "\x06\x00".freeze
+      MSV_AV_TIMESTAMP         = "\x07\x00".freeze
+      MSV_AV_SINGLE_HOST       = "\x08\x00".freeze
+      MSV_AV_TARGET_NAME       = "\x09\x00".freeze
+      MSV_AV_CHANNEL_BINDINGS  = "\x0A\x00".freeze
+
+      # @param av_pair_sequence [String] AV_PAIR list from challenge message
+      def initialize(av_pair_sequence)
+        @av_pairs = read_pairs(av_pair_sequence)
+      end
+
+      attr_reader :av_pairs
+
+      def to_s
+        result = ''
+        av_pairs.each do |k,v|
+          result << k
+          result << [v.length].pack('S')
+          result << v
+        end
+        result << Net::NTLM::TargetInfo::MSV_AV_EOL
+        result << [0].pack('S')
+        result.force_encoding(Encoding::ASCII_8BIT)
+      end
+
+      private
+
+      VALID_PAIR_ID = [
+          MSV_AV_EOL,
+          MSV_AV_NB_COMPUTER_NAME,
+          MSV_AV_NB_DOMAIN_NAME,
+          MSV_AV_DNS_COMPUTER_NAME,
+          MSV_AV_DNS_DOMAIN_NAME,
+          MSV_AV_DNS_TREE_NAME,
+          MSV_AV_FLAGS,
+          MSV_AV_TIMESTAMP,
+          MSV_AV_SINGLE_HOST,
+          MSV_AV_TARGET_NAME,
+          MSV_AV_CHANNEL_BINDINGS
+      ].freeze
+
+      def read_pairs(av_pair_sequence)
+        offset = 0
+        result = {}
+        return result if av_pair_sequence.nil?
+
+        until offset >= av_pair_sequence.length
+          id = av_pair_sequence[offset..offset+1]
+
+          unless VALID_PAIR_ID.include?(id)
+            raise Net::NTLM::InvalidTargetDataError.new( 
+              "Invalid AvId #{to_hex(id)} in AV_PAIR structure",
+              av_pair_sequence
+            )
+          end
+
+          length = av_pair_sequence[offset+2..offset+3].unpack('S')[0].to_i
+          if length > 0
+            value = av_pair_sequence[offset+4..offset+4+length-1]
+            result[id] = value
+          end
+
+          offset += 4 + length
+        end
+
+        result
+      end
+
+      def to_hex(str)
+        return nil if str.nil?
+        str.bytes.map {|b| '0x' + b.to_s(16).rjust(2,'0').upcase}.join('-')
+      end
+    end
+  end
+end

data/lib/net/ntlm/version.rb

@@ -1,11 +1,11 @@
-module Net
-  module NTLM
-    # @private
-    module VERSION
-      MAJOR = 0
-      MINOR = 6
-      TINY  = 1
-      STRING = [MAJOR, MINOR, TINY].join('.')
-    end
-  end
-end
+module Net
+  module NTLM
+    # @private
+    module VERSION
+      MAJOR = 0
+      MINOR = 6
+      TINY  = 2
+      STRING = [MAJOR, MINOR, TINY].join('.')
+    end
+  end
+end

data/rubyntlm.gemspec

@@ -1,28 +1,29 @@
-require File.join(File.dirname(__FILE__), 'lib', 'net', 'ntlm', 'version')
-
-Gem::Specification.new do |s|
-  s.platform = Gem::Platform::RUBY
-  s.name = 'rubyntlm'
-  s.version = Net::NTLM::VERSION::STRING
-  s.summary = 'Ruby/NTLM library.'
-  s.description = 'Ruby/NTLM provides message creator and parser for the NTLM authentication.'
-
-  s.authors = ['Kohei Kajimoto','Paul Morton']
-  s.email = ['koheik@gmail.com','paul.e.morton@gmail.com']
-  s.homepage = 'https://github.com/winrb/rubyntlm'
-
-
-  s.files         = `git ls-files`.split($/)
-  s.executables   = s.files.grep(%r{^bin/}) { |f| File.basename(f) }
-  s.test_files    = s.files.grep(%r{^(test|spec|features)/})
-  s.require_paths = ["lib"]
-
-  s.required_ruby_version = '>= 1.8.7'
-
-  s.license = 'MIT'
-
-  s.add_development_dependency "pry"
-  s.add_development_dependency "rake"
-  s.add_development_dependency "rspec", ">= 2.11"
-  s.add_development_dependency "simplecov"
-end
+require File.join(File.dirname(__FILE__), 'lib', 'net', 'ntlm', 'version')
+
+Gem::Specification.new do |s|
+  s.platform = Gem::Platform::RUBY
+  s.name = 'rubyntlm'
+  s.version = Net::NTLM::VERSION::STRING
+  s.summary = 'Ruby/NTLM library.'
+  s.description = 'Ruby/NTLM provides message creator and parser for the NTLM authentication.'
+
+  s.authors = ['Kohei Kajimoto','Paul Morton']
+  s.email = ['koheik@gmail.com','paul.e.morton@gmail.com']
+  s.homepage = 'https://github.com/winrb/rubyntlm'
+
+
+  s.files         = `git ls-files`.split($/)
+  s.executables   = s.files.grep(%r{^bin/}) { |f| File.basename(f) }
+  s.test_files    = s.files.grep(%r{^(test|spec|features)/})
+  s.require_paths = ["lib"]
+
+  s.required_ruby_version = '>= 1.8.7'
+
+  s.license = 'MIT'
+
+  s.add_development_dependency 'github_changelog_generator', '1.14.3'
+  s.add_development_dependency "pry"
+  s.add_development_dependency "rake"
+  s.add_development_dependency "rspec", ">= 2.11"
+  s.add_development_dependency "simplecov"
+end

data/spec/lib/net/ntlm/blob_spec.rb

@@ -1,16 +1,16 @@
-require 'spec_helper'
-
-describe Net::NTLM::Blob do
-
-  fields = [
-      { :name => :blob_signature, :class => Net::NTLM::Int32LE, :value => 257, :active => true },
-      { :name => :reserved, :class => Net::NTLM::Int32LE, :value => 0, :active => true },
-      { :name => :timestamp, :class => Net::NTLM::Int64LE, :value => 0, :active => true },
-      { :name => :challenge, :class => Net::NTLM::String, :value => '', :active => true },
-      { :name => :unknown1, :class => Net::NTLM::Int32LE, :value => 0, :active => true },
-      { :name => :target_info, :class => Net::NTLM::String, :value => '', :active => true },
-      { :name => :unknown2, :class => Net::NTLM::Int32LE, :value => 0, :active => true },
-  ]
-
-  it_behaves_like 'a fieldset', fields
-end
+require 'spec_helper'
+
+describe Net::NTLM::Blob do
+
+  fields = [
+      { :name => :blob_signature, :class => Net::NTLM::Int32LE, :value => 257, :active => true },
+      { :name => :reserved, :class => Net::NTLM::Int32LE, :value => 0, :active => true },
+      { :name => :timestamp, :class => Net::NTLM::Int64LE, :value => 0, :active => true },
+      { :name => :challenge, :class => Net::NTLM::String, :value => '', :active => true },
+      { :name => :unknown1, :class => Net::NTLM::Int32LE, :value => 0, :active => true },
+      { :name => :target_info, :class => Net::NTLM::String, :value => '', :active => true },
+      { :name => :unknown2, :class => Net::NTLM::Int32LE, :value => 0, :active => true },
+  ]
+
+  it_behaves_like 'a fieldset', fields
+end