bnet-authenticator 0.1.6 → 0.1.8

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 0d94b65670bd3f1a4459dd364e9849c926ac646d
+  data.tar.gz: 78084b93e3e2a87566e2a3526211f2e5680fd1bc
+SHA512:
+  metadata.gz: 92a2c1dd5afe2bb2b3affdf3746c7221f19e549988aa03dcd3908053d0fe90e0d444d49e4d653838ba728d849c1f09094c70e6c9f2beb151797f09efd273aeb7
+  data.tar.gz: f29318c63c651cc07f600c4e56233248480d7e195e059dcbc65dc9be02bb302c7c63d6c751ae2fe97508fed07bbb74ab273f1dad38767899ee1ebebcea88f4a7

data/README.md

@@ -1,39 +1,51 @@
-Bnet::Authenticator
-====
+# Bnet::Authenticator
 Ruby implementation of the Battle.net Mobile Authenticator.
 
-[![Gem Version](https://badge.fury.io/rb/bnet-authenticator.png)](http://badge.fury.io/rb/bnet-authenticator)
+[![Gem Version](http://img.shields.io/gem/v/bnet-authenticator.svg?style=flat)](http://badge.fury.io/rb/bnet-authenticator)
+[![Dependency Status](http://img.shields.io/gemnasium/dorentus/bnet-authenticator.svg?style=flat)](https://gemnasium.com/dorentus/bnet-authenticator)
 
-[![Build Status](https://travis-ci.org/dorentus/bnet-authenticator.svg?branch=master)](https://travis-ci.org/dorentus/bnet-authenticator) [![Dependency Status](https://gemnasium.com/dorentus/bnet-authenticator.png)](https://gemnasium.com/dorentus/bnet-authenticator) [![Coverage Status](https://coveralls.io/repos/dorentus/bnet-authenticator/badge.png)](https://coveralls.io/r/dorentus/bnet-authenticator) [![Code Climate](https://codeclimate.com/github/dorentus/bnet-authenticator.png)](https://codeclimate.com/github/dorentus/bnet-authenticator)
+[![Build Status](http://img.shields.io/travis/dorentus/bnet-authenticator.svg?style=flat)](https://travis-ci.org/dorentus/bnet-authenticator)
 
-Installation
-====
-    $ [sudo] gem install bnet-authenticator
+[![Coverage Status](http://img.shields.io/coveralls/dorentus/bnet-authenticator.svg?style=flat)](https://coveralls.io/r/dorentus/bnet-authenticator)
 
-Using the library
-====
-    >> require 'bnet/authenticator'
+[![Code Climate](http://img.shields.io/codeclimate/github/dorentus/bnet-authenticator.svg?style=flat)](https://codeclimate.com/github/dorentus/bnet-authenticator)
+[![Coverage Status from Code Climate](http://img.shields.io/codeclimate/coverage/github/dorentus/bnet-authenticator.svg?style=flat)](https://codeclimate.com/github/dorentus/bnet-authenticator)
 
-Request a new authenticator
-----
-    >> authenticator = Bnet::Authenticator.request_authenticator(:US)
-    => #<Bnet::Authenticator:0x007f83599ae848 @serial="US-1403-1677-5336", @secret="33a107e6a2927a2aa1be99cfe7b2d08c092a7a2a", @region=:US, @restorecode="4YV9XZVNMX">
+<sub>FYI: Badge images provided by http://shields.io/</sub>
 
-Get a token
-----
-    >> authenticator.get_token
-    => ["18338810", 1394965110]
+## Installation
+```bash
+$ [sudo] gem install bnet-authenticator
+```
 
-Restore an authenticator from server
-----
-    >> Bnet::Authenticator.restore_authenticator('CN-1402-1943-1283', '4CKBN08QEB')
-    => #<Bnet::Authenticator:0x007f83599cf458 @serial="CN-1402-1943-1283", @secret="4202aa2182640745d8a807e0fe7e34b30c1edb23", @region=:CN, @restorecode="4CKBN08QEB">
+## Using the library
+```irb
+>> require 'bnet/authenticator'
+```
 
-Initialize an authenticator with given serial and secret
-----
-    >> Bnet::Authenticator.new('CN-1402-1943-1283', '4202aa2182640745d8a807e0fe7e34b30c1edb23')
-    => #<Bnet::Authenticator:0x007f8359a17500 @serial="CN-1402-1943-1283", @secret="4202aa2182640745d8a807e0fe7e34b30c1edb23", @region=:CN, @restorecode="4CKBN08QEB">
+### Request a new authenticator
+```irb
+>> authenticator = Bnet::Authenticator.request_authenticator(:US)
+=> {:serial=>"US-1405-0242-3258", :secret=>"778275450e5c3e092bc4fe901cd7c11241166c88", :restorecode=>"0WCRH9Z926", :region=>:US}
+```
 
-Using the command-line tool
-====
+### Get a token
+```irb
+>> authenticator.get_token
+=> ["38530888", 1399038930]
+```
+
+### Restore an authenticator from server
+```irb
+>> Bnet::Authenticator.restore_authenticator('CN-1402-1943-1283', '4CKBN08QEB')
+=> {:serial=>"CN-1402-1943-1283", :secret=>"4202aa2182640745d8a807e0fe7e34b30c1edb23", :restorecode=>"4CKBN08QEB", :region=>:CN}
+```
+
+### Initialize an authenticator with given serial and secret
+```irb
+>> Bnet::Authenticator.new('CN-1402-1943-1283', '4202aa2182640745d8a807e0fe7e34b30c1edb23')
+=> {:serial=>"CN-1402-1943-1283", :secret=>"4202aa2182640745d8a807e0fe7e34b30c1edb23", :restorecode=>"4CKBN08QEB", :region=>:CN}
+```
+
+## Using the command-line tool
 Run `bna` and follow instructions.

data/bnet-authenticator.gemspec

@@ -17,10 +17,11 @@ Gem::Specification.new do |s|
   s.required_ruby_version = '>= 1.9.3'
 
   if s.respond_to?(:add_development_dependency)
-    s.add_development_dependency 'rake', '~> 10.1'
-    s.add_development_dependency 'minitest', '~> 5.0'
-    s.add_development_dependency 'yard', '~> 0.8'
-    s.add_development_dependency 'coveralls', '~> 0.7'
+    s.add_development_dependency 'rake'
+    s.add_development_dependency 'minitest'
+    s.add_development_dependency 'yard'
+    s.add_development_dependency 'coveralls'
+    s.add_development_dependency 'codeclimate-test-reporter'
   end
 
   s.files         = `git ls-files`.split("\n") - %w(.travis.yml .gitignore)

data/lib/bnet/attributes/restorecode.rb

@@ -0,0 +1,34 @@
+require 'digest/sha1'
+
+module Bnet
+  module Attributes
+    class Restorecode
+      attr_reader :text
+
+      def initialize(serial_or_restorecode, secret = nil)
+        if secret.nil?
+          restorecode = serial_or_restorecode
+          raise BadInputError.new("bad restoration code #{restorecode}") unless restorecode =~ /[0-9A-Z]{10}/
+          @text = restorecode
+        else
+          serial = serial_or_restorecode.is_a?(Serial) ? serial_or_restorecode : Serial.new(serial_or_restorecode)
+          secret = Secret.new secret unless secret.is_a?(Secret)
+
+          bin = Digest::SHA1.digest(serial.normalized + secret.binary)
+
+          @text = bin.split(//).last(10).join.bytes.map do |v|
+            RESTORECODE_MAP[v & 0x1f]
+          end.pack('C*')
+        end
+      end
+
+      def binary
+        text.bytes.map do |c|
+          RESTORECODE_MAP_INVERSE[c]
+        end.pack('C*')
+      end
+
+      alias_method :to_s, :text
+    end
+  end
+end

data/lib/bnet/attributes/secret.rb

@@ -0,0 +1,25 @@
+module Bnet
+  module Attributes
+    class Secret
+      attr_reader :text
+
+      def initialize(secret)
+        secret = secret.to_s
+
+        if secret =~ /[0-9a-f]{40}/i
+          @text = secret
+        elsif secret.length == 20  # treated as binary input
+          @text = secret.unpack('C*').map{ |i| i.to_s(16).rjust(2, '0') }.join
+        else
+          raise BadInputError.new("bad secret #{secret}")
+        end
+      end
+
+      def binary
+        text.scan(/.{2}/).map{|s| s.to_i(16)}.pack('C*')
+      end
+
+      alias_method :to_s, :text
+    end
+  end
+end

data/lib/bnet/attributes/serial.rb

@@ -0,0 +1,23 @@
+module Bnet
+  module Attributes
+    class Serial
+      attr_reader :normalized
+
+      def initialize(serial)
+        serial = serial.to_s.upcase.gsub(/-/, '')
+        raise BadInputError.new("bad serial #{serial}") unless serial =~ Regexp.new("^(#{AUTHENTICATOR_HOSTS.keys.join('|')})\\d{12}$")
+        @normalized = serial
+      end
+
+      def prettified
+        "#{normalized[0, 2]}-" + normalized[2, 12].scan(/.{4}/).join('-')
+      end
+
+      def region
+        normalized[0, 2].upcase.to_sym
+      end
+
+      alias_method :to_s, :prettified
+    end
+  end
+end

data/lib/bnet/authenticator.rb

@@ -1,52 +1,51 @@
 require 'bnet/errors'
-require 'bnet/authenticator_helper'
+require 'bnet/constants'
+
+require 'bnet/attributes/serial'
+require 'bnet/attributes/secret'
+require 'bnet/attributes/restorecode'
+
+require 'bnet/authenticator/core'
 
 module Bnet
 
   # The Battle.net authenticator
   class Authenticator
-    include AuthenticatorHelper
 
     # @!attribute [r] serial
     # @return [String] serial
-    def serial
-      self.class.prettify_serial(@normalized_serial)
-    end
+    attr_reader :serial
 
     # @!attribute [r] secret
-    # @return [String] hexified secret
+    # @return [String] hexlified secret
     attr_reader :secret
 
     # @!attribute [r] restorecode
     # @return [String] restoration code
-    def restorecode
-      restorecode_bin = Digest::SHA1.digest(@normalized_serial + secret.as_hex_to_bin)
-      self.class.encode_restorecode(restorecode_bin.split(//).last(10).join)
-    end
+    attr_reader :restorecode
 
     # @!attribute [r] region
     # @return [Symbol] region
-    def region
-      self.class.extract_region(@normalized_serial)
-    end
+    attr_reader :region
 
     # Create a new authenticator with given serial and secret
     # @param serial [String]
     # @param secret [String]
     def initialize(serial, secret)
-      raise BadInputError.new("bad serial #{serial}") unless self.class.is_valid_serial?(serial)
-      raise BadInputError.new("bad secret #{secret}") unless self.class.is_valid_secret?(secret)
-
-      @normalized_serial = self.class.normalize_serial(serial)
-      @secret = secret
+      serial = Bnet::Attributes::Serial.new serial
+      secret = Bnet::Attributes::Secret.new secret
+      restorecode = Bnet::Attributes::Restorecode.new serial, secret
+
+      @serial = serial.to_s
+      @secret = secret.to_s
+      @restorecode = restorecode.to_s
+      @region = serial.region
     end
 
     # Request a new authenticator from server
     # @param region [Symbol]
     # @return [Bnet::Authenticator]
     def self.request_authenticator(region)
-      raise BadInputError.new("bad region #{region}") unless is_valid_region?(region)
-
       k = create_one_time_pad(37)
 
       payload_plain = "\1" + k + region.to_s + CLIENT_MODEL.ljust(16, "\0")[0, 16]
@@ -56,7 +55,7 @@ module Bnet
 
       decrypted = decrypt_response(response_body[8, 37], k)
 
-      Authenticator.new(decrypted[20, 17], decrypted[0, 20].as_bin_to_hex)
+      Authenticator.new(decrypted[20, 17], decrypted[0, 20])
     end
 
     # Restore an authenticator from server
@@ -64,35 +63,36 @@ module Bnet
     # @param restorecode [String]
     # @return [Bnet::Authenticator]
     def self.restore_authenticator(serial, restorecode)
-      raise BadInputError.new("bad serial #{serial}") unless is_valid_serial?(serial)
-      raise BadInputError.new("bad restoration code #{restorecode}") unless is_valid_restorecode?(restorecode)
-
-      normalized_serial = normalize_serial(serial)
-      region = extract_region(normalized_serial)
+      serial = Bnet::Attributes::Serial.new serial
+      restorecode = Bnet::Attributes::Restorecode.new restorecode
 
       # stage 1
-      challenge = request_for('restore (stage 1)', region, RESTORE_INIT_REQUEST_PATH, normalized_serial)
+      challenge = request_for('restore (stage 1)',
+                              serial.region,
+                              RESTORE_INIT_REQUEST_PATH,
+                              serial.normalized)
 
       # stage 2
       key = create_one_time_pad(20)
 
-      digest = Digest::HMAC.digest(normalized_serial + challenge,
-                                   decode_restorecode(restorecode),
+      digest = Digest::HMAC.digest(serial.normalized + challenge,
+                                   restorecode.binary,
                                    Digest::SHA1)
 
-      payload = normalized_serial + rsa_encrypt_bin(digest + key)
+      payload = serial.normalized + rsa_encrypt_bin(digest + key)
 
-      response_body = request_for('restore (stage 2)', region, RESTORE_VALIDATE_REQUEST_PATH, payload)
+      response_body = request_for('restore (stage 2)',
+                                  serial.region,
+                                  RESTORE_VALIDATE_REQUEST_PATH,
+                                  payload)
 
-      Authenticator.new(prettify_serial(normalized_serial), decrypt_response(response_body, key).as_bin_to_hex)
+      Authenticator.new(serial, decrypt_response(response_body, key))
     end
 
     # Get server's time
     # @param region [Symbol]
     # @return [Integer] server timestamp in seconds
     def self.request_server_time(region)
-      raise BadInputError.new("bad region #{region}") unless is_valid_region?(region)
-
       server_time_big_endian = request_for('server time', region, TIME_REQUEST_PATH)
       server_time_big_endian.unpack('Q>')[0].to_f / 1000
     end
@@ -103,10 +103,10 @@ module Bnet
     #   defaults to current time
     # @return [String, Integer] token and the next timestamp token to change
     def self.get_token(secret, timestamp = nil)
-      raise BadInputError.new("bad seret #{secret}") unless is_valid_secret?(secret)
+      secret = Bnet::Attributes::Secret.new secret
 
       current = (timestamp || Time.now.getutc.to_i) / 30
-      digest = Digest::HMAC.digest([current].pack('Q>'), secret.as_hex_to_bin, Digest::SHA1)
+      digest = Digest::HMAC.digest([current].pack('Q>'), secret.binary, Digest::SHA1)
       start_position = digest[19].ord & 0xf
 
       token = digest[start_position, 4].unpack('L>')[0] & 0x7fffffff
@@ -119,7 +119,7 @@ module Bnet
     #   defaults to current time
     # @return [String, Integer] token and the next timestamp token to change
     def get_token(timestamp = nil)
-      self.class.get_token(@secret, timestamp)
+      self.class.get_token(secret, timestamp)
     end
 
     # Hash representation of this authenticator

data/lib/bnet/authenticator/core.rb

@@ -0,0 +1,50 @@
+require 'net/http'
+require 'digest/sha1'
+
+module Bnet
+
+  class Authenticator
+
+    class << self
+
+      def create_one_time_pad(length)
+        (0..1.0/0.0).reduce('') do |memo, i|
+          break memo if memo.length >= length
+          memo << Digest::SHA1.hexdigest(rand().to_s)
+        end[0, length]
+      end
+
+      def decrypt_response(text, key)
+        text.bytes.zip(key.bytes).reduce('') do |memo, pair|
+          memo + (pair[0] ^ pair[1]).chr
+        end
+      end
+
+      def rsa_encrypt_bin(bin)
+        i = bin.unpack('C*').map{ |i| i.to_s(16).rjust(2, '0') }.join.to_i(16)
+        (i ** RSA_KEY % RSA_MOD).to_s(16).scan(/.{2}/).map {|s| s.to_i(16)}.pack('C*')
+      end
+
+      def request_for(label, region, path, body = nil)
+        raise BadInputError.new("bad region #{region}") unless AUTHENTICATOR_HOSTS.has_key? region
+
+        request = body.nil? ? Net::HTTP::Get.new(path) : Net::HTTP::Post.new(path)
+        request.content_type = 'application/octet-stream'
+        request.body = body unless body.nil?
+
+        response = Net::HTTP.new(AUTHENTICATOR_HOSTS[region]).start do |http|
+          http.request request
+        end
+
+        if response.code.to_i != 200
+          raise RequestFailedError.new("Error requesting #{label}: #{response.code}")
+        end
+
+        response.body
+      end
+
+    end
+
+  end
+
+end

data/lib/bnet/authenticator/version.rb

@@ -1,5 +1,5 @@
 module Bnet
   class Authenticator
-    VERSION = "0.1.6"
+    VERSION = "0.1.8"
   end
 end

data/lib/bnet/commands/token.rb

@@ -26,7 +26,6 @@ module Bnet
 
         token, next_timestamp = Authenticator.get_token(secret)
 
-        puts token
         if @options.repeat
           interrupted = false
           trap("INT") { interrupted = true } # traps Ctrl-C
@@ -35,21 +34,22 @@ module Bnet
             sleep 1
 
             if Time.now.getutc.to_i < next_timestamp
-              print_countdown(next_timestamp - Time.now.getutc.to_i)
+              seconds = next_timestamp - Time.now.getutc.to_i
+              h, c = color_of(seconds)
+              puts "\e[s\e[%d;%dm\e[5m%02d\e[25m\t->\t%s\t<-\e[1A\e[0m\e[u" % [h, c, seconds, token]
               next
             end
 
             token, next_timestamp = Authenticator.get_token(secret)
-            puts token
           end
+        else
+          puts token
         end
       end
 
       private
 
-      def print_countdown(seconds, output = $stdout)
-        return unless output.tty?
-
+      def color_of(seconds)
         case
           when seconds > 25 then h, c = 1, 32
           when seconds > 20 then h, c = 0, 32
@@ -60,7 +60,7 @@ module Bnet
             h, c = 1, 31
         end
 
-        output.puts "\e[%d;%dm%02d\e[1A\e[0m" % [h, c, seconds]
+        [h, c]
       end
 
     end

data/lib/bnet/constants.rb

@@ -1,31 +1,34 @@
 module Bnet
 
   CLIENT_MODEL = 'bn/authenticator'
-  RSA_MOD = 104890018807986556874007710914205443157030159668034197186125678960287470894290830530618284943118405110896322835449099433232093151168250152146023319326491587651685252774820340995950744075665455681760652136576493028733914892166700899109836291180881063097461175643998356321993663868233366705340758102567742483097
+  RSA_MOD = "955e4bd989f3917d2f15544a7e0504eb\
+             9d7bb66b6f8a2fe470e453c779200e5e\
+             3ad2e43a02d06c4adbd8d328f1a426b8\
+             3658e88bfd949b2af4eaf30054673a14\
+             19a250fa4cc1278d12855b5b25818d16\
+             2c6e6ee2ab4a350d401d78f6ddb99711\
+             e72626b48bd8b5b0b7f3acf9ea3c9e00\
+             05fee59e19136cdb7c83f2ab8b0a2a99".gsub(/\s+/, '').to_i(16)
   RSA_KEY = 257
   AUTHENTICATOR_HOSTS = {
     :CN => "mobile-service.battlenet.com.cn",
-    :EU => "m.eu.mobileservice.blizzard.com",
-    :US => "m.us.mobileservice.blizzard.com",
+    :EU => "mobile-service.blizzard.com",
+    :US => "mobile-service.blizzard.com",
   }
   ENROLLMENT_REQUEST_PATH = '/enrollment/enroll.htm'
   TIME_REQUEST_PATH = '/enrollment/time.htm'
   RESTORE_INIT_REQUEST_PATH = '/enrollment/initiatePaperRestore.htm'
   RESTORE_VALIDATE_REQUEST_PATH = '/enrollment/validatePaperRestore.htm'
 
-  RESTORECODE_MAP = (0..32).reduce({}) do |memo, c|
-    memo[c] = case
-                when c < 10 then c + 48
-                else
-                  c += 55
-                  c += 1 if c > 72  # S
-                  c += 1 if c > 75  # O
-                  c += 1 if c > 78  # L
-                  c += 1 if c > 82  # I
-                  c
-              end
-    memo
-  end
+  RESTORECODE_MAP = {
+    0=>48,  1=>49,  2=>50,  3=>51,  4=>52,
+    5=>53,  6=>54,  7=>55,  8=>56,  9=>57,
+    10=>65, 11=>66, 12=>67, 13=>68, 14=>69,
+    15=>70, 16=>71, 17=>72, 18=>74, 19=>75,
+    20=>77, 21=>78, 22=>80, 23=>81, 24=>82,
+    25=>84, 26=>85, 27=>86, 28=>87, 29=>88,
+    30=>89, 31=>90, 32=>91
+  }
   RESTORECODE_MAP_INVERSE = RESTORECODE_MAP.invert
 
 end

data/test/test_battlenet_authenticator.rb

@@ -1,6 +1,9 @@
 require 'coveralls'
 Coveralls.wear_merged!
 
+require 'codeclimate-test-reporter'
+CodeClimate::TestReporter.start
+
 gem "minitest"
 require 'minitest/autorun'
 require 'bnet/authenticator'
@@ -18,21 +21,25 @@ class Bnet::AuthenticatorTest < Minitest::Test
 
   def test_argument_error
     assert_raises ::Bnet::BadInputError do
-      Bnet::Authenticator.new('ABC', '')
+      Bnet::Authenticator.new 'ABC', ''
+    end
+
+    assert_raises ::Bnet::BadInputError do
+      Bnet::Authenticator.new DEFAULT_SERIAL, 'ASDF'
     end
 
     assert_raises ::Bnet::BadInputError do
-      Bnet::Authenticator.request_authenticator('SG')
+      Bnet::Authenticator.request_authenticator 'SG'
     end
 
     assert_raises ::Bnet::BadInputError do
-      Bnet::Authenticator.restore_authenticator('DDDD', 'EEE')
+      Bnet::Authenticator.restore_authenticator 'DDDD', 'EEE'
     end
   end
 
   def test_request_new_serial
     begin
-      authenticator = Bnet::Authenticator.request_authenticator(:US)
+      authenticator = Bnet::Authenticator.request_authenticator :US
       assert_equal :US, authenticator.region
       refute_nil authenticator.serial
       refute_nil authenticator.secret
@@ -59,6 +66,10 @@ class Bnet::AuthenticatorTest < Minitest::Test
     end
   end
 
+  def test_bin
+    assert_equal true, system("ruby -Ilib bin/bna", :out => "/dev/null")
+  end
+
   private
 
   def is_default_authenticator(authenticator)
@@ -69,5 +80,6 @@ class Bnet::AuthenticatorTest < Minitest::Test
     assert_equal ['61459300', 1347279360], authenticator.get_token(1347279358)
     assert_equal ['61459300', 1347279360], authenticator.get_token(1347279359)
     assert_equal ['75939986', 1347279390], authenticator.get_token(1347279360)
+    assert_equal ['59914793', 1370448030], authenticator.get_token(1370448000)
   end
 end

metadata

@@ -1,80 +1,85 @@
 --- !ruby/object:Gem::Specification
 name: bnet-authenticator
 version: !ruby/object:Gem::Version
-  version: 0.1.6
-  prerelease: 
+  version: 0.1.8
 platform: ruby
 authors:
 - ZHANG Yi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-09 00:00:00.000000000 Z
+date: 2017-04-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.1'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.1'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: coveralls
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: codeclimate-test-reporter
+  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: Ruby implementation of the Battle.net Mobile Authenticator
 email:
 - zhangyi.cn@gmail.com
@@ -83,16 +88,19 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .yardopts
+- ".yardopts"
 - COPYING
 - Gemfile
 - README.md
 - Rakefile
 - bin/bna
 - bnet-authenticator.gemspec
+- lib/bnet/attributes/restorecode.rb
+- lib/bnet/attributes/secret.rb
+- lib/bnet/attributes/serial.rb
 - lib/bnet/authenticator.rb
+- lib/bnet/authenticator/core.rb
 - lib/bnet/authenticator/version.rb
-- lib/bnet/authenticator_helper.rb
 - lib/bnet/command.rb
 - lib/bnet/commands/help.rb
 - lib/bnet/commands/info.rb
@@ -101,33 +109,30 @@ files:
 - lib/bnet/commands/token.rb
 - lib/bnet/constants.rb
 - lib/bnet/errors.rb
-- lib/bnet/support.rb
 - test/test_battlenet_authenticator.rb
 homepage: https://github.com/dorentus/bnet-authenticator
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.6.7
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Battle.net Mobile Authenticator
 test_files:
 - test/test_battlenet_authenticator.rb
-has_rdoc: 

data/lib/bnet/authenticator_helper.rb

@@ -1,95 +0,0 @@
-require 'bnet/support'
-require 'bnet/constants'
-require 'digest/sha1'
-require 'digest/hmac'
-require 'net/http'
-
-module Bnet
-
-  module AuthenticatorHelper
-
-    def self.included(base)
-
-      class << base
-
-        def is_valid_serial?(serial)
-          normalized_serial = normalize_serial(serial)
-          normalized_serial =~ Regexp.new("^(#{AUTHENTICATOR_HOSTS.keys.join('|')})\\d{12}$") && is_valid_region?(extract_region(normalized_serial))
-        end
-
-        def normalize_serial(serial)
-          serial.upcase.gsub(/-/, '')
-        end
-
-        def extract_region(serial)
-          serial[0, 2].upcase.to_sym
-        end
-
-        def prettify_serial(serial)
-          "#{serial[0, 2]}-" + serial[2, 12].scan(/.{4}/).join('-')
-        end
-
-        def is_valid_secret?(secret)
-          secret =~ /[0-9a-f]{40}/i
-        end
-
-        def is_valid_region?(region)
-          AUTHENTICATOR_HOSTS.has_key? region
-        end
-
-        def is_valid_restorecode?(restorecode)
-          restorecode =~ /[0-9A-Z]{10}/
-        end
-
-        def encode_restorecode(bin)
-          bin.bytes.map do |v|
-            RESTORECODE_MAP[v & 0x1f]
-          end.as_bytes_to_bin
-        end
-
-        def decode_restorecode(str)
-          str.bytes.map do |c|
-            RESTORECODE_MAP_INVERSE[c]
-          end.as_bytes_to_bin
-        end
-
-        def create_one_time_pad(length)
-          (0..1.0/0.0).reduce('') do |memo, i|
-            break memo if memo.length >= length
-            memo << Digest::SHA1.hexdigest(rand().to_s)
-          end[0, length]
-        end
-
-        def decrypt_response(text, key)
-          text.bytes.zip(key.bytes).reduce('') do |memo, pair|
-            memo + (pair[0] ^ pair[1]).chr
-          end
-        end
-
-        def rsa_encrypt_bin(bin)
-          (bin.as_bin_to_i ** RSA_KEY % RSA_MOD).to_bin
-        end
-
-        def request_for(label, region, path, body = nil)
-          request = body.nil? ? Net::HTTP::Get.new(path) : Net::HTTP::Post.new(path)
-          request.content_type = 'application/octet-stream'
-          request.body = body unless body.nil?
-
-          response = Net::HTTP.new(AUTHENTICATOR_HOSTS[region]).start do |http|
-            http.request request
-          end
-
-          if response.code.to_i != 200
-            raise RequestFailedError.new("Error requesting #{label}: #{response.code}")
-          end
-
-          response.body
-        end
-
-      end
-
-    end
-
-  end
-
-end

data/lib/bnet/support.rb

@@ -1,63 +0,0 @@
-module Bnet
-
-  module Support
-
-    module Array
-
-      def as_bytes_to_bin
-        pack('C*')
-      end
-
-      def as_bytes_to_hex
-        '%02x' * length % self
-      end
-
-      def as_bytes_to_i
-        as_bytes_to_hex.to_i(16)
-      end
-
-    end
-
-    module Integer
-
-      def to_bytes
-        to_s(16).scan(/.{2}/).map {|s| s.to_i(16)}
-      end
-
-      def to_bin
-        to_bytes.as_bytes_to_bin
-      end
-
-    end
-
-    module String
-
-      def as_bin_to_i
-        bytes.to_a.as_bytes_to_i
-      end
-
-      def as_bin_to_hex
-        bytes.to_a.as_bytes_to_hex
-      end
-
-      def as_hex_to_bin
-        to_i(16).to_bytes.as_bytes_to_bin
-      end
-
-    end
-
-  end
-
-end
-
-class Array
-  include Bnet::Support::Array
-end
-
-class Integer
-  include Bnet::Support::Integer
-end
-
-class String
-  include Bnet::Support::String
-end