cipher.rb in ably-rest-0.8.9

- old
+ new

@@ -2,11 +2,11 @@
 require 'ably/models/message_encoders/base'
 require 'ably/util/crypto'
 
 module Ably::Models::MessageEncoders
   # Cipher Encoder & Decoder that automatically encrypts & decrypts messages using Ably::Util::Crypto
-  # when a channel has option encrypted: true.
+  # when a channel has the +:cipher+ channel option configured
   #
   class Cipher < Base
     ENCODING_ID = 'cipher'
 
     def initialize(*args)
@@ -18,32 +18,33 @@
       return if is_empty?(message)
       return if already_encrypted?(message)
 
       if channel_configured_for_encryption?(channel_options)
         add_encoding_to_message 'utf-8', message unless is_binary?(message) || is_utf8_encoded?(message)
-
         crypto = crypto_for(channel_options)
         message[:data] = crypto.encrypt(message[:data])
-        add_encoding_to_message "#{ENCODING_ID}+#{crypto.cipher_type.downcase}", message
+        add_encoding_to_message "#{ENCODING_ID}+#{crypto.cipher_params.cipher_type.downcase}", message
       end
     rescue ArgumentError => e
       raise Ably::Exceptions::CipherError.new(e.message, nil, 92005)
     rescue RuntimeError => e
       if e.message.match(/unsupported cipher algorithm/i)
         raise Ably::Exceptions::CipherError.new(e.message, nil, 92004)
+      else
+        raise e
       end
     end
 
     def decode(message, channel_options)
       if is_cipher_encoded?(message)
         unless channel_configured_for_encryption?(channel_options)
           raise Ably::Exceptions::CipherError.new('Message cannot be decrypted as the channel is not set up for encryption & decryption', nil, 92001)
         end
 
         crypto = crypto_for(channel_options)
-        unless crypto.cipher_type == cipher_algorithm(message).upcase
-          raise Ably::Exceptions::CipherError.new("Cipher algorithm #{crypto.cipher_type} does not match message cipher algorithm of #{cipher_algorithm(message).upcase}", nil, 92002)
+        unless crypto.cipher_params.cipher_type == cipher_algorithm(message).upcase
+          raise Ably::Exceptions::CipherError.new("Cipher algorithm #{crypto.cipher_params.cipher_type} does not match message cipher algorithm of #{cipher_algorithm(message).upcase}", nil, 92002)
         end
 
         message[:data] = crypto.decrypt(message[:data])
         strip_current_encoding_part message
       end
@@ -59,25 +60,25 @@
     def is_utf8_encoded?(message)
       current_encoding_part(message).to_s.match(/^utf-8$/i)
     end
 
     def crypto_for(channel_options)
-      @cryptos[channel_options.fetch(:cipher_params, :default)] ||= Ably::Util::Crypto.new(channel_options.fetch(:cipher_params, {}))
+      @cryptos[channel_options.to_s] ||= Ably::Util::Crypto.new(channel_options.fetch(:cipher, {}))
     end
 
     def channel_configured_for_encryption?(channel_options)
-      channel_options.fetch(:encrypted, false)
+      channel_options[:cipher]
     end
 
     def is_cipher_encoded?(message)
       !cipher_algorithm(message).nil?
     end
 
     def cipher_algorithm(message)
-      current_encoding_part(message).to_s[/^#{ENCODING_ID}\+([\w_-]+)$/, 1]
+      current_encoding_part(message).to_s[/^#{ENCODING_ID}\+([\w-]+)$/, 1]
     end
 
     def already_encrypted?(message)
-      message.fetch(:encoding, '').to_s.match(%r{(^|/)#{ENCODING_ID}\+([\w_-]+)($|/)})
+      message.fetch(:encoding, '').to_s.match(%r{(^|/)#{ENCODING_ID}\+([\w-]+)($|/)})
     end
   end
 end