imobile 0.0.5 → 0.0.6

data/CHANGELOG

@@ -1,3 +1,5 @@
+v0.0.6. New push certificates read method for Ruby 1.8.6 on Heroku.
+
 v0.0.5. Renamed device_token to push_token throughout the API.
 
 v0.0.4. Updated CryptoSupport with the push token device attribute.  

data/imobile.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{imobile}
-  s.version = "0.0.5"
+  s.version = "0.0.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Victor Costan"]

data/lib/imobile/push_notification.rb

@@ -96,21 +96,73 @@ module PushNotifications
   end
   
   # Decodes an APNs certificate.
-  def self.decode_push_certificate(certificate_blob)    
+  def self.decode_push_certificate(certificate_blob)
+    if use_new_certificate_decoder?
+      # Ruby 1.8.7 and above.
+      data = decode_push_certificate_new certificate_blob
+    else
+      # Ruby 1.8.6.
+      data = decode_push_certificate_heroku certificate_blob
+    end
+    data[:server_type] = server_type data[:certificate] 
+    data
+  end
+  
+  # Checks whether the new certificate decoding code is supported.
+  def self.use_new_certificate_decoder?
+    OpenSSL::PKCS12.respond_to? :new    
+  end
+  
+  # Decodes an APNs certificate, using the new (1.8.7+) OpenSSL methods.
+  def self.decode_push_certificate_new(certificate_blob)    
     pkcs12 = OpenSSL::PKCS12.new certificate_blob
     
     certificate = pkcs12.certificate
     key = pkcs12.key
+    
+    { :certificate => certificate, :key => key }
+  end
+  
+  # Decodes an APNs certificate, using the openssl command-line tool.
+  #
+  # This works on Heroku, which uses Ruby 1.8.6.
+  def self.decode_push_certificate_heroku(certificate_blob)
+    # Most of the filesystem on Heroku is read-only. On the other hand, not
+    # everyone runs on Heroku. Find a reasonable temporary dir.
+    if defined? RAILS_ROOT
+      temp_dir = File.join RAILS_ROOT, 'tmp'
+    elsif File.exists? '/tmp'
+      temp_dir = '/tmp'
+    else
+      temp_dir = '.'
+    end
+    
+    pkcs12_file_name = File.join temp_dir, "apns_#{Process.pid}.p12"
+    pem_file_name = File.join temp_dir, "apns_#{Process.pid}.pem"
+    out_file_name = File.join temp_dir, "apns_#{Process.pid}.err"
+    
+    # Use the command-line openssl tool to break up the pkcs12 file.
+    File.open(pkcs12_file_name, 'wb') { |f| f.write certificate_blob }
+    Kernel.system "openssl pkcs12 -in #{pkcs12_file_name} -clcerts -nodes " +
+                  "-out #{pem_file_name} -password pass: 2> #{out_file_name}"
+    pem_blob = File.read pem_file_name    
+    [pkcs12_file_name, pem_file_name, out_file_name].each { |f| File.delete f }
+    
+    certificate = OpenSSL::X509::Certificate.new pem_blob
+    key = OpenSSL::PKey::RSA.new pem_blob
+    { :certificate => certificate, :key => key }    
+  end
+  
+  # The Apple Push Notification server type that a certificate works with.
+  def self.server_type(certificate)
     case certificate.subject.to_s
     when /Apple Development Push/
-      server_type = :sandbox
+      return :sandbox
     when /Apple Production Push/
-      server_type = :production
+      return :production
     else
       raise "Invalid push certificate - #{certificate.inspect}"
-    end
-    
-    { :certificate => certificate, :key => key, :server_type => server_type }
+    end        
   end
   
   # Encodes a push notification in a binary string for APNs consumption.

data/test/crypto_app_fprint_test.rb

@@ -13,6 +13,8 @@ require 'flexmock/test_unit'
 
 class CryptoAppFprintTest < Test::Unit::TestCase
   def setup
+    super
+    
     testdata_path = File.join(File.dirname(__FILE__), '..', 'testdata')
     @device_attrs = File.open(File.join(testdata_path,
                                         'device_attributes.yml')) do |f| 

data/test/push_notification_test.rb

@@ -13,6 +13,8 @@ require 'flexmock/test_unit'
 
 class PushNotificationTest < Test::Unit::TestCase
   def setup
+    super
+    
     testdata_path = File.join(File.dirname(__FILE__), '..', 'testdata')
     @dev_cert_path = File.join(testdata_path, 'apns_developer.p12') 
     @prod_cert_path = File.join(testdata_path, 'apns_production.p12')
@@ -46,6 +48,13 @@ class PushNotificationTest < Test::Unit::TestCase
            "Wrong data in prod certificate #{cert_data[:certificate].inspect}")
   end
   
+  def test_read_push_certificate_on_heroku
+    flexmock(Imobile::PushNotifications).
+        should_receive(:use_new_certificate_decoder?).and_return(false)
+        
+    test_read_push_certificate
+  end
+  
   def test_pack_push_token
     assert_equal @dev_token, Imobile.pack_hex_push_token(@hex_dev_token)
   end

data/test/validate_receipt_test.rb

@@ -10,6 +10,8 @@ require 'test/unit'
 
 class ValidateReceiptTest < Test::Unit::TestCase
   def setup
+    super
+    
     testdata_path = File.join(File.dirname(__FILE__), '..', 'testdata')    
     @forged_sandbox_blob = File.read File.join(testdata_path,
                                                'forged_sandbox_receipt')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: imobile
 version: !ruby/object:Gem::Version 
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors: 
 - Victor Costan