gitlab-license 2.2.1 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e97f77de6b6b6e0b4910b0b892cc038dcf0c9103b65fc80a2fb27298a6be1140
-  data.tar.gz: 5c2a31361536c8a6eb4b87511ed41bdd889bf56239f28cdee43d2287c924b41e
+  metadata.gz: 7446407f434ff04d36c14ef4ee97be748000280b8abf6e23b83ca6a78a6f1ce5
+  data.tar.gz: 8604082fe40f6684eeec09a90f6c7fccc25a0e8df672637889d39894b92efc1d
 SHA512:
-  metadata.gz: f4724c22299fcfd99440b0f653db6cf58e884bdf52335733136793e716aaa830cc2c25a393d4d809af46e5f098c02b3432afaa4407180b523f9e8f2f400f35dc
-  data.tar.gz: 99989f3f28e4fd3c04b866780c5565458620dd9bb15ba6407cd41f586dae70b198271f66f7cb40853b026d8a02ca68c4db1f2a32eac14eb1e919a7c20fb0b5a8
+  metadata.gz: 05e748a228c17e433a5b725835e79e66b564fe82fb3ebb922e80e9b892c61e27caf4dd518a9ea6d1f086d16d1bd405bb36ee8c4fc1ccf73db1110d3f49d0e44b
+  data.tar.gz: ba3caed401ef9783d01c1fe16c7e8cf1807e21c35b61ea99d0be3b127d9f6c815a9b28c56c32e28eac6b4b4bad5d60ffee4ea58a198b1ca23649e08e1503d946

data/gitlab-license.gemspec

@@ -17,9 +17,9 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.required_ruby_version = '>= 2.3.0'
+  spec.required_ruby_version = '>= 2.7.0'
 
-  spec.add_development_dependency 'bundler', '~> 1.9'
+  spec.add_development_dependency 'bundler', '~> 2.4'
   spec.add_development_dependency 'byebug'
   spec.add_development_dependency 'rake', '~> 10.0'
   spec.add_development_dependency 'rspec', '~> 3.9'

data/lib/gitlab/license/version.rb

@@ -1,5 +1,5 @@
 module Gitlab
   class License
-    VERSION = '2.2.1'.freeze
+    VERSION = '2.3.0'.freeze
   end
 end

data/lib/gitlab/license.rb

@@ -15,6 +15,7 @@ module Gitlab
 
     class << self
       attr_reader :encryption_key
+      attr_reader :fallback_decryption_keys
       @encryption_key = nil
 
       def encryption_key=(key)
@@ -24,6 +25,19 @@ module Gitlab
         @encryptor = nil
       end
 
+      def fallback_decryption_keys=(keys)
+        unless keys
+          @fallback_decryption_keys = nil
+          return
+        end
+
+        unless keys.is_a?(Enumerable) && keys.all? { |key| key.is_a?(OpenSSL::PKey::RSA) }
+          raise ArgumentError, 'Invalid fallback RSA encryption keys provided.'
+        end
+
+        @fallback_decryption_keys = Array(keys)
+      end
+
       def encryptor
         @encryptor ||= Encryptor.new(encryption_key)
       end
@@ -33,11 +47,7 @@ module Gitlab
 
         data = Boundary.remove_boundary(data)
 
-        begin
-          license_json = encryptor.decrypt(data)
-        rescue Encryptor::Error
-          raise ImportError, 'License data could not be decrypted.'
-        end
+        license_json = decrypt_with_fallback_keys(data)
 
         begin
           attributes = JSON.parse(license_json)
@@ -47,6 +57,22 @@ module Gitlab
 
         new(attributes)
       end
+
+      def decrypt_with_fallback_keys(data)
+        keys_to_try = Array(encryption_key)
+        keys_to_try += fallback_decryption_keys if fallback_decryption_keys
+
+        keys_to_try.each do |decryption_key|
+          begin
+            decryptor = Encryptor.new(decryption_key)
+            return decryptor.decrypt(data)
+          rescue Encryptor::Error
+            next
+          end
+        end
+
+        raise ImportError, 'License data could not be decrypted.'
+      end
     end
 
     attr_reader :version

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gitlab-license
 version: !ruby/object:Gem::Version
-  version: 2.2.1
+  version: 2.3.0
 platform: ruby
 authors:
 - Douwe Maan
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-08-04 00:00:00.000000000 Z
+date: 2023-06-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -18,14 +18,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.9'
+        version: '2.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.9'
+        version: '2.4'
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement
@@ -133,14 +133,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.3.0
+      version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.33
+rubygems_version: 3.4.13
 signing_key:
 specification_version: 4
 summary: gitlab-license helps you generate, verify and enforce software licenses.