active_elastic_job 3.0.0 → 3.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4fa6153074f7ae6a834972d070137734873cafdf2fe4807ead1a838ca9d497cf
-  data.tar.gz: e1b5905ce2c23f3d11a795883e8ee7be8be9c60fd391af4c76a2c252b99c6a4a
+  metadata.gz: 7314269003451ee2d9b211948b70a351621f340395ffddcf47e7f8362a5e4d4e
+  data.tar.gz: 3b75e291c60225b28aaf879143e49ba16955bd3faed096a9b1c7dc6804aa40f8
 SHA512:
-  metadata.gz: 32dfb859495c2658137eb010c4e58e8be5872e8be54a6e245852157beefb2ce1bf542a350d263b9b493d70ce0a4d5f26d935a14e325f6eabd9c6f75bb2ce5d24
-  data.tar.gz: 2a44d66bef9a7903abb96c2d2ca899465cf8cd34ea770eb96cab20ccccffa4ee60360cbca2f7ceba0f9ff31709cc890d37fc219de11beda451df1f9e49016ffe
+  metadata.gz: 0fe756ae355407bb1f923850efbb53e6587dcb136aee42b64467780ab73bc1935210494039a88e02ea7d525846bdcd90ac398136ca33c6389dae66be975d417b
+  data.tar.gz: c6cb04a7f3acee2cce0991d66b665ed544d42903f9b89a124705717af8b3787fd6b4e69de60d0d1c78ff03bde436377d803fc169f3accff0d6f61f50297e1e98

data/lib/active_elastic_job/rack/sqs_message_consumer.rb

@@ -25,7 +25,10 @@ module ActiveElasticJob
         { 'Content-Type'.freeze => 'text/plain'.freeze },
         [ 'Request forbidden!'.freeze ]
       ]
-      DOCKER_HOST_IP = /172.17.0.\d+/.freeze
+
+      # 172.17.0.x is the default for Docker
+      # 172.18.0.x is the default for the bridge network of Docker Compose
+      DOCKER_HOST_IP = /172.1(7|8).0.\d+/.freeze
 
       def initialize(app) #:nodoc:
         @app = app
@@ -33,7 +36,7 @@ module ActiveElasticJob
 
       def call(env) #:nodoc:
         request = ActionDispatch::Request.new env
-        if enabled? && aws_sqsd?(request)
+        if enabled? && (aws_sqsd?(request) || sqsd?(request))
           unless request.local? || sent_from_docker_host?(request)
             return FORBIDDEN_RESPONSE
           end
@@ -87,6 +90,18 @@ module ActiveElasticJob
           current_user_agent[0..('aws-sqsd'.freeze.size - 1)] == 'aws-sqsd'.freeze)
       end
 
+      def sqsd?(request)
+        # Does not match against a Regexp
+        # in order to avoid performance penalties.
+        # Instead performs a simple string comparison.
+        # Benchmark runs showed an performance increase of
+        # up to 40%
+        current_user_agent = request.headers['User-Agent'.freeze]
+        return (current_user_agent.present? &&
+          current_user_agent.size >= 'sqsd'.freeze.size &&
+          current_user_agent[0..('sqsd'.freeze.size - 1)] == 'sqsd'.freeze)
+      end
+
       def periodic_tasks_route
         @periodic_tasks_route ||= config.periodic_tasks_route
       end

data/lib/active_elastic_job/version.rb

@@ -1,7 +1,7 @@
 module ActiveElasticJob
   module VERSION
     MAJOR = 3
-    MINOR = 0
+    MINOR = 1
     TINY  = 0
     PRE   = nil
 

data/lib/active_job/queue_adapters/active_elastic_job_adapter.rb

@@ -130,23 +130,42 @@ module ActiveJob
         end
 
         def build_message(queue_name, serialized_job, timestamp)
-          {
+          args = {
             queue_url: queue_url(queue_name),
             message_body: serialized_job,
             delay_seconds: calculate_delay(timestamp),
-            message_attributes: {
-              "message-digest".freeze => {
-                string_value: message_digest(serialized_job),
-                data_type: "String".freeze
-              },
-              origin: {
-                string_value: ActiveElasticJob::ACRONYM,
-                data_type: "String".freeze
-              }
+            message_attributes: build_message_attributes(serialized_job)
+          }
+
+          if queue_name.split('.').last == 'fifo'
+            args.merge!(fifo_required_params(serialized_job))
+          end
+
+          return args
+        end
+
+        def build_message_attributes(serialized_job)
+          {
+            "message-digest".freeze => {
+              string_value: message_digest(serialized_job),
+              data_type: "String".freeze
+            },
+            origin: {
+              string_value: ActiveElasticJob::ACRONYM,
+              data_type: "String".freeze
             }
           }
         end
 
+        def fifo_required_params(serialized_job)
+          parsed_job = JSON.parse(serialized_job)
+
+          {
+            message_group_id: parsed_job['job_class'],
+            message_deduplication_id: parsed_job['job_id']
+          }
+        end
+
         def queue_url(queue_name)
           cache_key = queue_name.to_s
           @queue_urls ||= { }
@@ -198,13 +217,13 @@ module ActiveJob
           Rails.application.config.active_elastic_job
         end
 
-        def message_digest(messsage_body)
+        def message_digest(message_body)
           @verifier ||= ActiveElasticJob::MessageVerifier.new(secret_key_base)
-          @verifier.generate_digest(messsage_body)
+          @verifier.generate_digest(message_body)
         end
 
-        def verify_md5_digests!(response, messsage_body, message_attributes)
-          calculated = md5_of_message_body(messsage_body)
+        def verify_md5_digests!(response, message_body, message_attributes)
+          calculated = md5_of_message_body(message_body)
           returned = response.md5_of_message_body
           if calculated != returned
             raise MD5MismatchError.new response.message_id, calculated, returned
@@ -213,7 +232,7 @@ module ActiveJob
           if message_attributes
             calculated = md5_of_message_attributes(message_attributes)
             returned = response.md5_of_message_attributes
-            if  calculated != returned
+            if calculated != returned
               raise MD5MismatchError.new response.message_id, calculated, returned
             end
           end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: active_elastic_job
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.1.0
 platform: ruby
 authors:
 - Tawan Sierek
 - Joey Paris
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-02-22 00:00:00.000000000 Z
+date: 2021-10-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-sqs
@@ -207,7 +207,7 @@ homepage: https://github.com/active-elastic-job/active-elastic-job
 licenses:
 - MIT
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -222,8 +222,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key:
+rubygems_version: 3.0.3
+signing_key: 
 specification_version: 4
 summary: Active Elastic Job is a simple to use Active Job backend for Rails applications
   deployed on the Amazon Elastic Beanstalk platform.