webpush 0.3.6 → 0.3.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2e6318084376fd3bac8eac5d32a4cae9fdcdddecd61970489981d7789045a311
-  data.tar.gz: 5d855613fdbebddf56563d571969f964da0edd24361f12472dd9f3ee641145d7
+  metadata.gz: 1a7dfdadec9ade5140f48e4b7643202630c9e14700e8366011464b0c6d3bfade
+  data.tar.gz: 6e8bed89a1abd252c703f1f79e865e23d69a5cd6e973709bd1e86d85977fb893
 SHA512:
-  metadata.gz: 7bb6f34b88a6246584e5b004598d044a2a7aa872d8be8889d53d4231262934e9431e293ac1ebb9622c24b483afbb393ff46617c3506b0d19d819cac49ee26677
-  data.tar.gz: 5b653bbcc07b7e46949387180c67eabcba8c994961c99a76f5979cb332aa0204bf524a87d237c762e507a383b56b291a5770174840561727a471c8b19855d9f6
+  metadata.gz: bf031e189b8d2637968605500b14abd1c3941f1ff8229ebf2131e5e6c4343badff7295f308c5a192fcccfeca90ad696873f891f47ead43fd3398057333786ce2
+  data.tar.gz: 3b3097ce59cb726d4009cb8dc5e7c5b17a330b4cd8a5f97a9dd424c337f91a1c3570d5ef9459e69be3a5f61cbf42eee8536b110716d373744df78e7ae74da741

data/CHANGELOG.md

@@ -1,5 +1,14 @@
 # Change Log
 
+## [v0.3.6](https://github.com/zaru/webpush/tree/v0.3.6) (2019-01-09)
+[Full Changelog](https://github.com/zaru/webpush/compare/v0.3.5...v0.3.6)
+
+**Merged pull requests:**
+
+- Added a error class to arguments of raise\_error [\#62](https://github.com/zaru/webpush/pull/62) ([zaru](https://github.com/zaru))
+- Fix TravisCI bundler version [\#61](https://github.com/zaru/webpush/pull/61) ([zaru](https://github.com/zaru))
+- Raise Webpush::Unauthorized on HTTP 403 [\#59](https://github.com/zaru/webpush/pull/59) ([collimarco](https://github.com/collimarco))
+
 ## [v0.3.5](https://github.com/zaru/webpush/tree/v0.3.5) (2019-01-02)
 [Full Changelog](https://github.com/zaru/webpush/compare/v0.3.4...v0.3.5)
 

data/README.md

@@ -45,6 +45,9 @@ vapid_key = Webpush.generate_key
 # Save these in your application server settings
 vapid_key.public_key
 vapid_key.private_key
+
+# Or you can save in PEM format if you prefer
+vapid_key.to_pem
 ```
 
 ### Declaring manifest.json
@@ -281,6 +284,23 @@ Webpush.payload_send(
 )
 ```
 
+### With VAPID in PEM format
+
+This library also supports the PEM format for the VAPID keys:
+
+```ruby
+Webpush.payload_send(
+  endpoint: "https://fcm.googleapis.com/gcm/send/eah7hak....",
+  message: "A message",
+  p256dh: "BO/aG9nYXNkZmFkc2ZmZHNmYWRzZmFl...",
+  auth: "aW1hcmthcmFpa3V6ZQ==",
+  vapid: {
+    subject: "mailto:sender@example.com"
+    pem: ENV['VAPID_KEYS']
+  }
+)
+```
+
 ### With GCM api key
 
 ```ruby

data/lib/webpush/request.rb

@@ -70,7 +70,7 @@ module Webpush
     end
 
     def build_vapid_headers
-      vapid_key = VapidKey.from_keys(vapid_public_key, vapid_private_key)
+      vapid_key = vapid_pem ? VapidKey.from_pem(vapid_pem) : VapidKey.from_keys(vapid_public_key, vapid_private_key)
       jwt = JWT.encode(jwt_payload, vapid_key.curve, 'ES256', jwt_header_fields)
       p256ecdsa = vapid_key.public_key_for_push_header
 
@@ -138,6 +138,10 @@ module Webpush
       @vapid_options.fetch(:private_key, nil)
     end
 
+    def vapid_pem
+      @vapid_options.fetch(:pem, nil)
+    end
+
     def default_options
       {
         ttl: 60*60*24*7*4, # 4 weeks

data/lib/webpush/vapid_key.rb

@@ -14,6 +14,18 @@ module Webpush
       key
     end
 
+    # Create a VapidKey instance from pem encoded elliptic curve public and private keys
+    #
+    # @return [Webpush::VapidKey] a VapidKey instance for the given public and private keys
+    def self.from_pem(pem)
+      key = new
+      src = OpenSSL::PKey.read pem
+      key.curve.public_key = src.public_key
+      key.curve.private_key = src.private_key
+
+      key
+    end
+
     attr_reader :curve
 
     def initialize
@@ -63,6 +75,13 @@ module Webpush
     end
     alias to_hash to_h
 
+    def to_pem
+      public_key = OpenSSL::PKey::EC.new curve
+      public_key.private_key = nil
+      
+      curve.to_pem + public_key.to_pem
+    end
+
     def inspect
       "#<#{self.class}:#{object_id.to_s(16)} #{to_h.map { |k, v| ":#{k}=#{v}" }.join(" ")}>"
     end

data/lib/webpush/version.rb

@@ -1,3 +1,3 @@
 module Webpush
-  VERSION = "0.3.6"
+  VERSION = "0.3.7"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: webpush
 version: !ruby/object:Gem::Version
-  version: 0.3.6
+  version: 0.3.7
 platform: ruby
 authors:
 - zaru@sakuraba
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-01-09 00:00:00.000000000 Z
+date: 2019-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hkdf
@@ -168,7 +168,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.1
+rubyforge_project: 
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Encryption Utilities for Web Push payload.