webpush 0.3.5 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: e6d555b555c5277dc1abbe12a9808292b62b241a
-  data.tar.gz: 3f12232353b917a3135ce12f33a38f1a2a7f5388
+SHA256:
+  metadata.gz: 5477ba01938fc82903b96c38eb3663259ffb2c85c5c077acb12c39ca0bf4f595
+  data.tar.gz: 1574886feed49138a2de64c37ad8997b54715b890a4517d13edbd82197d4e092
 SHA512:
-  metadata.gz: b7429002edc35b7d8e92cb15ff6d329f52257d0f36ab46f316440c31f3141869d5617973e4c3250d79abd05efa4d60f0918194ab3160b42866cb400ba6220a20
-  data.tar.gz: 1a22cb446da2ff49013a3a5474bb970bbfa5789b3d24c693be4aadca2eca64e94db242cbe4fc36185a77dee25b45c3259ef8edb834de273f136db4efbfa98746
+  metadata.gz: ebe9bed5482e052ccef497c0befc0c946079d6ce99db40acfbce09b042cc8123413cd8ac8c01776a40daaea3a8e4d4575d37e611d8d55191df5351adb6a29562
+  data.tar.gz: 23e55f3c0d33c1f9b12cde268132e9414c804a1c00ee3dbe44fb2a84ad01852aa88b8426f578f9a77ed31f3d6649feb6bf94f013e781cab2051bd7fb35abee0d

data/.rubocop.yml

@@ -0,0 +1,30 @@
+require: rubocop-performance
+
+AllCops:
+  Exclude:
+    - 'bin/**/*'
+
+Metrics/AbcSize:
+  Max: 20
+
+Metrics/ClassLength:
+  Max: 100
+
+Metrics/ModuleLength:
+  Max: 100
+
+Metrics/LineLength:
+  Enabled: false
+
+Metrics/BlockLength:
+  Exclude:
+    - spec/**/*_spec.rb
+
+Lint/AmbiguousBlockAssociation:
+  Enabled: false
+
+Style/Documentation:
+  Enabled: false
+
+Style/IndentHeredoc:
+  Enabled: false

data/.travis.yml

@@ -1,11 +1,24 @@
+env:
+  global:
+    - CC_TEST_REPORTER_ID=155202524386dfebe0c3267a5c868b5417ff4cc2cde8ed301fb36b177d46a458
 language: ruby
 rvm:
   - 2.2
   - 2.3
   - 2.4
   - 2.5
-before_install: gem install bundler
+  - 2.6
+  - 2.7
+before_install:
+  - gem uninstall -v '>= 2' -i $(rvm gemdir)@global -ax bundler || true
+  - gem install bundler -v 1.17.3
+before_script:
+  - curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter
+  - chmod +x ./cc-test-reporter
+  - ./cc-test-reporter before-build
 script: "bundle exec rake spec"
+after_script:
+- ./cc-test-reporter after-build --exit-code $TRAVIS_TEST_RESULT
 addons:
   code_climate:
     repo_token: 155202524386dfebe0c3267a5c868b5417ff4cc2cde8ed301fb36b177d46a458

data/CHANGELOG.md

@@ -1,8 +1,46 @@
 # Change Log
 
-## [Unreleased](https://github.com/zaru/webpush/tree/HEAD)
+## [v1.0.0](https://github.com/zaru/webpush/tree/v1.0.0) (2019-08-15)
 
-[Full Changelog](https://github.com/zaru/webpush/compare/v0.3.4...HEAD)
+A stable version 1.0.0 has been released.
+
+Thanks @mohamedhafez, @mplatov and @MedetaiAkaru for everything!
+
+[Full Changelog](https://github.com/zaru/webpush/compare/v0.3.8...v1.0.0)
+
+**Merged pull requests:**
+
+- switch to aes128gcm encoding [\#84](https://github.com/zaru/webpush/pull/84) ([mohamedhafez](https://github.com/mohamedhafez))
+- Fixed fcm spec [\#77](https://github.com/zaru/webpush/pull/77) ([zaru](https://github.com/zaru))
+- add fcm endpoints [\#76](https://github.com/zaru/webpush/pull/76) ([MedetaiAkaru](https://github.com/MedetaiAkaru))
+- Add Rubocop and fix [\#74](https://github.com/zaru/webpush/pull/74) ([zaru](https://github.com/zaru))
+- Fix TravisCI bundler version [\#73](https://github.com/zaru/webpush/pull/73) ([zaru](https://github.com/zaru))
+
+## [v0.3.8](https://github.com/zaru/webpush/tree/v0.3.8) (2019-04-16)
+[Full Changelog](https://github.com/zaru/webpush/compare/v0.3.7...v0.3.8)
+
+**Merged pull requests:**
+
+- Fix authorization header [\#72](https://github.com/zaru/webpush/pull/72) ([xronos-i-am](https://github.com/xronos-i-am))
+
+## [v0.3.7](https://github.com/zaru/webpush/tree/v0.3.7) (2019-03-06)
+[Full Changelog](https://github.com/zaru/webpush/compare/v0.3.6...v0.3.7)
+
+**Merged pull requests:**
+
+- Add PEM support to import / export keys [\#65](https://github.com/zaru/webpush/pull/65) ([collimarco](https://github.com/collimarco))
+
+## [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)
 
 **Merged pull requests:**
 

data/README.md

@@ -1,12 +1,15 @@
 # WebPush
 
 [![Code Climate](https://codeclimate.com/github/zaru/webpush/badges/gpa.svg)](https://codeclimate.com/github/zaru/webpush)
+[![Test Coverage](https://codeclimate.com/github/zaru/webpush/badges/coverage.svg)](https://codeclimate.com/github/zaru/webpush/coverage)
 [![Build Status](https://travis-ci.org/zaru/webpush.svg?branch=master)](https://travis-ci.org/zaru/webpush)
 [![Gem Version](https://badge.fury.io/rb/webpush.svg)](https://badge.fury.io/rb/webpush)
 
 This gem makes it possible to send push messages to web browsers from Ruby backends using the [Web Push Protocol](https://tools.ietf.org/html/draft-ietf-webpush-protocol-10). It supports [Message Encryption for Web Push](https://tools.ietf.org/html/draft-ietf-webpush-encryption) to send messages securely from server to user agent.
 
-Payload is supported by Chrome50+, Firefox48+.
+Payload is supported by Chrome 50+, Firefox 48+, Edge 79+.
+
+[webpush Demo app here (building by Sinatra app).](https://github.com/zaru/webpush_demo_ruby)
 
 ## Installation
 
@@ -45,6 +48,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
@@ -274,13 +280,30 @@ Webpush.payload_send(
   p256dh: "BO/aG9nYXNkZmFkc2ZmZHNmYWRzZmFl...",
   auth: "aW1hcmthcmFpa3V6ZQ==",
   vapid: {
-    subject: "mailto:sender@example.com"
+    subject: "mailto:sender@example.com",
     public_key: ENV['VAPID_PUBLIC_KEY'],
     private_key: ENV['VAPID_PRIVATE_KEY']
   }
 )
 ```
 
+### 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/Rakefile

@@ -1,5 +1,5 @@
-require "bundler/gem_tasks"
-require "rspec/core/rake_task"
+require 'bundler/gem_tasks'
+require 'rspec/core/rake_task'
 
 RSpec::Core::RakeTask.new(:spec)
 

data/lib/webpush.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'openssl'
 require 'base64'
 require 'hkdf'
@@ -11,6 +13,10 @@ require 'webpush/encryption'
 require 'webpush/request'
 require 'webpush/railtie' if defined?(Rails)
 
+# Push API implementation
+#
+# https://tools.ietf.org/html/rfc8030
+# https://www.w3.org/TR/push-api/
 module Webpush
   class << self
     # Deliver the payload to the required endpoint given by the JavaScript
@@ -28,21 +34,16 @@ module Webpush
     # @param options [Hash<Symbol,String>] additional options for the notification
     # @option options [#to_s] :ttl Time-to-live in seconds
     # @option options [#to_s] :urgency Urgency can be very-low, low, normal, high
-    def payload_send(message: "", endpoint:, p256dh: "", auth: "", vapid: {}, **options)
-      subscription = {
-        endpoint: endpoint,
-        keys: {
-          p256dh: p256dh,
-          auth: auth
-        }
-      }
+    # rubocop:disable Metrics/ParameterLists
+    def payload_send(message: '', endpoint:, p256dh: '', auth: '', vapid: {}, **options)
       Webpush::Request.new(
         message: message,
-        subscription: subscription,
+        subscription: subscription(endpoint, p256dh, auth),
         vapid: vapid,
         **options
       ).perform
     end
+    # rubocop:enable Metrics/ParameterLists
 
     # Generate a VapidKey instance to obtain base64 encoded public and private keys
     # suitable for VAPID protocol JSON web token signing
@@ -59,11 +60,21 @@ module Webpush
     def decode64(str)
       # For Ruby < 2.3, Base64.urlsafe_decode64 strict decodes and will raise errors if encoded value is not properly padded
       # Implementation: http://ruby-doc.org/stdlib-2.3.0/libdoc/base64/rdoc/Base64.html#method-i-urlsafe_decode64
-      if !str.end_with?("=") && str.length % 4 != 0
-        str = str.ljust((str.length + 3) & ~3, "=")
-      end
+      str = str.ljust((str.length + 3) & ~3, '=') if !str.end_with?('=') && str.length % 4 != 0
 
       Base64.urlsafe_decode64(str)
     end
+
+    private
+
+    def subscription(endpoint, p256dh, auth)
+      {
+        endpoint: endpoint,
+        keys: {
+          p256dh: p256dh,
+          auth: auth
+        }
+      }
+    end
   end
 end

data/lib/webpush/encryption.rb

@@ -1,11 +1,14 @@
+# frozen_string_literal: true
+
 module Webpush
   module Encryption
     extend self
 
+    # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
     def encrypt(message, p256dh, auth)
       assert_arguments(message, p256dh, auth)
 
-      group_name = "prime256v1"
+      group_name = 'prime256v1'
       salt = Random.new.bytes(16)
 
       server = OpenSSL::PKey::EC.new(group_name)
@@ -20,75 +23,55 @@ module Webpush
 
       client_auth_token = Webpush.decode64(auth)
 
-      prk = HKDF.new(shared_secret, salt: client_auth_token, algorithm: 'SHA256', info: "Content-Encoding: auth\0").next_bytes(32)
+      info = "WebPush: info\0" + client_public_key_bn.to_s(2) + server_public_key_bn.to_s(2)
+      content_encryption_key_info = "Content-Encoding: aes128gcm\0"
+      nonce_info = "Content-Encoding: nonce\0"
 
-      context = create_context(client_public_key_bn, server_public_key_bn)
+      prk = HKDF.new(shared_secret, salt: client_auth_token, algorithm: 'SHA256', info: info).next_bytes(32)
 
-      content_encryption_key_info = create_info('aesgcm', context)
       content_encryption_key = HKDF.new(prk, salt: salt, info: content_encryption_key_info).next_bytes(16)
 
-      nonce_info = create_info('nonce', context)
       nonce = HKDF.new(prk, salt: salt, info: nonce_info).next_bytes(12)
 
       ciphertext = encrypt_payload(message, content_encryption_key, nonce)
 
-      {
-        ciphertext: ciphertext,
-        salt: salt,
-        server_public_key_bn: convert16bit(server_public_key_bn),
-        server_public_key: server_public_key_bn.to_s(2),
-        shared_secret: shared_secret
-      }
-    end
+      serverkey16bn = convert16bit(server_public_key_bn)
+      rs = ciphertext.bytesize
+      raise ArgumentError, "encrypted payload is too big" if rs > 4096
 
-    private
+      aes128gcmheader = "#{salt}" + [rs].pack('N*') + [serverkey16bn.bytesize].pack('C*') + serverkey16bn
 
-    def create_context(client_public_key, server_public_key)
-      c = convert16bit(client_public_key)
-      s = convert16bit(server_public_key)
-      context = "\0"
-      context += [c.bytesize].pack("n*")
-      context += c
-      context += [s.bytesize].pack("n*")
-      context += s
-      context
+      aes128gcmheader + ciphertext
     end
+    # rubocop:enable Metrics/AbcSize, Metrics/MethodLength
+
+    private
 
     def encrypt_payload(plaintext, content_encryption_key, nonce)
       cipher = OpenSSL::Cipher.new('aes-128-gcm')
       cipher.encrypt
       cipher.key = content_encryption_key
       cipher.iv = nonce
-      padding = cipher.update("\0\0")
       text = cipher.update(plaintext)
-
-      e_text = padding + text + cipher.final
+      padding = cipher.update("\2\0")
+      e_text = text + padding + cipher.final
       e_tag = cipher.auth_tag
 
       e_text + e_tag
     end
 
-    def create_info(type, context)
-      info = "Content-Encoding: "
-      info += type
-      info += "\0"
-      info += "P-256"
-      info += context
-      info
-    end
-
     def convert16bit(key)
-      [key.to_s(16)].pack("H*")
+      [key.to_s(16)].pack('H*')
     end
 
     def assert_arguments(message, p256dh, auth)
-      raise ArgumentError, "message cannot be blank" if blank?(message)
-      raise ArgumentError, "p256dh cannot be blank" if blank?(p256dh)
-      raise ArgumentError, "auth cannot be blank" if blank?(auth)
+      raise ArgumentError, 'message cannot be blank' if blank?(message)
+      raise ArgumentError, 'p256dh cannot be blank' if blank?(p256dh)
+      raise ArgumentError, 'auth cannot be blank' if blank?(auth)
     end
 
     def blank?(value)
       value.nil? || value.empty?
     end
   end
-end
+end

data/lib/webpush/errors.rb

@@ -1,9 +1,11 @@
+# frozen_string_literal: true
+
 module Webpush
   class Error < RuntimeError; end
 
   class ConfigurationError < Error; end
 
-  class ResponseError < Error;
+  class ResponseError < Error
     attr_reader :response, :host
 
     def initialize(response, host)
@@ -24,5 +26,4 @@ module Webpush
   class TooManyRequests < ResponseError; end
 
   class PushServiceError < ResponseError; end
-
 end

data/lib/webpush/railtie.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Webpush
   class Railtie < Rails::Railtie
     rake_tasks do

data/lib/webpush/request.rb

@@ -1,13 +1,17 @@
+# frozen_string_literal: true
+
+require 'uri'
 require 'jwt'
 require 'base64'
 
 module Webpush
   # It is temporary URL until supported by the GCM server.
-  GCM_URL = 'https://android.googleapis.com/gcm/send'
-  TEMP_GCM_URL = 'https://gcm-http.googleapis.com/gcm'
+  GCM_URL = 'https://android.googleapis.com/gcm/send'.freeze
+  TEMP_GCM_URL = 'https://fcm.googleapis.com/fcm'.freeze
 
+  # rubocop:disable Metrics/ClassLength
   class Request
-    def initialize(message: "", subscription:, vapid:, **options)
+    def initialize(message: '', subscription:, vapid:, **options)
       endpoint = subscription.fetch(:endpoint)
       @endpoint = endpoint.gsub(GCM_URL, TEMP_GCM_URL)
       @payload = build_payload(message, subscription)
@@ -15,8 +19,9 @@ module Webpush
       @options = default_options.merge(options)
     end
 
+    # rubocop:disable Metrics/AbcSize
     def perform
-      http = Net::HTTP.new(uri.host, uri.port)
+      http = Net::HTTP.new(uri.host, uri.port, *proxy_options)
       http.use_ssl = true
       http.ssl_timeout = @options[:ssl_timeout] unless @options[:ssl_timeout].nil?
       http.open_timeout = @options[:open_timeout] unless @options[:open_timeout].nil?
@@ -24,64 +29,56 @@ module Webpush
 
       req = Net::HTTP::Post.new(uri.request_uri, headers)
       req.body = body
-      resp = http.request(req)
 
-      if resp.is_a?(Net::HTTPGone) # 410
-        raise ExpiredSubscription.new(resp, uri.host)
-      elsif resp.is_a?(Net::HTTPNotFound) # 404
-        raise InvalidSubscription.new(resp, uri.host)
-      elsif resp.is_a?(Net::HTTPUnauthorized) || # 401, Mozilla autopush
-        resp.is_a?(Net::HTTPBadRequest) && resp.message == "UnauthorizedRegistration" # 400, Google FCM
-        raise Unauthorized.new(resp, uri.host)
-      elsif resp.is_a?(Net::HTTPRequestEntityTooLarge) # 413
-        raise PayloadTooLarge.new(resp, uri.host)
-      elsif resp.is_a?(Net::HTTPTooManyRequests) # 429, try again later!
-        raise TooManyRequests.new(resp, uri.host)
-      elsif resp.is_a?(Net::HTTPServerError) # 5xx
-        raise PushServiceError.new(resp, uri.host)
-      elsif !resp.is_a?(Net::HTTPSuccess)  # unknown/unhandled response error
-        raise ResponseError.new(resp, uri.host)
-      end
+      resp = http.request(req)
+      verify_response(resp)
 
       resp
     end
+    # rubocop:enable Metrics/AbcSize
+
+    def proxy_options
+      return [] unless @options[:proxy]
+
+      proxy_uri = URI.parse(@options[:proxy])
 
+      [proxy_uri.host, proxy_uri.port, proxy_uri.user, proxy_uri.password]
+    end
+
+    # rubocop:disable Metrics/MethodLength
     def headers
       headers = {}
-      headers["Content-Type"] = "application/octet-stream"
-      headers["Ttl"]          = ttl
-      headers["Urgency"]      = urgency
-
-      if @payload.has_key?(:server_public_key)
-        headers["Content-Encoding"] = "aesgcm"
-        headers["Encryption"] = "salt=#{salt_param}"
-        headers["Crypto-Key"] = "dh=#{dh_param}"
+      headers['Content-Type'] = 'application/octet-stream'
+      headers['Ttl']          = ttl
+      headers['Urgency']      = urgency
+
+      if @payload
+        headers['Content-Encoding'] = 'aes128gcm'
+        headers["Content-Length"] = @payload.length.to_s
       end
 
       if api_key?
-        headers["Authorization"] = api_key
+        headers['Authorization'] = "key=#{api_key}"
       elsif vapid?
-        vapid_headers = build_vapid_headers
-        headers["Authorization"] = vapid_headers["Authorization"]
-        headers["Crypto-Key"] = [ headers["Crypto-Key"], vapid_headers["Crypto-Key"] ].compact.join(";")
+        headers["Authorization"] = build_vapid_header
       end
 
       headers
     end
+    # rubocop:enable Metrics/MethodLength
 
-    def build_vapid_headers
-      vapid_key = VapidKey.from_keys(vapid_public_key, vapid_private_key)
+    def build_vapid_header
+      # https://tools.ietf.org/id/draft-ietf-webpush-vapid-03.html
+
+      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
 
-      {
-        'Authorization' => 'WebPush ' + jwt,
-        'Crypto-Key' => 'p256ecdsa=' + p256ecdsa,
-      }
+       "vapid t=#{jwt},k=#{p256ecdsa}"
     end
 
     def body
-      @payload.fetch(:ciphertext, "")
+      @payload || ''
     end
 
     private
@@ -98,32 +95,24 @@ module Webpush
       @options.fetch(:urgency).to_s
     end
 
-    def dh_param
-      trim_encode64(@payload.fetch(:server_public_key))
-    end
-
-    def salt_param
-      trim_encode64(@payload.fetch(:salt))
-    end
-
     def jwt_payload
       {
         aud: audience,
         exp: Time.now.to_i + expiration,
-        sub: subject,
+        sub: subject
       }
     end
 
     def jwt_header_fields
-      { 'typ' => 'JWT' }
+      { "typ": "JWT", "alg": "ES256" }
     end
 
     def audience
-      uri.scheme + "://" + uri.host
+      uri.scheme + '://' + uri.host
     end
 
     def expiration
-      @vapid_options.fetch(:expiration, 24*60*60)
+      @vapid_options.fetch(:expiration, 24 * 60 * 60)
     end
 
     def subject
@@ -138,17 +127,21 @@ 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
+        ttl: 60 * 60 * 24 * 7 * 4, # 4 weeks
         urgency: 'normal'
       }
     end
 
     def build_payload(message, subscription)
-      return {} if message.nil? || message.empty?
+      return nil if message.nil? || message.empty?
 
-      encrypt_payload(message, subscription.fetch(:keys))
+      encrypt_payload(message, **subscription.fetch(:keys))
     end
 
     def encrypt_payload(message, p256dh:, auth:)
@@ -160,7 +153,7 @@ module Webpush
     end
 
     def api_key?
-      !(api_key.nil? || api_key.empty?) && @endpoint =~ /\Ahttps:\/\/(android|gcm-http)\.googleapis\.com/
+      !(api_key.nil? || api_key.empty?) && @endpoint =~ %r{\Ahttps://(android|gcm-http|fcm)\.googleapis\.com}
     end
 
     def vapid?
@@ -170,5 +163,27 @@ module Webpush
     def trim_encode64(bin)
       Webpush.encode64(bin).delete('=')
     end
+
+    # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/MethodLength, Metrics/PerceivedComplexity, Style/GuardClause
+    def verify_response(resp)
+      if resp.is_a?(Net::HTTPGone) # 410
+        raise ExpiredSubscription.new(resp, uri.host)
+      elsif resp.is_a?(Net::HTTPNotFound) # 404
+        raise InvalidSubscription.new(resp, uri.host)
+      elsif resp.is_a?(Net::HTTPUnauthorized) || resp.is_a?(Net::HTTPForbidden) || # 401, 403
+            resp.is_a?(Net::HTTPBadRequest) && resp.message == 'UnauthorizedRegistration' # 400, Google FCM
+        raise Unauthorized.new(resp, uri.host)
+      elsif resp.is_a?(Net::HTTPRequestEntityTooLarge) # 413
+        raise PayloadTooLarge.new(resp, uri.host)
+      elsif resp.is_a?(Net::HTTPTooManyRequests) # 429, try again later!
+        raise TooManyRequests.new(resp, uri.host)
+      elsif resp.is_a?(Net::HTTPServerError) # 5xx
+        raise PushServiceError.new(resp, uri.host)
+      elsif !resp.is_a?(Net::HTTPSuccess) # unknown/unhandled response error
+        raise ResponseError.new(resp, uri.host)
+      end
+    end
+    # rubocop:enable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/MethodLength, Metrics/PerceivedComplexity, Style/GuardClause
   end
+  # rubocop:enable Metrics/ClassLength
 end

data/lib/webpush/vapid_key.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Webpush
   # Class for abstracting the generation and encoding of elliptic curve public and private keys for use with the VAPID protocol
   #
@@ -14,6 +16,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,8 +77,15 @@ 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(" ")}>"
+      "#<#{self.class}:#{object_id.to_s(16)} #{to_h.map { |k, v| ":#{k}=#{v}" }.join(' ')}>"
     end
 
     private

data/lib/webpush/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Webpush
-  VERSION = "0.3.5"
+  VERSION = '1.1.0'.freeze
 end

data/webpush.gemspec

@@ -1,29 +1,30 @@
-# coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
+lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'webpush/version'
 
 Gem::Specification.new do |spec|
-  spec.name          = "webpush"
+  spec.name          = 'webpush'
   spec.version       = Webpush::VERSION
-  spec.authors       = ["zaru@sakuraba"]
-  spec.email         = ["zarutofu@gmail.com"]
+  spec.authors       = ['zaru@sakuraba']
+  spec.email         = ['zarutofu@gmail.com']
 
-  spec.summary       = %q{Encryption Utilities for Web Push payload. }
-  spec.homepage      = "https://github.com/zaru/webpush"
+  spec.summary       = 'Encryption Utilities for Web Push payload. '
+  spec.homepage      = 'https://github.com/zaru/webpush'
 
   spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
-  spec.bindir        = "exe"
+  spec.bindir        = 'exe'
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
-  spec.require_paths = ["lib"]
+  spec.require_paths = ['lib']
+  
+  spec.required_ruby_version = '>= 2.2'
 
-  spec.add_dependency "hkdf", "~> 0.2"
-  spec.add_dependency "jwt", "~> 2.0"
+  spec.add_dependency 'hkdf', '~> 0.2'
+  spec.add_dependency 'jwt', '~> 2.0'
 
-  spec.add_development_dependency "bundler", "~> 1.11"
+  spec.add_development_dependency 'bundler', '>= 1.17.3'
   spec.add_development_dependency 'pry'
-  spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "rspec", "~> 3.0"
-  spec.add_development_dependency "webmock", "~> 1.24"
-  spec.add_development_dependency "ece", "~> 0.2"
+  spec.add_development_dependency 'rake', '>= 10.0'
+  spec.add_development_dependency 'rspec', '~> 3.0'
+  spec.add_development_dependency 'simplecov'
+  spec.add_development_dependency 'webmock', '~> 3.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: webpush
 version: !ruby/object:Gem::Version
-  version: 0.3.5
+  version: 1.1.0
 platform: ruby
 authors:
 - zaru@sakuraba
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-01-02 00:00:00.000000000 Z
+date: 2020-11-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hkdf
@@ -42,16 +42,16 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.11'
+        version: 1.17.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.11'
+        version: 1.17.3
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -70,14 +70,14 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '10.0'
 - !ruby/object:Gem::Dependency
@@ -95,33 +95,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
-  name: webmock
+  name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.24'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.24'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: ece
+  name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '3.0'
 description: 
 email:
 - zarutofu@gmail.com
@@ -131,6 +131,7 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rspec"
+- ".rubocop.yml"
 - ".travis.yml"
 - CHANGELOG.md
 - Gemfile
@@ -161,15 +162,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.2'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Encryption Utilities for Web Push payload.