junoser 0.5.5 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bd8a2424c80ebdcb0ed5600ad8288c998200c086d77959e54e06ef64d454e34d
-  data.tar.gz: b5f2f4bcfd79fc44c64847b3ee5d56ae908711b704451250ef7e26943cf059ae
+  metadata.gz: a73208784003b23a9dc996cf06ef4941a3da1ad35143848885c3e37a0e921e84
+  data.tar.gz: ae1ded9c7e208d3af98a96cf4c9fe5839b51d79447f1921fb36807f4202017ad
 SHA512:
-  metadata.gz: 95a0151dabc6e3b9a1c3c82c1e97cd9fe64546bfc2ca858767ce539fdade394b6b1b9891753a2fcdcf1a261754933c047f37e2d20f9d913beff5dd8c73cf313d
-  data.tar.gz: 487285a5986e28319c1ce38fe64573402e662fad33791d049eff9781b2c140474fb02d819d2151f3e76fb84d553a779446dac48d9ae5428d1dcff1d10c785971
+  metadata.gz: 8ac8d0ca12b3dada5bea555115c5ac172cc7dd3123c3fb5b85ab01e7f7e116daed5b2e9faebfc6237569719ad363c182522359a0cb1d1f1892f3bb85cfb5cc47
+  data.tar.gz: c37c95e729cdbf60a517845c0561c80b5bbb6e43f5b1dfd0c6ed8a8f49e431028c12ffb6dd0b081e8ce15ce829af599e246635a60df8d7f528d567835271e154

data/.github/dependabot.yml

@@ -0,0 +1,6 @@
+version: 2
+updates:
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "weekly"

data/.github/workflows/test-linux.yaml

@@ -9,7 +9,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby-version: ['3.2', '3.1', '3.0']
+        ruby-version: ['3.3', '3.2', '3.1']
         os: [ubuntu-latest]
         experimental: [false]
         include:
@@ -19,7 +19,7 @@ jobs:
 
     name: Test with ruby ${{ matrix.ruby-version }} on ${{ matrix.os }}
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - name: Set up Ruby
         uses: ruby/setup-ruby@v1
         with:

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,26 @@
+## [0.6.0] - 2024-09-15
+
+### Added
+
+* Update vSRX syntax to 22.4R1.10
+  * "security"
+  * "chassis cluster"
+* Newly supported syntax
+  * "interfaces xxx enable"
+  * "interfaces xxx unit xxx enable"
+* Rake task
+  * `rule:tree` to show the dependency tree of rules
+
+
+## [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

data/Gemfile.lock

@@ -1,21 +1,21 @@
 PATH
   remote: .
   specs:
-    junoser (0.5.5)
+    junoser (0.6.0)
       parslet
 
 GEM
   remote: https://rubygems.org/
   specs:
-    mini_portile2 (2.8.2)
-    nokogiri (1.15.3)
+    mini_portile2 (2.8.7)
+    nokogiri (1.16.7)
       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.8.1)
+    rake (13.2.1)
+    test-unit (3.6.2)
       power_assert
 
 PLATFORMS
@@ -29,4 +29,4 @@ DEPENDENCIES
   test-unit
 
 BUNDLED WITH
-   2.4.1
+   2.5.9

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/Rakefile

@@ -20,7 +20,7 @@ def open_files(input, output, &block)
 end
 
 def move_wildcards(element)
-  ['ipaddr', 'ipv6addr', 'ipprefix'].each do |pattern|
+  %w[ipaddr ipv6addr ipprefix].each do |pattern|
     element.xpath(%[.//xsd:element[@type="#{pattern}"]/xsd:annotation/xsd:appinfo/flag[text()="nokeyword"]/../../..]).each do |wildcard|
       parent = wildcard.parent
       removed = wildcard.remove
@@ -60,12 +60,24 @@ task 'find-srx-methods' do
   vmx = File.read('lib/junoser/parser.rb')
 
   vsrx.scan(/^ +([0-9a-z_]+) *$/).flatten.uniq.sort.each do |method|
-    next if ['arg', 'end', 'ipaddr', 'time'].include?(method)
+    next if %w[arg end ipaddr time].include?(method)
 
     puts method unless vsrx =~ /rule\(:#{method}\)/m || vmx =~ /rule\(:#{method}\)/m
   end
 end
 
+namespace :rule do
+  desc 'Show rule tree'
+  task :tree, [:path] do |_, args|
+    if args.path
+      raise "File not found: #{args.path}" unless File.exist?(args.path)
+      Junoser::RuleTree::Parser.new(File.read(args.path)).print
+    else
+      Junoser::RuleTree::Parser.new($stdin.read).print
+    end
+  end
+end
+
 Rake::TestTask.new do |t|
   t.libs << 'test'
 

data/lib/junoser/development.rb

@@ -2,3 +2,4 @@ require 'underscorable'
 require 'junoser/xsd/parsable'
 require 'junoser/ruler'
 require 'junoser/js_ruler'
+require 'junoser/rule_tree'

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/js_ruler.rb

@@ -226,6 +226,11 @@ module Junoser
         "#{$1}\n  arg.as(:arg) (\n#{$2}\n  )\nend"
       end
 
+      # set interfaces xxx enable
+      str.gsub!(/^(rule\(:interfaces_type\) do\s*[^\n]*\s*c\()(\s*)/m) do
+        %[#{$1}#{$2}"enable",#{$2}]
+      end
+
       str
     end