openproject-token 1.0.1 → 2.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 0f564f673033235bcf2582b7308be69ce507e58d
-  data.tar.gz: d9ad6a858ba3d9a066ae7dbc0fb3f930b220b748
+SHA256:
+  metadata.gz: 1468e154b8c769ea67d98d887da8b9e00c6e830e04b3375a0622c0137afdaeeb
+  data.tar.gz: 8d6197c22e207b8882b7eaab394b5a24fc16e403d9b46c43ee360f395b7b595c
 SHA512:
-  metadata.gz: e60ba554b193fb0e3e2dc0e0fb6733f7c293022731d6ad269950f1edad89d171d0ddb5e0063e1b2f9eda312e71d927510836a53eaefc3694037b7deb6f553229
-  data.tar.gz: 721439cc7e07bdd6daaedf5d17bc8cdcf2a5c55a8a41b3e4569cb46cd67d120e37b63e1051bf66da134d536cab8f000b61550027151f7f6995202f05d6ec5067
+  metadata.gz: 1550e4748618f99e45f3653d8c34360e4f7bb0803a5850f5d89c9b705cd87a9faf217e36ced06f5c5648134c417bc72404cfb6f4a2a910939b0a015a92bf6264
+  data.tar.gz: 15662a9656073de5d1c0a8b8af5e72383aca6436233349c202b29c0262ea208a4afe2a77e6e8b109d052a84c40c636b19fd6a7ee03b49a886442130b57c47d36

data/lib/open_project/token.rb

@@ -49,13 +49,15 @@ module OpenProject
     include ActiveModel::Validations
 
     attr_reader :version
-    attr_accessor :subscriber, :mail
+    attr_accessor :subscriber, :mail, :company, :domain
     attr_accessor :starts_at, :issued_at, :expires_at
     attr_accessor :notify_admins_at, :notify_users_at, :block_changes_at
     attr_accessor :restrictions
 
     validates_presence_of :subscriber
     validates_presence_of :mail
+    validates_presence_of :company, allow_blank: true
+    validates_presence_of :domain, if: :validate_domain?
 
     validates_each(
       :starts_at, :issued_at, :expires_at, :notify_admins_at, :notify_users_at, :block_changes_at,
@@ -104,6 +106,11 @@ module OpenProject
       will_block_changes? && Date.today >= self.block_changes_at
     end
 
+    # tokens with no version or a version lower than 2.0 don't have the attributes company or domain
+    def validate_domain?
+      version && Gem::Version.new(version) >= domain_required_from_version
+    end
+
     def restricted?(key = nil)
       if key
         restricted? && restrictions.has_key?(key)
@@ -118,6 +125,8 @@ module OpenProject
       hash["version"]          = self.version
       hash["subscriber"]       = self.subscriber
       hash["mail"]             = self.mail
+      hash["company"]          = self.company
+      hash["domain"]           = self.domain
 
       hash["issued_at"]        = self.issued_at
       hash["starts_at"]        = self.starts_at
@@ -147,17 +156,13 @@ module OpenProject
     def load_attributes(attributes)
       attributes = Hash[attributes.map { |k, v| [k.to_s, v] }]
 
-      version = attributes["version"] || 1
-      unless version && version == 1
-        raise ArgumentError, "Version is too new"
-      end
-
-      @version = version
+      @version = read_version attributes
       @subscriber = attributes["subscriber"]
       @mail = attributes["mail"]
+      @company = attributes["company"]
+      @domain = attributes["domain"]
 
-      %w(starts_at issued_at expires_at
-         notify_admins_at notify_users_at block_changes_at).each do |attr|
+      date_attribute_keys.each do |attr|
         value = attributes[attr]
         value = Date.parse(value) rescue nil if value.is_a?(String)
 
@@ -167,10 +172,54 @@ module OpenProject
       end
 
       restrictions = attributes["restrictions"]
+
       if restrictions && restrictions.is_a?(Hash)
         restrictions = Hash[restrictions.map { |k, v| [k.to_sym, v] }]
         @restrictions = restrictions
       end
     end
+
+    ##
+    # Reads the version from the given attributes hash.
+    # Besides the usual values it allows for a special value `-1`.
+    # This is then results in the version being `nil` specifically rather than
+    # the current gem version by default.
+    #
+    # This way the generated token will get what ever version the importing party
+    # has. This is important due to a bug in openproject-token 1.x where any version
+    # other than `nil` (or the integer literal 1) results in a "Version is too new" error.
+    # This affects all OpenProject installations with a version older than 10.6
+    # which will run into internal server errors trying to activate their Enterprise
+    # tokens due to this.
+    #
+    # Generating tokens with version `-1` prevents that.
+    #
+    # @param attr [Hash] Parsed token attributes.
+    def read_version(attr)
+      value = attr["version"]
+      version = nil
+
+      if value.present? && value.to_s != "-1"
+        version = Gem::Version.new(v)
+
+        if version > current_gem_version
+          raise ArgumentError, "Version is too new"
+        end
+      end
+
+      version
+    end
+
+    def date_attribute_keys
+      %w(starts_at issued_at expires_at notify_admins_at notify_users_at block_changes_at)
+    end
+
+    def current_gem_version
+      @current_gem_version ||= Gem::Version.new(OpenProject::Token::VERSION.to_s)
+    end
+
+    def domain_required_from_version
+      @domain_required_from_version ||= Gem::Version.new('2.0')
+    end
   end
 end

data/lib/open_project/token/version.rb

@@ -1,5 +1,5 @@
 module OpenProject
   class Token
-    VERSION = "1.0.1"
+    VERSION = "2.1.1"
   end
 end

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: openproject-token
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 2.1.1
 platform: ruby
 authors:
 - OpenProject GmbH
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-24 00:00:00.000000000 Z
+date: 2020-06-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -67,7 +67,7 @@ files:
 - lib/openproject-token.rb
 homepage: https://www.openproject.org
 licenses:
-- GPLv3
+- GPL-3.0
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -84,8 +84,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: OpenProject EE token reader