webpush 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 380725977abfa7cbf7b62f4a4ac5b34c1ba1877d
-  data.tar.gz: 2c82b655b035f6b25c75346010d630564339269b
+  metadata.gz: b5006a4c889349920fc642e5e126f9a2bb986fa8
+  data.tar.gz: cc39101673ba4b9c52aa4482e1dbb554ccb51342
 SHA512:
-  metadata.gz: b7c99af20b1caf248fe7def5e81e8f8eb9897b077f7f36157127a78e69611ad5a6e145214e6334fff7b7eb6d941b9157544e8c8ef40fa1534b014f2402396a21
-  data.tar.gz: e04325bf879edc79cd740cde288495071f011c7a3b25d765b634ab58989f83298a4793b9934b7a6e8724bcc76a2832b5621b74dd372ed6c8d40f10ceb9a82e38
+  metadata.gz: 81560e7eabb65bac0fb4ce2972279654bdbcbca4719d815a40cd63994b20f59ba2430ad6835e6d5a0655df6897552344588948622399a405e9b4964bc2740b14
+  data.tar.gz: 4785dc7d17f520a0df9891dd1ada08b57e59b19e972a9308190c3025ba7491f27052b0163c5f4dfd4fb7361066539bc98b325ef47e5e81bfa0bce0bca2309cc0

data/README.md

@@ -22,7 +22,7 @@ Or install it yourself as:
 
 ## Usage
 
-```
+```ruby
 message = {
   title: "title",
   body: "body",
@@ -30,12 +30,12 @@ message = {
 }
 
 Webpush.payload_send(
-                     message: JSON.generate(message),
-                     endpoint: "https://android.googleapis.com/gcm/send/eah7hak....",
-                     p256dh: "BO/aG9nYXNkZmFkc2ZmZHNmYWRzZmFl...",
-                     auth: "aW1hcmthcmFpa3V6ZQ==",
-                     api_key: "[GoogleDeveloper APIKEY]" # optional, not used in Firefox.
-                     )
+  message: JSON.generate(message),
+  endpoint: "https://android.googleapis.com/gcm/send/eah7hak....",
+  p256dh: "BO/aG9nYXNkZmFkc2ZmZHNmYWRzZmFl...",
+  auth: "aW1hcmthcmFpa3V6ZQ==",
+  api_key: "[GoogleDeveloper APIKEY]" # optional, not used in Firefox.
+)
 ```
 
 ### ServiceWorker sample
@@ -44,7 +44,7 @@ see. https://github.com/zaru/web-push-sample
 
 p256dh and auth generate sample code.
 
-```
+```javascript
 navigator.serviceWorker.ready.then(function(sw) {
   Notification.requestPermission(function(permission) {
     if(permission !== 'denied') {
@@ -63,7 +63,7 @@ navigator.serviceWorker.ready.then(function(sw) {
 
 payloads received sample code.
 
-```
+```javascript
 self.addEventListener("push", function(event) {
   var json = event.data.json();
   self.registration.showNotification(json.title, {

data/bin/rake

@@ -0,0 +1,16 @@
+#!/usr/bin/env ruby
+#
+# This file was generated by Bundler.
+#
+# The application 'rake' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require "pathname"
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
+  Pathname.new(__FILE__).realpath)
+
+require "rubygems"
+require "bundler/setup"
+
+load Gem.bin_path("rake", "rake")

data/lib/webpush.rb

@@ -1,10 +1,12 @@
-require 'webpush/version'
 require 'openssl'
 require 'base64'
 require 'hkdf'
 require 'net/http'
 require 'json'
 
+require 'webpush/version'
+require 'webpush/encryption'
+
 module Webpush
 
   # It is temporary URL until supported by the GCM server.
@@ -14,10 +16,8 @@ module Webpush
   class << self
     def payload_send(message:, endpoint:, p256dh:, auth:, api_key: "")
       endpoint = endpoint.gsub(GCM_URL, TEMP_GCM_URL)
-      p256dh = unescape_base64(p256dh)
-      auth = unescape_base64(auth)
 
-      payload = encrypt(message, p256dh, auth)
+      payload = Webpush::Encryption.encrypt(message, p256dh, auth)
       push_server_post(endpoint, payload, api_key)
     end
 
@@ -45,84 +45,5 @@ module Webpush
         return false
       end
     end
-
-    def encrypt(message, p256dh, auth)
-      group_name = "prime256v1"
-      salt = Random.new.bytes(16)
-
-      server = OpenSSL::PKey::EC.new(group_name)
-      server.generate_key
-      server_public_key_bn = server.public_key.to_bn
-
-      group = OpenSSL::PKey::EC::Group.new(group_name)
-      client_public_key_hex = Base64.decode64(p256dh).unpack("H*").first
-      client_public_key_bn = OpenSSL::BN.new(client_public_key_hex, 16)
-      client_public_key = OpenSSL::PKey::EC::Point.new(group, client_public_key_bn)
-
-      shared_secret = server.dh_compute_key(client_public_key)
-
-      clientAuthToken = Base64.decode64(auth)
-
-      prk = HKDF.new(shared_secret, :salt => clientAuthToken, :algorithm => 'SHA256', :info => "Content-Encoding: auth\0").next_bytes(32)
-
-      context = create_context(client_public_key_bn, server_public_key_bn)
-
-      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)
-      }
-    end
-
-    def create_context(clientPublicKey, serverPublicKey)
-      c = convert16bit(clientPublicKey)
-      s = convert16bit(serverPublicKey)
-      context = "\0"
-      context += [c.bytesize].pack("n*")
-      context += c
-      context += [s.bytesize].pack("n*")
-      context += s
-      context
-    end
-
-    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
-      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*")
-    end
-
-    def unescape_base64(base64)
-      base64.gsub(/_|\-/, "_" => "/", "-" => "+")
-    end
   end
-
 end

data/lib/webpush/encryption.rb

@@ -0,0 +1,81 @@
+module Webpush
+  module Encryption
+    extend self
+
+    def encrypt(message, p256dh, auth)
+      group_name = "prime256v1"
+      salt = Random.new.bytes(16)
+
+      server = OpenSSL::PKey::EC.new(group_name)
+      server.generate_key
+      server_public_key_bn = server.public_key.to_bn
+
+      group = OpenSSL::PKey::EC::Group.new(group_name)
+      client_public_key_bn = OpenSSL::BN.new(Base64.urlsafe_decode64(p256dh), 2)
+      client_public_key = OpenSSL::PKey::EC::Point.new(group, client_public_key_bn)
+
+      shared_secret = server.dh_compute_key(client_public_key)
+
+      client_auth_token = Base64.urlsafe_decode64(auth)
+
+      prk = HKDF.new(shared_secret, :salt => client_auth_token, :algorithm => 'SHA256', :info => "Content-Encoding: auth\0").next_bytes(32)
+
+      context = create_context(client_public_key_bn, server_public_key_bn)
+
+      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),
+        shared_secret: shared_secret
+      }
+    end
+
+    private
+
+    def create_context(clientPublicKey, serverPublicKey)
+      c = convert16bit(clientPublicKey)
+      s = convert16bit(serverPublicKey)
+      context = "\0"
+      context += [c.bytesize].pack("n*")
+      context += c
+      context += [s.bytesize].pack("n*")
+      context += s
+      context
+    end
+
+    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
+      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*")
+    end
+  end
+end

data/lib/webpush/version.rb

@@ -1,3 +1,3 @@
 module Webpush
-  VERSION = "0.1.5"
+  VERSION = "0.1.6"
 end

data/webpush.gemspec

@@ -20,6 +20,9 @@ Gem::Specification.new do |spec|
   spec.add_dependency "hkdf", "~> 0.2"
 
   spec.add_development_dependency "bundler", "~> 1.11"
+  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"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: webpush
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - zaru@sakuraba
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-04-29 00:00:00.000000000 Z
+date: 2016-05-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hkdf
@@ -38,6 +38,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.11'
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -66,6 +80,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: webmock
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.24'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.24'
+- !ruby/object:Gem::Dependency
+  name: ece
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.2'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.2'
 description: 
 email:
 - zarutofu@gmail.com
@@ -80,8 +122,10 @@ files:
 - README.md
 - Rakefile
 - bin/console
+- bin/rake
 - bin/setup
 - lib/webpush.rb
+- lib/webpush/encryption.rb
 - lib/webpush/version.rb
 - webpush.gemspec
 homepage: https://github.com/zaru/webpush
@@ -103,7 +147,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Encryption Utilities for Web Push payload.