bnet-authenticator 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f4191aafea73d608b418b1f57cc796f0b893c8eb
-  data.tar.gz: fe976d92aa9851508812f3d262a903d0996bc32c
+  metadata.gz: 82d4b4048774174d05fac51442d1fa7314c0cff7
+  data.tar.gz: 79a85eaf15072ae7548b87eabbc344d5161e6fef
 SHA512:
-  metadata.gz: 50f3ae4f46910cc95f96dd2e0b4736834c64711b9ba95ddf8a25b2951a3cf0e58197a287afad49df109bed7dc800a28023f345e5b881866566168ac6a3c8c947
-  data.tar.gz: 7be05aeeb5a6136f0a0fc4ca45fc64e80d29a793d9cb8902c99cf2d0dcff6f4e32c763b7b4873ee69a05ed918925b2c8a8d1447d715721a7c5d86499138e4aca
+  metadata.gz: 7d2ac8f76a5e66e123f93ff4b44d4940222eb6eaa6d95c390c5944d4c95420661738d7e65ce87e042e2092b1348d0fb8c2535ca0b42f0af7549f90bb887904b2
+  data.tar.gz: 2844c2afa341884aec85670c6c1d814381bf264d4f87c8b22b867fc756eae790b5b36a4ae286ec2f0f5517ed7bab3785ce51731ea23330830edc1e10c887a194

data/lib/bnet/authenticator.rb

@@ -1,14 +1,11 @@
-require 'bnet/support'
-require 'bnet/authenticator/errors'
-require 'bnet/authenticator/constants'
-require 'digest/sha1'
-require 'digest/hmac'
-require 'net/http'
+require 'bnet/errors'
+require 'bnet/authenticator_helper'
 
 module Bnet
 
   # The Battle.net authenticator
   class Authenticator
+    include AuthenticatorHelper
 
     # @!attribute [r] serial
     # @return [String] serial
@@ -137,83 +134,6 @@ module Bnet
       to_hash.to_s
     end
 
-    class << self
-      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.digest(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_encrypted(integer)
-        (integer ** 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

data/lib/bnet/authenticator/version.rb

@@ -1,5 +1,5 @@
 module Bnet
   class Authenticator
-    VERSION = "0.1.3"
+    VERSION = "0.1.4"
   end
 end

data/lib/bnet/authenticator_helper.rb

@@ -0,0 +1,95 @@
+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.digest(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_encrypted(integer)
+          (integer ** 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/command.rb

@@ -42,7 +42,7 @@ module Bnet
 
       begin
         run
-      rescue Bnet::Authenticator::BadInputError, Bnet::Authenticator::RequestFailedError => e
+      rescue Bnet::BadInputError, Bnet::RequestFailedError => e
         raise Bnet::InvalidCommandException.new(e.message, name.to_sym)
       end
     end

data/lib/bnet/constants.rb

@@ -0,0 +1,31 @@
+module Bnet
+
+  CLIENT_MODEL = 'bn/authenticator'
+  RSA_MOD = 104890018807986556874007710914205443157030159668034197186125678960287470894290830530618284943118405110896322835449099433232093151168250152146023319326491587651685252774820340995950744075665455681760652136576493028733914892166700899109836291180881063097461175643998356321993663868233366705340758102567742483097
+  RSA_KEY = 257
+  AUTHENTICATOR_HOSTS = {
+    :CN => "mobile-service.battlenet.com.cn",
+    :EU => "m.eu.mobileservice.blizzard.com",
+    :US => "m.us.mobileservice.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_INVERSE = RESTORECODE_MAP.invert
+
+end

data/lib/bnet/errors.rb

@@ -0,0 +1,6 @@
+module Bnet
+
+  class RequestFailedError < StandardError; end
+  class BadInputError < StandardError; end
+
+end

data/test/test_battlenet_authenticator.rb

@@ -17,15 +17,15 @@ class Bnet::AuthenticatorTest < Minitest::Test
   end
 
   def test_argument_error
-    assert_raises ::Bnet::Authenticator::BadInputError do
+    assert_raises ::Bnet::BadInputError do
       Bnet::Authenticator.new('ABC', '')
     end
 
-    assert_raises ::Bnet::Authenticator::BadInputError do
+    assert_raises ::Bnet::BadInputError do
       Bnet::Authenticator.request_authenticator('SG')
     end
 
-    assert_raises ::Bnet::Authenticator::BadInputError do
+    assert_raises ::Bnet::BadInputError do
       Bnet::Authenticator.restore_authenticator('DDDD', 'EEE')
     end
   end
@@ -37,7 +37,7 @@ class Bnet::AuthenticatorTest < Minitest::Test
       refute_nil authenticator.serial
       refute_nil authenticator.secret
       refute_nil authenticator.restorecode
-    rescue Bnet::Authenticator::RequestFailedError => e
+    rescue Bnet::RequestFailedError => e
       puts e
     end
   end
@@ -46,7 +46,7 @@ class Bnet::AuthenticatorTest < Minitest::Test
     begin
       authenticator = Bnet::Authenticator.restore_authenticator(DEFAULT_SERIAL, DEFAULT_RSCODE)
       is_default_authenticator authenticator
-    rescue Bnet::Authenticator::RequestFailedError => e
+    rescue Bnet::RequestFailedError => e
       puts e
     end
   end
@@ -54,7 +54,7 @@ class Bnet::AuthenticatorTest < Minitest::Test
   def test_request_server_time
     begin
       Bnet::Authenticator.request_server_time :EU
-    rescue Bnet::Authenticator::RequestFailedError => e
+    rescue Bnet::RequestFailedError => e
       puts e
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bnet-authenticator
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - ZHANG Yi
@@ -82,15 +82,16 @@ files:
 - bin/bna
 - bnet-authenticator.gemspec
 - lib/bnet/authenticator.rb
-- lib/bnet/authenticator/constants.rb
-- lib/bnet/authenticator/errors.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
 - lib/bnet/commands/new.rb
 - lib/bnet/commands/restore.rb
 - 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

data/lib/bnet/authenticator/constants.rb

@@ -1,35 +0,0 @@
-module Bnet
-
-  class Authenticator
-
-    CLIENT_MODEL = 'bn/authenticator'
-    RSA_MOD = 104890018807986556874007710914205443157030159668034197186125678960287470894290830530618284943118405110896322835449099433232093151168250152146023319326491587651685252774820340995950744075665455681760652136576493028733914892166700899109836291180881063097461175643998356321993663868233366705340758102567742483097
-    RSA_KEY = 257
-    AUTHENTICATOR_HOSTS = {
-      :CN => "mobile-service.battlenet.com.cn",
-      :EU => "m.eu.mobileservice.blizzard.com",
-      :US => "m.us.mobileservice.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_INVERSE = RESTORECODE_MAP.invert
-
-  end
-
-end

data/lib/bnet/authenticator/errors.rb

@@ -1,10 +0,0 @@
-module Bnet
-
-  class Authenticator
-
-    class RequestFailedError < StandardError; end
-    class BadInputError < StandardError; end
-
-  end
-
-end