rubyntlm 0.1.1 → 0.2.0

data/.travis.yml

@@ -0,0 +1,12 @@
+language: ruby
+rvm:
+  - 1.9.3
+  - 1.9.2
+  - jruby-18mode
+  - jruby-19mode
+  - rbx-18mode
+  - rbx-19mode
+  - ruby-head
+  - jruby-head
+  - 1.8.7
+  - ree

data/CHANGELOG.md

@@ -0,0 +1,6 @@
+0.2.0 - Major changes to behavior!!!!
+  - Bug - Type 1 packets do not include a domain and workstation by defauly. Packet capture software will see this type of packet as malformed. All packets now include this information
+  - Bug - Type 3 packets do not include the calling workstation. This should be setup by default.
+
+0.1.2
+ - Feature user can specify the target domain 

data/Gemfile

@@ -0,0 +1,3 @@
+source 'https://rubygems.org'
+
+gemspec

data/Gemfile.lock

@@ -0,0 +1,17 @@
+PATH
+  remote: .
+  specs:
+    rubyntlm (0.2.0)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    rake (10.0.3)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  bundler (~> 1.3)
+  rake
+  rubyntlm!

data/README.md

@@ -0,0 +1,41 @@
+# Ruby/NTLM -- NTLM Authentication Library for Ruby
+
+[![Build Status](https://travis-ci.org/winrb/[rubyntlm].png)](https://travis-ci.org/winrb/rubyntlm)
+
+Ruby/NTLM provides message creator and parser for the NTLM authentication. 
+
+__100% Ruby__
+
+Simple Example
+--------------
+
+### Creating NTLM Type 1 message
+
+```ruby
+   t1 = NTLM::Message::Type1.new()
+```
+
+### Parsing NTLM Type 2 message from server
+
+```ruby
+   t2 = NTLM::Message.parse(message_from_server)
+```
+
+### Creating NTLM Type 3 message
+
+```ruby
+   t3 = t2.response({:user => 'user', :password => 'passwd'})
+```
+
+Support
+-------
+
+https://groups.google.com/forum/?fromgroups#!forum/rubyntlm
+
+Contributing
+------------
+1. Fork it.
+2. Create a branch (git checkout -b my_feature_branch)
+3. Commit your changes (git commit -am "Added a sweet feature")
+4. Push to the branch (git push origin my_feature_branch)
+5. Create a pull requst from your branch into master (Please be sure to provide enough detail for us to cipher what this change is doing)

data/Rakefile

@@ -1,66 +1,10 @@
-# Rakefile for rubyntlm    -*- ruby -*-
-# $Id: Rakefile,v 1.2 2006/10/05 01:36:52 koheik Exp $
-
-require 'rake/rdoctask'
-require 'rake/testtask'
-require 'rake/packagetask'
-require 'rake/gempackagetask'
-require File.join(File.dirname(__FILE__), 'lib', 'net', 'ntlm')
-
-PKG_NAME = 'rubyntlm'
-PKG_VERSION = Net::NTLM::VERSION::STRING
-
-task :default => [:test]
-
-Rake::TestTask.new(:test) do |t|
-  t.test_files = FileList[ "test/*.rb" ]
-  t.warning = true
-  t.verbose = true
-end
-
-# Rake::PackageTask.new(PKG_NAME, PKG_VERSION) do |p|
-#   p.need_tar_gz = true
-#   p.package_dir = 'build'
-#   p.package_files.include("README", "Rakefile")
-#   p.package_files.include("lib/net/**/*.rb", "test/**/*.rb", "examples/**/*.rb")
-# end
-
-Rake::RDocTask.new do |rd|
-  rd.rdoc_dir = 'doc'
-  rd.title = 'Ruby/NTLM library'
-  rd.main = "README"
-  rd.rdoc_files.include("README", "lib/**/*.rb")
-end
-
-dist_dirs = ["lib", "test", "examples"]
-spec = Gem::Specification.new do |s|
-  s.name = PKG_NAME
-  s.version = PKG_VERSION
-  s.summary = %q{Ruby/NTLM library.}
-  s.description = %q{Ruby/NTLM provides message creator and parser for the NTLM authentication.}
-  s.authors = ["Kohei Kajimoto"]
-  s.email = %q{koheik@gmail.com}
-  s.homepage = %q{http://rubyforge.org/projects/rubyntlm}
-  s.rubyforge_project = %q{rubyntlm}
-
-  s.files = ["Rakefile", "README"]
-  dist_dirs.each do |dir|
-    s.files = s.files + Dir.glob("#{dir}/**/*.rb")
-  end
-  
-  s.has_rdoc = true
-  s.extra_rdoc_files = %w( README )
-  s.rdoc_options.concat ['--main', 'README']
-  
-  s.autorequire = 'net/ntlm'
-end
-
-Rake::GemPackageTask.new(spec) do |p|
-  p.gem_spec = spec
-  p.need_tar = true
-  p.need_zip = true
-  p.package_dir = 'build'
-end
-
-  
-  
+require "bundler/gem_tasks"
+require 'rake/testtask'
+
+task :default => [:test]
+
+Rake::TestTask.new(:test) do |t|
+  t.test_files = FileList[ "test/*.rb" ]
+  t.warning = true
+  t.verbose = true
+end

data/lib/net/ntlm.rb

@@ -45,14 +45,16 @@
 require 'base64'
 require 'openssl'
 require 'openssl/digest'
+require 'kconv'
+require 'socket'
 
 module Net  #:nodoc:
-  module NTLM
+  module NTLM #:nodoc:
 
     module VERSION #:nodoc:
       MAJOR = 0
-      MINOR = 1
-      TINY  = 1
+      MINOR = 2
+      TINY  = 0
       STRING = [MAJOR, MINOR, TINY].join('.')
     end
 
@@ -605,8 +607,8 @@ module Net  #:nodoc:
         string          :sign,         {:size => 8, :value => SSP_SIGN}
         int32LE         :type,         {:value => 1}
         int32LE         :flag,         {:value => DEFAULT_FLAGS[:TYPE1] }
-        security_buffer :domain,       {:value => "", :active => false}
-        security_buffer :workstation,  {:value => "", :active => false}
+        security_buffer :domain,       {:value => ""}
+        security_buffer :workstation,  {:value => Socket.gethostname }
         string          :padding,      {:size => 0, :value => "", :active => false }
       }
 
@@ -667,6 +669,7 @@ module Net  #:nodoc:
         def response(arg, opt = {})
           usr = arg[:user]
           pwd = arg[:password]
+          domain = arg[:domain] ? arg[:domain] : ""
           if usr.nil? or pwd.nil?
             raise ArgumentError, "user and password have to be supplied"
           end
@@ -699,13 +702,12 @@ module Net  #:nodoc:
             opt[:unicode] = true
           end
 
-          tgt = self.target_name
           ti = self.target_info
 
           chal = self[:challenge].serialize
-          
+
           if opt[:ntlmv2]
-            ar = {:ntlmv2_hash => NTLM::ntlmv2_hash(usr, pwd, tgt, opt), :challenge => chal, :target_info => ti}
+            ar = {:ntlmv2_hash => NTLM::ntlmv2_hash(usr, pwd, domain, opt), :challenge => chal, :target_info => ti}
             lm_res = NTLM::lmv2_response(ar, opt)
             ntlm_res = NTLM::ntlmv2_response(ar, opt)
           elsif has_flag?(:NTLM2_KEY)
@@ -719,7 +721,7 @@ module Net  #:nodoc:
           Type3.create({
           	:lm_response => lm_res,
           	:ntlm_response => ntlm_res,
-          	:domain => tgt,
+          	:domain => domain,
             :user => usr,
             :workstation => ws,
             :flag => self.flag
@@ -754,8 +756,13 @@ module Net  #:nodoc:
             t.ntlm_response = arg[:ntlm_response]
             t.domain = arg[:domain]
             t.user = arg[:user]
-            t.workstation = arg[:workstation]
-            
+
+            if arg[:workstation]
+              t.workstation = arg[:workstation] 
+            else
+              t.workstation = NTLM.encode_utf16le(Socket.gethostname)
+            end
+
             if arg[:session_key]
               t.enable(:session_key)
               t.session_key = arg[session_key]

data/lib/rubyntlm.rb

@@ -0,0 +1 @@
+require 'net/ntlm'

data/rubyntlm.gemspec

@@ -0,0 +1,22 @@
+require File.join(File.dirname(__FILE__), 'lib', 'net', 'ntlm')
+
+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.add_development_dependency "bundler", "~> 1.3"
+  s.add_development_dependency "rake"
+end

metadata

@@ -1,53 +1,99 @@
---- !ruby/object:Gem::Specification 
-rubygems_version: 0.9.0
-specification_version: 1
+--- !ruby/object:Gem::Specification
 name: rubyntlm
-version: !ruby/object:Gem::Version 
-  version: 0.1.1
-date: 2006-10-04 00:00:00 -05:00
-summary: Ruby/NTLM library.
-require_paths: 
-- lib
-email: koheik@gmail.com
-homepage: http://rubyforge.org/projects/rubyntlm
-rubyforge_project: rubyntlm
-description: Ruby/NTLM provides message creator and parser for the NTLM authentication.
-autorequire: net/ntlm
-default_executable: 
-bindir: bin
-has_rdoc: true
-required_ruby_version: !ruby/object:Gem::Version::Requirement 
-  requirements: 
-  - - ">"
-    - !ruby/object:Gem::Version 
-      version: 0.0.0
-  version: 
+version: !ruby/object:Gem::Version
+  version: 0.2.0
+  prerelease: 
 platform: ruby
-signing_key: 
-cert_chain: 
-post_install_message: 
-authors: 
+authors:
 - Kohei Kajimoto
-files: 
+- Paul Morton
+autorequire: 
+bindir: bin
+cert_chain: []
+date: 2013-03-22 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.3'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.3'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+description: Ruby/NTLM provides message creator and parser for the NTLM authentication.
+email:
+- koheik@gmail.com
+- paul.e.morton@gmail.com
+executables: []
+extensions: []
+extra_rdoc_files: []
+files:
+- .travis.yml
+- CHANGELOG.md
+- Gemfile
+- Gemfile.lock
+- README.md
 - Rakefile
-- README
-- lib/net/ntlm.rb
-- test/function_test.rb
 - examples/http.rb
 - examples/imap.rb
 - examples/smtp.rb
-test_files: []
-
-rdoc_options: 
-- --main
-- README
-extra_rdoc_files: 
-- README
-executables: []
-
-extensions: []
-
+- lib/net/ntlm.rb
+- lib/rubyntlm.rb
+- rubyntlm.gemspec
+- test/function_test.rb
+homepage: https://github.com/winrb/rubyntlm
+licenses: []
+post_install_message: 
+rdoc_options: []
+require_paths:
+- lib
+required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
+      - 0
+      hash: -254558294721854043
+required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
+      - 0
+      hash: -254558294721854043
 requirements: []
-
-dependencies: []
-
+rubyforge_project: 
+rubygems_version: 1.8.25
+signing_key: 
+specification_version: 3
+summary: Ruby/NTLM library.
+test_files:
+- test/function_test.rb

data/README

@@ -1,25 +0,0 @@
-= Ruby/NTLM -- NTLM Authentication Library for Ruby
-
-Ruby/NTLM provides message creator and parser for the NTLM authentication.
-
-Some features:
-* Independent from non-standard Ruby libraries.
-* Supports NTLM and NTLMv2 reponses.
-
-== Simple Example
-
-* Creating NTLM Type 1 message
-
-   t1 = NTLM::Message::Type1.new()
-
-* Parsing NTLM Type 2 message from server
-
-   t2 = NTLM::Message.parse(message_from_server)
-
-* Creating NTLM Type 3 message
-
-   t3 = t2.response({:user => 'user', :password => 'passwd'})
-
-== Support
-
-You can find Ruby/NTLM RubyForge page at http://rubyforge.org/projects/rubyntlm.