conpar 0.1.3 → 0.1.4

data/README.md

@@ -1,4 +1,5 @@
 # Conpar 
+[![Gem Version](https://badge.fury.io/rb/conpar.svg)](http://badge.fury.io/rb/conpar)
 [![Build Status](https://travis-ci.org/CITguy/conpar.png?branch=master)](https://travis-ci.org/CITguy/conpar)
 [![Coverage Status](https://coveralls.io/repos/CITguy/conpar/badge.png?branch=master)](https://coveralls.io/r/CITguy/conpar?branch=master)
 

data/lib/conpar/directive/access_list/ether_type.rb

@@ -4,13 +4,17 @@ module Conpar
       # Class that maps directly to Cisco ethertype ACL definition
       # See http://www.cisco.com/c/en/us/td/docs/security/asa/asa91/configuration/general/asa_91_general_config/acl_ethertype.html
       class EtherType < Base
-        SIGNATURE = /^(access-list)\b.*\s(ethertype)\s/i
+        # (0.1.4): "ethertype" should be followed by "permit" or "deny"
+        SIGNATURE = /^(access-list)\b.*\s(ethertype)\s+(permit|deny)/i
 
         def initialize(content="", options={})
           super
 
           @sub_ilk = "ethertype"
 
+          # access-list access_list_name ethertype
+          # {deny | permit}
+          # {ipx | bpdu | mpls-unicast | mpls-multicast | is-is | any | hex_number}
           parse_regex = %r/^
             (access-list)\s*                 # Directive Signature
             (?<name>#{NAME})\s*              # ACL Name

data/lib/conpar/directive/access_list/extended.rb

@@ -4,7 +4,8 @@ module Conpar
       # Class that maps directly to Cisco extended ACL definition
       # See http://www.cisco.com/c/en/us/td/docs/security/asa/asa91/configuration/general/asa_91_general_config/acl_extended.html
       class Extended < Base
-        SIGNATURE = /^(access-list)\b.*\s(extended)\s/i
+        # (0.1.4): "extended" should be followed by "permit" or "deny"
+        SIGNATURE = /^(access-list)\b.*\s(extended)\s+(permit|deny)\s/i
 
         def initialize(content="", options={})
           super

data/lib/conpar/directive/access_list/standard.rb

@@ -4,13 +4,16 @@ module Conpar
       # Class that maps directly to Cisco standard ACL definition
       # See http://www.cisco.com/c/en/us/td/docs/security/asa/asa91/configuration/general/asa_91_general_config/acl_standard.html
       class Standard < Base
-        SIGNATURE = /^(access-list)\b.*\s(standard)\s/i
+        # (0.1.4): "standard" should be followed by "permit" or "deny"
+        SIGNATURE = /^(access-list)\b.*\s(standard)\s+(permit|deny)/i
 
         def initialize(content="", options={})
           super
 
           @sub_ilk = "standard"
 
+          # access-list access_list_name standard
+          # { deny | permit } { any4 | ip_address mask }
           parse_regex = %r/^
             (access-list)\s*                 # Directive signature
             (?<name>#{NAME})\s*              # ACL Name

data/lib/conpar/directive/access_list/web_type.rb

@@ -4,7 +4,8 @@ module Conpar
       # Class that maps directly to Cisco webtype ACL definition
       # See http://www.cisco.com/c/en/us/td/docs/security/asa/asa91/configuration/general/asa_91_general_config/acl_webtype.html
       class WebType < Base
-        SIGNATURE = /^(access-list)\b.*\s(webtype)\s/i
+        # (0.1.4) "webtype" should be followed by "permit" or "deny"
+        SIGNATURE = /^(access-list)\b.*\s(webtype)\s+(permit|deny)/i
 
         def initialize(content="", options={})
           super

data/lib/conpar/version.rb

@@ -1,3 +1,3 @@
 module Conpar
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

data/spec/lib/directive/access_list/extended_spec.rb

@@ -3,11 +3,15 @@ require 'spec_helper'
 describe Conpar::Directive::AccessList::Extended do
   let(:klass) { Conpar::Directive::AccessList::Extended }
 
-  context "extended acl with 'standard' in name of object-group" do
-    subject { "access-list ACL_IN extended permit ip any object-group standard-grp" }
-
-    it "::SIGNATURE should match" do
-      expect(subject).to match(klass::SIGNATURE)
+  [
+    "access-list 101 extended permit icmp any object-group standard-grp",
+    "access-list 101 extended permit icmp any any object-group standard"
+  ].each do |acl|
+    context "for '#{acl}'" do
+      subject { acl }
+      it "::SIGNATURE should MATCH" do
+        expect(subject).to match(klass::SIGNATURE)
+      end
     end
   end
 

data/spec/lib/directive/access_list/standard_spec.rb

@@ -3,13 +3,18 @@ require 'spec_helper'
 describe Conpar::Directive::AccessList::Standard do
   let(:klass) { Conpar::Directive::AccessList::Standard }
 
-  context "extended acl with 'standard' in name of object-group" do
-    subject { "access-list ACL_IN extended permit ip any object-group standard-grp" }
-
-    it "::SIGNATURE should not match" do
-      expect(subject).not_to match(klass::SIGNATURE)
+  [
+    "access-list 101 extended permit icmp any any object-group standard-grp",
+    "access-list 101 extended permit icmp any any object-group standard"
+  ].each do |acl|
+    context "for '#{acl}'" do
+      subject { acl }
+      it "::SIGNATURE should NOT match" do
+        expect(klass::SIGNATURE.match(subject)).to be_nil
+      end
     end
   end
+
   {
     "access-list OSPF standard permit 192.168.1.0 255.255.255.0" => {
       name: "OSPF",

data/spec/lib/directive/access_list_spec.rb

@@ -7,7 +7,8 @@ describe Conpar::Directive::AccessList do
       "access-list foo extended deny all"    => Conpar::Directive::AccessList::Extended,
       "access-list foo webtype deny all"     => Conpar::Directive::AccessList::WebType,
       "access-list foo ethertype deny all"   => Conpar::Directive::AccessList::EtherType,
-      "access-list foo unknowntype deny all" => Conpar::Directive::AccessList::Base
+      "access-list foo unknowntype deny all" => Conpar::Directive::AccessList::Base,
+      "access-list 101 extended permit ip any any object-group standard" => Conpar::Directive::AccessList::Extended
     }.each do |line, klass_output|
       it "for '#{line}' should return a #{klass_output.name}" do
         expect(subject.new(line)).to be_a_kind_of(klass_output)

data/spec/lib/document_spec.rb

@@ -94,5 +94,20 @@ describe Conpar::Document do
         it { expect(result.select{|r| r.ilk == :directive }).to have(2).items }
       end
     end
+
+    # 4 comments, 3 different known ACLs, 1 unknown ACL, 2 other directives
+    context 'sample5' do
+      let(:config) { File.read("spec/samples/sample6") }
+
+      context "result" do
+        let(:result) { subject.parse(config) }
+        it { expect(result.select{|r| r.ilk == :comment }).to have(4).items }
+        it { expect(result.select{|r| r.ilk == :access_list }).to have(4).items }
+        it { expect(result.select{|r| r.sub_ilk == "standard" }).to have(1).items }
+        it { expect(result.select{|r| r.sub_ilk == "extended" }).to have(2).items }
+        it { expect(result.select{|r| r.sub_ilk == "unknown" }).to have(1).items }
+        it { expect(result.select{|r| r.ilk == :directive }).to have(2).items }
+      end
+    end
   end
 end

data/spec/samples/sample6

@@ -0,0 +1,10 @@
+: First Comment
+access-list foo-bar standard deny all
+: Second Comment
+access-list bang-biz extended permit ip any any
+access-list dne blahtype permit all
+: additional directives
+version 1.0.0
+logging enable
+: tricky acl (contains both "extended" and "standard" but is Extended)
+access-list 101 extended permit ip any any object-group standard

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: conpar
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-15 00:00:00.000000000 Z
+date: 2014-04-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -210,6 +210,7 @@ files:
 - spec/samples/sample3
 - spec/samples/sample4
 - spec/samples/sample5
+- spec/samples/sample6
 - spec/spec_helper.rb
 homepage: ''
 licenses:
@@ -226,7 +227,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -766122589984341945
+      hash: -1371363594229726120
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -235,7 +236,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -766122589984341945
+      hash: -1371363594229726120
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23
@@ -263,5 +264,6 @@ test_files:
 - spec/samples/sample3
 - spec/samples/sample4
 - spec/samples/sample5
+- spec/samples/sample6
 - spec/spec_helper.rb
 has_rdoc: