junoser 0.5.4 → 0.5.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3e3d7eddfe23eff9321fcd418687ab21af2d7f6a9188d1c3a7971c9f69393449
-  data.tar.gz: d8496ad009be8d91d5c08d69f45ad44203683bca6b986896ecedb36b2946b709
+  metadata.gz: 4881a7d03899a61a155ba962e077a6ca784a6ca254ff526d58942e4d106156b8
+  data.tar.gz: bbe11bdff5a203610c548add8633484c799053dd6195f8e247eade567bb2e8a1
 SHA512:
-  metadata.gz: 699d47a030b28169dc1d9daceb881e34aee2aed4f9a119f34e81f37bfae9b4f633c14f78ebe05974b9e0f4809280add29bb695d4c73f65c53637fed3a722b509
-  data.tar.gz: 81df8499d1d55b562b1a571dd5328b3fcd8e1fb82de8babf2cd377a951f2b6770eeed58a7cb0bd52c5180a27d378e2c9c18f128435c16cc84194a5f09abdddfc
+  metadata.gz: 86cf2a739b40ce9254fd610b289af47734e21bd960b0687cc612c4765bd2e4e29241e39e6505a3902bd1c47cb5fea579ed047d9b3de850691407c644e8babdf3
+  data.tar.gz: b850d666c030f79dcbd5c5b269b7a411ab214c607efb3600c6170f8b417772887d2a5b0767adbce90d3d09387a5e122af45818e5a717056346c1d095585e0389

data/.pre-commit-config.yaml

@@ -1,6 +1,6 @@
 repos:
   - repo: https://github.com/alessandrojcm/commitlint-pre-commit-hook
-    rev: v5.0.0
+    rev: v9.13.0
     hooks:
       - id: commitlint
         stages: [commit-msg]

data/CHANGELOG.md

@@ -1,3 +1,19 @@
+## [0.5.6] - 2024-05-01
+
+### Fixed
+
+* "teardown" may appear outside of "prefix-limit" block
+* "tcp-flags" should accept a quoted string as an argument
+* Structured config with square brackets ( `[ ... ]` ) should be parsed even when it's split into multiple lines
+
+
+## [0.5.5] - 2023-11-14
+
+### Fixed
+
+* junoser-squash unexpectedly removed non-idential lines
+
+
 ## [0.5.4] - 2023-07-15
 
 ### Added

data/Gemfile.lock

@@ -1,21 +1,21 @@
 PATH
   remote: .
   specs:
-    junoser (0.5.4)
+    junoser (0.5.6)
       parslet
 
 GEM
   remote: https://rubygems.org/
   specs:
-    mini_portile2 (2.8.2)
-    nokogiri (1.15.3)
+    mini_portile2 (2.8.6)
+    nokogiri (1.16.4)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
     parslet (2.0.0)
     power_assert (2.0.3)
-    racc (1.7.1)
-    rake (13.0.6)
-    test-unit (3.6.1)
+    racc (1.7.3)
+    rake (13.2.1)
+    test-unit (3.6.2)
       power_assert
 
 PLATFORMS

data/LICENSE.txt

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2015-2023 Shintaro Kojima
+Copyright (c) 2015-2024 Shintaro Kojima
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/README.md

@@ -103,4 +103,4 @@ Or send a pull request to fix.
 
 ## Copyright and License
 
-Copyright (c) 2015-2023 Shintaro Kojima. Code released under the [MIT license](LICENSE.txt).
+Copyright (c) 2015-2024 Shintaro Kojima. Code released under the [MIT license](LICENSE.txt).

data/lib/junoser/input.rb

@@ -13,6 +13,7 @@ module Junoser
 
       content = remove_blank_and_comment_line(content)
       content = unify_carriage_return(content)
+      content = unify_square_brackets(content)
     end
 
 
@@ -30,5 +31,25 @@ module Junoser
       str.gsub! /\r\n?/, "\n"
       str
     end
+
+    # Statements or [ ... ] may be split into multiple lines. This method unifies them into one line.
+    def unify_square_brackets(str)
+      lines = []
+
+      open_brackets = 0
+      str.split("\n").each do |line|
+        raise "ERROR: invalid statement: #{line}" if open_brackets < 0
+
+        if open_brackets == 0
+          lines << line
+        else
+          lines.last << " " << line
+        end
+
+        open_brackets += line.count('[') - line.count(']')
+      end
+
+      lines.join("\n")
+    end
   end
 end

data/lib/junoser/parser.rb

@@ -20385,7 +20385,7 @@ module Junoser
                                             b(str("destination-prefix-list"),
                                               firewall_prefix_list
                                             ),
-                                            a(str("tcp-flags"), arg),
+                                            a(str("tcp-flags"), quote | arg),
                                             str("tcp-initial"),
                                             str("tcp-established"),
                                             str("is-fragment")
@@ -20453,7 +20453,7 @@ module Junoser
                                                     (str("af11") | str("af12") | str("af13") | str("af21") | str("af22") | str("af23") | str("af31") | str("af32") | str("af33") | str("af41") | str("af42") | str("af43") | str("ef") | str("cs0") | str("cs1") | str("cs2") | str("cs3") | str("cs4") | str("cs5") | str("cs6") | str("cs7") | str("be") | arg)
                                               )
                                             ),
-                                            a(str("tcp-flags"), arg),
+                                            a(str("tcp-flags"), quote | arg),
                                             str("tcp-initial"),
                                             str("tcp-established")
                                         )
@@ -20899,7 +20899,7 @@ module Junoser
                                     (str("ftp-data") | str("ftp") | str("ssh") | str("telnet") | str("smtp") | str("tacacs") | str("tacacs-ds") | str("domain") | str("dhcp") | str("bootps") | str("bootpc") | str("tftp") | str("finger") | str("https") | str("kerberos-sec") | str("pop3") | str("sunrpc") | str("ident") | str("nntp") | str("ntp") | str("netbios-ns") | str("netbios-dgm") | str("netbios-ssn") | str("imap") | str("snmptrap") | str("snmp") | str("xdmcp") | str("bgp") | str("ldap") | str("mobileip-agent") | str("mobilip-mn") | str("msdp") | str("http") | str("snpp") | str("biff") | str("exec") | str("login") | str("who") | str("cmd") | str("syslog") | str("printer") | str("talk") | str("ntalk") | str("rip") | str("timed") | str("klogin") | str("kshell") | str("ldp") | str("krb-prop") | str("krbupdate") | str("kpasswd") | str("socks") | str("afs") | str("pptp") | str("radius") | str("radacct") | str("zephyr-srv") | str("zephyr-clt") | str("zephyr-hm") | str("nfsd") | str("eklogin") | str("ekshell") | str("rkinit") | str("cvspserver") | arg)
                               )
                             ),
-                            a(str("tcp-flags"), arg),
+                            a(str("tcp-flags"), quote | arg),
                             c(
                               b(str("icmp-code"),
                                     (str("network-unreachable") | str("host-unreachable") | str("protocol-unreachable") | str("port-unreachable") | str("fragmentation-needed") | str("source-route-failed") | str("destination-network-unknown") | str("destination-host-unknown") | str("source-host-isolated") | str("destination-network-prohibited") | str("destination-host-prohibited") | str("network-unreachable-for-tos") | str("host-unreachable-for-tos") | str("communication-prohibited-by-filtering") | str("host-precedence-violation") | str("precedence-cutoff-in-effect") | str("redirect-for-network") | str("redirect-for-host") | str("redirect-for-tos-and-net") | str("redirect-for-tos-and-host") | str("ttl-eq-zero-during-transit") | str("ttl-eq-zero-during-reassembly") | str("ip-header-bad") | str("required-option-missing") | arg)
@@ -21271,7 +21271,7 @@ module Junoser
                                             b(str("destination-prefix-list"),
                                               firewall_prefix_list
                                             ),
-                                            a(str("tcp-flags"), arg),
+                                            a(str("tcp-flags"), quote | arg),
                                             str("tcp-initial"),
                                             str("tcp-established"),
                                             str("is-fragment")
@@ -21339,7 +21339,7 @@ module Junoser
                                                     (str("af11") | str("af12") | str("af13") | str("af21") | str("af22") | str("af23") | str("af31") | str("af32") | str("af33") | str("af41") | str("af42") | str("af43") | str("ef") | str("cs0") | str("cs1") | str("cs2") | str("cs3") | str("cs4") | str("cs5") | str("cs6") | str("cs7") | str("be") | arg)
                                               )
                                             ),
-                                            a(str("tcp-flags"), arg),
+                                            a(str("tcp-flags"), quote | arg),
                                             str("tcp-initial"),
                                             str("tcp-established")
                                         )
@@ -27339,7 +27339,7 @@ module Junoser
                                     (str("ftp-data") | str("ftp") | str("ssh") | str("telnet") | str("smtp") | str("tacacs") | str("tacacs-ds") | str("domain") | str("dhcp") | str("bootps") | str("bootpc") | str("tftp") | str("finger") | str("https") | str("kerberos-sec") | str("pop3") | str("sunrpc") | str("ident") | str("nntp") | str("ntp") | str("netbios-ns") | str("netbios-dgm") | str("netbios-ssn") | str("imap") | str("snmptrap") | str("snmp") | str("xdmcp") | str("bgp") | str("ldap") | str("mobileip-agent") | str("mobilip-mn") | str("msdp") | str("http") | str("snpp") | str("biff") | str("exec") | str("login") | str("who") | str("cmd") | str("syslog") | str("printer") | str("talk") | str("ntalk") | str("rip") | str("timed") | str("klogin") | str("kshell") | str("ldp") | str("krb-prop") | str("krbupdate") | str("kpasswd") | str("socks") | str("afs") | str("pptp") | str("radius") | str("radacct") | str("zephyr-srv") | str("zephyr-clt") | str("zephyr-hm") | str("nfsd") | str("eklogin") | str("ekshell") | str("rkinit") | str("cvspserver") | arg)
                               )
                             ),
-                            a(str("tcp-flags"), arg),
+                            a(str("tcp-flags"), quote | arg),
                             str("tcp-initial"),
                             str("tcp-established"),
                             c(
@@ -27591,7 +27591,7 @@ module Junoser
                                                     (str("ftp-data") | str("ftp") | str("ssh") | str("telnet") | str("smtp") | str("tacacs") | str("tacacs-ds") | str("domain") | str("dhcp") | str("bootps") | str("bootpc") | str("tftp") | str("finger") | str("https") | str("kerberos-sec") | str("pop3") | str("sunrpc") | str("ident") | str("nntp") | str("ntp") | str("netbios-ns") | str("netbios-dgm") | str("netbios-ssn") | str("imap") | str("snmptrap") | str("snmp") | str("xdmcp") | str("bgp") | str("ldap") | str("mobileip-agent") | str("mobilip-mn") | str("msdp") | str("http") | str("snpp") | str("biff") | str("exec") | str("login") | str("who") | str("cmd") | str("syslog") | str("printer") | str("talk") | str("ntalk") | str("rip") | str("timed") | str("klogin") | str("kshell") | str("ldp") | str("krb-prop") | str("krbupdate") | str("kpasswd") | str("socks") | str("afs") | str("pptp") | str("radius") | str("radacct") | str("zephyr-srv") | str("zephyr-clt") | str("zephyr-hm") | str("nfsd") | str("eklogin") | str("ekshell") | str("rkinit") | str("cvspserver") | arg)
                                               )
                                             ),
-                                            a(str("tcp-flags"), arg),
+                                            a(str("tcp-flags"), quote | arg),
                                             str("tcp-initial"),
                                             str("tcp-established"),
                                             c(
@@ -27704,7 +27704,7 @@ module Junoser
                                                     (str("any") | str("hop-by-hop") | str("routing") | str("mobility") | str("esp") | str("fragment") | str("dstopts") | str("ah") | arg)
                                               )
                                             ),
-                                            a(str("tcp-flags"), arg),
+                                            a(str("tcp-flags"), quote | arg),
                                             str("tcp-initial"),
                                             str("tcp-established"),
                                             c(
@@ -29581,7 +29581,7 @@ module Junoser
                             ),
                             str("tcp-initial"),
                             str("tcp-established"),
-                            a(str("tcp-flags"), arg),
+                            a(str("tcp-flags"), quote | arg),
                             b(str("interface"),
                               match_interface_object
                             ),
@@ -30037,7 +30037,7 @@ module Junoser
                               a(str("ah-spi"), arg),
                               a(str("ah-spi-except"), arg)
                             ),
-                            a(str("tcp-flags"), arg),
+                            a(str("tcp-flags"), quote | arg),
                             c(
                               b(str("loss-priority"),
                                     (str("low") | str("high") | str("medium-low") | str("medium-high"))
@@ -30216,7 +30216,7 @@ module Junoser
                             ),
                             str("tcp-initial"),
                             str("tcp-established"),
-                            a(str("tcp-flags"), arg),
+                            a(str("tcp-flags"), quote | arg),
                             c(
                               a(str("esp-spi"), arg),
                               a(str("esp-spi-except"), arg)
@@ -30386,7 +30386,7 @@ module Junoser
                             ),
                             str("tcp-initial"),
                             str("tcp-established"),
-                            a(str("tcp-flags"), arg),
+                            a(str("tcp-flags"), quote | arg),
                             c(
                               a(str("esp-spi"), arg),
                               a(str("esp-spi-except"), arg)
@@ -30875,7 +30875,7 @@ module Junoser
                               a(str("fragment-offset-except"), arg)
                             ),
                             a(str("fragment-flags"), arg),
-                            a(str("tcp-flags"), arg),
+                            a(str("tcp-flags"), quote | arg),
                             c(
                               a(str("ah-spi"), arg),
                               a(str("ah-spi-except"), arg)
@@ -109012,7 +109012,7 @@ module Junoser
                                                     (str("ftp-data") | str("ftp") | str("ssh") | str("telnet") | str("smtp") | str("tacacs") | str("tacacs-ds") | str("domain") | str("dhcp") | str("bootps") | str("bootpc") | str("tftp") | str("finger") | str("https") | str("kerberos-sec") | str("pop3") | str("sunrpc") | str("ident") | str("nntp") | str("ntp") | str("netbios-ns") | str("netbios-dgm") | str("netbios-ssn") | str("imap") | str("snmptrap") | str("snmp") | str("xdmcp") | str("bgp") | str("ldap") | str("mobileip-agent") | str("mobilip-mn") | str("msdp") | str("http") | str("snpp") | str("biff") | str("exec") | str("login") | str("who") | str("cmd") | str("syslog") | str("printer") | str("talk") | str("ntalk") | str("rip") | str("timed") | str("klogin") | str("kshell") | str("ldp") | str("krb-prop") | str("krbupdate") | str("kpasswd") | str("socks") | str("afs") | str("pptp") | str("radius") | str("radacct") | str("zephyr-srv") | str("zephyr-clt") | str("zephyr-hm") | str("nfsd") | str("eklogin") | str("ekshell") | str("rkinit") | str("cvspserver") | arg)
                                               )
                                             ),
-                                            a(str("tcp-flags"), arg),
+                                            a(str("tcp-flags"), quote | arg),
                                             c(
                                               b(str("ip-protocol"),
                                                     (str("icmp6") | str("icmpv6") | str("igmp") | str("ipip") | str("tcp") | str("egp") | str("udp") | str("rsvp") | str("gre") | str("esp") | str("ah") | str("icmp") | str("ospf") | str("pim") | str("sctp") | str("dstopts") | str("routing") | str("fragment") | str("hop-by-hop") | str("ipv6") | str("no-next-header") | str("vrrp") | arg)
@@ -109114,7 +109114,7 @@ module Junoser
                                                     (str("ftp-data") | str("ftp") | str("ssh") | str("telnet") | str("smtp") | str("tacacs") | str("tacacs-ds") | str("domain") | str("dhcp") | str("bootps") | str("bootpc") | str("tftp") | str("finger") | str("https") | str("kerberos-sec") | str("pop3") | str("sunrpc") | str("ident") | str("nntp") | str("ntp") | str("netbios-ns") | str("netbios-dgm") | str("netbios-ssn") | str("imap") | str("snmptrap") | str("snmp") | str("xdmcp") | str("bgp") | str("ldap") | str("mobileip-agent") | str("mobilip-mn") | str("msdp") | str("http") | str("snpp") | str("biff") | str("exec") | str("login") | str("who") | str("cmd") | str("syslog") | str("printer") | str("talk") | str("ntalk") | str("rip") | str("timed") | str("klogin") | str("kshell") | str("ldp") | str("krb-prop") | str("krbupdate") | str("kpasswd") | str("socks") | str("afs") | str("pptp") | str("radius") | str("radacct") | str("zephyr-srv") | str("zephyr-clt") | str("zephyr-hm") | str("nfsd") | str("eklogin") | str("ekshell") | str("rkinit") | str("cvspserver") | arg)
                                               )
                                             ),
-                                            a(str("tcp-flags"), arg)
+                                            a(str("tcp-flags"), quote | arg)
                                         )
                                     )
                                 )
@@ -122382,7 +122382,7 @@ module Junoser
                                     (str("ftp-data") | str("ftp") | str("ssh") | str("telnet") | str("smtp") | str("tacacs") | str("tacacs-ds") | str("domain") | str("dhcp") | str("bootps") | str("bootpc") | str("tftp") | str("finger") | str("https") | str("kerberos-sec") | str("pop3") | str("sunrpc") | str("ident") | str("nntp") | str("ntp") | str("netbios-ns") | str("netbios-dgm") | str("netbios-ssn") | str("imap") | str("snmptrap") | str("snmp") | str("xdmcp") | str("bgp") | str("ldap") | str("mobileip-agent") | str("mobilip-mn") | str("msdp") | str("http") | str("snpp") | str("biff") | str("exec") | str("login") | str("who") | str("cmd") | str("syslog") | str("printer") | str("talk") | str("ntalk") | str("rip") | str("timed") | str("klogin") | str("kshell") | str("ldp") | str("krb-prop") | str("krbupdate") | str("kpasswd") | str("socks") | str("afs") | str("pptp") | str("radius") | str("radacct") | str("zephyr-srv") | str("zephyr-clt") | str("zephyr-hm") | str("nfsd") | str("eklogin") | str("ekshell") | str("rkinit") | str("cvspserver") | arg)
                               )
                             ),
-                            a(str("tcp-flags"), arg),
+                            a(str("tcp-flags"), quote | arg),
                             c(
                               b(str("icmp-code"),
                                     (str("network-unreachable") | str("host-unreachable") | str("protocol-unreachable") | str("port-unreachable") | str("fragmentation-needed") | str("source-route-failed") | str("destination-network-unknown") | str("destination-host-unknown") | str("source-host-isolated") | str("destination-network-prohibited") | str("destination-host-prohibited") | str("network-unreachable-for-tos") | str("host-unreachable-for-tos") | str("communication-prohibited-by-filtering") | str("host-precedence-violation") | str("precedence-cutoff-in-effect") | str("redirect-for-network") | str("redirect-for-host") | str("redirect-for-tos-and-net") | str("redirect-for-tos-and-host") | str("ttl-eq-zero-during-transit") | str("ttl-eq-zero-during-reassembly") | str("ip-header-bad") | str("required-option-missing") | arg)

data/lib/junoser/ruler.rb

@@ -56,6 +56,7 @@ module Junoser
       str.gsub! '"message" arg', '"message" (quote | arg)'
       str.gsub! '"description" arg', '"description" (quote | arg)'
       str.gsub! '"as-path-prepend" arg', '"as-path-prepend" (quote | arg)'
+      str.gsub! '"tcp-flags" arg', '"tcp-flags" (quote | arg)'
 
       str.gsub!(/^(\s*)"as-path" arg \(\s*c\(\s*arg/) do
         format(['"as-path" arg (',
@@ -245,8 +246,8 @@ module Junoser
       str.gsub!(/^(rule\(:license_object\) do.*?"key") arg/m) { "#{$1} (quote | arg)" }
 
       # Fix .xsd: "prefix-limit teardown"
-      str.gsub!(/^(\s*)"teardown" (\(.*?as\(:oneline\)\s*\)\s*\))/m) do
-        "#{$1}\"teardown\" arg #{$2},\n#{$1}\"teardown\""
+      str.gsub!(/^((\s*)"maximum" arg,)\s*"teardown" (\(.*?as\(:oneline\)\s*\)\s*\))/m) do
+        "#{$1}\n#{$2}\"teardown\" arg #{$3},\n#{$2}\"teardown\""
       end
 
       # Fix .xsd: faster interface speed support

data/lib/junoser/squash.rb

@@ -29,16 +29,18 @@ module Junoser
       end
 
       @lines.uniq!
-      remove_subcommand(@lines).map(&:strip).join("\n")
+      remove_command_context(@lines).map(&:strip).join("\n")
     end
 
     private
 
-    def remove_subcommand(lines)
+    def remove_command_context(lines)
       lines.each_with_index do |l, i|
         lines[i..-1].each do |l2|
-          if l.include?(l2) and l != l2
-            lines.delete(l2)
+          if l2[-1] == " "  # l2 is a command context
+            lines.delete(l2) if l.include?(l2) and l != l2
+          else  # l2 has argument
+            lines.delete(l2) if l.include?("#{l2} ")
           end
         end
       end

data/lib/junoser/version.rb

@@ -1,3 +1,3 @@
 module Junoser
-  VERSION = "0.5.4"
+  VERSION = "0.5.6"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: junoser
 version: !ruby/object:Gem::Version
-  version: 0.5.4
+  version: 0.5.6
 platform: ruby
 authors:
 - Shintaro Kojima
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-07-16 00:00:00.000000000 Z
+date: 2024-04-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parslet