bnet-authenticator 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 82d4b4048774174d05fac51442d1fa7314c0cff7
-  data.tar.gz: 79a85eaf15072ae7548b87eabbc344d5161e6fef
+  metadata.gz: 028841465a3483415e852b56a2ca8e05552dafd4
+  data.tar.gz: 2bf75662b2cdbe6bf3841e38fcc32b7a9a798b4c
 SHA512:
-  metadata.gz: 7d2ac8f76a5e66e123f93ff4b44d4940222eb6eaa6d95c390c5944d4c95420661738d7e65ce87e042e2092b1348d0fb8c2535ca0b42f0af7549f90bb887904b2
-  data.tar.gz: 2844c2afa341884aec85670c6c1d814381bf264d4f87c8b22b867fc756eae790b5b36a4ae286ec2f0f5517ed7bab3785ce51731ea23330830edc1e10c887a194
+  metadata.gz: 93b5da7a8a001dc4720f9a2c4947e267a2afe16400d6971c6995ad1e2af7fe71da58a142c0f8ae28ac91c566f3f9f701b963de51df49f7e68b04d2446f9748fc
+  data.tar.gz: 401d3af738845309d9690aaed1dfcb1cd33fec147e491afc370071c8f39d44b6a622c40338366025419b4a526b80a02216600a693372af4f9a80c625ec06ef0b

data/lib/bnet/authenticator.rb

@@ -91,7 +91,8 @@ module Bnet
     # @param region [Symbol]
     # @return [Integer] server timestamp in seconds
     def self.request_server_time(region)
-      request_for('server time', region, TIME_REQUEST_PATH).as_bin_to_i.to_f / 1000
+      server_time_big_endian = request_for('server time', region, TIME_REQUEST_PATH)
+      server_time_big_endian.unpack('Q>')[0].to_f / 1000
     end
 
     # Get token from given secret and timestamp
@@ -105,9 +106,10 @@ module Bnet
       current = (timestamp || Time.now.getutc.to_i) / 30
       digest = Digest::HMAC.digest([current].pack('Q>'), secret.as_hex_to_bin, Digest::SHA1)
       start_position = digest[19].ord & 0xf
-      token = '%08d' % (digest[start_position, 4].as_bin_to_i % 100000000)
 
-      return token, (current + 1) * 30
+      token = digest[start_position, 4].unpack('L>')[0] & 0x7fffffff
+
+      return '%08d' % (token % 100000000), (current + 1) * 30
     end
 
     # Get authenticator's token from given timestamp

data/lib/bnet/authenticator/version.rb

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

data/lib/bnet/commands/info.rb

@@ -15,8 +15,7 @@ module Bnet
       end
 
       def run
-        serial = @args.shift
-        secret = @args.shift
+        serial, secret = @args.shift(2)
 
         authenticator = Authenticator.new(serial, secret)
         puts authenticator.to_readable_text

data/lib/bnet/commands/new.rb

@@ -15,8 +15,7 @@ module Bnet
       end
 
       def run
-        region = args.shift || 'US'
-        region = region.to_sym
+        region = (args.shift || 'US').to_sym
 
         authenticator = Authenticator.request_authenticator(region)
         puts authenticator.to_readable_text

data/lib/bnet/commands/restore.rb

@@ -15,8 +15,7 @@ module Bnet
       end
 
       def run
-        serial = @args.shift
-        restorecode = @args.shift
+        serial, restorecode = @args.shift(2)
 
         authenticator = Authenticator.restore_authenticator(serial, restorecode)
         puts authenticator.to_readable_text

data/test/test_battlenet_authenticator.rb

@@ -68,6 +68,6 @@ class Bnet::AuthenticatorTest < Minitest::Test
     assert_equal DEFAULT_RSCODE, authenticator.restorecode
     assert_equal ['61459300', 1347279360], authenticator.get_token(1347279358)
     assert_equal ['61459300', 1347279360], authenticator.get_token(1347279359)
-    assert_equal ['23423634', 1347279390], authenticator.get_token(1347279360)
+    assert_equal ['75939986', 1347279390], authenticator.get_token(1347279360)
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bnet-authenticator
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - ZHANG Yi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-16 00:00:00.000000000 Z
+date: 2014-03-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake