ruby-ntlm 0.0.1 → 0.0.3

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 3e26c065e9eceacdfec71a78b2c6deefd4fad3a9
+  data.tar.gz: 4664f657f8615350873b3991ee93aee2ee365e84
+SHA512:
+  metadata.gz: 489944e1a1b4e05385b1699d62002e21facbf910afa5638e923d1c0d23ebb7378f7ab4ab6de589aefa648a3227d06da29df1eb977ae008dc2ff07d0dd82f0d6e
+  data.tar.gz: afe5422cae120622ac64e3f6a888e93d795c173695072bfe31dc003e9954f579a8af5a845481bfe672fa580d21425b78172bfb6dbae047dab71f215beb5960af

data/.gitignore

@@ -0,0 +1,17 @@
+*.gem
+*.rbc
+.bundle
+.config
+.yardoc
+Gemfile.lock
+InstalledFiles
+_yardoc
+coverage
+doc/
+lib/bundler/man
+pkg
+rdoc
+spec/reports
+test/tmp
+test/version_tmp
+tmp

data/.travis.yml

@@ -0,0 +1,7 @@
+language: ruby
+rvm:
+  #- 1.8.7
+  - 1.9.3
+  - 2.2.5
+  - 2.3.1
+script: bundle exec rake test

data/Gemfile

@@ -0,0 +1,3 @@
+# vim: set ft=ruby:
+source 'https://rubygems.org'
+gemspec

data/README.markdown

@@ -1,3 +1,5 @@
+[![Build Status](https://travis-ci.org/macks/ruby-ntlm.svg?branch=master)](https://travis-ci.org/macks/ruby-ntlm)
+
 ruby-ntlm
 =========
 
@@ -25,13 +27,6 @@ Usage
     request.ntlm_auth('User', 'Domain', 'Password')
     response = http.request(request)
 
-### HTTP (using Mechanize) ###
-
-    require 'ntlm/mechanize'
-    mech = Mechanize.new
-    mech.auth('Domain\\User', 'Password')
-    mech.get('http://www.example.com/index.html')
-
 ### IMAP ###
 
     require 'ntlm/imap'

data/Rakefile

@@ -1,34 +1,11 @@
-require 'rubygems'
-require 'rake'
-require 'jeweler'
-require 'rake/testtask'
-
-task :default => :test
+# vim: set ft=ruby:
 
-Jeweler::Tasks.new do |gem|
-  gem.name = 'ruby-ntlm'
-  gem.summary = %Q{NTLM implementation for Ruby}
-  gem.description = %Q{NTLM implementation for Ruby.}
-  gem.email = 'macksx@gmail.com'
-  gem.homepage = 'http://github.com/macks/ruby-ntlm'
-  gem.authors = ['MATSUYAMA Kengo']
-end
+require "bundler/gem_tasks"
+require 'rake/testtask'
 
 Rake::TestTask.new(:test) do |task|
   task.libs << 'lib:test'
   task.pattern = 'test/**/*_test.rb'
   task.verbose = true
-end
-
-begin
-  require 'rcov/rcovtask'
-  Rcov::RcovTask.new do |task|
-    task.libs << 'lib:test'
-    task.pattern = 'test/**/*_test.rb'
-    task.verbose = true
-  end
-rescue LoadError
-  task :rcov do
-    abort 'rcov is not available.'
-  end
+  task.warning = true
 end

data/lib/ntlm/http.rb

@@ -23,6 +23,8 @@ module Net
       end
 
       unless started?
+        @original_body = req.body
+        req.body = nil
         start do
           req.delete('connection')
           return request(req, body, &block)
@@ -30,15 +32,16 @@ module Net
       end
 
       # Negotiation
-      req['authorization'] = 'NTLM ' + NTLM.negotiate.to_base64
+      req['authorization'] = 'NTLM ' + ::NTLM.negotiate.to_base64
       res = request_without_ntlm_auth(req, body)
       challenge = res['www-authenticate'][/NTLM (.*)/, 1].unpack('m').first rescue nil
 
       if challenge && res.code == '401'
         # Authentication
         user, domain, password = req.ntlm_auth_params
-        req['authorization'] = 'NTLM ' + NTLM.authenticate(challenge, user, domain, password).to_base64
+        req['authorization'] = 'NTLM ' + ::NTLM.authenticate(challenge, user, domain, password).to_base64
         req.body_stream.rewind if req.body_stream
+        req.body = @original_body
         request_without_ntlm_auth(req, body, &block)  # We must re-use the connection.
       else
         yield res if block_given?

data/lib/ntlm/imap.rb

@@ -24,9 +24,9 @@ module Net
       def process(data)
         case (@state += 1)
         when 1
-          NTLM.negotiate.to_s
+          ::NTLM.negotiate.to_s
         when 2
-          NTLM.authenticate(data, @user, @domain, @password).to_s
+          ::NTLM.authenticate(data, @user, @domain, @password).to_s
         end
       end
     end # NTLMAuthenticator

data/lib/ntlm/message.rb

@@ -79,9 +79,15 @@ module NTLM
     end
 
     def initialize(args = {})
-      @buffer = ''
-      @offset  = 0
-      @flag    = args[:flag] || self.class::DEFAULT_FLAGS
+      @buffer      = ''
+      @offset      = 0
+      @flag        = args[:flag] || self.class::DEFAULT_FLAGS
+      @domain      = nil
+      @workstation = nil
+      @version     = nil
+      @target_info = nil
+      @session_key = nil
+      @mic         = nil
 
       self.class::ATTRIBUTES.each do |key|
         instance_variable_set("@#{key}", args[key]) if args[key]
@@ -147,7 +153,7 @@ module NTLM
     end
 
     def fetch_payload(fields)
-      size, allocated_size, offset = fields.unpack('vvV')
+      size, _, offset = fields.unpack('vvV')
       return nil if size.zero?
       @buffer[offset, size]
     end
@@ -204,7 +210,7 @@ module NTLM
       ATTRIBUTES    = [:domain, :workstation, :version]
       DEFAULT_FLAGS = [NEGOTIATE_UNICODE, NEGOTIATE_OEM, REQUEST_TARGET, NEGOTIATE_NTLM, NEGOTIATE_ALWAYS_SIGN, NEGOTIATE_EXTENDED_SECURITY].inject(:|)
 
-      attr_accessor *ATTRIBUTES
+      attr_accessor(*ATTRIBUTES)
 
       def parse(string)
         super
@@ -247,7 +253,7 @@ module NTLM
       ATTRIBUTES    = [:target_name, :challenge, :target_info, :version]
       DEFAULT_FLAGS = 0
 
-      attr_accessor *ATTRIBUTES
+      attr_accessor(*ATTRIBUTES)
 
       def parse(string)
         super
@@ -300,7 +306,7 @@ module NTLM
       ATTRIBUTES    = [:lm_response, :nt_response, :domain, :user, :workstation, :session_key, :version, :mic]
       DEFAULT_FLAGS = [NEGOTIATE_UNICODE, REQUEST_TARGET, NEGOTIATE_NTLM, NEGOTIATE_ALWAYS_SIGN, NEGOTIATE_EXTENDED_SECURITY].inject(:|)
 
-      attr_accessor *ATTRIBUTES
+      attr_accessor(*ATTRIBUTES)
 
       def parse(string)
         super

data/lib/ntlm/smtp.rb

@@ -17,10 +17,10 @@ module Net
       end
 
       res = critical {
-        r = get_response("AUTH NTLM #{NTLM.negotiate.to_base64}")
+        r = get_response("AUTH NTLM #{::NTLM.negotiate.to_base64}")
         check_auth_continue(r)
         challenge = r.string.split(/ /, 2).last.unpack('m').first
-        get_response(NTLM.authenticate(challenge, user, domain, secret).to_base64)
+        get_response(::NTLM.authenticate(challenge, user, domain, secret).to_base64)
       }
       check_auth_response(res)
       res

data/lib/ntlm/util.rb

@@ -77,7 +77,9 @@ module NTLM
     # [MS-NLMP] 3.3.1
     def ntlm_v1_response(challenge, password, options = {})
       if options[:ntlm_v2_session]
+        challenge = challenge.b if challenge.respond_to?(:b)
         client_challenge = options[:client_challenge] || OpenSSL::Random.random_bytes(8)
+        client_challenge = client_challenge.b if client_challenge.respond_to?(:b)
         hash = OpenSSL::Digest::MD5.digest(challenge + client_challenge)[0, 8]
         nt_response = encrypt(hash, nt_v1_hash(password), 21)
         lm_response = client_challenge + ("\0" * 16)

data/lib/ntlm/version.rb

@@ -0,0 +1,5 @@
+# vim: set et sw=2 sts=2:
+
+module NTLM
+  VERSION = '0.0.3'
+end

data/ruby-ntlm.gemspec

@@ -0,0 +1,24 @@
+# coding: utf-8
+lib = File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require 'ntlm/version'
+
+Gem::Specification.new do |spec|
+  spec.name          = "ruby-ntlm"
+  spec.version       = NTLM::VERSION
+  spec.authors       = ["MATSUYAMA Kengo"]
+  spec.email         = ["macksx@gmail.com"]
+  spec.summary       = %q{NTLM implementation for Ruby.}
+  spec.description   = %q{NTLM implementation for Ruby.}
+  spec.homepage      = "http://github.com/macks/ruby-ntlm"
+  spec.license       = "MIT"
+
+  spec.files         = `git ls-files -z`.split("\x0")
+  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
+  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
+  spec.require_paths = ["lib"]
+
+  spec.add_development_dependency "bundler", "~> 1.5"
+  spec.add_development_dependency "rake"
+  spec.add_development_dependency "test-unit"
+end

metadata

@@ -1,36 +1,69 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: ruby-ntlm
-version: !ruby/object:Gem::Version 
-  hash: 29
-  prerelease: false
-  segments: 
-  - 0
-  - 0
-  - 1
-  version: 0.0.1
+version: !ruby/object:Gem::Version
+  version: 0.0.3
 platform: ruby
-authors: 
+authors:
 - MATSUYAMA Kengo
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-01-18 00:00:00 +09:00
-default_executable: 
-dependencies: []
-
+date: 2016-08-26 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.5'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.5'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: test-unit
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: NTLM implementation for Ruby.
-email: macksx@gmail.com
+email:
+- macksx@gmail.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
-- README.markdown
-files: 
+extra_rdoc_files: []
+files:
+- ".gitignore"
+- ".travis.yml"
+- Gemfile
 - README.markdown
 - Rakefile
-- VERSION
 - examples/http.rb
 - examples/http2.rb
 - examples/imap.rb
@@ -39,56 +72,42 @@ files:
 - lib/ntlm.rb
 - lib/ntlm/http.rb
 - lib/ntlm/imap.rb
-- lib/ntlm/mechanize.rb
 - lib/ntlm/message.rb
 - lib/ntlm/smtp.rb
 - lib/ntlm/util.rb
+- lib/ntlm/version.rb
+- ruby-ntlm.gemspec
 - test/auth_test.rb
 - test/function_test.rb
 - test/test_helper.rb
 - unused/extconf.rb
 - unused/http_example.rb
 - unused/ntlm.c
-has_rdoc: true
 homepage: http://github.com/macks/ruby-ntlm
-licenses: []
-
+licenses:
+- MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
   - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
   - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 2.4.5.1
 signing_key: 
-specification_version: 3
-summary: NTLM implementation for Ruby
-test_files: 
-- examples/http.rb
-- examples/http2.rb
-- examples/imap.rb
-- examples/mechanize.rb
-- examples/smtp.rb
+specification_version: 4
+summary: NTLM implementation for Ruby.
+test_files:
 - test/auth_test.rb
 - test/function_test.rb
 - test/test_helper.rb

data/VERSION

@@ -1 +0,0 @@
-0.0.1

data/lib/ntlm/mechanize.rb

@@ -1,42 +0,0 @@
-require 'mechanize'
-require 'ntlm/http'
-
-class Mechanize
-  class Chain
-    class AuthHeaders
-
-      unless method_defined?(:handle_without_ntlm)
-        alias handle_without_ntlm handle
-      end
-
-      def handle(ctx, params)
-        if @auth_hash[params[:uri].host] == :ntlm && @user && @password
-          if @user.index('\\')
-            domain, user = @user.split('\\', 2)
-          end
-          params[:request].ntlm_auth(user, domain, @password)
-        end
-        handle_without_ntlm(ctx, params)
-      end
-    end
-  end
-
-  unless private_method_defined?(:fetch_page_without_ntlm)
-    alias fetch_page_without_ntlm fetch_page
-  end
-
-  private
-
-  def fetch_page(params)
-    begin
-      fetch_page_without_ntlm(params)
-    rescue Mechanize::ResponseCodeError => e
-      if e.response_code == '401' && e.page.header['www-authenticate'] =~ /NTLM/ && @auth_hash[e.page.uri.host] != :ntlm
-        @auth_hash[e.page.uri.host] = :ntlm
-        fetch_page_without_ntlm(params)
-      else
-        raise
-      end
-    end
-  end
-end