reversible_cryptography 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4b8ceb52bb8366e939475256f82cee4197bdd645
-  data.tar.gz: 4df03b3cb5c06b804344f195e4d958861483fc0f
+  metadata.gz: b62a2069be44c9cf86f98fd026a43cd2a3d8e6be
+  data.tar.gz: 104d949e5d362e3808d8262be73bcf0fe52d76a5
 SHA512:
-  metadata.gz: 3107759517c36c88174738ce9a2f7a8e21c2e07e9458e23dff282c7a99e08e4b67e72f8847f8920822b6333e6945cb49c1d9cdd83fccab2b474fad77e57a4cee
-  data.tar.gz: ea0ff97c2e8c1fe047176b6daf37326da7ec35638c84e4ad8615db0873645eb5306b45e29809c985d437f9583bbefe0ca3aeee83d8bb3091fc908068612a1d61
+  metadata.gz: 0af90075535d26a280902c8c0ffb25b2d433abf5c1cf64b17c221a92bf489ae81dfc3f0652032f9ccbc3877dc5269afa5f4abe19837f78bcbeeb3d6700626581
+  data.tar.gz: dff254aab06ef0ce53238e34c90c9c8860e56c46d3ed5f266a4366b4cf9e7fd5134bd7d1116a1fa284687890d7508f2f686325bb1042ec90f6bb55b42d66a300

data/lib/reversible_cryptography.rb

@@ -2,5 +2,9 @@ require "reversible_cryptography/version"
 require "reversible_cryptography/message"
 
 module ReversibleCryptography
-  # Your code goes here...
+  class BaseError < StandardError; end
+  class EmptyInputString < BaseError; end
+  class InvalidPassword < BaseError; end
+  class EmptyPassword < InvalidPassword; end
+  class InvalidFormat < BaseError; end
 end

data/lib/reversible_cryptography/message.rb

@@ -8,6 +8,9 @@ module ReversibleCryptography
 
     class << self
       def encrypt(str, password)
+        raise EmptyInputString if blank?(str)
+        raise EmptyPassword if blank?(password)
+
         enc = OpenSSL::Cipher::AES256.new(MODE)
         enc.encrypt
 
@@ -23,10 +26,17 @@ module ReversibleCryptography
       end
 
       def decrypt(str, password)
+        raise EmptyInputString if blank?(str)
+        raise EmptyPassword if blank?(password)
+
         key = str.sub(/^md5:(.+):salt:(.+):#{PREFIX}:/, '')
         md5 = $1
         salt_string = $2
 
+        if [key, md5, salt_string].any? { |s| blank?(s) }
+          raise InvalidFormat
+        end
+
         salt = convert_salt(salt_string)
 
         dec = OpenSSL::Cipher::AES256.new(MODE)
@@ -37,7 +47,7 @@ module ReversibleCryptography
         if OpenSSL::Digest.hexdigest("MD5", result) == md5
           result
         else
-          raise StandardError.new("Invalid Password")
+          raise InvalidPassword
         end
       end
 
@@ -56,6 +66,10 @@ module ReversibleCryptography
       def generate_salt_string(salt)
         salt.unpack("C*").join("-")
       end
+
+      def blank?(str)
+        str.nil? || str.empty?
+      end
     end
   end
 end

data/lib/reversible_cryptography/version.rb

@@ -1,3 +1,3 @@
 module ReversibleCryptography
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: reversible_cryptography
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Takumi MIURA
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-03-31 00:00:00.000000000 Z
+date: 2015-04-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor