aws_security_viz 0.1.4.pre.alpha.pre.81 → 0.1.4.pre.alpha.pre.82

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    YmZlMjAxZjA3YTcwMjIzYTFiOGMzMWQ1NjExYTllMGM0ZDE3NDgzZg==
-  data.tar.gz: !binary |-
-    OTgwZTlmZmE4NzhkZDg5OWUwYzYzYjAwOTA3MWM5MmEzY2I2YzU3NQ==
+SHA1:
+  metadata.gz: f1fed3837156ff2477390d1b411bbbd97a1d96fc
+  data.tar.gz: e737d124886db6d03301ae21d489aef70db7bec6
 SHA512:
-  metadata.gz: !binary |-
-    YTNiZjUzZjhkMWYzZTIyZTllMTI3Nzg0ZTViOWU0MGU5OGIxZTg1ZmEzMTFj
-    Yzk2ZTA5ODk2NTA3ZDQ2MmE3NzBmMTgyMDdmZWFlMmIyMzEyYTEzMDdmNDIy
-    MTMyNjdmZjU2YzVjNzJkNDYyYjUzMTY2ZWM0YzFjOTM0NmY0M2E=
-  data.tar.gz: !binary |-
-    N2ExYzhiOWM2ZDM0MWFiNjMyNjljOGZjYjM2OWRhNjkxMDYyZmRiN2NmMTA5
-    ZTY5Y2JmMjZhM2YyOTI5ZGU4ZGQzZmQxNmZkZTQyNjQ0ZTNmMzcxMmJhYjlm
-    YjUyNmQxZjUyOTA2ZGJiODljMjAzMmY4NjAxZTk2YWRiMzc1ZmM=
+  metadata.gz: 6fd4637e47289e1c56f93d78268b1f379113db10f61fd65a5f1ad2e9909594662fbab47d7920bce17d0902a55d9318c34f6800366c7d2fdcaf54d9eac3450162
+  data.tar.gz: 09898633b2c77440f2b85a64f424db98658275f4fcd23300ecce2bbd357f06eef16b8aee177641b57c6f7f7009dc54cb3c73f5d6002cdb8e1637db36cd3e1865

data/Rakefile

@@ -1,2 +1,4 @@
 require 'bundler/gem_tasks'
+require 'rspec/core/rake_task'
 
+RSpec::Core::RakeTask.new(:spec)

data/aws_security_viz.gemspec

@@ -6,7 +6,7 @@ Gem::Specification.new do |s|
   s.name        = 'aws_security_viz'
   s.version     = AwsSecurityViz::VERSION
   s.version     = "#{s.version}-alpha-#{ENV['TRAVIS_BUILD_NUMBER']}" if ENV['TRAVIS']
-  s.date        = '2015-10-15'
+  s.date        = Time.now.strftime('%Y-%m-%d')
   s.summary     = "Visualize your aws security groups"
   s.description = "Provides a quick mechanism to visualize your EC2 security groups in multiple formats"
   s.authors     = ["Anay Nayak"]
@@ -22,15 +22,16 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
 
   s.add_development_dependency "bundler", "~> 1.13"
-  s.add_development_dependency "rake", "~> 11.2.2"
+  s.add_development_dependency "rake", "~> 12.0.0"
   s.add_development_dependency "rspec", "~> 3.5.0"
 
   s.add_runtime_dependency 'ruby-graphviz', "~> 1.2.2"
-  s.add_runtime_dependency 'fog-aws', "~> 0.11.0"
+  s.add_runtime_dependency 'fog-aws', "~> 1.2.0"
   s.add_runtime_dependency 'unf', "~> 0.1.4"
-  s.add_runtime_dependency 'json', "~> 2.0.2"
+  s.add_runtime_dependency 'json', "~> 2.0.3"
   s.add_runtime_dependency 'trollop', "~> 2.1.2"
   s.add_runtime_dependency 'organic_hash', "~> 1.0.2"
+  s.add_runtime_dependency 'rgl', "~> 0.5.2"
 
   s.required_ruby_version = '>= 2.0.0'
 end

data/exe/aws_security_viz

@@ -11,6 +11,8 @@ opts = Trollop::options do
   opt :filename, 'Output file name', :type => :string, :default => 'aws-security-viz.png'
   opt :config, 'Config file (opts.yml)', :type => :string, :default => 'opts.yml'
   opt :color, 'Colored node edges', :default => false
+  opt :source_filter, 'Source filter', :default => nil, :type => :string
+  opt :target_filter, 'Target filter', :default => nil, :type => :string
 end
 
 cmd = ARGV.shift
@@ -21,5 +23,10 @@ if cmd=="setup"
 end
 
 config = AwsConfig.load(opts[:config]).merge(obfuscate: ENV['OBFUSCATE'], debug: ENV['DEBUG'])
-VisualizeAws.new(config, opts).unleash(opts[:filename])
+begin
+  VisualizeAws.new(config, opts).unleash(opts[:filename])
+rescue Exception => e
+  puts "[ERROR] #{e.message}"
+  exit 1
+end
 

data/lib/aws_security_viz.rb

@@ -4,6 +4,7 @@ require_relative 'provider/ec2'
 require_relative 'renderer/graphviz'
 require_relative 'renderer/json'
 require_relative 'graph'
+require_relative 'graph_filter'
 require_relative 'exclusions'
 require_relative 'debug_graph'
 require_relative 'color_picker'
@@ -19,6 +20,7 @@ class VisualizeAws
 
   def unleash(output_file)
     g = build
+    g.filter(@options[:source_filter], @options[:target_filter])
     if output_file.end_with?('json')
       g.output(Renderer::Json.new(output_file, @config))
       FileUtils.copy(File.expand_path('../export/html/view.html', __FILE__),

data/lib/debug_graph.rb

@@ -14,6 +14,10 @@ class DebugGraph
     @g.add_edge(h(from), h(to), opts.update(label: h(opts[:label])))
   end
 
+  def filter(source, destination)
+    @g.filter(source, destination)
+  end
+
   def output(renderer)
     @g.output(renderer)
   end

data/lib/graph.rb

@@ -1,45 +1,43 @@
+require 'rgl/adjacency'
+
 class Graph
-  attr_reader :ops
+  attr_reader :underlying
 
-  def initialize(config)
+  def initialize(config, underlying=RGL::DirectedAdjacencyGraph.new)
     @config = config
-    @ops = []
-    @nodes = Set.new
+    @underlying = underlying
+    @edge_properties = {}
   end
 
   def add_node(name)
     log("node: #{name}")
-    uniquely_add(@ops, :node, name) {
-      [:node, name]
-    }
+    @underlying.add_vertex(name)
   end
 
   def add_edge(from, to, opts)
     log("edge: #{from} -> #{to}")
-    add_node(from)
-    add_node(to)
-    uniquely_add(@ops, :edge, from, to) {
-      [:edge, from, to, opts]
-    }
+    @underlying.add_edge(from, to)
+    @edge_properties[[from, to]] = opts
+  end
+
+  def filter(source, destination)
+    @underlying = GraphFilter.new(underlying).filter(source, destination)
   end
 
   def output(renderer)
-    @ops.each { |op, *args|
-      renderer.add_node(*args) if op==:node
-      renderer.add_edge(*args) if op==:edge
+    @underlying.each_vertex { |v| renderer.add_node(v) }
+    @underlying.each_edge { |u, v|
+      renderer.add_edge(u, v, opts(u, v))
     }
     renderer.output
   end
 
-  def uniquely_add(target, type, *opts, &block)
-    return if opts.compact.empty?
-    return if @nodes.include?([type, opts])
-    @nodes.add([type, opts])
-    target << yield
-  end
-
-
   def log(msg)
     puts msg if @config.debug?
   end
+
+  private
+  def opts(u, v)
+    @edge_properties[[u, v]]
+  end
 end

data/lib/graph_filter.rb

@@ -0,0 +1,38 @@
+require 'rgl/traversal'
+require 'rgl/implicit'
+
+class GraphFilter
+  def initialize(graph)
+    @graph = graph
+  end
+
+  def filter(source, destination)
+    return @graph if source.nil? && destination.nil?
+    if !source.nil? && destination.nil?
+      return reduce(@graph, source)
+    end
+    if !destination.nil? && source.nil?
+      return reduce(@graph.reverse, destination).reverse
+    end
+    search(@graph, source, destination)
+  end
+
+  private
+  def reduce(graph, source)
+    tree = graph.bfs_search_tree_from(source)
+    graph.vertices_filtered_by { |v| tree.has_vertex? v }
+  end
+
+  def search(graph, source, destination)
+    visitor = RGL::DFSVisitor.new(graph)
+    path = []
+    paths = []
+    visitor.set_examine_vertex_event_handler { |x| path << x }
+    visitor.set_finish_vertex_event_handler { |x| path.pop }
+    visitor.set_examine_edge_event_handler { |x, y| paths << path.dclone + [y] if y == destination }
+    graph.depth_first_visit(source, visitor) { |x|}
+    to_remove = graph.vertices - paths.flatten
+    graph.remove_vertices(*to_remove)
+    graph
+  end
+end

data/spec/graph_filter_spec.rb

@@ -0,0 +1,85 @@
+require 'spec_helper'
+require 'ostruct'
+
+describe GraphFilter do
+  it 'should include nodes reachable from source' do
+    graph = GraphFilter.new(RGL::DirectedAdjacencyGraph[1, 2, 2, 3, 2, 4, 4, 5])
+
+    expect(graph.filter(2, nil).to_s).to eq('(2-3)(2-4)(4-5)')
+  end
+  it 'should remove nodes not reachable from source' do
+    graph = GraphFilter.new(RGL::DirectedAdjacencyGraph[1, 2, 2, 3, 2, 4, 4, 5, 3, 5])
+
+    expect(graph.filter(3, nil).to_s).to eq('(3-5)')
+  end
+  it 'should remove nodes not reachable to destination' do
+    graph = GraphFilter.new(RGL::DirectedAdjacencyGraph[
+                                1, 2,
+                                1, 3,
+                                1, 4,
+                                2, 3,
+                                2, 4,
+                                3, 4,
+                            ])
+
+    expect(graph.filter(nil, 3).to_s).to eq('(1-2)(1-3)(2-3)')
+  end
+  it 'should remove nodes not reachable to destination from source' do
+    graph = GraphFilter.new(RGL::DirectedAdjacencyGraph[
+                                1, 2,
+                                1, 3,
+                                1, 4,
+                                2, 3,
+                                2, 4,
+                            ])
+
+    expect(graph.filter(2, 4).to_s).to eq('(2-4)')
+  end
+  it 'should retain edges which pass through intermediate nodes' do
+    graph = GraphFilter.new(RGL::DirectedAdjacencyGraph[
+                                1, 2,
+                                1, 3,
+                                1, 4,
+                                2, 3,
+                                2, 4,
+                                3, 4,
+                            ])
+    expect(graph.filter(2, 4).to_s).to eq('(2-3)(2-4)(3-4)')
+  end
+  it 'should remove nodes not reachable to destination from source #1' do
+    graph = GraphFilter.new(RGL::DirectedAdjacencyGraph[
+                                1, 2,
+                                1, 3,
+                                1, 4,
+                                2, 3,
+                                2, 4,
+                                3, 5,
+                                5, 4
+                            ])
+    expect(graph.filter(1, 5).to_s).to eq('(1-2)(1-3)(2-3)(3-5)')
+  end
+  it 'should remove nodes not reachable to destination from source #2' do
+    graph = GraphFilter.new(RGL::DirectedAdjacencyGraph[
+                                1, 2,
+                                1, 3,
+                                1, 4,
+                                2, 3,
+                                2, 4,
+                                3, 5,
+                                5, 4
+                            ])
+    expect(graph.filter(1, 4).to_s).to eq('(1-2)(1-3)(1-4)(2-3)(2-4)(3-5)(5-4)')
+  end
+  it 'should remove nodes not reachable to destination from source #3' do
+    graph = GraphFilter.new(RGL::DirectedAdjacencyGraph[
+                                1, 2,
+                                1, 3,
+                                1, 4,
+                                2, 3,
+                                2, 4,
+                                3, 5,
+                                5, 4
+                            ])
+    expect(graph.filter(2, 4).to_s).to eq('(2-3)(2-4)(3-5)(5-4)')
+  end
+end

data/spec/integration/aws_expected.json

@@ -0,0 +1 @@
+{"nodes":[{"id":"asv-app","label":"asv-app"},{"id":"asv-bastion","label":"asv-bastion"},{"id":"*","label":"*"},{"id":"asv-db","label":"asv-db"},{"id":"asv-solr","label":"asv-solr"},{"id":"default","label":"default"}],"edges":[{"id":"asv-bastion-asv-app","source":"asv-bastion","target":"asv-app","label":"22/tcp"},{"id":"*-asv-app","source":"*","target":"asv-app","label":"80/tcp"},{"id":"*-asv-bastion","source":"*","target":"asv-bastion","label":"22/tcp"},{"id":"asv-app-asv-db","source":"asv-app","target":"asv-db","label":"5432/tcp"},{"id":"asv-bastion-asv-db","source":"asv-bastion","target":"asv-db","label":"22/tcp"},{"id":"asv-app-asv-solr","source":"asv-app","target":"asv-solr","label":"8983/tcp"},{"id":"asv-bastion-asv-solr","source":"asv-bastion","target":"asv-solr","label":"22/tcp"},{"id":"default-default","source":"default","target":"default","label":"*"},{"id":"*-default","source":"*","target":"default","label":"22/tcp"},{"id":"default-*","source":"default","target":"*","label":"*"}]}

data/spec/integration/expected.json

@@ -1 +1 @@
-{"nodes":[{"id":"app","label":"app"},{"id":"8.8.8.8/32","label":"8.8.8.8/32"},{"id":"amazon-elb-sg","label":"amazon-elb-sg"},{"id":"*","label":"*"},{"id":"db","label":"db"}],"edges":[{"id":"8.8.8.8/32-app","source":"8.8.8.8/32","target":"app","label":"80/tcp"},{"id":"amazon-elb-sg-app","source":"amazon-elb-sg","target":"app","label":"80/tcp"},{"id":"*-app","source":"*","target":"app","label":"22/tcp"},{"id":"app-db","source":"app","target":"db","label":"5984/tcp"}]}
+{"nodes":[{"id":"app","label":"app"},{"id":"8.8.8.8/32","label":"8.8.8.8/32"},{"id":"amazon-elb-sg","label":"amazon-elb-sg"},{"id":"*","label":"*"},{"id":"db","label":"db"}],"edges":[{"id":"app-db","source":"app","target":"db","label":"5984/tcp"},{"id":"8.8.8.8/32-app","source":"8.8.8.8/32","target":"app","label":"80/tcp"},{"id":"amazon-elb-sg-app","source":"amazon-elb-sg","target":"app","label":"80/tcp"},{"id":"*-app","source":"*","target":"app","label":"22/tcp"}]}

data/spec/integration/visualize_aws_spec.rb

@@ -9,6 +9,8 @@ describe VisualizeAws do
   }
   let(:source_file) { File.join(File.dirname(__FILE__), 'dummy.json') }
   let(:config) { AwsConfig.new({groups: {'0.0.0.0/0' => '*'}}) }
+  let(:expected_content) { File.read(expected_file) }
+  let(:actual_content) { temp_file.read }
 
   context 'json to dot file' do
     let(:expected_file) { File.join(File.dirname(__FILE__), 'dummy.dot') }
@@ -16,7 +18,7 @@ describe VisualizeAws do
 
     it 'should parse json input', :integration => true do
       VisualizeAws.new(config, opts).unleash(temp_file.path)
-      expect(File.read(expected_file)).to eq(temp_file.read)
+      expect(expected_content).to eq(actual_content)
     end
   end
 
@@ -27,7 +29,28 @@ describe VisualizeAws do
     it 'should parse json input', :integration => true do
       expect(FileUtils).to receive(:copy)
       VisualizeAws.new(config, opts).unleash(temp_file.path)
-      expect(File.read(expected_file)).to eq(temp_file.read)
+      expect(JSON.parse(expected_content)).to eq(JSON.parse(actual_content))
+    end
+  end
+
+  if ENV['TEST_ACCESS_KEY']
+    context 'ec2 to json file' do
+      let(:expected_file) { File.join(File.dirname(__FILE__), 'aws_expected.json') }
+      let(:temp_file) { Tempfile.new(%w(aws .json)) }
+      let(:opts) {
+        {
+            :filename => temp_file,
+            :secret_key => ENV['TEST_SECRET_KEY'],
+            :access_key => ENV['TEST_ACCESS_KEY']
+        }
+      }
+
+      it 'should read from ec2 account', :integration => true do
+        expect(FileUtils).to receive(:copy)
+        VisualizeAws.new(config, opts).unleash(temp_file.path)
+        expect(JSON.parse(expected_content)['edges']).to match_array(JSON.parse(actual_content)['edges'])
+        expect(JSON.parse(expected_content)['nodes']).to match_array(JSON.parse(actual_content)['nodes'])
+      end
     end
   end
 end

data/spec/visualize_aws_spec.rb

@@ -1,5 +1,21 @@
 require 'spec_helper'
 
+class DummyRenderer
+  attr_reader :output
+
+  def initialize
+    @output = []
+  end
+
+  def add_node(name)
+    @output << [:node, name]
+  end
+
+  def add_edge(from, to, opts)
+    @output << [:edge, from, to, opts]
+  end
+end
+
 describe VisualizeAws do
   before do
     @ec2 = double(Fog::Compute)
@@ -7,16 +23,17 @@ describe VisualizeAws do
   end
 
   let(:visualize_aws) { VisualizeAws.new(AwsConfig.new) }
+  let(:renderer) { DummyRenderer.new }
 
   it 'should add nodes, edges for each security group' do
     expect(@ec2).to receive(:security_groups).and_return([group('Remote ssh', group_ingress('22', 'My machine')), group('My machine')])
     graph = visualize_aws.build
 
-    expect(graph.ops).to eq([
-                [:node, 'Remote ssh'],
-                [:node, 'My machine'],
-                [:edge, 'My machine', 'Remote ssh', {:color => :blue, :label => '22/tcp'}],
-            ])
+    expect(graph.output(renderer)).to contain_exactly(
+                                          [:node, 'Remote ssh'],
+                                          [:node, 'My machine'],
+                                          [:edge, 'My machine', 'Remote ssh', {:color => :blue, :label => '22/tcp'}],
+                                      )
   end
 
   context 'groups' do
@@ -24,33 +41,33 @@ describe VisualizeAws do
       expect(@ec2).to receive(:security_groups).and_return([group('Web', group_ingress('80', 'ELB'))])
       graph = visualize_aws.build
 
-      expect(graph.ops).to eq([
-                  [:node, 'Web'],
-                  [:node, 'ELB'],
-                  [:edge, 'ELB', 'Web', {:color => :blue, :label => '80/tcp'}],
-              ])
+      expect(graph.output(renderer)).to contain_exactly(
+                                            [:node, 'Web'],
+                                            [:node, 'ELB'],
+                                            [:edge, 'ELB', 'Web', {:color => :blue, :label => '80/tcp'}]
+                                        )
     end
 
     it 'should add an edge for each security ingress' do
       expect(@ec2).to receive(:security_groups).and_return(
-              [
-                  group('App', group_ingress('80', 'Web'), group_ingress('8983', 'Internal')),
-                  group('Web', group_ingress('80', 'External')),
-                  group('Db', group_ingress('7474', 'App'))
-              ])
+          [
+              group('App', group_ingress('80', 'Web'), group_ingress('8983', 'Internal')),
+              group('Web', group_ingress('80', 'External')),
+              group('Db', group_ingress('7474', 'App'))
+          ])
       graph = visualize_aws.build
 
-      expect(graph.ops).to eq([
-                  [:node, 'App'],
-                  [:node, 'Web'],
-                  [:edge, 'Web', 'App', {:color => :blue, :label => '80/tcp'}],
-                  [:node, 'Internal'],
-                  [:edge, 'Internal', 'App', {:color => :blue, :label => '8983/tcp'}],
-                  [:node, 'External'],
-                  [:edge, 'External', 'Web', {:color => :blue, :label => '80/tcp'}],
-                  [:node, 'Db'],
-                  [:edge, 'App', 'Db', {:color => :blue, :label => '7474/tcp'}],
-              ])
+      expect(graph.output(renderer)).to contain_exactly(
+                                            [:node, 'App'],
+                                            [:node, 'Web'],
+                                            [:edge, 'Web', 'App', {:color => :blue, :label => '80/tcp'}],
+                                            [:node, 'Internal'],
+                                            [:edge, 'Internal', 'App', {:color => :blue, :label => '8983/tcp'}],
+                                            [:node, 'External'],
+                                            [:edge, 'External', 'Web', {:color => :blue, :label => '80/tcp'}],
+                                            [:node, 'Db'],
+                                            [:edge, 'App', 'Db', {:color => :blue, :label => '7474/tcp'}]
+                                        )
 
     end
   end
@@ -59,123 +76,123 @@ describe VisualizeAws do
 
     it 'should add an edge for each cidr ingress' do
       expect(@ec2).to receive(:security_groups).and_return(
-              [
-                  group('Web', group_ingress('80', 'External')),
-                  group('Db', group_ingress('7474', 'App'), cidr_ingress('22', '127.0.0.1/32'))
-              ])
+          [
+              group('Web', group_ingress('80', 'External')),
+              group('Db', group_ingress('7474', 'App'), cidr_ingress('22', '127.0.0.1/32'))
+          ])
       graph = visualize_aws.build
 
-      expect(graph.ops).to eq([
-                  [:node, 'Web'],
-                  [:node, 'External'],
-                  [:edge, 'External', 'Web', {:color => :blue, :label => '80/tcp'}],
-                  [:node, 'Db'],
-                  [:node, 'App'],
-                  [:edge, 'App', 'Db', {:color => :blue, :label => '7474/tcp'}],
-                  [:node, '127.0.0.1/32'],
-                  [:edge, '127.0.0.1/32', 'Db', {:color => :blue, :label => '22/tcp'}],
-              ])
+      expect(graph.output(renderer)).to contain_exactly(
+                                            [:node, 'Web'],
+                                            [:node, 'External'],
+                                            [:edge, 'External', 'Web', {:color => :blue, :label => '80/tcp'}],
+                                            [:node, 'Db'],
+                                            [:node, 'App'],
+                                            [:edge, 'App', 'Db', {:color => :blue, :label => '7474/tcp'}],
+                                            [:node, '127.0.0.1/32'],
+                                            [:edge, '127.0.0.1/32', 'Db', {:color => :blue, :label => '22/tcp'}]
+                                        )
 
     end
 
     it 'should add map edges for cidr ingress' do
       expect(@ec2).to receive(:security_groups).and_return(
-              [
-                  group('Web', group_ingress('80', 'External')),
-                  group('Db', group_ingress('7474', 'App'), cidr_ingress('22', '127.0.0.1/32'))
-              ])
+          [
+              group('Web', group_ingress('80', 'External')),
+              group('Db', group_ingress('7474', 'App'), cidr_ingress('22', '127.0.0.1/32'))
+          ])
       mapping = {'127.0.0.1/32' => 'Work'}
       mapping = CidrGroupMapping.new([], mapping)
       allow(CidrGroupMapping).to receive(:new).and_return(mapping)
 
       graph = visualize_aws.build
 
-      expect(graph.ops).to eq([
-                  [:node, 'Web'],
-                  [:node, 'External'],
-                  [:edge, 'External', 'Web', {:color => :blue, :label => '80/tcp'}],
-                  [:node, 'Db'],
-                  [:node, 'App'],
-                  [:edge, 'App', 'Db', {:color => :blue, :label => '7474/tcp'}],
-                  [:node, 'Work'],
-                  [:edge, 'Work', 'Db', {:color => :blue, :label => '22/tcp'}],
-              ])
+      expect(graph.output(renderer)).to contain_exactly(
+                                            [:node, 'Web'],
+                                            [:node, 'External'],
+                                            [:edge, 'External', 'Web', {:color => :blue, :label => '80/tcp'}],
+                                            [:node, 'Db'],
+                                            [:node, 'App'],
+                                            [:edge, 'App', 'Db', {:color => :blue, :label => '7474/tcp'}],
+                                            [:node, 'Work'],
+                                            [:edge, 'Work', 'Db', {:color => :blue, :label => '22/tcp'}]
+                                        )
 
     end
 
     it 'should group mapped duplicate edges for cidr ingress' do
       expect(@ec2).to receive(:security_groups).and_return(
-              [
-                  group('ssh', cidr_ingress('22', '192.168.0.1/32'), cidr_ingress('22', '127.0.0.1/32'))
-              ])
+          [
+              group('ssh', cidr_ingress('22', '192.168.0.1/32'), cidr_ingress('22', '127.0.0.1/32'))
+          ])
       mapping = {'127.0.0.1/32' => 'Work', '192.168.0.1/32' => 'Work'}
       mapping = CidrGroupMapping.new([], mapping)
       allow(CidrGroupMapping).to receive(:new).and_return(mapping)
 
       graph = visualize_aws.build
 
-      expect(graph.ops).to eq([
-                  [:node, 'ssh'],
-                  [:node, 'Work'],
-                  [:edge, 'Work', 'ssh', {:color => :blue, :label => '22/tcp'}],
-              ])
+      expect(graph.output(renderer)).to contain_exactly(
+                                            [:node, 'ssh'],
+                                            [:node, 'Work'],
+                                            [:edge, 'Work', 'ssh', {:color => :blue, :label => '22/tcp'}]
+                                        )
     end
   end
 
   context "filter" do
     it 'include cidr which do not match the pattern' do
       expect(@ec2).to receive(:security_groups).and_return(
-              [
-                  group('Web', cidr_ingress('22', '127.0.0.1/32')),
-                  group('Db', cidr_ingress('22', '192.0.1.1/32'))
-              ])
+          [
+              group('Web', cidr_ingress('22', '127.0.0.1/32')),
+              group('Db', cidr_ingress('22', '192.0.1.1/32'))
+          ])
 
       opts = {:exclude => ['127.*']}
       graph = VisualizeAws.new(AwsConfig.new(opts)).build
 
-      expect(graph.ops).to eq([
-                  [:node, 'Web'],
-                  [:node, 'Db'],
-                  [:node, '192.0.1.1/32'],
-                  [:edge, '192.0.1.1/32', 'Db', {:color => :blue, :label => '22/tcp'}],
-              ])
+      expect(graph.output(renderer)).to contain_exactly(
+                                            [:node, 'Web'],
+                                            [:node, 'Db'],
+                                            [:node, '192.0.1.1/32'],
+                                            [:edge, '192.0.1.1/32', 'Db', {:color => :blue, :label => '22/tcp'}]
+                                        )
     end
 
     it 'include groups which do not match the pattern' do
       expect(@ec2).to receive(:security_groups).and_return(
-              [
-                  group('Web', group_ingress('80', 'External')),
-                  group('Db', group_ingress('7474', 'App'), cidr_ingress('22', '127.0.0.1/32'))
-              ])
+          [
+              group('Web', group_ingress('80', 'External')),
+              group('Db', group_ingress('7474', 'App'), cidr_ingress('22', '127.0.0.1/32'))
+          ])
 
       opts = {:exclude => ['D.*b', 'App']}
       graph = VisualizeAws.new(AwsConfig.new(opts)).build
 
-      expect(graph.ops).to eq([
-                  [:node, 'Web'],
-                  [:node, 'External'],
-                  [:edge, 'External', 'Web', {:color => :blue, :label => '80/tcp'}],
-              ])
+      expect(graph.output(renderer)).to contain_exactly(
+                                            [:node, 'Web'],
+                                            [:node, 'External'],
+                                            [:edge, 'External', 'Web', {:color => :blue, :label => '80/tcp'}]
+                                        )
     end
 
     it 'include derived groups which do not match the pattern' do
       expect(@ec2).to receive(:security_groups).and_return(
-              [
-                  group('Web', group_ingress('80', 'External')),
-                  group('Db', group_ingress('7474', 'App'), cidr_ingress('22', '127.0.0.1/32'))
-              ])
+          [
+              group('Web', group_ingress('80', 'External')),
+              group('Db', group_ingress('7474', 'App'), cidr_ingress('22', '127.0.0.1/32'))
+          ])
 
       opts = {:exclude => ['App']}
       graph = VisualizeAws.new(AwsConfig.new(opts)).build
 
-      expect(graph.ops).to eq([
-                  [:node, 'Web'],
-                  [:node, 'External'],
-                  [:edge, 'External', 'Web', {:color => :blue, :label => '80/tcp'}],
-                  [:node, 'Db'],
-                  [:node, '127.0.0.1/32'],
-                  [:edge, '127.0.0.1/32', 'Db', {:color => :blue, :label => '22/tcp'}],
-              ])
+      expect(graph.output(renderer)).to contain_exactly(
+                                            [:node, 'Web'],
+                                            [:node, 'External'],
+                                            [:edge, 'External', 'Web', {:color => :blue, :label => '80/tcp'}],
+                                            [:node, 'Db'],
+                                            [:node, '127.0.0.1/32'],
+                                            [:edge, '127.0.0.1/32', 'Db', {:color => :blue, :label => '22/tcp'}]
+                                        )
 
     end
   end

metadata

@@ -1,141 +1,155 @@
 --- !ruby/object:Gem::Specification
 name: aws_security_viz
 version: !ruby/object:Gem::Version
-  version: 0.1.4.pre.alpha.pre.81
+  version: 0.1.4.pre.alpha.pre.82
 platform: ruby
 authors:
 - Anay Nayak
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-10-15 00:00:00.000000000 Z
+date: 2017-02-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.13'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.13'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 11.2.2
+        version: 12.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 11.2.2
+        version: 12.0.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 3.5.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 3.5.0
 - !ruby/object:Gem::Dependency
   name: ruby-graphviz
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.2.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.2.2
 - !ruby/object:Gem::Dependency
   name: fog-aws
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.11.0
+        version: 1.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.11.0
+        version: 1.2.0
 - !ruby/object:Gem::Dependency
   name: unf
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.1.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.1.4
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.2
+        version: 2.0.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.2
+        version: 2.0.3
 - !ruby/object:Gem::Dependency
   name: trollop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.1.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.1.2
 - !ruby/object:Gem::Dependency
   name: organic_hash
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.0.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.0.2
+- !ruby/object:Gem::Dependency
+  name: rgl
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.5.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.5.2
 description: Provides a quick mechanism to visualize your EC2 security groups in multiple
   formats
 email: anayak007+rubygems@gmail.com
@@ -144,8 +158,8 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - LICENSE.md
@@ -167,12 +181,15 @@ files:
 - lib/exclusions.rb
 - lib/export/html/view.html
 - lib/graph.rb
+- lib/graph_filter.rb
 - lib/opts.yml.sample
 - lib/provider/ec2.rb
 - lib/provider/json.rb
 - lib/renderer/graphviz.rb
 - lib/renderer/json.rb
 - lib/version.rb
+- spec/graph_filter_spec.rb
+- spec/integration/aws_expected.json
 - spec/integration/dummy.dot
 - spec/integration/dummy.json
 - spec/integration/expected.json
@@ -189,12 +206,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>'
+  - - ">"
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
@@ -204,6 +221,8 @@ signing_key:
 specification_version: 4
 summary: Visualize your aws security groups
 test_files:
+- spec/graph_filter_spec.rb
+- spec/integration/aws_expected.json
 - spec/integration/dummy.dot
 - spec/integration/dummy.json
 - spec/integration/expected.json