cryptor 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 28c23ac85c838a1017c2298d7237cba2f4a4cce2
-  data.tar.gz: 7176ba9550de9958c17cfebfdec784f66f236b5c
+  metadata.gz: 7e231e81835f4ec4b64c603b597b38266d505cd8
+  data.tar.gz: 0843bf2d906c77f5824d75c187d30d2d28bf246c
 SHA512:
-  metadata.gz: 82907137a69c2f33963ea311ec7e9c8a632d4f91b4313b354bb69ec2b654c53c80906f9b57e8afcbe96b5f8fc6b17fab4baab48f12331d0e8db9437226b46485
-  data.tar.gz: 85e14622245d730c9ec036644a5f5c32f9f7d6bfcbb19c4e8060dab4bc3eab4864af79d56dcbdc0913057facb8df4dfc61677cdab6092928149f08268c3cd01f
+  metadata.gz: 46ecd69eebc0ab266b699f978bc934f03fd7211414eb55a8147e9cdc14a1a999424fd266c66d2db211b4ce9a0734cb6799d7e45beba2927167cd40579d835c36
+  data.tar.gz: 3da93938f00f68a5e7b3d968e7628a09d788b3838142a48945ae14437150c5849bae15da751002ba205b70c5c90bf399ca6f80793315ce6e4a90a4f02ed48e21

data/CHANGES.md

@@ -1,3 +1,7 @@
+0.0.2 (2014-06-07)
+------------------
+* Raise Cryptor::CorruptedMessageError on MAC verification failure
+
 0.0.1 (2014-06-05)
 ------------------
 * Happy Snow day!

data/cryptor.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(/^(test|spec|features)\//)
   spec.require_paths = ['lib']
 
-  spec.add_runtime_dependency 'ordo', '>= 0.0.1'
+  spec.add_runtime_dependency 'ordo', '>= 0.0.2'
 
   spec.add_development_dependency 'rake'
   spec.add_development_dependency 'rubocop'

data/lib/cryptor.rb

@@ -4,3 +4,11 @@ require 'cryptor/cipher'
 require 'cryptor/encoding'
 require 'cryptor/secret_key'
 require 'cryptor/symmetric_encryption'
+
+# Multi-backend high-level encryption library
+module Cryptor
+  CryptoError = Class.new(StandardError)
+
+  InvalidMessageError   = Class.new(CryptoError)
+  CorruptedMessageError = Class.new(CryptoError)
+end

data/lib/cryptor/ciphers/message_encryptor.rb

@@ -32,6 +32,8 @@ module Cryptor
 
       def decrypt(key, ciphertext)
         encryptor(key).decrypt_and_verify(ciphertext)
+      rescue ActiveSupport::MessageVerifier::InvalidSignature => ex
+        raise CorruptedMessageError, ex.to_s
       end
 
       private

data/lib/cryptor/ciphers/xsalsa20poly1305.rb

@@ -14,6 +14,8 @@ module Cryptor
 
       def decrypt(key, ciphertext)
         box(key).decrypt(ciphertext)
+      rescue RbNaCl::CryptoError => ex
+        raise CorruptedMessageError, ex.to_s
       end
 
       private

data/lib/cryptor/symmetric_encryption.rb

@@ -28,24 +28,16 @@ module Cryptor
     end
 
     def decrypt(ciphertext)
-      message     = ORDO::Message.parse(ciphertext)
-      fingerprint = message['Key-Fingerprint']
+      begin
+        message = ORDO::Message.parse(ciphertext)
+      rescue ORDO::ParseError => ex
+        raise InvalidMessageError, ex.to_s
+      end
 
+      fingerprint = message['Key-Fingerprint']
       fail ArgumentError, "no key configured for: #{fingerprint}" if @key.fingerprint != fingerprint
 
-      @key.decrypt decode(message)
-    end
-
-    private
-
-    def decode(message)
-      encoding = message['Content-Transfer-Encoding']
-
-      case encoding
-      when 'base64' then Base64.strict_decode64(message.body)
-      when 'binary' then message.body
-      else fail ArgumentError, "invalid message encoding: #{encoding}"
-      end
+      @key.decrypt message.body
     end
   end
 end

data/lib/cryptor/version.rb

@@ -1,4 +1,4 @@
 # An easy-to-use library for real-world Ruby cryptography
 module Cryptor
-  VERSION = '0.0.1'
+  VERSION = '0.0.2'
 end

data/spec/symmetric_encryption_spec.rb

@@ -2,6 +2,14 @@ require 'spec_helper'
 
 describe Cryptor::SymmetricEncryption do
   let(:plaintext) { 'THE MAGIC WORDS ARE SQUEAMISH OSSIFRAGE' }
+
+  let(:garbage) do
+    'Timely and accurate information about the activities, capabilities, ' \
+    'plans, and intentions of foreign powers, organizations, and persons ' \
+    'and their agents, is essential to the national security of the ' \
+    'United States.'
+  end
+
   subject { described_class.new(secret_key) }
 
   context 'xsalsa20poly1305' do
@@ -13,6 +21,20 @@ describe Cryptor::SymmetricEncryption do
       ciphertext = subject.encrypt(plaintext)
       expect(subject.decrypt(ciphertext)).to eq plaintext
     end
+
+    it 'raises InvalidMessageError if asked to decrypt garbage' do
+      expect { subject.decrypt(garbage) }.to raise_exception(Cryptor::InvalidMessageError)
+    end
+
+    it 'raises CorruptedMessageError if the message is corrupt' do
+      valid_message  = subject.encrypt(plaintext)
+      munged_message = ORDO::Message.parse(valid_message)
+      munged_message.body.replace Base64.strict_encode64(munged_message.body + "\0")
+
+      expect do
+        subject.decrypt(munged_message.to_string)
+      end.to raise_exception(Cryptor::CorruptedMessageError)
+    end
   end
 
   context 'message_encryptor' do
@@ -24,5 +46,19 @@ describe Cryptor::SymmetricEncryption do
       ciphertext = subject.encrypt(plaintext)
       expect(subject.decrypt(ciphertext)).to eq plaintext
     end
+
+    it 'raises InvalidMessageError if asked to decrypt garbage' do
+      expect { subject.decrypt(garbage) }.to raise_exception(Cryptor::InvalidMessageError)
+    end
+
+    it 'raises CorruptedMessageError if the message is corrupt' do
+      valid_message  = subject.encrypt(plaintext)
+      munged_message = ORDO::Message.parse(valid_message)
+      munged_message.body.replace Base64.strict_encode64(munged_message.body + "\0")
+
+      expect do
+        subject.decrypt(munged_message.to_string)
+      end.to raise_exception(Cryptor::CorruptedMessageError)
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cryptor
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Tony Arcieri
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-06 00:00:00.000000000 Z
+date: 2014-06-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ordo
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.0.1
+        version: 0.0.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.0.1
+        version: 0.0.2
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement