toquen 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 12bb92a9c1a199d33e77b7c902603120b442cc43
-  data.tar.gz: 13da56549c30b17f39a2e5fafac352cb5d8ecc7d
+  metadata.gz: 4170f1693c5c6bfaa962826d43179a5f6eee4583
+  data.tar.gz: 541031a124b960ed711485f99805ccda367f00e6
 SHA512:
-  metadata.gz: d7c316d71f39b4fc65019b5632cf5c686b13f0dde8b9ae43efbd71956dca23115bc40e1ebd1cb2ce9d3e51367a54ed70f9bedae19829ec1eb7931dcfd778b641
-  data.tar.gz: 70de592b929668e36cd7aaaf7a9d94fe931e644714e40a0a2a2b86e70f3103fda262c95480a85571436739024a4c28875fcf91a16c6c6e81f00adbc587c13b3a
+  metadata.gz: d794d3149af0c9ad3b1002109496b9bc1f94959b29a8e9e8963062a7c2a84d1d695e886f823c35ad0859df0592baeddf1ee109e5f84766d9f7f63777892fdfac
+  data.tar.gz: b9067b1456a24d82bd83485f0229b4cc45d302098328dab95cb0180251fc03ae0bb38ed07fc80f12ac6d73878d9d92b4051ba3acfaf81d42b0956911ffec7c2d

data/README.md

@@ -115,3 +115,5 @@ And then, when you're finished:
 Or, if you want to do everything in one step:
 
     $ cap databases open_ssh cook close_ssh
+
+**Note**: You can also use the task *open_port[22]* and *close_port[22]* to open and close SSH (or any other port).

data/lib/toquen/aws.rb

@@ -8,6 +8,7 @@ module Toquen
       @key_id = fetch(:aws_access_key_id)
       @key = fetch(:aws_secret_access_key)
       @regions = fetch(:aws_regions, ['us-east-1'])
+      AWS.config(:access_key_id => @key_id, :secret_access_key => @key)
     end
 
     def server_details
@@ -20,6 +21,11 @@ module Toquen
       }
     end
 
+    def get_security_groups(ids)
+      ectwo = AWS::EC2.new
+      ids.map { |id| ectwo.security_groups[id] }
+    end
+
     def authorize_ingress(secgroup, protocol, port, ip)
       # test if exists first
       return false if secgroup.ingress_ip_permissions.to_a.select { |p|
@@ -52,7 +58,7 @@ module Toquen
           :type => i.instance_type,
           :external_dns => i.public_dns_name,
           :internal_dns => i.private_dns_name,
-          :security_groups => i.security_groups
+          :security_groups => i.security_groups.to_a.map(&:id)
         }
       end
     end

data/lib/toquen/capistrano.rb

@@ -81,20 +81,9 @@ task :cook do
 end
 before :cook, :update_kitchen
 
-desc "Open SSH ingress to current machine"
-task :open_ssh do
-  secgroups = {}
-  filter_roles = Set.new fetch(:filter)[:roles]
-  aws = Toquen::AWSProxy.new
-  aws.regions.each do |region|
-    aws.server_details_in(region).each do |instance|
-      instance_roles = instance[:roles] + ["all", "server-#{instance[:name]}"]
-      unless (filter_roles.intersection instance_roles.to_set).empty?
-        instance[:security_groups].each { |sg| secgroups[sg.id] = sg }
-      end
-    end
-  end
-
+desc "Open a port of ingress to the current machine"
+task :open_port, :port do |t, args|
+  port = (args[:port] || 22).to_i
   run_locally do
     ivip = StunClient.get_ip
     if ivip.nil?
@@ -103,30 +92,20 @@ task :open_ssh do
     end
 
     ivip = "#{ivip}/32"
-    secgroups.values.each do |sg|
-      if aws.authorize_ingress sg, :tcp, 22, ivip
-        info "Opened port tcp:22 on security group '#{sg.name}' (#{sg.id}) to #{ivip}"
+    aws = Toquen::AWSProxy.new
+    aws.get_security_groups(fetch(:filter)[:secgroups]).each do |sg|
+      if aws.authorize_ingress sg, :tcp, port, ivip
+        info "Opened port tcp:#{port} on security group '#{sg.name}' (#{sg.id}) to #{ivip}"
       else
-        warn "Port tcp:22 in security group '#{sg.name}' (#{sg.id}) already open to #{ivip}"
+        warn "Port tcp:#{port} in security group '#{sg.name}' (#{sg.id}) already open to #{ivip}"
       end
     end
   end
 end
 
-desc "Close SSH ingress to current machine"
-task :close_ssh do
-  secgroups = {}
-  filter_roles = Set.new fetch(:filter)[:roles]
-  aws = Toquen::AWSProxy.new
-  aws.regions.each do |region|
-    aws.server_details_in(region).each do |instance|
-      instance_roles = instance[:roles] + ["all", "server-#{instance[:name]}"]
-      unless (filter_roles.intersection instance_roles.to_set).empty?
-        instance[:security_groups].each { |sg| secgroups[sg.id] = sg }
-      end
-    end
-  end
-
+desc "Close a port of ingress to the current machine"
+task :close_port, :port do |t, args|
+  port = (args[:port] || 22).to_i
   run_locally do
     ivip = StunClient.get_ip
     if ivip.nil?
@@ -135,16 +114,27 @@ task :close_ssh do
     end
 
     ivip = "#{ivip}/32"
-    secgroups.values.each do |sg|
-      if aws.revoke_ingress sg, :tcp, 22, ivip
-        info "Closed port tcp:22 on security group '#{sg.name}' (#{sg.id}) to #{ivip}"
+    aws = Toquen::AWSProxy.new
+    aws.get_security_groups(fetch(:filter)[:secgroups]).each do |sg|
+      if aws.revoke_ingress sg, :tcp, port, ivip
+        info "Closed port tcp:#{port} on security group '#{sg.name}' (#{sg.id}) to #{ivip}"
       else
-        warn "Port tcp:22 in security group '#{sg.name}' (#{sg.id}) already closed to #{ivip}"
+        warn "Port tcp:#{port} in security group '#{sg.name}' (#{sg.id}) already closed to #{ivip}"
       end
     end
   end
 end
 
+desc "Open SSH ingress to current machine"
+task :open_ssh do
+  invoke "open_port", "22"
+end
+
+desc "Close SSH ingress to current machine"
+task :close_ssh do
+  invoke "close_port", "22"
+end
+
 desc "install toquen capistrano setup to current directory"
 task :toquen_install do
   unless Dir.exists?('config')

data/lib/toquen/local_writer.rb

@@ -13,11 +13,14 @@ module Toquen
       open("config/deploy/#{name}.rb", 'w') do |f|
         f.write("# This file will be overwritten by toquen!  Don't put anything here.\n")
         f.write("set :stage, '#{name}'.intern\n")
+        secgroups = []
         servers.each { |details|
           rstring = (details[:roles] + [ "all", "server-#{details[:name]}" ]).join(' ')
           f.write("server '#{details[:external_ip]}', roles: %w{#{rstring}}, awsname: '#{details[:name]}'\n")
+          secgroups += details[:security_groups]
         }
-        f.write("set :filter, roles: %w{#{name}}\n")
+        secstring = secgroups.uniq.join(' ')
+        f.write("set :filter, roles: %w{#{name}}, secgroups: %w{#{secstring}}\n")
       end
     end
 

data/lib/toquen/version.rb

@@ -1,3 +1,3 @@
 module Toquen
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: toquen
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Brian Muller