gitlab-license 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 003f891e0c79c5dad69dd13991814fd337dd842f
-  data.tar.gz: 9a324afa2d6c474d654baddded5d8c8f06c06e2c
+  metadata.gz: 2a87318ee3ba270b898c8fdd55958d02f219d0ab
+  data.tar.gz: 6d9394ee078fc45357a4e39a7c79bae098c6d956
 SHA512:
-  metadata.gz: 902fe5b33b61f2c259a638c4ed9bfdb05cade11046e4c7913557df9030e547ea29e8fa3e363208fd0d4f13b460b3300d646a78ef3d133444106aee2209d9850f
-  data.tar.gz: 0ca91a33ad564337b64b691ddd7badb405899bc3a7b1d6d8c8e45e08397e59b4a031d30836553ea7568f9ba49ae7c7d49af86063f08e3379b58cb152f9e18161
+  metadata.gz: 19c9de17bb52fcb767e62d1af7c1350ac523ad26073636d57fe6cb2945a29be20374a49ac5d98b83d78e9c393c81f27d801f72ba1da9fb4c79252ef4437fe526
+  data.tar.gz: 6eab5c49867731fbc886b6e678b910f9501b862f75646c28657301e8c1be00eb65fdffb87a609ed38668c70c0424a68fc93bdd78a419c7b29b69fa51ee907304

data/lib/gitlab/license.rb

@@ -8,24 +8,40 @@ require "gitlab/license/encryptor"
 
 module Gitlab
   class License
+    class Error < StandardError; end
+    class ImportError < Error; end
+    class ValidationError < Error; end
+
     class << self
-      attr_accessor :encryption_key
+      attr_reader :encryption_key
       @encryption_key = nil
 
-      def encryptor
-        unless self.encryption_key && self.encryption_key.is_a?(OpenSSL::PKey::RSA)
-          raise "No RSA encryption key provided."
+      def encryption_key=(key)
+        if key && !key.is_a?(OpenSSL::PKey::RSA)
+          raise ArgumentError, "No RSA encryption key provided."
         end
 
-        Encryptor.new(self.encryption_key)
+        @encryption_key = key
       end
 
-      def import(data)
-        from_json(encryptor.decrypt(data))
+      def encryptor
+        @encryptor ||= Encryptor.new(self.encryption_key)
       end
 
-      def from_json(license_json)
-        new(JSON.parse(license_json))
+      def import(data)
+        begin
+          license_json = encryptor.decrypt(data)
+        rescue Encryptor::Error
+          raise ImportError, "License data could not be decrypted."
+        end
+
+        begin
+          attributes = JSON.parse(license_json)
+        rescue JSON::ParseError
+          raise ImportError, "License data is invalid JSON."
+        end
+        
+        new(attributes)
       end
     end
 
@@ -51,7 +67,7 @@ module Gitlab
     end
 
     def validate!
-      raise "License is invalid" unless valid?
+      raise ValidationError, "License is invalid" unless valid?
     end
 
     def will_expire?

data/lib/gitlab/license/encryptor.rb

@@ -1,15 +1,23 @@
 module Gitlab
   class License
     class Encryptor
+      class Error < StandardError; end
+      class KeyError < Error; end
+      class DecryptionError < Error; end
+
       attr_accessor :key
 
       def initialize(key)
+        if key && !key.is_a?(OpenSSL::PKey::RSA)
+          raise KeyError, "No RSA encryption key provided."
+        end
+
         @key = key
       end
 
       def encrypt(data)
         unless key.private?
-          raise "Provided key is not a private key."
+          raise KeyError, "Provided key is not a private key."
         end
 
         # Encrypt the data using symmetric AES encryption.
@@ -35,26 +43,53 @@ module Gitlab
 
       def decrypt(data)
         unless key.public?
-          raise "Provided key is not a public key."
+          raise KeyError, "Provided key is not a public key."
         end
 
-        json_data = Base64.decode64(data)
-        encryption_data = JSON.parse(json_data)
+        json_data = Base64.decode64(data.chomp)
+
+        begin
+          encryption_data = JSON.parse(json_data)
+        rescue JSON::ParserError
+          raise DecryptionError, "Encryption data is invalid JSON."
+        end
+
+        unless %w(data key iv).all? { |key| encryption_data[key] }
+          raise DecryptionError, "Required field missing from encryption data."
+        end
 
         encrypted_data  = Base64.decode64(encryption_data["data"])
         encrypted_key   = Base64.decode64(encryption_data["key"])
         aes_iv          = Base64.decode64(encryption_data["iv"])
 
-        # Decrypt the AES key using asymmetric RSA encryption.
-        aes_key = self.key.public_decrypt(encrypted_key)
+        begin
+          # Decrypt the AES key using asymmetric RSA encryption.
+          aes_key = self.key.public_decrypt(encrypted_key)
+        rescue OpenSSL::PKey::RSAError
+          raise DecryptionError, "AES encryption key could not be decrypted."
+        end
 
         # Decrypt the data using symmetric AES encryption.
         cipher = OpenSSL::Cipher::AES128.new(:CBC)
         cipher.decrypt
-        cipher.key  = aes_key
-        cipher.iv   = aes_iv
 
-        data = cipher.update(encrypted_data) + cipher.final
+        begin
+          cipher.key  = aes_key
+        rescue OpenSSL::Cipher::CipherError
+          raise DecryptionError, "AES encryption key is invalid."
+        end
+
+        begin
+          cipher.iv   = aes_iv
+        rescue OpenSSL::Cipher::CipherError
+          raise DecryptionError, "AES IV is invalid."
+        end
+
+        begin
+          data = cipher.update(encrypted_data) + cipher.final
+        rescue OpenSSL::Cipher::CipherError
+          raise DecryptionError, "Data could not be decrypted."
+        end
 
         data
       end

data/lib/gitlab/license/version.rb

@@ -1,5 +1,5 @@
 module Gitlab
   class License
-    VERSION = "0.0.1"
+    VERSION = "0.0.2"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gitlab-license
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Douwe Maan
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-04-29 00:00:00.000000000 Z
+date: 2015-05-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler