webmoney 0.0.14 → 0.0.15.pre

data/ChangeLog

@@ -1,5 +1,20 @@
 ChangeLog
 
+Thu Nov 22 13:07:47 2012 +0400
+----------------------------
+  V 0.0.15.pre
+  * Changes in x509 cert/key configuration (backward compatible)
+  * Pure ruby implementation of signing algorithm (100 times faster),
+    thanks to Sergey Gridasov <grindars@gmail.com>
+
+Thu Oct 25 13:47:06 2012 +0400
+----------------------------
+  V 0.0.14
+  * Added X9 interface (:balance)
+  * Added x509 version X11 interface (:get_passport)
+  * Some bugs fixed
+  * Fix compile Warning
+
 Wed Apr 11 2012 14:16:00 +0400
 ----------------------------
   V 0.0.13

data/README.md

@@ -72,8 +72,20 @@ wmid = '111222333444'
 
 ## Light
 
+The key convert instruction from P12 format to PEM see [here](http://wiki.webmoney.ru/projects/webmoney/wiki/konvertatsiya_klyuchey_wm_keeper_light_v_pem_format)
+
+```ruby
+mywm = MyWM.new(:wmid => '123456789012',
+  :cert => 'webmoney.pem', # ~/.wm/webmoney.pem
+#  :cert => '/home/user/webmoney.pem',
+  :key =>  'webmoney.key', # ~/.wm/webmoney.key
+#  :key =>  '/home/user/webmoney.key',
+  :password => 'pa$$w0rt')
+```
+or
+
 ```ruby
-cert = OpenSSL::X509::Certificate.new(File.read("webmoney.cert"))
+cert = OpenSSL::X509::Certificate.new(File.read("webmoney.pem"))
 key = OpenSSL::PKey::RSA.new(File.read("webmoney.key"), "password")
 mywm = MyWM.new(:wmid => '123456789012', :cert => cert, :key => key)
 ```

data/VERSION

@@ -1 +1 @@
-0.0.14
+0.0.15.pre

data/lib/signer.rb

@@ -0,0 +1,128 @@
+require "base64"
+require "stringio"
+require "openssl"
+require "securerandom"
+
+class Signer
+  module Key
+
+    def self.read(io, wmid, password = nil)
+      if !password.nil?
+
+        header = io.read 30
+        data = io.read
+
+        begin
+          return try_read_encrypted wmid, password, header, data
+        rescue
+          return try_read_encrypted wmid, password[0...password.length / 2], header, data
+        end
+      end
+
+      reserved1, sign_flag = io.read(4).unpack("vv")
+      crc    = io.read(16)
+      length, = io.read(4).unpack("V")
+
+      data = io.read
+      raise "unexpected data length" if length != data.length
+
+      digest = OpenSSL::Digest::MD4.new
+      digest.update [ reserved1, 0 ].pack("v*")
+      digest.update [ 0, 0, 0, 0, length ].pack("V*")
+      digest.update data
+
+      calculated_crc = digest.digest
+
+      raise "invalid key digest" if crc != calculated_crc
+
+      data_io = StringIO.new data[4..-1], 'rb'
+
+      e = read_bn_from data_io
+      n = read_bn_from data_io
+
+      { e: e, n: n }
+    end
+
+    def self.try_read_encrypted(wmid, password, header, data)
+        nested_io = StringIO.new ''.encode('BINARY'), 'rb+'
+        nested_io.write header
+        nested_io.write wm_encrypt(wmid, password, data)
+        nested_io.rewind
+
+        return self.read nested_io, wmid
+    end
+
+    def self.read_bn_from(io)
+      bytes, = io.read(2).unpack("v")
+
+      data = io.read(bytes).reverse
+
+      OpenSSL::BN.new(data, 2)
+    end
+
+    def self.wm_encrypt(wmid, password, data)
+      data = data.dup
+
+      digest = OpenSSL::Digest::MD4.new
+      digest.update wmid
+      digest.update password
+
+      key = digest.digest.unpack("C*")
+      i = 0
+      while i < data.length
+        data[i] = (data[i].ord ^ key[i % key.length]).chr
+
+        i += 1
+      end
+
+      data
+    end
+  end
+
+  def initialize(wmid, password, key)
+    raise ArgumentError, "nil wmid" if wmid.nil?
+    raise ArgumentError, "Incorrect WMID" unless is_wmid wmid
+    raise ArgumentError, "nil password" if password.nil?
+    raise ArgumentError, "nil key" if key.nil?
+    raise ArgumentError, "Illegal size for base64 keydata" unless key.length == 220
+
+    key = Base64.decode64 key
+
+    raise ArgumentError, "Illegal size for keydata" if key.length != 164
+
+    io = StringIO.open key.force_encoding('BINARY'), 'rb'
+    @key = Key.read io, wmid, password
+  end
+
+  def sign(data)
+    raise ArgumentError, "nil data" if data.nil?
+
+    digest = OpenSSL::Digest::MD4.new
+    digest.update data
+    data = digest.digest.unpack("V*")
+
+    10.times do
+      data << SecureRandom.random_number(1 << 32)
+    end
+
+    data = data.pack("V*")
+
+    data = ([ data.length ].pack("v") + data).ljust( @key[:n].num_bytes, 0.chr).reverse
+
+    data_bignum = OpenSSL::BN.new data, 2
+
+    signature = data_bignum.mod_exp(@key[:e], @key[:n])
+
+    signature.to_s(2).rjust(@key[:n].num_bytes, 0.chr).unpack('n*').reverse.map { |w| sprintf '%04x', w }.join
+  end
+
+  protected
+
+  def is_wmid(string)
+    if string =~ /^[0-9]{12}$/
+      true
+    else
+      false
+    end
+  end
+end

data/lib/webmoney.rb

@@ -10,7 +10,7 @@ require 'rubygems'
 require 'nokogiri'
 
 $LOAD_PATH.unshift(File.expand_path(File.dirname(__FILE__) + "/../lib"))
-%w(wmsigner interfaces wmid passport purse request_xml request_retval request_result messenger).each{|lib| require lib}
+%w(signer interfaces wmid passport purse request_xml request_retval request_result messenger).each{|lib| require lib}
 
 # Module for Webmoney lib. Instance contain info
 # for WMT-interfaces requests (wmid, key, etc).
@@ -29,7 +29,7 @@ module Webmoney
   class IncorrectPurseError < WebmoneyError; end
   class NonExistentWmidError < WebmoneyError; end
   class CaCertificateError < WebmoneyError; end
-  
+
   attr_reader :wmid, :error, :errormsg, :last_request, :last_response, :interfaces, :rid
   attr_accessor :messenger
 
@@ -61,14 +61,24 @@ module Webmoney
 
     @wmid = Wmid.new(opt[:wmid])
 
-    # classic or light
-    case opt[:key]
-      when String
-        @signer = Signer.new(@wmid, opt[:password], opt[:key])
-      when OpenSSL::PKey::RSA, OpenSSL::PKey::DSA
-        @key = opt[:key]
-        @cert = opt[:cert]
-        #@password = opt[:password]
+    # When x509, key and cert is path to file or filename in ~/.wm/,
+    # or initialized PKey::RSA and X509::Certificate objects
+    def detect_file(option)
+      pathes = %w(%s ~/.wm/%s)
+      pathes.map{|path| File.expand_path(path % option)}.detect{|path| File.file?(path)}
+    end
+
+    if file = detect_file(opt[:key])
+      # light
+      @key = OpenSSL::PKey::RSA.new(File.read(file), opt[:password])
+      @cert = OpenSSL::X509::Certificate.new(File.read(detect_file(opt[:cert])))
+    elsif opt[:key].is_a? OpenSSL::PKey::RSA
+      # initialized OpenSSL::PKey::RSA objects
+      @key = opt[:key]
+      @cert = opt[:cert]
+    elsif opt[:password]
+      # key is classic base64-encoded key
+      @signer = Signer.new(@wmid, opt[:password], opt[:key])
     end
 
     # ca_cert or default
@@ -240,6 +250,8 @@ module Webmoney
 
   def check_libxml_version
     libxml = Nokogiri::VERSION_INFO['libxml']
+    return true if libxml.nil?
+
     [libxml['compiled'], libxml['loaded']].each do |ver|
       major, minor = ver.match(/^(\d+)\.(\d+).*/).to_a[1,2].map{|i| i.to_i}
       return false if major < 2 or minor < 7

data/rakefile

@@ -3,9 +3,7 @@ require 'rake'
 require 'rake/clean'
 require 'rake/extensiontask'
 
-CLEAN.include ["ext/wmsigner/*.{so,o}", "ext/wmsigner/Makefile", "lib/wmsigner.so", "pkg", "tmp"]
-
-Rake::ExtensionTask.new('wmsigner')
+CLEAN.include ["pkg"]
 
 require 'rspec/core'
 require 'rspec/core/rake_task'
@@ -30,13 +28,6 @@ spec = begin
     gemspec.summary = "Webmoney interfaces and native wmsigner"
     gemspec.files += %w( ChangeLog ) + Dir.glob( 'ssl-certs/*.crt' )
     gemspec.test_files += %w( Gemfile ) + Dir.glob( 'spec/**/*.rb' )
-
-    if RUBY_PLATFORM.match("win32")
-      gemspec.platform = Gem::Platform::WIN32
-      gemspec.files += []
-    else
-      gemspec.platform = Gem::Platform::RUBY
-      gemspec.extensions = Dir.glob( 'ext/**/extconf.rb' )
-    end
+    gemspec.add_dependency "jruby-openssl" if RUBY_PLATFORM == "java"
   end
 end

data/spec/benchmark.rb

@@ -0,0 +1,12 @@
+#!/usr/bin/env ruby
+
+require 'benchmark'
+require "#{File.expand_path File.dirname(__FILE__)}/spec_helper"
+
+@wm = TestWM.new
+n = 100
+puts Benchmark.measure {
+  n.times do
+    @wm.send(:sign, 'abc123')
+  end
+}

data/spec/spec_helper.rb

@@ -32,33 +32,12 @@ class TestWM
 end
 
 def getwm(config)
-  if config.wmtype == "light"
-    # light
-    cert = OpenSSL::X509::Certificate.new(
-      begin
-        File.read(config.cert)
-      rescue
-        File.read("#{ENV['HOME']}/.wm/#{config.cert}")
-      end)
-    key = OpenSSL::PKey::RSA.new(
-      begin
-        File.read(config.key)
-      rescue
-        File.read("#{ENV['HOME']}/.wm/#{config.key}")
-      end, config.password)
-    TestWM.new :wmid => config.wmid,
-      :key => key,
-      :cert => cert,
-      :ca_cert => WmConfig.ca_cert,
-      :rid => config.rid
-  else
-    # classic
-    TestWM.new :wmid => config.wmid,
-      :password => config.password,
-      :key => config.key,
-      :ca_cert => config.ca_cert,
-      :rid => config.rid
-  end
+  TestWM.new :wmid => config.wmid,
+    :key => config.key,
+    :password => config.password,
+    :cert => config.cert,
+    :ca_cert => WmConfig.ca_cert,
+    :rid => config.rid
 end
 
 def webmoney

data/spec/unit/interfaces_spec.rb

@@ -3,8 +3,8 @@ require 'spec_helper'
 
 describe "interfaces url" do
 
-  let(:wmc) { TestWM.new } # classic
-  let(:wml) { TestWM.new :wmid => WmConfig.first['wmid'], :key => nil } # light
+  let(:wmc) { webmoney } # classic
+  let(:wml) { contragent } # light
 
   it "should be exactly type" do
     wmc.should be_classic # @wm.classic? == true

data/webmoney.gemspec

@@ -5,13 +5,12 @@
 
 Gem::Specification.new do |s|
   s.name = "webmoney"
-  s.version = "0.0.14"
+  s.version = "0.0.15.pre"
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = ["Alexander Oryol"]
-  s.date = "2012-10-25"
+  s.date = "2012-11-22"
   s.email = "eagle.alex@gmail.com"
-  s.extensions = ["ext/wmsigner/extconf.rb"]
   s.extra_rdoc_files = [
     "ChangeLog",
     "README.md"
@@ -22,22 +21,6 @@ Gem::Specification.new do |s|
     "README.md",
     "RUNNING_TESTS",
     "VERSION",
-    "ext/wmsigner/base64.cpp",
-    "ext/wmsigner/base64.h",
-    "ext/wmsigner/cmdbase.cpp",
-    "ext/wmsigner/cmdbase.h",
-    "ext/wmsigner/crypto.cpp",
-    "ext/wmsigner/crypto.h",
-    "ext/wmsigner/extconf.rb",
-    "ext/wmsigner/md4.cpp",
-    "ext/wmsigner/md4.h",
-    "ext/wmsigner/rsalib1.cpp",
-    "ext/wmsigner/rsalib1.h",
-    "ext/wmsigner/signer.cpp",
-    "ext/wmsigner/signer.h",
-    "ext/wmsigner/stdafx.cpp",
-    "ext/wmsigner/stdafx.h",
-    "ext/wmsigner/wmsigner.cpp",
     "lib/interfaces.rb",
     "lib/messenger.rb",
     "lib/passport.rb",
@@ -45,9 +28,11 @@ Gem::Specification.new do |s|
     "lib/request_result.rb",
     "lib/request_retval.rb",
     "lib/request_xml.rb",
+    "lib/signer.rb",
     "lib/webmoney.rb",
     "lib/wmid.rb",
     "rakefile",
+    "spec/benchmark.rb",
     "spec/spec_helper.rb",
     "spec/unit/balance_spec.rb",
     "spec/unit/check_user.rb",
@@ -71,7 +56,7 @@ Gem::Specification.new do |s|
   s.rubyforge_project = "webmoney"
   s.rubygems_version = "1.8.24"
   s.summary = "Webmoney interfaces and native wmsigner"
-  s.test_files = ["Gemfile", "spec/spec_helper.rb", "spec/unit/balance_spec.rb", "spec/unit/purse_spec.rb", "spec/unit/time_spec.rb", "spec/unit/check_user.rb", "spec/unit/interfaces_spec.rb", "spec/unit/messenger_spec.rb", "spec/unit/signer_spec.rb", "spec/unit/passport_spec.rb", "spec/unit/trust_spec.rb", "spec/unit/wmid_spec.rb", "spec/unit/login_spec.rb", "spec/unit/webmoney_spec.rb", "spec/unit/iconv_spec.rb"]
+  s.test_files = ["Gemfile", "spec/spec_helper.rb", "spec/benchmark.rb", "spec/unit/balance_spec.rb", "spec/unit/purse_spec.rb", "spec/unit/time_spec.rb", "spec/unit/check_user.rb", "spec/unit/interfaces_spec.rb", "spec/unit/messenger_spec.rb", "spec/unit/signer_spec.rb", "spec/unit/passport_spec.rb", "spec/unit/trust_spec.rb", "spec/unit/wmid_spec.rb", "spec/unit/login_spec.rb", "spec/unit/webmoney_spec.rb", "spec/unit/iconv_spec.rb"]
 
   if s.respond_to? :specification_version then
     s.specification_version = 3

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: webmoney
 version: !ruby/object:Gem::Version
-  version: 0.0.14
-  prerelease: 
+  version: 0.0.15.pre
+  prerelease: 7
 platform: ruby
 authors:
 - Alexander Oryol
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-25 00:00:00.000000000 Z
+date: 2012-11-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -94,8 +94,7 @@ dependencies:
 description: 
 email: eagle.alex@gmail.com
 executables: []
-extensions:
-- ext/wmsigner/extconf.rb
+extensions: []
 extra_rdoc_files:
 - ChangeLog
 - README.md
@@ -105,22 +104,6 @@ files:
 - README.md
 - RUNNING_TESTS
 - VERSION
-- ext/wmsigner/base64.cpp
-- ext/wmsigner/base64.h
-- ext/wmsigner/cmdbase.cpp
-- ext/wmsigner/cmdbase.h
-- ext/wmsigner/crypto.cpp
-- ext/wmsigner/crypto.h
-- ext/wmsigner/extconf.rb
-- ext/wmsigner/md4.cpp
-- ext/wmsigner/md4.h
-- ext/wmsigner/rsalib1.cpp
-- ext/wmsigner/rsalib1.h
-- ext/wmsigner/signer.cpp
-- ext/wmsigner/signer.h
-- ext/wmsigner/stdafx.cpp
-- ext/wmsigner/stdafx.h
-- ext/wmsigner/wmsigner.cpp
 - lib/interfaces.rb
 - lib/messenger.rb
 - lib/passport.rb
@@ -128,9 +111,11 @@ files:
 - lib/request_result.rb
 - lib/request_retval.rb
 - lib/request_xml.rb
+- lib/signer.rb
 - lib/webmoney.rb
 - lib/wmid.rb
 - rakefile
+- spec/benchmark.rb
 - spec/spec_helper.rb
 - spec/unit/balance_spec.rb
 - spec/unit/check_user.rb
@@ -163,13 +148,13 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1774018962906030977
+      hash: 3598956069163173329
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: webmoney
 rubygems_version: 1.8.24
@@ -179,6 +164,7 @@ summary: Webmoney interfaces and native wmsigner
 test_files:
 - Gemfile
 - spec/spec_helper.rb
+- spec/benchmark.rb
 - spec/unit/balance_spec.rb
 - spec/unit/purse_spec.rb
 - spec/unit/time_spec.rb