gitlab-license 2.2.0 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b5090d0ea93ebe93a8ae432f94f6cafb36247511d024123140d010d241f2f133
-  data.tar.gz: 160af752702b9c305ecfe9d6405ec1dc4b1eff19e9bf3f89a8a7f79913013099
+  metadata.gz: 7446407f434ff04d36c14ef4ee97be748000280b8abf6e23b83ca6a78a6f1ce5
+  data.tar.gz: 8604082fe40f6684eeec09a90f6c7fccc25a0e8df672637889d39894b92efc1d
 SHA512:
-  metadata.gz: a6d58d7a27ff46ac88e7da9d92c7a3c5854777f8f49c7630a9b72b792b8ca75de3611893a5e9555fb45be94781d5bf760c10971e23f8916e00d0f19326a1e6ea
-  data.tar.gz: a5e5e07714819ab014a656953a99b5c8f32c4ed494c130a6b535f1810f967453aa0d71b38c28a00eb321bf0e28fe18f16bdb5fc953bd0e889025bd7ae558dc24
+  metadata.gz: 05e748a228c17e433a5b725835e79e66b564fe82fb3ebb922e80e9b892c61e27caf4dd518a9ea6d1f086d16d1bd405bb36ee8c4fc1ccf73db1110d3f49d0e44b
+  data.tar.gz: ba3caed401ef9783d01c1fe16c7e8cf1807e21c35b61ea99d0be3b127d9f6c815a9b28c56c32e28eac6b4b4bad5d60ffee4ea58a198b1ca23649e08e1503d946

data/README.md

@@ -18,6 +18,17 @@ Or install it yourself as:
 
     $ gem install gitlab-license
 
+## Release
+
+To release a new version of this gem, follow these steps:
+
+1. Bump the `VERSION` constant in [`lib/gitlab/license/version.rb`](https://dev.gitlab.org/gitlab/gitlab-license/-/blob/master/lib/gitlab/license/version.rb#L3).  This is typically merged as part of the feature MR.
+1. Create a [new release](https://dev.gitlab.org/gitlab/gitlab-license/-/releases) in the project (e.g. `v2.1.0`). For more details on creating a new release, refer to the [documentation](https://dev.gitlab.org/help/user/project/releases/index.md#create-a-release).
+1. [Build the gem](https://guides.rubygems.org/command-reference/#gem-build) to be published: `gem build gitlab-license.gemspec`
+1. [Publish the gem](https://guides.rubygems.org/publishing) to Rubygems: `gem push gitlab-license-2.1.0.gem`
+   - Note you will need to be added as an owner in Rubygems in order to publish.
+   - Once this is published, the new version of the gem can be installed in other projects like CustomersDot or GitLab via bundler or using `gem install` directly.
+
 ## Usage
 
 ```ruby
@@ -48,17 +59,17 @@ license.licensee = {
   "Email"   => "douwe@gitlab.com"
 }
 
-# The date the license starts. 
+# The date the license starts.
 # Required.
 license.starts_at         = Date.new(2015, 4, 24)
-# The date the license expires. 
+# The date the license expires.
 # Not required, to allow lifetime licenses.
 license.expires_at        = Date.new(2016, 4, 23)
 
 # The below dates are hardcoded in the license so that you can play with the
 # period after which there are "repercussions" to license expiration.
 
-# The date admins will be notified about the license's pending expiration. 
+# The date admins will be notified about the license's pending expiration.
 # Not required.
 license.notify_admins_at  = Date.new(2016, 4, 19)
 
@@ -66,7 +77,7 @@ license.notify_admins_at  = Date.new(2016, 4, 19)
 # Not required.
 license.notify_users_at   = Date.new(2016, 4, 23)
 
-# The date "changes" like code pushes, issue or merge request creation 
+# The date "changes" like code pushes, issue or merge request creation
 # or modification and project creation will be blocked.
 # Not required.
 license.block_changes_at  = Date.new(2016, 5, 7)

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.0'.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
@@ -68,7 +94,7 @@ module Gitlab
         false
       elsif !starts_at || !starts_at.is_a?(Date)
         false
-      elsif !expires_at && !gl_team_license?
+      elsif !expires_at && !gl_team_license? && !jh_team_license?
         false
       elsif expires_at && !expires_at.is_a?(Date)
         false
@@ -165,6 +191,10 @@ module Gitlab
       licensee['Company'].to_s.match?(/GitLab/i) && licensee['Email'].to_s.end_with?('@gitlab.com')
     end
 
+    def jh_team_license?
+      licensee['Company'].to_s.match?(/GitLab/i) && licensee['Email'].to_s.end_with?('@jihulab.com')
+    end
+
     def restricted?(key = nil)
       if key
         restricted? && restrictions.has_key?(key)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gitlab-license
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.3.0
 platform: ruby
 authors:
 - Douwe Maan
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-07-14 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.