pubnub 5.2.2 → 5.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f32d00b144dc8b386aaf9fcccc75c2d65a781068120e248b1d00d72ecd09b717
-  data.tar.gz: 50543ea5dc212a93d4e468a33e2462e962a673e0241126a0ddf03cef277f2d61
+  metadata.gz: 7b811bcac62af8b07a13d11b2ddcc4d2ab8f58410e1b3ac3112aa2221aa7445c
+  data.tar.gz: 337be3ead454cc2a8ea9c29b14c6dfd07ba0eee5b801d1f7ea8dc9cb0c94c140
 SHA512:
-  metadata.gz: e74dff21f6979c2329a030205ed1aae0255ce5e1ef9392d0462fbca753ddee9348a55bccec40ab0049889ed171a297f96feedfb82c5e15b0e938a80c810cb9f7
-  data.tar.gz: a70f58b2998364701e2d2db3ce91b5ed73b52e9c37b3e6e5edd00b8d5f6ea3ae93471bbd3ca5d14ceaf8d5d9a4475e216044ef1de47136c534e58827b55f877f
+  metadata.gz: 6d8f8f6307e338a94479d0b571c63f2232a8682b0f1f616b3d9b2ebcc3eb1ebf815104b2f769a71ea04a40bf87a2f4901153cd13f70e611ed229432a60b34ed7
+  data.tar.gz: 82431be095bed63b13960c42dcaf3831fff1e569f6ebb77f84dec7a757e4a26a825ca5a26f34ee1ad611452541c8c153c2f841231cd490498caaea1f21e58c62

data/.github/CODEOWNERS

@@ -1,3 +1,2 @@
-*         @parfeon @CraigLn @kleewho @seba-aln
-.github/* @parfeon @CraigLn @kleewho @seba-aln
-README.md @techwritermat @kazydek
+*         @parfeon @seba-aln
+README.md @techwritermat @kazydek @parfeon @seba-aln

data/.pubnub.yml

@@ -1,6 +1,18 @@
 ---
-version: "5.2.2"
+version: "5.3.1"
 changelog:
+  - date: 2023-11-03
+    version: v5.3.1
+    changes:
+      - type: improvement
+        text: "Update license information."
+  - date: 2023-10-16
+    version: v5.3.0
+    changes:
+      - type: feature
+        text: "Add crypto module that allows to configure SDK to encrypt and decrypt messages."
+      - type: bug
+        text: "Improved security of crypto implementation by adding enhanced AES-CBC cryptor."
   - date: 2023-03-14
     version: v5.2.2
     changes:
@@ -663,7 +675,7 @@ sdks:
                     - x86-64
           - distribution-type: package
             distribution-repository: RubyGems
-            package-name: pubnub-5.2.2.gem
+            package-name: pubnub-5.3.1.gem
             location: https://rubygems.org/gems/pubnub
             requires:
               - name: addressable
@@ -768,8 +780,8 @@ sdks:
                     - x86-64
           - distribution-type: library
             distribution-repository: GitHub release
-            package-name: pubnub-5.2.2.gem
-            location: https://github.com/pubnub/ruby/releases/download/v5.2.2/pubnub-5.2.2.gem
+            package-name: pubnub-5.3.1.gem
+            location: https://github.com/pubnub/ruby/releases/download/v5.3.1/pubnub-5.3.1.gem
             requires:
               - name: addressable
                 min-version: 2.0.0

data/.tool-versions

@@ -1 +1 @@
-ruby jruby-9.3.8.0
+ruby 3.2.2

data/CHANGELOG.md

@@ -1,3 +1,18 @@
+## v5.3.1
+November 03 2023
+
+#### Modified
+- Update license information.
+
+## v5.3.0
+October 16 2023
+
+#### Added
+- Add crypto module that allows to configure SDK to encrypt and decrypt messages.
+
+#### Fixed
+- Improved security of crypto implementation by adding enhanced AES-CBC cryptor.
+
 ## v5.2.2
 March 14 2023
 

data/Gemfile

@@ -17,7 +17,7 @@ end
 
 group :development, :test do
   gem 'awesome_print'
-  gem 'pry'
+  gem 'pry', '>= 0.14.2'
   gem 'pry-rescue'
   gem 'pry-stack_explorer'
 end

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    pubnub (5.2.2)
+    pubnub (5.3.1)
       addressable (>= 2.0.0)
       concurrent-ruby (~> 1.1.5)
       concurrent-ruby-edge (~> 0.5.0)
@@ -100,8 +100,8 @@ GEM
       dry-equalizer (~> 0.2)
       dry-initializer (~> 3.0)
       dry-schema (~> 1.5)
-    ffi (1.13.1)
-    ffi (1.13.1-java)
+    ffi (1.16.2)
+    ffi (1.16.2-java)
     hashdiff (1.0.1)
     httpclient (2.8.3)
     interception (0.5)
@@ -115,10 +115,10 @@ GEM
     parallel (1.19.2)
     parser (2.7.1.4)
       ast (~> 2.4.1)
-    pry (0.13.1)
+    pry (0.14.2)
       coderay (~> 1.1)
       method_source (~> 1.0)
-    pry (0.13.1-java)
+    pry (0.14.2-java)
       coderay (~> 1.1)
       method_source (~> 1.0)
       spoon (~> 0.0)
@@ -187,7 +187,7 @@ DEPENDENCIES
   awesome_print
   codacy-coverage
   cucumber
-  pry
+  pry (>= 0.14.2)
   pry-rescue
   pry-stack_explorer
   pubnub!

data/LICENSE.txt

@@ -1,30 +1,29 @@
-PubNub Real-time Cloud-Hosted Push API and Push Notification Client Frameworks
-Copyright (c) 2013-2014 PubNub Inc.
-http://www.pubnub.com/
-http://www.pubnub.com/terms
+PubNub Software Development Kit License Agreement
+Copyright © 2023 PubNub Inc. All rights reserved.
 
-MIT License
+Subject to the terms and conditions of the license, you are hereby granted
+a non-exclusive, worldwide, royalty-free license to (a) copy and modify
+the software in source code or binary form for use with the software services
+and interfaces provided by PubNub, and (b) redistribute unmodified copies
+of the software to third parties. The software may not be incorporated in
+or used to provide any product or service competitive with the products
+and services of PubNub.
 
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
+The above copyright notice and this license shall be included
+in or with all copies or substantial portions of the software.
 
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
+This license does not grant you permission to use the trade names, trademarks,
+service marks, or product names of PubNub, except as required for reasonable
+and customary use in describing the origin of the software and reproducing
+the content of this license.
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO
+EVENT SHALL PUBNUB OR THE AUTHORS OR COPYRIGHT HOLDERS OF THE SOFTWARE BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
+CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-PubNub Real-time Cloud-Hosted Push API and Push Notification Client Frameworks
-Copyright (c) 2013-2014 PubNub Inc.
-http://www.pubnub.com/
-http://www.pubnub.com/terms
+https://www.pubnub.com/
+https://www.pubnub.com/terms

data/VERSION

@@ -1 +1 @@
-5.2.2
+5.3.1

data/features/step_definitions/access_steps.rb

@@ -254,5 +254,3 @@ end
 Then('the error detail message is not empty') do
   expect(parse_error_body(@global_state[:last_call_res])["error"]["message"].empty?).to eq false
 end
-
-

data/features/step_definitions/crypto_steps.rb

@@ -0,0 +1,99 @@
+# frozen_string_literal: true
+#
+require 'pubnub'
+
+Given(/^Crypto module with '([^']*)' cryptor$/) do |cryptor_id|
+  @cryptor_ids = [cryptor_id]
+end
+
+Given(/^Crypto module with default '([^']*)' and additional '([^']*)' cryptors$/) do |cryptor_id1, cryptor_id2|
+  @cryptor_ids = [cryptor_id1, cryptor_id2]
+end
+
+Given(/^Legacy code with '([^']*)' cipher key and '(random|constant|-)' vector$/) do |cipher_key, use_random_iv|
+  use_random_iv = use_random_iv != 'constant'
+  @legacy_cryptor = Cryptor.new cipher_key, use_random_iv
+end
+
+Then(/^with '([^']*)' cipher key$/) do |cipher_key|
+  @cipher_key = cipher_key
+end
+
+Then(/^with '(random|constant|-)' vector$/) do |use_random_iv|
+  @use_random_iv = use_random_iv != 'constant'
+end
+
+When(/^I encrypt '([^']*)' file as '([^']*)'$/) do |file_name, _|
+  @source_file_name = file_name
+  @source_file_content = File.binread "sdk-specifications/features/encryption/assets/#{file_name}"
+  @encrypted_content = crypto_module.encrypt @source_file_content
+  if file_name.include? 'empty'
+    @encrypt_status = 'encryption error' if @encrypted_content.nil? && @encrypt_status.nil?
+    @encrypt_status = 'success' if !@encrypted_content.nil? && @encrypt_status.nil?
+  else
+    expect(@encrypted_content).not_to eq nil
+  end
+end
+
+When(/^I decrypt '([^']*)' file$/) do |file_name|
+  file_content = File.binread "sdk-specifications/features/encryption/assets/#{file_name}"
+
+  begin
+    @decrypted_content = crypto_module.decrypt file_content
+  rescue Pubnub::UnknownCryptorError
+    @decrypt_status = 'unknown cryptor error'
+  end
+  @decrypt_status = 'decryption error' if @decrypted_content.nil? && @decrypt_status.nil?
+  @decrypt_status = 'success' if !@decrypted_content.nil? && @decrypt_status.nil?
+end
+
+When(/^I decrypt '([^']*)' file as '([^']*)'$/) do |file_name, _|
+  file_content = File.binread "sdk-specifications/features/encryption/assets/#{file_name}"
+
+  begin
+    @decrypted_content = crypto_module.decrypt file_content
+  rescue Pubnub::UnknownCryptorError
+    @decrypt_status = 'unknown cryptor error'
+  end
+  @decrypt_status = 'decryption error' if @decrypted_content.nil? && @decrypt_status.nil?
+  @decrypt_status = 'success' if !@decrypted_content.nil? && @decrypt_status.nil?
+end
+
+Then(/^Decrypted file content equal to the '([^']*)' file content$/) do |file_name|
+  file_content = File.binread "sdk-specifications/features/encryption/assets/#{file_name}"
+  expect(@decrypted_content).not_to eq nil
+  expect(@decrypted_content).to eq file_content
+end
+
+Then('Successfully decrypt an encrypted file with legacy code') do
+  expect(@legacy_cryptor).not_to eq nil
+  base64_encoded = Base64.strict_encode64(@encrypted_content)
+  decrypted_content = @legacy_cryptor.decrypt(base64_encoded)
+  expect(decrypted_content).not_to eq nil
+  expect(decrypted_content).to eq @source_file_content
+end
+
+Then(/^I receive '([^']*)'$/) do |outcome|
+  expect(@encrypt_status || @decrypt_status).not_to eq nil
+  expect(@encrypt_status || @decrypt_status).to eq outcome
+end
+
+# Crypto module
+#
+# @return [Pubnub::Crypto::CryptoModule] Crypto module instance.
+def crypto_module
+  cryptors = []
+  @cryptor_ids.each do |cryptor_id|
+    cryptor = if cryptor_id == 'acrh'
+                Pubnub::Crypto::AesCbcCryptor.new @cipher_key
+              elsif cryptor_id == 'legacy'
+                Pubnub::Crypto::LegacyCryptor.new @cipher_key, @use_random_iv
+              end
+    cryptors.push(cryptor) unless cryptor.nil?
+  end
+
+  raise ArgumentError, "No crypto identifiers specified: #{@cryptor_ids}" if cryptors.empty?
+
+  default_cryptor = cryptors.shift
+  Pubnub::Crypto::CryptoModule.new default_cryptor, cryptors unless default_cryptor.nil?
+end

data/features/support/cryptor.rb

@@ -0,0 +1,58 @@
+# Internal Crypto class used for message encryption and decryption
+class Cryptor
+  def initialize(cipher_key, use_random_iv)
+    @alg = 'AES-256-CBC'
+    sha256_key = Digest::SHA256.hexdigest(cipher_key.to_s)
+    @key = sha256_key.slice(0, 32)
+    @using_random_iv = use_random_iv
+    @iv = @using_random_iv == true ? random_iv : '0123456789012345'
+  end
+
+  def encrypt(message)
+    aes = OpenSSL::Cipher.new(@alg)
+    aes.encrypt
+    aes.key = @key
+    aes.iv = @iv
+
+    json_message = message.to_json
+    cipher = @using_random_iv == true ? @iv : ''
+    cipher << aes.update(json_message)
+    cipher << aes.final
+
+    Base64.strict_encode64(cipher)
+  end
+
+  def decrypt(cipher_text)
+    undecoded_text = Base64.decode64(cipher_text)
+    iv = @iv
+
+    if cipher_text.length > 16 && @using_random_iv == true
+      iv = undecoded_text.slice!(0..15)
+    end
+
+    decode_cipher = OpenSSL::Cipher.new(@alg).decrypt
+    decode_cipher.key = @key
+    decode_cipher.iv = iv
+
+    plain_text = decryption(undecoded_text, decode_cipher)
+
+    plain_text
+  end
+
+  private
+
+  def decryption(cipher_text, decode_cipher)
+    plain_text = decode_cipher.update(cipher_text)
+    plain_text << decode_cipher.final
+  rescue StandardError => e
+    puts "Pubnub :: DECRYPTION ERROR: #{e}"
+    '"DECRYPTION ERROR"'
+  end
+
+  private
+
+  def random_iv
+    random_bytes = Random.new.bytes(16).unpack('NnnnnN')
+    format('%08x%04x%04x', *random_bytes)
+  end
+end

data/features/support/hooks.rb

@@ -8,7 +8,6 @@ Before do |scenario|
   @pn_configuration = {}
 
   when_mock_server_used {
-    puts "Using mock"
     expect(ENV['SERVER_HOST']).not_to be_nil
     expect(ENV['SERVER_PORT']).not_to be_nil
     @pn_configuration = {

data/lib/pubnub/client.rb

@@ -1,13 +1,16 @@
+# frozen_string_literal: true
+
 require 'base64'
 
 require 'pubnub/error'
 require 'pubnub/uuid'
 require 'pubnub/formatter'
-require 'pubnub/crypto'
 require 'pubnub/constants'
 require 'pubnub/configuration'
 require 'pubnub/subscribe_callback'
 
+require 'pubnub/modules/crypto/module'
+
 require 'pubnub/schemas/envelope_schema'
 
 require 'pubnub/event'
@@ -183,6 +186,7 @@ module Pubnub
       clean_env
       prepare_env
       validate! @env
+      setup_crypto_module
       @telemetry = Telemetry.new
       Pubnub.logger.debug('Pubnub::Client') do
         "Created new Pubnub::Client instance. Version: #{Pubnub::VERSION}"
@@ -339,6 +343,14 @@ module Pubnub
       @env[:token] = token
     end
 
+    # Data processing crypto module.
+    #
+    # @return [Pubnub::Crypto::CryptoProvider, nil] Crypto module for data encryption and
+    #   decryption.
+    def crypto_module
+      @env[:crypto_module]
+    end
+
     private
 
     def create_state_pools(event)
@@ -386,9 +398,26 @@ module Pubnub
       Concurrent.global_logger = Pubnub.logger
       @subscriber = Subscriber.new(self)
       options[:user_id] = options[:uuid] if options[:user_id].nil?
+
+      if options[:cipher_key] && options[:crypto_module]
+        puts 'It is expected that only cipherKey or cryptoModule will be configured ' \
+               'at once. PubNub client will use the configured cryptoModule.'
+      end
+
       @env = options
     end
 
+    # Complete crypto module configuration
+    # Create crypto module if it is required by user (specified
+    # <i>cipher_key</i> and not <i>crypto_module</i>).
+    def setup_crypto_module
+      random_iv = @env[:random_iv]
+      key = @env[:cipher_key]
+
+      # Create crypto module if it is not specified
+      @env[:crypto_module] = Crypto::CryptoModule.new_legacy(key, random_iv) if key && @env[:crypto_module].nil?
+    end
+
     def prepare_env
       assign_defaults
       setup_pools

data/lib/pubnub/error.rb

@@ -51,4 +51,7 @@ module Pubnub
 
   class ResponseError < Error
   end
+
+  class UnknownCryptorError < Error
+  end
 end

data/lib/pubnub/event.rb

@@ -113,12 +113,12 @@ module Pubnub
     def operation_http_method
       case @event
       when Pubnub::Constants::OPERATION_DELETE, Pubnub::Constants::OPERATION_REMOVE_MESSAGE_ACTION,
-           Pubnub::Constants::OPERATION_REMOVE_CHANNEL_METADATA, Pubnub::Constants::OPERATION_REMOVE_UUID_METADATA,
-           Pubnub::Constants::OPERATION_REVOKE_TOKEN
+        Pubnub::Constants::OPERATION_REMOVE_CHANNEL_METADATA, Pubnub::Constants::OPERATION_REMOVE_UUID_METADATA,
+        Pubnub::Constants::OPERATION_REVOKE_TOKEN
         'delete'
       when Pubnub::Constants::OPERATION_SET_UUID_METADATA, Pubnub::Constants::OPERATION_SET_CHANNEL_METADATA,
-           Pubnub::Constants::OPERATION_SET_CHANNEL_MEMBERS, Pubnub::Constants::OPERATION_SET_MEMBERSHIPS,
-           Pubnub::Constants::OPERATION_REMOVE_CHANNEL_MEMBERS, Pubnub::Constants::OPERATION_REMOVE_MEMBERSHIPS
+        Pubnub::Constants::OPERATION_SET_CHANNEL_MEMBERS, Pubnub::Constants::OPERATION_SET_MEMBERSHIPS,
+        Pubnub::Constants::OPERATION_REMOVE_CHANNEL_MEMBERS, Pubnub::Constants::OPERATION_REMOVE_MEMBERSHIPS
         'patch'
       when Pubnub::Constants::OPERATION_ADD_MESSAGE_ACTION
         'post'
@@ -170,7 +170,7 @@ module Pubnub
 
     def create_variables_from_options(options)
       variables = %w[channel channels message http_sync callback
-                     ssl cipher_key random_iv secret_key auth_key
+                     ssl cipher_key random_iv crypto_module secret_key auth_key
                      publish_key subscribe_key timetoken action_timetoken message_timetoken
                      open_timeout read_timeout idle_timeout heartbeat
                      group action read write delete manage ttl presence start
@@ -217,6 +217,14 @@ module Pubnub
       ck.call(data)
     end
 
+    # Data processing crypto module.
+    #
+    # @return [Pubnub::Crypto::CryptoProvider, nil] Crypto module for data encryption and
+    #   decryption.
+    def crypto_module
+      @crypto_module
+    end
+
     def error_message(parsed_response)
       parsed_response['message']
     rescue StandardError

data/lib/pubnub/events/add_message_action.rb

@@ -13,8 +13,8 @@ module Pubnub
 
     def fire
       Pubnub.logger.debug('Pubnub::Add Message Action') { "Fired event #{self.class}" }
-      type_payload = { type: @type, value: @value}
-      body = Formatter.format_message(type_payload, '', false, false)
+      type_payload = { type: @type, value: @value }
+      body = Formatter.format_message(type_payload, nil, false)
 
       response = send_request(body, { "Content-Type": 'application/json' })
 

data/lib/pubnub/events/grant_token.rb

@@ -34,7 +34,7 @@ module Pubnub
           patterns: prepare_permissions(:pattern, @channels, @channel_groups, @uuids, @spaces_permissions, @users_permissions)
         }.select { |_, v| v }
       }
-      body = Formatter.format_message(raw_body, "", false, false)
+      body = Formatter.format_message(raw_body, nil, false)
       response = send_request(body, { "Content-Type": "application/json" })
 
       envelopes = fire_callbacks(handle(response, uri))

data/lib/pubnub/events/history.rb

@@ -8,6 +8,11 @@ module Pubnub
     def initialize(options, app)
       @event = :history
       @telemetry_name = :l_hist
+
+      # Override crypto module if custom cipher key has been used.
+      random_iv = options.key?(:random_iv) ? options[:random_iv] : true
+      options[:crypto_module] = Crypto::CryptoModule.new_legacy(options[:cipher_key], random_iv) if options[:cipher_key]
+
       super
     end
 
@@ -63,23 +68,30 @@ module Pubnub
 
     def decrypt_history(message, crypto)
       if @include_token || @include_meta
-        message['message'] = JSON.parse(crypto.decrypt(message['message']), quirks_mode: true)
+        encrypted_message = Base64.decode64(message['message'])
+        message['message'] = JSON.parse(crypto.decrypt(encrypted_message), quirks_mode: true)
 
         message
       else
-        JSON.parse(crypto.decrypt(message), quirks_mode: true)
+        encrypted_message = Base64.decode64(message)
+        JSON.parse(crypto.decrypt(encrypted_message), quirks_mode: true)
       end
     end
 
     def valid_envelope(parsed_response, req_res_objects)
       messages = parsed_response[0]
 
-      if (@cipher_key || @app.env[:cipher_key] || @cipher_key_selector || @app.env[:cipher_key_selector]) && messages
-        cipher_key = compute_cipher_key(parsed_response)
-        random_iv = compute_random_iv(parsed_response)
-        crypto = Crypto.new(cipher_key, random_iv)
+      # TODO: Uncomment code below when cryptor implementations will be added.
+      if crypto_module && messages
+        crypto = crypto_module
         messages = messages.map { |message| decrypt_history(message, crypto) }
       end
+      # if (@cipher_key || @app.env[:cipher_key] || @cipher_key_selector || @app.env[:cipher_key_selector]) && messages
+      #   cipher_key = compute_cipher_key(parsed_response)
+      #   random_iv = compute_random_iv(parsed_response)
+      #   crypto = Crypto.new(cipher_key, random_iv)
+      #   messages = messages.map { |message| decrypt_history(message, crypto) }
+      # end
 
       start = parsed_response[1]
       finish = parsed_response[2]

data/lib/pubnub/events/publish.rb

@@ -10,6 +10,11 @@ module Pubnub
     def initialize(options, app)
       @event = :publish
       @telemetry_name = :l_pub
+
+      # Override crypto module if custom cipher key has been used.
+      random_iv = options.key?(:random_iv) ? options[:random_iv] : true
+      options[:crypto_module] = Crypto::CryptoModule.new_legacy(options[:cipher_key], random_iv) if options[:cipher_key]
+
       super
       @sequence_number = sequence_number!
       @origination_time_token = @app.generate_ortt
@@ -25,9 +30,8 @@ module Pubnub
 
     def fire
       Pubnub.logger.debug('Pubnub::Publish') { "Fired event #{self.class}" }
-
       if @compressed
-        compressed_body = Formatter.format_message(@message, @cipher_key, @random_iv, false)
+        compressed_body = Formatter.format_message(@message, @crypto_module, false)
         response = send_request(compressed_body)
       else
         response = send_request
@@ -72,7 +76,7 @@ module Pubnub
         '0',
         Formatter.format_channel(@channel, true),
         '0',
-        Formatter.format_message(@message, @cipher_key, @random_iv)
+        Formatter.format_message(@message, @crypto_module)
       ]
 
       rpath.pop if @compressed

data/lib/pubnub/events/remove_channel_members.rb

@@ -42,7 +42,7 @@ module Pubnub
         { uuid: { id: member } }
       end
 
-      body = Formatter.format_message({ delete: members }, "", @random_iv, false)
+      body = Formatter.format_message({ delete: members }, nil, false)
       response = send_request(body)
 
       envelopes = fire_callbacks(handle(response, uri))
@@ -83,11 +83,11 @@ module Pubnub
     def valid_envelope(parsed_response, req_res_objects)
       members = parsed_response['data'].map { |channel_member|
         member = Hash.new
-        channel_member.each{ |k,v| member[k.to_sym] = v }
+        channel_member.each { |k, v| member[k.to_sym] = v }
 
         unless member[:uuid].nil?
           uuid_metadata = Hash.new
-          member[:uuid].each{ |k,v| uuid_metadata[k.to_sym] = v }
+          member[:uuid].each { |k, v| uuid_metadata[k.to_sym] = v }
           uuid_metadata[:updated] = Date._parse(uuid_metadata[:updated]) unless uuid_metadata[:updated].nil?
           member[:uuid] = uuid_metadata
         end

data/lib/pubnub/events/remove_channel_metadata.rb

@@ -17,7 +17,7 @@ module Pubnub
     def fire
       Pubnub.logger.debug('Pubnub::RemoveChannelMetadata') { "Fired event #{self.class}" }
 
-      body = Formatter.format_message(@data, "", @random_iv, false)
+      body = Formatter.format_message(@data, nil, false)
       response = send_request(body)
 
       envelopes = fire_callbacks(handle(response, uri))

data/lib/pubnub/events/remove_memberships.rb

@@ -42,7 +42,7 @@ module Pubnub
         { channel: { id: membership } }
       end
 
-      body = Formatter.format_message({ delete: memberships }, "", @random_iv, false)
+      body = Formatter.format_message({ delete: memberships }, nil, false)
       response = send_request(body)
 
       envelopes = fire_callbacks(handle(response, uri))
@@ -83,11 +83,11 @@ module Pubnub
     def valid_envelope(parsed_response, req_res_objects)
       memberships = parsed_response['data'].map { |uuid_membership|
         membership = Hash.new
-        uuid_membership.each{ |k,v| membership[k.to_sym] = v }
+        uuid_membership.each { |k, v| membership[k.to_sym] = v }
 
         unless membership[:channel].nil?
           channel_metadata = Hash.new
-          membership[:channel].each{ |k,v| channel_metadata[k.to_sym] = v }
+          membership[:channel].each { |k, v| channel_metadata[k.to_sym] = v }
           channel_metadata[:updated] = Date._parse(channel_metadata[:updated]) unless channel_metadata[:updated].nil?
           membership[:channel] = channel_metadata
         end

data/lib/pubnub/events/remove_uuid_metadata.rb

@@ -17,7 +17,7 @@ module Pubnub
     def fire
       Pubnub.logger.debug('Pubnub::RemoveUuidMetadata') { "Fired event #{self.class}" }
 
-      body = Formatter.format_message(@data, "", @random_iv, false)
+      body = Formatter.format_message(@data, nil, false)
       response = send_request(body)
 
       envelopes = fire_callbacks(handle(response, uri))