gpsoauth 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 204ea5290b6b19ac4b313ddc82c47b6a30f3924f
-  data.tar.gz: 261ff8ab1af1e678a6d94eeb6e90e99c409332df
+  metadata.gz: 1eaebe898412ce66cec93768814c6e969a52a7bb
+  data.tar.gz: d4610c0b873235e30161dee5b87cc716849b9b48
 SHA512:
-  metadata.gz: 5d562ca5ae735ff3662e0b5cf0ab9b0c2f10ed78ebcf099adc380b285639f88a906ecde2e63b0dd711202f1a1d4be55edb492b3a2f1a2b10f80e80e96f71677c
-  data.tar.gz: ea4eba98bfa330fb52108c292fcd84f0ec4c9c20fbc2f3de300900ca1505a7e05586f1db9146e60b931e05f6f4d3f39cacd93838acecddfaee2d653cf82a5041
+  metadata.gz: 99bc53141aff810f80721186e8e629f87fac3d25831946bbb639702e191a12d46ccf4f2c1e7dccd158ba38a993023fa117f19d2175489f595613e228934ae3a4
+  data.tar.gz: 4f9222a04638f17c13a3fb48a048eb6e0d234c935ac97c3d9fb34f30f7db6c9aac0c42547416dc4429d64e5d3087892216a3eb43a6525cc6b005807972e5bf70

data/.gitignore

@@ -10,3 +10,5 @@
 
 *.swo
 *.swp
+
+.byebug_history

data/README.md

@@ -1,5 +1,7 @@
 # Gpsoauth
 
+[![Gem Version](https://badge.fury.io/rb/gpsoauth.svg)](https://badge.fury.io/rb/gpsoauth)
+
 A Ruby client library for Google Play Services OAuth
 
 A port of the Python library [gpsoauth](https://github.com/simon-weber/gpsoauth) by [Simon Weber](https://github.com/simon-weber)
@@ -18,15 +20,15 @@ And then execute:
 
     $ bundle
 
-    Or install it yourself as:
+Or install it yourself as:
 
-        $ gem install gpsoauth
+    $ gem install gpsoauth
 
 ## Usage
 
-Instantiate a Gpsoauth connection. This requires an Android ID:
+Instantiate a Gpsoauth client. This requires an Android ID:
 
-    g = Gpsoauth::Connection.new(android_id, [service, device_country, operator_country, lang, sdk_version])
+    g = Gpsoauth::Client.new(android_id, [service, device_country, operator_country, lang, sdk_version])
 
 Perform 'master login' with email/password:
 

data/gpsoauth.gemspec

@@ -22,6 +22,8 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "bundler", "~> 1.11"
   spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "minitest", "~> 5.9"
+  spec.add_development_dependency "byebug", "~> 9.0"
 
-  spec.add_dependency "httparty", "~> 0.13.7"
+  spec.add_dependency "httparty", "~> 0.14"
 end

data/lib/gpsoauth.rb

@@ -1,10 +1,9 @@
 require "httparty"
 require "base64"
 
-require "gpsoauth/connection"
+require "gpsoauth/client"
 require "gpsoauth/exceptions"
 require "gpsoauth/google"
-require "gpsoauth/utility"
 require "gpsoauth/version"
 
 module Gpsoauth

data/lib/gpsoauth/{connection.rb → client.rb}

@@ -1,5 +1,5 @@
 module Gpsoauth
-  class Connection
+  class Client
     AUTH_URL = "https://android.clients.google.com/auth"
     USER_AGENT = "gpsoauth/gpsoauth"
 
@@ -29,9 +29,7 @@ module Gpsoauth
         Email: email,
         has_permission: 1,
         add_account: 1,
-        # @TODO Finish password encryption
-        # EncryptedPasswd: Google::signature(email, password, android_key)
-        Passwd: password,
+        EncryptedPasswd: Google::signature(email, password, android_key),
         service: @service,
         source: "android",
         androidId: @android_id,

data/lib/gpsoauth/google.rb

@@ -17,26 +17,43 @@ module Gpsoauth
     end
 
     def self.signature(email, password, key)
-      signature = "\x00".bytes
-      struct = key_to_struct(key)
-      signature.push Digest::SHA1.hexdigest(struct)[0,4]
-
-      # @TODO Encryptedpasswd notes:
+      # Encryption scheme deconstructed here:
       # http://codedigging.com/blog/2014-06-09-about-encryptedpasswd/
-      #
-      # cipher = PKCS1_OAEP.new(key)
-      # encrypted_login = cipher.encrypt((email + u'\x00' + password).encode('utf-8'))
-      # signature.extend(encrypted_login)
-      # return base64.urlsafe_b64encode(signature)
+
+      struct = key_to_struct(key).pack('c*')
+      first_four_bytes_sha1 = OpenSSL::Digest::SHA1.digest(struct)[0...4]
+
+      encrypted_login_password = key.public_encrypt(
+        email + "\x00" + password,
+        OpenSSL::PKey::RSA::PKCS1_OAEP_PADDING
+      )
+
+      signature = "\x00" + first_four_bytes_sha1 + encrypted_login_password
+      Base64.urlsafe_encode64(signature)
     end
 
     private
 
+    def self.long_to_bytes(key)
+      arr = []
+      key, mod = key.divmod(256)
+
+      while mod > 0 || key > 0
+        arr << mod
+        key, mod = key.divmod(256)
+      end
+
+      arr = arr.reverse
+    end
+
     def self.key_to_struct(key)
-      mod = key.n.to_s.bytes.map{ |x| x.to_s(16) }.join
-      exponent = key.e.to_s.bytes.map{ |x| x.to_s(16) }.join
+      mod_buffer = "\x00\x00\x00\x80".unpack('C*')
+      exponent_buffer = "\x00\x00\x00\x03".unpack('C*')
+
+      mod = long_to_bytes(key.n.to_i)
+      exponent = long_to_bytes(key.e.to_i)
 
-      "\x00\x00\x00\x80#{mod}\x00\x00\x00\x03#{exponent}".b
+      mod_buffer + mod + exponent_buffer + exponent
     end
   end
 end

data/lib/gpsoauth/version.rb

@@ -1,3 +1,3 @@
 module Gpsoauth
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gpsoauth
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Bryan Mytko
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-07-24 00:00:00.000000000 Z
+date: 2016-07-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -38,20 +38,48 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.9'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.9'
+- !ruby/object:Gem::Dependency
+  name: byebug
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '9.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '9.0'
 - !ruby/object:Gem::Dependency
   name: httparty
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.13.7
+        version: '0.14'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.13.7
+        version: '0.14'
 description: |-
   A Ruby client library for Google Play Services OAuth.
                             A port of the Python library gpsoauth by Simon Weber
@@ -68,10 +96,9 @@ files:
 - README.md
 - gpsoauth.gemspec
 - lib/gpsoauth.rb
-- lib/gpsoauth/connection.rb
+- lib/gpsoauth/client.rb
 - lib/gpsoauth/exceptions.rb
 - lib/gpsoauth/google.rb
-- lib/gpsoauth/utility.rb
 - lib/gpsoauth/version.rb
 homepage: http://github.com/bryanmytko/gpsoauth
 licenses:

data/lib/gpsoauth/utility.rb

@@ -1,2 +0,0 @@
-module Gpsoauth
-end