google-api 0.1.0 → 0.2.0

data/CHANGELOG.md

@@ -1,4 +1,8 @@
-## v0.0.1.rc2 (TBD)
+## v0.2.0 (2012-11-24)
+
+* Rewrite token encryption to use OpenSSL's Cipher. (NOTE: This is a non-backward compatible change!)
+
+## v0.1.0 (2012-11-14)
 
 * Generalize #update_oauth! method for an oauthable ActiveRecord object. See active_record_inclusions.rb for more.
 

data/google-api.gemspec

@@ -11,7 +11,7 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.name          = "google-api"
   gem.require_paths = ["lib"]
-  gem.version       = "0.1.0"
+  gem.version       = "0.2.0"
 
   gem.add_runtime_dependency 'mime-types', '~> 1.0'
   gem.add_runtime_dependency 'oauth2', '~> 0.8.0'

data/lib/google-api/active_record_inclusions.rb

@@ -14,8 +14,8 @@ module GoogleAPI
       def oauthable
         define_method :oauth_hash do
           {
-            access_token: GoogleAPI.decrypt!(oauth_access_token),
-            refresh_token: GoogleAPI.decrypt!(oauth_refresh_token),
+            access_token: GoogleAPI::Encrypter.decrypt!(oauth_access_token),
+            refresh_token: GoogleAPI::Encrypter.decrypt!(oauth_refresh_token),
             expires_at: oauth_access_token_expires_at
           }
         end
@@ -25,10 +25,10 @@ module GoogleAPI
         # that you want to update on the object can be passed as a final parameter.
         define_method :update_oauth! do |access_token, refresh_token = nil, additional_attrs = {}|
           attrs = {
-            oauth_access_token: GoogleAPI.encrypt!(access_token),
+            oauth_access_token: GoogleAPI::Encrypter.encrypt!(access_token),
             oauth_access_token_expires_at: 59.minutes.from_now # it's actually an hour from now, but just to make sure we don't overlap at all, let's set it to 59 minutes
           }.merge(additional_attrs)
-          attrs[:oauth_refresh_token] = GoogleAPI.encrypt!(refresh_token) if refresh_token
+          attrs[:oauth_refresh_token] = GoogleAPI::Encrypter.encrypt!(refresh_token) if refresh_token
           update_attributes(attrs)
         end
 

data/lib/google-api/encrypter.rb

@@ -0,0 +1,26 @@
+module GoogleAPI
+  class Encrypter
+
+    class << self
+
+      def encrypt!(value)
+        crypt(:encrypt, value)
+      end
+
+      def decrypt!(value)
+        crypt(:decrypt, value)
+      end
+
+      protected
+        def crypt(method, value)
+          cipher = OpenSSL::Cipher::AES256.new(:CBC)
+          cipher.send(method)
+          cipher.key = GoogleAPI.encryption_key
+          result = cipher.update(value)
+          result << cipher.final
+        end
+
+    end
+
+  end
+end

data/lib/google-api.rb

@@ -3,6 +3,7 @@ require 'oauth2'
 require 'google-api/oauth2'
 require 'google-api/api'
 require 'google-api/client'
+require 'google-api/encrypter'
 if defined?(::Rails)
   require 'google-api/railtie'
 else
@@ -56,14 +57,6 @@ module GoogleAPI
       @discovered_apis = {}
     end
 
-    def encrypt!(string)
-      Base64.encode64("#{string}#{encryption_key}")
-    end
-
-    def decrypt!(string)
-      Base64.decode64(string).sub(/#{Regexp.escape(encryption_key)}$/, '')
-    end
-
   end
 
 end

data/spec/google-api/encrypter_spec.rb

@@ -0,0 +1,29 @@
+require 'spec_helper'
+
+describe GoogleAPI::Encrypter do
+
+  before(:each) do
+    GoogleAPI.configure do |config|
+      config.client_id = 'test id'
+      config.client_secret = 'test secret'
+      config.encryption_key = 'a really really really really really really long encryption key'
+    end
+  end
+
+  describe "#encrypt!" do
+
+    it "should return an encrypted version of the string" do
+      GoogleAPI::Encrypter.encrypt!('test').should == "0\xC2\xF3y\b\xA00\xB1\x9C\xBD;\xC7s61\x8E"
+    end
+
+  end
+
+  describe "#decrypt!" do
+
+    it "should return an decrypted version of the string" do
+      GoogleAPI::Encrypter.decrypt!("0\xC2\xF3y\b\xA00\xB1\x9C\xBD;\xC7s61\x8E").should == 'test'
+    end
+
+  end
+
+end

data/spec/google-api_spec.rb

@@ -116,32 +116,4 @@ describe GoogleAPI do
 
   end
 
-  describe "#encrypt!" do
-
-    it "should return an encrypted version of the string" do
-      GoogleAPI.configure do |config|
-        config.client_id = 'test id'
-        config.client_secret = 'test secret'
-        config.encryption_key = 'encryption key'
-      end
-
-      GoogleAPI.encrypt!('test').should == "dGVzdGVuY3J5cHRpb24ga2V5\n"
-    end
-
-  end
-
-  describe "#decrypt!" do
-
-    it "should return an decrypted version of the string" do
-      GoogleAPI.configure do |config|
-        config.client_id = 'test id'
-        config.client_secret = 'test secret'
-        config.encryption_key = 'encryption key'
-      end
-
-      GoogleAPI.decrypt!("dGVzdGVuY3J5cHRpb24ga2V5\n").should == 'test'
-    end
-
-  end
-
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: google-api
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-15 00:00:00.000000000 Z
+date: 2012-11-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mime-types
@@ -127,6 +127,7 @@ files:
 - lib/google-api/active_record_inclusions.rb
 - lib/google-api/api.rb
 - lib/google-api/client.rb
+- lib/google-api/encrypter.rb
 - lib/google-api/oauth2.rb
 - lib/google-api/railtie.rb
 - spec/fixtures/discovery_drive.json
@@ -136,6 +137,7 @@ files:
 - spec/fixtures/refresh_access_token.json
 - spec/google-api/api_spec.rb
 - spec/google-api/client_spec.rb
+- spec/google-api/encrypter_spec.rb
 - spec/google-api_spec.rb
 - spec/spec_helper.rb
 - spec/support/faraday_stubs.rb
@@ -156,7 +158,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3705329295137939947
+      hash: 1675511776149438759
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -165,7 +167,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3705329295137939947
+      hash: 1675511776149438759
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24
@@ -180,6 +182,7 @@ test_files:
 - spec/fixtures/refresh_access_token.json
 - spec/google-api/api_spec.rb
 - spec/google-api/client_spec.rb
+- spec/google-api/encrypter_spec.rb
 - spec/google-api_spec.rb
 - spec/spec_helper.rb
 - spec/support/faraday_stubs.rb