propono 1.1.3 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 158f942077120ee93c8c02b1f44007ad1292eb3e
-  data.tar.gz: aa5ad40b0f52a720e0c6f291453ab827d53a297a
+  metadata.gz: 19a7aae1334abb194ea3fe2ca03a3b7d6641a9b0
+  data.tar.gz: 181145ff80cc31864884a2ed6f6ca3b2c8757f24
 SHA512:
-  metadata.gz: 98a05da78d36f413b9f1ae7be5fb3fa667c81348cce0d46b97cf0de95ad286f3fbfcb4b1e3588a0fa7f765c2687552a466d2bd1bbd9ea38bc3ae3db15a13563b
-  data.tar.gz: 5e8f33d494c1cf232a51a0a4051fe0548e2a853df8c15ca707a6f270a1b7c27ca7a2256fc368ace22a2e97b29a3b006067f2033b39048ac6ea6175fd61baad7d
+  metadata.gz: 43c3d394220ac21226e33245ea52e10e07cb093a367c4747c750421c6c99f8e7267692f8470f1e5b885f7eef60571f9d0e6af1f355ea8e62773f3d8583684df3
+  data.tar.gz: f69c5512d119490b0ef13bd2fd8b219166f660f724cd6539a1176e987ea8d821b8310277700868ed6dff2e42429f252c802eea166535cb8a9af9ecf582248cbd

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+# 1.2.0 / 2014-05-25
+* [BUGFIX] Restrict SQS policy to only allow SNS topic publishes.
+
 # 1.1.3 / 2014-05-14
 * [FEATURE] Added ability to drain queue. Also allow dot releases of Fog.
 

data/lib/propono/components/queue_subscription.rb

@@ -26,50 +26,35 @@ module Propono
       @failed_queue = QueueCreator.find_or_create("#{queue_name}-failed")
       @corrupt_queue = QueueCreator.find_or_create("#{queue_name}-corrupt")
       sns.subscribe(@topic.arn, @queue.arn, 'sqs')
-      sqs.set_queue_attributes(@queue.url, "Policy", generate_policy)
+      sqs.set_queue_attributes(@queue.url, "Policy", generate_policy(@queue, @topic))
 
       @slow_queue = QueueCreator.find_or_create("#{queue_name}-slow")
       @slow_topic = TopicCreator.find_or_create(@suffixed_slow_topic_id)
       sns.subscribe(@slow_topic.arn, @slow_queue.arn, 'sqs')
-      sqs.set_queue_attributes(@slow_queue.url, "Policy", generate_slow_policy)
+      sqs.set_queue_attributes(@slow_queue.url, "Policy", generate_policy(@slow_queue, @slow_topic))
     end
 
     private
 
-    def generate_policy
+    def generate_policy(queue, topic)
       <<-EOS
 {
   "Version": "2008-10-17",
-  "Id": "#{@queue.arn}/SQSDefaultPolicy",
+  "Id": "#{queue.arn}/SQSDefaultPolicy",
   "Statement": [
     {
-      "Sid": "#{@queue.arn}-Sid",
+      "Sid": "#{queue.arn}-Sid",
       "Effect": "Allow",
       "Principal": {
         "AWS": "*"
       },
       "Action": "SQS:*",
-      "Resource": "#{@queue.arn}"
-    }
-  ]
-}
-      EOS
-    end
-
-    def generate_slow_policy
-      <<-EOS
-{
-  "Version": "2008-10-17",
-  "Id": "#{@slow_queue.arn}/SQSDefaultPolicy",
-  "Statement": [
-    {
-      "Sid": "#{@slow_queue.arn}-Sid",
-      "Effect": "Allow",
-      "Principal": {
-        "AWS": "*"
-      },
-      "Action": "SQS:*",
-      "Resource": "#{@slow_queue.arn}"
+      "Resource": "#{queue.arn}",
+      "Condition": {
+        "StringEquals": {
+          "aws:SourceArn": "#{topic.arn}"
+        }
+      }
     }
   ]
 }

data/lib/propono/version.rb

@@ -1,3 +1,3 @@
 module Propono
-  VERSION = "1.1.3"
+  VERSION = "1.2.0"
 end

data/test/components/queue_subscription_test.rb

@@ -30,7 +30,7 @@ module Propono
       TopicCreator.stubs(find_or_create: Topic.new("1123"))
 
       queue_name = subscription.send(:queue_name)
-      
+
       sqs = mock()
       sqs.expects(:create_queue).with(queue_name).returns(mock(body: {'QueueUrl' => Fog::AWS::SQS::Mock::QueueUrl}))
       sqs.expects(:create_queue).with(queue_name + '-failed').returns(mock(body: {'QueueUrl' => Fog::AWS::SQS::Mock::QueueUrl}))
@@ -75,18 +75,15 @@ module Propono
     def test_create_calls_set_queue_attributes
       arn = "arn123"
       policy = "{foobar: 123}"
-      slow_policy = "{foobar: 456}"
 
       TopicCreator.stubs(find_or_create: Topic.new(arn))
       QueueCreator.stubs(find_or_create: Queue.new(Fog::AWS::SQS::Mock::QueueUrl))
 
       sqs = mock()
-      sqs.expects(:set_queue_attributes).with(Fog::AWS::SQS::Mock::QueueUrl, "Policy", policy)
-      sqs.expects(:set_queue_attributes).with(Fog::AWS::SQS::Mock::QueueUrl, "Policy", slow_policy)
+      sqs.expects(:set_queue_attributes).with(Fog::AWS::SQS::Mock::QueueUrl, "Policy", policy).twice
       subscription = QueueSubscription.new("Some topic")
       subscription.stubs(sqs: sqs)
       subscription.stubs(generate_policy: policy)
-      subscription.stubs(generate_slow_policy: slow_policy)
       subscription.create
     end
 
@@ -102,7 +99,7 @@ module Propono
       QueueCreator.expects(:find_or_create).with('MyApp-SomeTopic-suf-slow').returns(slow_queue)
       subscription = QueueSubscription.new("SomeTopic")
       subscription.create
-      
+
       assert_equal queue, subscription.queue
       assert_equal failed_queue, subscription.failed_queue
       assert_equal corrupt_queue, subscription.corrupt_queue
@@ -116,7 +113,35 @@ module Propono
     end
 
     def test_generate_policy
-      skip "TODO - Implement this test."
+      queue_arn = "queue-arn"
+      topic_arn = "topic-arn"
+      queue = mock().tap {|m|m.stubs(arn: queue_arn)}
+      topic = mock().tap {|m|m.stubs(arn: topic_arn)}
+
+      policy = <<-EOS
+{
+  "Version": "2008-10-17",
+  "Id": "#{queue_arn}/SQSDefaultPolicy",
+  "Statement": [
+    {
+      "Sid": "#{queue_arn}-Sid",
+      "Effect": "Allow",
+      "Principal": {
+        "AWS": "*"
+      },
+      "Action": "SQS:*",
+      "Resource": "#{queue_arn}",
+      "Condition": {
+        "StringEquals": {
+          "aws:SourceArn": "#{topic_arn}"
+        }
+      }
+    }
+  ]
+}
+EOS
+
+      assert_equal policy, QueueSubscription.new(nil).send(:generate_policy, queue, topic)
     end
   end
 end

data/test/integration/slow_queue_test.rb

@@ -3,8 +3,8 @@ require File.expand_path('../integration_test', __FILE__)
 module Propono
   class SlowQueueTest < IntegrationTest
     def test_slow_messages_are_received
-      topic = "slow-test-topic"
-      slow_topic = "slow-test-topic-slow"
+      topic = "propono-tests-slow-queue-topic"
+      slow_topic = "propono-tests-slow-queue-topic-slow"
       text = "This is my message #{DateTime.now} #{rand()}"
       slow_text = "This is my slow message #{DateTime.now} #{rand()}"
       flunks = []
@@ -42,6 +42,6 @@ module Propono
       flunk(flunks.join("\n")) unless flunks.empty?
     ensure
       # thread.terminate
-    end        
+    end
   end
 end

data/test/integration/sns_to_sqs_test.rb

@@ -3,7 +3,7 @@ require File.expand_path('../integration_test', __FILE__)
 module Propono
   class SnsToSqsTest < IntegrationTest
     def test_the_message_gets_there
-      topic = "test-topic"
+      topic = "propono-tests-sns-to-sqs-topic"
       text = "This is my message #{DateTime.now} #{rand()}"
       flunks = []
       message_received = false
@@ -38,18 +38,18 @@ module Propono
     ensure
       thread.terminate
     end
-    
+
 =begin
-    
+
 
     def test_failed_messge_is_transferred_to_failed_channel
       topic = "test-topic"
       text = "This is my message #{DateTime.now} #{rand()}"
       flunks = []
       message_received = false
-    
+
       Propono.subscribe_by_queue(topic)
-    
+
       thread = Thread.new do
         begin
           Propono.listen_to_queue(topic) do |message, context|
@@ -61,7 +61,7 @@ module Propono
           thread.terminate
         end
       end
-      
+
       failure_listener = Thread.new do
         begin
           Propono.listen_to_queue(topic, channel: :failed) do |message, context|
@@ -75,16 +75,16 @@ module Propono
           thread.terminate
         end
       end
-    
+
       Thread.new do
         sleep(1) while !message_received
         sleep(5) # Make sure all the message deletion clear up in the thread has happened
         thread.terminate
         failure_listener.terminate
       end
-    
+
       sleep(1) # Make sure the listener has started
-    
+
       Propono.publish(topic, text)
       flunks << "Test Timeout" unless wait_for_thread(thread)
       flunk(flunks.join("\n")) unless flunks.empty?
@@ -93,6 +93,6 @@ module Propono
     end
 
 =end
-    
+
   end
 end

data/test/integration/tcp_to_sqs_test.rb

@@ -1,9 +1,9 @@
 require File.expand_path('../integration_test', __FILE__)
 
 module Propono
-  class UdpToSqsTest < IntegrationTest
+  class TcpToSqsTest < IntegrationTest
     def test_the_message_gets_there
-      topic = "test-topic"
+      topic = "propono-tests-tcp-to-sqs-topic"
       message = "This is my message #{DateTime.now} #{rand()}"
       flunks = []
       message_received = false

data/test/integration/udp_proxy_test.rb

@@ -3,7 +3,7 @@ require File.expand_path('../integration_test', __FILE__)
 module Propono
   class UdpProxyTest < IntegrationTest
     def test_the_message_gets_there
-      topic = "test-topic"
+      topic = "propono-tests-udp-proxy-topic"
       text = "This is my message #{DateTime.now} #{rand()}"
       flunks = []
       message_received = false

data/test/integration/udp_to_sqs_test.rb

@@ -3,7 +3,7 @@ require File.expand_path('../integration_test', __FILE__)
 module Propono
   class UdpToSqsTest < IntegrationTest
     def test_the_message_gets_there
-      topic = "test-topic"
+      topic = "propono-tests-udp-to-sqs-topic"
       message = "This is my message #{DateTime.now} #{rand()}"
       flunks = []
       message_received = false

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: propono
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: 1.2.0
 platform: ruby
 authors:
 - MalcyL
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-14 00:00:00.000000000 Z
+date: 2014-05-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog