push_package 0.1.3 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 92b42abb04c7954bc8d7839c005adc487cadb7ed
-  data.tar.gz: 851ae8a649b114587915478ffcefb7178ec51a0a
+  metadata.gz: cc872d152c7700bd4e120c861fc8a41ae4799d43
+  data.tar.gz: a9d3e1266b6f6a7ec9e4a5cf3ad04e58e84de68e
 SHA512:
-  metadata.gz: 5401e2d4e1cf6c591a136bd71b987d10f16c4f8c153a5066c6ce59b44488b1fff8e270af2e696cdfc6999bf6c3be474e99f6d1131e6e04ca3d6ea173503b6cec
-  data.tar.gz: 69c9e4011e20e41ba83255fd2304614a9426493c402c6725c2fbaadfaba876075fc997443fd03518581ee8dd514b3b1aa28ebcbe9c04827f89006e59e3f01957
+  metadata.gz: e527193e4a22d908ba95ece1deb457501dd3c720642d498d6dfe45d98ab98fb3bc55c1bdf5bae0e0b448837a7c6f048217e403e5f35a36fab2c7ed85f5d6d86b
+  data.tar.gz: 57c8e51d968c9de7728722c14b4a602e34d2037aea375c47ee1f8c1f449246cbc4352676a9a810aa7435d09ab8ae829039acafd60dc00f1d6c104aaf02a6d7fb

data/.travis.yml

@@ -7,6 +7,7 @@ rvm:
 - 2.1.5
 - 2.2.3
 - jruby-19mode
+sudo: false
 notifications:
   email:
   - adam.v.duke@gmail.com

data/README.md

@@ -21,6 +21,9 @@ This gem provides a Ruby library and command line tool for creating a push packa
 
 You must obtain a Website Push certificate from apple which requires a iOS developer license or a Mac developer license
 
+[Starting February 2016](https://developer.apple.com/support/certificates/expiration/), you will also need a copy of the
+Apple intermediate cert ([WWDR Certificate, expiring 02/07/23](https://developer.apple.com/certificationauthority/AppleWWDRCA.cer))
+
 ```ruby
 require 'push_package'
 
@@ -35,7 +38,8 @@ website_params = {
 
 iconset_path = 'path/to/iconset'
 certificate = 'path/to/certificate.p12' # or certificate_string
-package = PushPackage.new(website_params, iconset_path, certificate, 'optional cert password')
+intermediate_cert = 'path/to/AppleWWDRCA.cer'
+package = PushPackage.new(website_params, iconset_path, certificate, 'optional cert password', intermediate_cert)
 package.save('path/to/save')
 
 ```

data/lib/push_package.rb

@@ -15,7 +15,7 @@ class PushPackage
 
   attr_reader :p12
 
-  def initialize(website_params, iconset_path, certificate, password = nil)
+  def initialize(website_params, iconset_path, certificate, password = nil, intermediate_cert = nil)
     raise InvalidParameterError unless valid_website_params?(website_params)
     raise InvalidIconsetError unless valid_iconset?(iconset_path)
     raise ArgumentError unless certificate
@@ -35,6 +35,11 @@ class PushPackage
       cert_data.force_encoding(Encoding::ASCII_8BIT)
     end
     @p12 = OpenSSL::PKCS12.new(cert_data, password)
+
+    if intermediate_cert
+      intermediate_cert_data = File.read(intermediate_cert)
+      @extra_certs = [OpenSSL::X509::Certificate.new(intermediate_cert_data)]
+    end
   end
 
   def save(output_path = nil)
@@ -87,7 +92,7 @@ class PushPackage
 
     def signature
       #use the certificate to create a pkcs7 detached signature
-      OpenSSL::PKCS7::sign(@p12.certificate, @p12.key, manifest_data, [], OpenSSL::PKCS7::BINARY | OpenSSL::PKCS7::DETACHED)
+      OpenSSL::PKCS7::sign(@p12.certificate, @p12.key, manifest_data, @extra_certs, OpenSSL::PKCS7::BINARY | OpenSSL::PKCS7::DETACHED)
     end
 
     def manifest_data

data/lib/push_package/version.rb

@@ -1,3 +1,3 @@
 class PushPackage
-  VERSION = '0.1.3'.freeze
+  VERSION = '0.2.0'.freeze
 end

data/spec/push_package_spec.rb

@@ -73,6 +73,12 @@ describe PushPackage do
           PushPackage.new(website_params, iconset_path, '/some/file.p12')
         end.must_raise(Errno::ENOENT)
       end
+
+      it 'should support intermediate_cert path' do
+        lambda do
+          PushPackage.new(website_params, iconset_path, certificate, 'testing', '/some/file.crt')
+        end.must_raise(Errno::ENOENT)
+      end
     end
 
     describe 'website params with string keys' do
@@ -93,6 +99,12 @@ describe PushPackage do
           PushPackage.new(website_params_symbol_keys, iconset_path, '/some/file.p12')
         end.must_raise(Errno::ENOENT)
       end
+
+      it 'should support intermediate_cert path' do
+        lambda do
+          PushPackage.new(website_params_symbol_keys, iconset_path, certificate, 'testing', '/some/file.crt')
+        end.must_raise(Errno::ENOENT)
+      end
     end
   end
 
@@ -173,5 +185,24 @@ describe PushPackage do
          OpenSSL::PKCS7::DETACHED
       ).must_equal true
     end
+
+    it 'should have no extra certs in signature' do
+      extracted_package.must_include('signature')
+      signature = File.read(tmp_path + '/signature')
+      p7 = OpenSSL::PKCS7.new(signature)
+      p7.certificates().size.must_equal 1
+    end
+
+    describe 'when intermediate_cert given' do
+      let(:intermediate_cert) { File.open(fixture_path('intermediate.crt')) }
+      let(:push_package) { PushPackage.new(website_params, iconset_path, certificate, 'testing', intermediate_cert) }
+
+      it 'should have one extra cert in signature' do
+        extracted_package.must_include('signature')
+        signature = File.read(tmp_path + '/signature')
+        p7 = OpenSSL::PKCS7.new(signature)
+        p7.certificates().size.must_equal 2
+      end
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: push_package
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.2.0
 platform: ruby
 authors:
 - Stefan Natchev
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-11 00:00:00.000000000 Z
+date: 2016-01-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubyzip
@@ -92,6 +92,7 @@ files:
 - spec/fixtures/iconset/icon_16x16@2x.png
 - spec/fixtures/iconset/icon_32x32.png
 - spec/fixtures/iconset/icon_32x32@2x.png
+- spec/fixtures/intermediate.crt
 - spec/fixtures/localhost.crt
 - spec/fixtures/localhost.csr
 - spec/fixtures/localhost.key
@@ -120,7 +121,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: A gem for creating Safari push notification push packages.
@@ -131,6 +132,7 @@ test_files:
 - spec/fixtures/iconset/icon_16x16@2x.png
 - spec/fixtures/iconset/icon_32x32.png
 - spec/fixtures/iconset/icon_32x32@2x.png
+- spec/fixtures/intermediate.crt
 - spec/fixtures/localhost.crt
 - spec/fixtures/localhost.csr
 - spec/fixtures/localhost.key