active_elastic_job 1.5.0 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 586dcedcf8240ca38ef83c890ca82a9f89210cac
-  data.tar.gz: fb057db8a70b8d93a1f7d05f13f6d911d084ba54
+  metadata.gz: 295868f33a251b59a3dfe4cfd54c8f1dd2180873
+  data.tar.gz: 323dff4ad944340e11f8819d5c5f2d28f1ead982
 SHA512:
-  metadata.gz: 70282a93e9cb166188a439fae19c5d35a4023a9d6bc605cc1b9cd3cbf56bd555bdc05f7e8ebb111fb4be010b569500988beb17925b2416041dacfde996237d1a
-  data.tar.gz: 4e827fb5790e8409dd9ed687937448899f400dcc4d51a901011f085c08ddf50b02082e1b946fc53e333da61826ecff05b17d9ae324cf9ad9403aa8da9b71ffa1
+  metadata.gz: 0a5cac45a1460d5e5b8865db125fbd2684807d5d6fd71e2ca6c967459a0d3fcba895c062e7d10250dac038743694148ba05366538d7d09ba6688b0fda285c207
+  data.tar.gz: a57f088927d4efb9f8906cc75ccac279da3ae96298633a42dc54fd94e804b213cfe6edda11fac91961a82b49c47753aab64dad96dd23a13561ae2c611082e7ab

data/lib/active_elastic_job/rack/sqs_message_consumer.rb

@@ -19,6 +19,8 @@ module ActiveElasticJob
       CONTENT_TYPE = 'application/json'.freeze
       CONTENT_TYPE_HEADER_NAME = 'Content-Type'.freeze
       OK_RESPONSE_CODE = '200'.freeze
+      INSIDE_DOCKER_CONTAINER = `cat /proc/1/cgroup` =~ /docker/
+      DOCKER_HOST_IP = "172.17.0.1".freeze
 
       def initialize(app) #:nodoc:
         @app = app
@@ -27,7 +29,7 @@ module ActiveElasticJob
       def call(env) #:nodoc:
         request = ActionDispatch::Request.new env
         if enabled? && aws_sqsd?(request) && originates_from_gem?(request)
-          unless request.local?
+          unless request.local? || sent_from_docker_host?(request)
             m = "Accepts only requests from localhost for job processing".freeze
             return ['403', {CONTENT_TYPE_HEADER_NAME => 'text/plain' }, [ m ]]
           end
@@ -86,6 +88,10 @@ module ActiveElasticJob
           return false
         end
       end
+
+      def sent_from_docker_host?(request)
+        INSIDE_DOCKER_CONTAINER && request.remote_ip == DOCKER_HOST_IP
+      end
     end
   end
 end

data/lib/active_elastic_job/version.rb

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

data/lib/active_job/queue_adapters/active_elastic_job_adapter.rb

@@ -171,9 +171,10 @@ module ActiveJob
         end
 
         def aws_sqs_client
+          @aws_key ||= ENV['AWS_SECRET_ACCESS_KEY'] || ENV['AWS_SECRET_KEY'] || ENV['AMAZON_SECRET_ACCESS_KEY']
           @aws_sqs_client ||= Aws::SQS::Client.new(
             access_key_id: ENV['AWS_ACCESS_KEY_ID'],
-            secret_access_key: ENV['AWS_SECRET_ACCESS_KEY'],
+            secret_access_key: @aws_key,
             region: ENV['AWS_REGION']
           )
         end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_elastic_job
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.6.0
 platform: ruby
 authors:
 - Tawan Sierek
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-13 00:00:00.000000000 Z
+date: 2016-04-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk