RubyGems - aws_security_viz - Versions diffs - 0.1.2.pre.alpha.pre.58 → 0.1.2.pre.alpha.pre.59 - Mend

aws_security_viz 0.1.2.pre.alpha.pre.58 → 0.1.2.pre.alpha.pre.59

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (12) hide show

checksums.yaml +8 -8
data/lib/aws_security_viz.rb +8 -9
data/lib/debug_graph.rb +5 -4
data/lib/export/html/view.html +131 -35
data/lib/graph.rb +28 -21
data/lib/renderer/graphviz.rb +30 -0
data/lib/renderer/json.rb +23 -0
data/spec/integration/expected.json +1 -0
data/spec/integration/visualize_aws_spec.rb +18 -7
data/spec/visualize_aws_spec.rb +101 -66
metadata +5 -3
data/spec/support/matchers/graph.rb +0 -8

checksums.yaml CHANGED Viewed

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NmYxNzdmYTg5OTc1ODk0N2UwNzgwOWYwZTI5ZTdjZmZiNDg0MTk0Mg==
+    ZTU2ODBmNTYyYTNkYTUwZWVlNGM4ODQwNWUxOGI4ZWU0ZDlhMTIwMQ==
   data.tar.gz: !binary |-
-    NWY5NTNkOWU4NDNmNjg5OWRhMjE5YjkxNzZlMzA0OGI1NWYxZWE0NQ==
+    YTMzYTFhODNlZjAyMWEwMjRiNjUzN2JjZDc1M2I0ZGNhODAwMDRjMg==
 SHA512:
   metadata.gz: !binary |-
-    NDJhODY3ZDBjYzNlMjE2NGFjMGYwNjQ0YWI1OTZjMTkxNGIzYjczMjllOGY2
-    N2EwN2IxNGE1ZDZiZDZiZTE5MGUxYjczNTZhNjU4MTBkNTk1YWM0MGU2MDJl
-    NDNmMTE1YWE4ZDE3ZmMyYmQ3MDFlMjRmMGM0ZjMyZDkyNThkOGI=
+    ZDNjMTcxMGU3ZDlhYjlmYzc4ZTExZTQ0MWI5NDlkMTNjYWFjYmY0ZDZhYmM3
+    YTIzMzIwNzQ0N2U5NjM3Njk3YmM5OGIzMjUwZjRmZjRlM2I4OWNlNzBlOGQy
+    M2YwZTYxZmE4NTkwNTQ4Y2VmZDQyNjBhYWVhZjY5ZDAzNDM4YWM=
   data.tar.gz: !binary |-
-    Y2IyZDZkZDhjMDJkMmYyMjI2YzBkYzk0NmVkZGEzMDhkMDI3NTI3Mzg5MDgy
-    MjZmMmRhMGM2MGU4MjA1MTlkOTg2OTYyZjkzMDM3NDIyY2VjZDM0YzdmY2I2
-    YTg2ZjBkOTIwYTM1OGMwMzIzNGIzNDk1NjQzMDU1NzdmZTMxYzE=
+    YzIxOGFiZmMzNDYyMTNhZGZjYmMyNzBhZmZhOTYwYzE1ZDllOTU1NDM4NzVk
+    NzU3Njg1Y2RiMDcxNzlkNWU1MWRiYTdhNDE0NjQxYmZjNDYzMWM1N2U4MmU4
+    NDUzOTM0ZGEzMzM4OWFhYTBiYjAyNGJiZDk3ZTgzZTc0YThmYzc=

data/lib/aws_security_viz.rb CHANGED Viewed

@@ -1,6 +1,8 @@
 require_relative 'ec2/security_groups'
 require_relative 'provider/json'
 require_relative 'provider/ec2'
+require_relative 'renderer/graphviz'
+require_relative 'renderer/json'
 require_relative 'graph'
 require_relative 'exclusions'
 require_relative 'debug_graph'
@@ -17,28 +19,25 @@ class VisualizeAws
   def unleash(output_file)
     g = build
-    render(g, output_file)
+    renderer = output_file.end_with?('json') ? Renderer::Json.new(output_file, @config) : Renderer::GraphViz.new(output_file, @config)
+    g.output(renderer)
   end
   def build
-    g = ENV["OBFUSCATE"] ? DebugGraph.new : Graph.new
+    g = ENV["OBFUSCATE"] ? DebugGraph.new(@config) : Graph.new(@config)
     @security_groups.each_with_index { |group, index|
       picker = ColorPicker.new(@options[:color])
       g.add_node(group.name)
       group.traffic.each { |traffic|
-       if traffic.ingress
-          g.add_edge(traffic.from, traffic.to, :color => picker.color(index, traffic.ingress), :style => 'bold', :label => traffic.port_range)
+        if traffic.ingress
+          g.add_edge(traffic.from, traffic.to, :color => picker.color(index, traffic.ingress), :label => traffic.port_range)
         else
-          g.add_edge(traffic.to, traffic.from, :color => picker.color(index, traffic.ingress), :style => 'bold', :label => traffic.port_range)
+          g.add_edge(traffic.to, traffic.from, :color => picker.color(index, traffic.ingress), :label => traffic.port_range)
         end
       }
     }
     g
   end
-  def render(g, output_file)
-    extension = File.extname(output_file)
-    g.output(extension[1..-1].to_sym => output_file, :use => @config.format)
-  end
 end

data/lib/debug_graph.rb CHANGED Viewed

@@ -1,8 +1,9 @@
 require 'digest'
+require_relative 'graph'
 class DebugGraph
-  def initialize
-    @g = Graph.new
+  def initialize(config)
+    @g = Graph.new(config)
   end
   def add_node(name)
@@ -13,8 +14,8 @@ class DebugGraph
     @g.add_edge(h(from), h(to), opts.update(label: h(opts[:label])))
   end
-  def output(opts)
-    @g.output(opts)
+  def output(renderer)
+    @g.output(renderer)
   end
   private

data/lib/export/html/view.html CHANGED Viewed

@@ -1,36 +1,132 @@
- <html>
-    <head>
-        <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/3.3.4/css/bootstrap.min.css">
-        <link rel="stylesheet" href="https://cdn.rawgit.com/mountainstorm/jquery.graphviz.svg/master/css/graphviz.svg.css">
-    </head>
-    <body>
-        <div id="graph" style=""></div>
-        <script type="text/javascript" src="https://code.jquery.com/jquery-2.1.3.min.js"></script>
-        <script type="text/javascript" src="https://cdn.rawgit.com/jquery/jquery-mousewheel/master/jquery.mousewheel.min.js"></script>
-        <script type="text/javascript" src="https://cdn.rawgit.com/jquery/jquery-color/master/jquery.color.js"></script>
-        <script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/3.3.4/js/bootstrap.min.js"></script>
-        <script type="text/javascript" src="https://cdn.rawgit.com/mountainstorm/jquery.graphviz.svg/master/js/jquery.graphviz.svg.js"></script>
-        <script type="text/javascript">
-            $(document).ready(function(){
-                $("#graph").graphviz({
-                    url: "demo.svg",
-                    ready: function() {
-                        var gv = this
-                        gv.nodes().click(function () {
-                            var $set = $()
-                            $set.push(this)
-                            $set = $set.add(gv.linkedFrom(this, true))
-                            gv.highlight($set, true)
-                            gv.bringToFront($set)
-                        })
-                        $(document).keydown(function (evt) {
-                            if (evt.keyCode == 27) {
-                                gv.highlight()
-                            }
-                        })
-                    }
-                });
+<html>
+<head>
+    <style type="text/css">
+        #container {
+            max-width: 100%;
+            height: 100%;
+            margin: auto;
+        }
+    </style>
+</head>
+<body>
+<div id="container"></div>
+<script src="https://rawgit.com/Linkurious/linkurious.js/develop/dist/sigma.min.js"></script>
+<script src="https://rawgit.com/Linkurious/linkurious.js/develop/dist/plugins/sigma.parsers.json.min.js"></script>
+<script src="https://rawgit.com/Linkurious/linkurious.js/develop/dist/plugins/sigma.layouts.forceLink.min.js"></script>
+<script src="https://rawgit.com/Linkurious/linkurious.js/develop/dist/plugins/sigma.plugins.design.min.js"></script>
+<script src="https://rawgit.com/Linkurious/linkurious.js/develop/dist/plugins/sigma.plugins.colorbrewer.min.js"></script>
+<script src="https://rawgit.com/Linkurious/linkurious.js/develop/dist/plugins/sigma.renderers.edgeLabels.min.js"></script>
+<script>
+    sigma.classes.graph.addMethod('neighbors', function (nodeId) {
+        var k,
+                neighbors = {},
+                index = this.allNeighborsIndex[nodeId] || {};
+        for (k in index)
+            neighbors[k] = this.nodesIndex[k];
+        return neighbors;
+    });
+    sigma.classes.graph.addMethod('neighborCount', function (nodeId) {
+        return this.allNeighborsCount[nodeId];
+    });
+    var config = {
+        renderer: {
+            container: 'container',
+            type: 'canvas'
+        },
+        settings: {
+            animationsTime: 1000,
+            borderSize: 1,
+            outerBorderSize: 1,
+            defaultNodeOuterBorderColor: 'rgb(236, 81, 72)',
+            enableEdgeHovering: true,
+            edgeHoverHighlightNodes: 'circle',
+            sideMargin: 1,
+            edgeHoverColor: 'edge',
+            defaultEdgeHoverColor: '#000',
+            edgeHoverExtremities: true,
+            scalingMode: 'outside',
+            edgeLabelThreshold: 2,
+            edgeHoverSizeRatio: 2,
+            edgeLabelSize: 'proportional'
+        }
+    };
+    sigma.parsers.json('/aws.json', config, function (s) {
+        s.graph.nodes().forEach(function (n) {
+            n.x = Math.random();
+            n.y = Math.random();
+            n.size = 1;
+            n.label = n.id;
+            n.data = {edgeCount: s.graph.neighborCount(n.id)};
+        });
+        var myStyles = {
+            nodes: {
+                color: {
+                    by: 'data.edgeCount',
+                    scheme: 'colorbrewer.nodes',
+                    bins: 3
+                },
+                size: {
+                    by: 'data.edgeCount',
+                    bins: 7,
+                    min: 2,
+                    max: 10
+                }
+            }
+        };
+        var myPalette = {
+            colorbrewer: {
+                nodes: sigma.plugins.colorbrewer.Dark2
+            }
+        };
+        var design = sigma.plugins.design(s, {styles: myStyles, palette: myPalette});
+        design.apply();
+        s.graph.nodes().forEach(function (n) {
+            n.originalColor = n.color;
+        });
+        s.graph.edges().forEach(function (e) {
+            e.size = 1;
+            e.originalColor = e.color;
+            e.type = "arrow";
+        });
+        var fa = sigma.layouts.startForceLink(s, {autoStop: true, adjustSizes: true, randomize: true});
+        s.bind('clickNode', function (e) {
+            var nodeId = e.data.node.id,
+                    toKeep = s.graph.neighbors(nodeId);
+            toKeep[nodeId] = e.data.node;
+            s.graph.nodes().forEach(function (n) {
+                if (toKeep[n.id])
+                    n.color = n.originalColor;
+                else
+                    n.color = '#eee';
             });
-        </script>
-    </body>
-</html>
+            s.graph.edges().forEach(function (e) {
+                if (toKeep[e.source] && toKeep[e.target])
+                    e.color = e.originalColor;
+                else
+                    e.color = '#eee';
+            });
+            s.refresh();
+        });
+        s.bind('clickStage', function (e) {
+            s.graph.nodes().forEach(function (n) {
+                n.color = n.originalColor;
+            });
+            s.graph.edges().forEach(function (e) {
+                e.color = e.originalColor;
+            });
+            s.refresh();
+        });
+    });
+</script>
+</body>
+</html>

data/lib/graph.rb CHANGED Viewed

@@ -1,39 +1,46 @@
-require 'graphviz'
-require 'logger'
 class Graph
-  def initialize
-    @g = GraphViz::new('G', :type => 'strict digraph') { |g|
-      g[:overlap] = :false
-      g[:splines] = :true
-      g[:sep] = 1
-      g[:concentrate] = :true
-    }
+  attr_reader :ops
+  def initialize(config)
+    @config = config
+    @ops = []
+    @nodes = Set.new
   end
   def add_node(name)
     log("node: #{name}")
-    @g.add_node(name) if name
-  end
-  def get_node(name, &block)
-    @g.get_node(name, &block)
+    uniquely_add(@ops, :node, name) {
+      [:node, name]
+    }
   end
+  #TODO : Dedup edge labels ?
+  #TODO : Remove env dependencies
   def add_edge(from, to, opts)
     log("edge: #{from} -> #{to}")
-    @g.add_edge(from, to, opts)
+    add_node(from)
+    add_node(to)
+    uniquely_add(@ops, :edge, from, to) {
+      [:edge, from, to, opts]
+    }
   end
-  def each_edge(&block)
-    @g.each_edge(&block)
+  def output(renderer)
+    @ops.each { |op, *args|
+      renderer.add_node(*args) if op==:node
+      renderer.add_edge(*args) if op==:edge
+    }
+    renderer.output
   end
-  def output(opts)
-    log("output: #{opts}")
-    @g.output(opts)
+  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 ENV["DEBUG"]
   end

data/lib/renderer/graphviz.rb ADDED Viewed

@@ -0,0 +1,30 @@
+require 'graphviz'
+module Renderer
+  class GraphViz
+    def initialize(file_name, config)
+      @g = ::GraphViz::new('G', :type => 'strict digraph') { |g|
+        g[:overlap] = :false
+        g[:splines] = :true
+        g[:sep] = 1
+        g[:concentrate] = :true
+      }
+      @file_name = file_name
+      @config = config
+    end
+    def add_node(name)
+      @g.add_node(name)
+    end
+    def add_edge(from, to, opts)
+      @g.add_edge(from, to, ({style: 'bold'}).merge(opts))
+    end
+    def output
+      extension = File.extname(@file_name)
+      opts = {extension[1..-1].to_sym => @file_name, :use => @config.format}
+      @g.output(opts)
+    end
+  end
+end

data/lib/renderer/json.rb ADDED Viewed

@@ -0,0 +1,23 @@
+module Renderer
+  class Json
+    def initialize(file_name, config)
+      @nodes = []
+      @edges = []
+      @file_name = file_name
+      @config = config
+    end
+    def add_node(name)
+      @nodes << {id: name, label: name}
+    end
+    def add_edge(from, to, opts)
+      @edges << {id: "#{from}-#{to}", source: from, target: to, label: opts[:label]}
+    end
+    def output
+      IO.write(@file_name, {nodes: @nodes, edges: @edges}.to_json)
+    end
+  end
+end

data/spec/integration/expected.json ADDED Viewed

@@ -0,0 +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"}]}

data/spec/integration/visualize_aws_spec.rb CHANGED Viewed

@@ -1,17 +1,28 @@
 require 'spec_helper'
 describe VisualizeAws do
-  context 'json' do
-    let(:opts) {
-      {
+  let(:opts) {
+    {
         :source_file => source_file,
         :filename => temp_file
-      }
     }
-    let(:source_file) {File.join(File.dirname(__FILE__), 'dummy.json')}
-    let(:expected_file) {File.join(File.dirname(__FILE__), 'dummy.dot')}
+  }
+  let(:source_file) { File.join(File.dirname(__FILE__), 'dummy.json') }
+  let(:config) { AwsConfig.new({groups: {'0.0.0.0/0' => '*'}}) }
+  context 'json to dot file' do
+    let(:expected_file) { File.join(File.dirname(__FILE__), 'dummy.dot') }
     let(:temp_file) { Tempfile.new(%w(aws .dot)) }
-    let(:config) {AwsConfig.new({groups: {'0.0.0.0/0' => '*'}})}
+    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)
+    end
+  end
+  context 'json to json file' do
+    let(:expected_file) { File.join(File.dirname(__FILE__), 'expected.json') }
+    let(:temp_file) { Tempfile.new(%w(aws .json)) }
     it 'should parse json input', :integration => true do
       VisualizeAws.new(config, opts).unleash(temp_file.path)

data/spec/visualize_aws_spec.rb CHANGED Viewed

@@ -6,49 +6,52 @@ describe VisualizeAws do
     allow(Fog::Compute).to receive(:new).and_return(@ec2)
   end
-  let(:visualize_aws) {VisualizeAws.new(AwsConfig.new)}
+  let(:visualize_aws) { VisualizeAws.new(AwsConfig.new) }
-  it 'should add nodes for each security group' do
+  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
-    node1 = graph.get_node('Remote ssh')
-    node2 = graph.get_node('My machine')
-    expect(node1).not_to be_nil
-    expect(node2).not_to be_nil
-    expect(graph.each_edge.size).to eq(1)
+    expect(graph.ops).to eq([
+                [:node, 'Remote ssh'],
+                [:node, 'My machine'],
+                [:edge, 'My machine', 'Remote ssh', {:color => :blue, :label => '22/tcp'}],
+            ])
   end
   context 'groups' do
-    it 'should add an edge for each security ingress' 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.each_edge.size).to eq(1)
-      expect(graph).to have_edge "My machine" => 'Remote ssh'
-    end
     it 'should add nodes for external security groups defined through ingress' do
       expect(@ec2).to receive(:security_groups).and_return([group('Web', group_ingress('80', 'ELB'))])
       graph = visualize_aws.build
-      expect(graph.get_node('Web')).to_not be_nil
-      expect(graph.get_node('ELB')).to_not be_nil
-      expect(graph.each_edge.size).to eq(1)
-      expect(graph).to have_edge("ELB" => 'Web')
+      expect(graph.ops).to eq([
+                  [: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.each_edge.size).to eq(4)
-      expect(graph).to have_edge('Internal'=>'App', 'External' => 'Web', 'App'=> 'Db')
+      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'}],
+              ])
     end
   end
@@ -56,92 +59,124 @@ 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.each_edge.size).to eq(3)
-      expect(graph).to have_edge('External' => 'Web', 'App'=> 'Db')
-      expect(graph).to have_edge('127.0.0.1/32' => 'Db' )
+      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'}],
+              ])
     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.each_edge.size).to eq(3)
-      expect(graph).to have_edge('External' => 'Web', 'App'=> 'Db')
-      expect(graph).to have_edge('Work' => 'Db' )
+      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'}],
+              ])
     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.each_edge.size).to eq(1)
-      expect(graph).to have_edge('Work' => 'ssh' )
+      expect(graph.ops).to eq([
+                  [: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.each_edge.size).to eq(1)
-      expect(graph).to have_edge('192.0.1.1/32' => 'Db')
-      expect(graph).to_not have_edge('127.0.0.1/32' => 'Web')
+      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'}],
+              ])
     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.each_edge.size).to eq(1)
-      expect(graph).to have_edge('External' => 'Web')
+      expect(graph.ops).to eq([
+                  [: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.each_edge.size).to eq(2)
-      expect(graph).to have_edge('External' => 'Web')
-      expect(graph).to have_edge('127.0.0.1/32' => 'Db' )
-    end
+      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'}],
+              ])
+    end
   end
 end

metadata CHANGED Viewed

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: aws_security_viz
 version: !ruby/object:Gem::Version
-  version: 0.1.2.pre.alpha.pre.58
+  version: 0.1.2.pre.alpha.pre.59
 platform: ruby
 authors:
 - Anay Nayak
@@ -169,12 +169,14 @@ files:
 - lib/opts.yml.sample
 - lib/provider/ec2.rb
 - lib/provider/json.rb
+- lib/renderer/graphviz.rb
+- lib/renderer/json.rb
 - lib/version.rb
 - spec/integration/dummy.dot
 - spec/integration/dummy.json
+- spec/integration/expected.json
 - spec/integration/visualize_aws_spec.rb
 - spec/spec_helper.rb
-- spec/support/matchers/graph.rb
 - spec/visualize_aws_spec.rb
 homepage: https://github.com/anaynayak/aws-security-viz
 licenses:
@@ -203,7 +205,7 @@ summary: Visualize your aws security groups
 test_files:
 - spec/integration/dummy.dot
 - spec/integration/dummy.json
+- spec/integration/expected.json
 - spec/integration/visualize_aws_spec.rb
 - spec/spec_helper.rb
-- spec/support/matchers/graph.rb
 - spec/visualize_aws_spec.rb

data/spec/support/matchers/graph.rb DELETED Viewed

@@ -1,8 +0,0 @@
-RSpec::Matchers.define :have_edge do |edge|
-  match do |actual|
-    edges = actual.each_edge
-    edge.each do |k,v|
-      expect(edges.any? {|e| e.node_one == GraphViz.escape(k) && e.node_two == GraphViz.escape(v)}).to eq(true)
-    end
-  end
-end