junoser 0.7.1 → 0.7.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bd8d0023004d5b1a354481038fd124a73b1aff42b66fd0582534dbed3587acfc
-  data.tar.gz: 26215df72ca310d36a6b57e5e288d145c5e575ced116633e023b0d895db4546f
+  metadata.gz: 2e6df480657c3d5918488f74cce4fb003d9f8b5472957d328966d77fc95a1ffe
+  data.tar.gz: 8dd2431e38b33a0f2364610f62960d6dfc6c4117a94bbc4b86b3b39e1b1f46af
 SHA512:
-  metadata.gz: 4fb26b5d915d873942e4ae4fcff612f70664ed933353287597c74da9ecf42f68f7e6f55ce8472e64a73ae2598a77937beacfb1fc9b417b9247e4dfcbcf76904f
-  data.tar.gz: 534d3484149a158d384e2beaabd6a12c33cd16ef993d2ddfb90e61410b76a6dd3ef214e7894c9a2b2541effbe69f7e271b4cc7208d9bb22470efc5e16a912c99
+  metadata.gz: 04a55401f9bcadfae291d179df38fd4c024947593b8c6c3910898edcd54ef549712378c3dc188a24bf45a5b968a1a545bc8079387a61551ce6e0d81f08e95d6d
+  data.tar.gz: 0b2695675044a3d3393522294f9f1863c2aab48126697a249134eb097a0338c878cf58fde4f200cbb19f7b7ddf9f43c2459bd72ba23614b1774d03088d56fcdb

data/CHANGELOG.md

@@ -1,3 +1,23 @@
+## [0.7.3] - 2025-10-02
+
+### Added
+
+* Newly supported syntax for vSRX
+  * "chassis high-availability"
+
+
+## [0.7.2] - 2025-04-22
+
+### Fixed
+
+* A Nokogiri's [security vulnerability](https://github.com/codeout/junoser/security/dependabot/19)
+* The argument of commands below should be a regular expression
+  * "system login class foo allow-commands-regexps"
+  * "system login class foo deny-commands-regexps"
+  * "system login class foo allow-configuration-regexps"
+  * "system login class foo deny-configuration-regexps"
+
+
 ## [0.7.1] - 2025-02-03
 
 ### Added

data/Gemfile

@@ -1,4 +1,14 @@
+# frozen_string_literal: true
+
 source 'https://rubygems.org'
 
 # Specify your gem's dependencies in junoser.gemspec
 gemspec
+
+group :development do
+  gem 'bundler', '~> 2.0'
+  gem 'nokogiri'
+  gem 'rake', '~> 13.0'
+  gem 'rubocop'
+  gem 'test-unit'
+end

data/Gemfile.lock

@@ -1,22 +1,51 @@
 PATH
   remote: .
   specs:
-    junoser (0.7.1)
+    junoser (0.7.3)
       parslet
 
 GEM
   remote: https://rubygems.org/
   specs:
-    mini_portile2 (2.8.8)
-    nokogiri (1.17.2)
+    ast (2.4.3)
+    json (2.15.0)
+    language_server-protocol (3.17.0.5)
+    lint_roller (1.1.0)
+    mini_portile2 (2.8.9)
+    nokogiri (1.18.10)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
+    parallel (1.27.0)
+    parser (3.3.9.0)
+      ast (~> 2.4.1)
+      racc
     parslet (2.0.0)
     power_assert (2.0.5)
+    prism (1.5.1)
     racc (1.8.1)
-    rake (13.2.1)
-    test-unit (3.6.7)
+    rainbow (3.1.1)
+    rake (13.3.0)
+    regexp_parser (2.11.3)
+    rubocop (1.81.1)
+      json (~> 2.3)
+      language_server-protocol (~> 3.17.0.2)
+      lint_roller (~> 1.1.0)
+      parallel (~> 1.10)
+      parser (>= 3.3.0.2)
+      rainbow (>= 2.2.2, < 4.0)
+      regexp_parser (>= 2.9.3, < 3.0)
+      rubocop-ast (>= 1.47.1, < 2.0)
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (>= 2.4.0, < 4.0)
+    rubocop-ast (1.47.1)
+      parser (>= 3.3.7.2)
+      prism (~> 1.4)
+    ruby-progressbar (1.13.0)
+    test-unit (3.7.0)
       power_assert
+    unicode-display_width (3.2.0)
+      unicode-emoji (~> 4.1)
+    unicode-emoji (4.1.0)
 
 PLATFORMS
   ruby
@@ -26,7 +55,8 @@ DEPENDENCIES
   junoser!
   nokogiri
   rake (~> 13.0)
+  rubocop
   test-unit
 
 BUNDLED WITH
-   2.6.2
+   2.6.9

data/Rakefile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'bundler/gem_tasks'
 require 'junoser/development'
 require 'nokogiri'
@@ -9,9 +11,9 @@ rule_path = File.join(__dir__, 'tmp/rule.rb')
 ruby_parser_path = File.join(__dir__, 'lib/junoser/parser.rb')
 js_parser_path = File.join(__dir__, 'tmp/junos.js')
 
-def open_files(input, output, &block)
-  i = open(input)
-  o = open(output, 'w')
+def open_files(input, output)
+  i = File.open(input)
+  o = File.open(output, 'w')
 
   yield i, o
 
@@ -71,6 +73,7 @@ namespace :rule do
   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

data/bin/console

@@ -1,7 +1,8 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
-require "bundler/setup"
-require "junoser"
+require 'bundler/setup'
+require 'junoser'
 
 # You can add fixtures and/or initialization code here to make experimenting
 # with your gem easier. You can also use a different console, if you like.
@@ -10,5 +11,5 @@ require "junoser"
 # require "pry"
 # Pry.start
 
-require "irb"
+require 'irb'
 IRB.start

data/exe/junoser

@@ -1,13 +1,14 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
+require 'English'
 require 'optparse'
 require 'pathname'
 
-$: << File.expand_path('../../lib', Pathname.new(__FILE__).realpath)
+$LOAD_PATH << File.expand_path('../../lib', Pathname.new(__FILE__).realpath)
 
 require 'junoser'
 
-
 command = nil
 opts = OptionParser.new do |opts|
   opts.banner = 'junoser: an juniper configuration parser'
@@ -41,11 +42,11 @@ opts.parse!
 
 case command
 when :check
-  abort unless Junoser::Cli.commit_check($<)
+  abort unless Junoser::Cli.commit_check($DEFAULT_INPUT)
 when :display_set
-  puts Junoser::Cli.display_set($<)
+  puts Junoser::Cli.display_set($DEFAULT_INPUT)
 when :struct
-  puts Junoser::Cli.struct($<)
+  puts Junoser::Cli.struct($DEFAULT_INPUT)
 else
   puts opts
   abort

data/exe/junoser-squash

@@ -1,8 +1,11 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
+
+require 'English'
 require 'optparse'
 require 'pathname'
 
-$: << File.expand_path('../../lib', Pathname.new(__FILE__).realpath)
+$LOAD_PATH << File.expand_path('../../lib', Pathname.new(__FILE__).realpath)
 require 'junoser/squash'
 
 command = :squash
@@ -17,9 +20,9 @@ opts = OptionParser.new do |opts|
 end
 opts.parse!
 case command
-  when :squash
-    puts Junoser::Squash.new($<).transform
-  else
-    puts opts
-    abort
+when :squash
+  puts Junoser::Squash.new($DEFAULT_INPUT).transform
+else
+  puts opts
+  abort
 end

data/junoser.gemspec

@@ -1,31 +1,29 @@
-# coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
+# frozen_string_literal: true
+
+lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'junoser/version'
 
 Gem::Specification.new do |spec|
-  spec.name          = "junoser"
+  spec.name          = 'junoser'
   spec.version       = Junoser::VERSION
-  spec.authors       = ["Shintaro Kojima"]
-  spec.email         = ["goodies@codeout.net"]
+  spec.authors       = ['Shintaro Kojima']
+  spec.email         = ['goodies@codeout.net']
 
-  spec.summary       = %q{PEG parser for JUNOS configuration.}
-  spec.description   = %q{PEG parser to vefiry and translate into different formats for JUNOS configuration.}
-  spec.homepage      = "https://github.com/codeout/junoser"
+  spec.summary       = 'PEG parser for JUNOS configuration.'
+  spec.description   = 'PEG parser to vefiry and translate into different formats for JUNOS configuration.'
+  spec.homepage      = 'https://github.com/codeout/junoser'
 
   # Specify which files should be added to the gem when it is released.
   # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
-  spec.files         = Dir.chdir(File.expand_path('..', __FILE__)) do
-    `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features|example)/}) }
+  spec.files         = Dir.chdir(File.expand_path(__dir__)) do
+    `git ls-files -z *`.split("\x0").reject { |f| f.match(%r{^(test/|example/|commitlint)}) }
   end
-  spec.bindir        = "exe"
+  spec.bindir        = 'exe'
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
-  spec.require_paths = ["lib"]
+  spec.require_paths = ['lib']
 
-  spec.add_dependency "parslet"
+  spec.add_dependency 'parslet'
 
-  spec.add_development_dependency "bundler", "~> 2.0"
-  spec.add_development_dependency "rake", "~> 13.0"
-  spec.add_development_dependency "nokogiri"
-  spec.add_development_dependency "test-unit"
+  spec.metadata['rubygems_mfa_required'] = 'true'
 end

data/lib/junoser/cli.rb

@@ -1,9 +1,10 @@
+# frozen_string_literal: true
+
 require 'parslet'
 require 'junoser/display'
 require 'junoser/input'
 require 'junoser/parser'
 
-
 module Junoser
   module Cli
     class << self
@@ -37,7 +38,6 @@ module Junoser
         end
       end
 
-
       private
 
       def commit_check_structured(config)

data/lib/junoser/development.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'underscorable'
 require 'junoser/xsd/parsable'
 require 'junoser/ruler'

data/lib/junoser/display/config_store.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'forwardable'
 
 module Junoser
@@ -9,7 +11,7 @@ module Junoser
 
       attr_accessor :deactivated
 
-      def initialize(depth=0)
+      def initialize(depth = 0)
         @hash = {}
         @depth = depth
         @deactivated = false
@@ -19,7 +21,7 @@ module Junoser
         store = self
 
         join_arg(str).split("\n").each_with_index do |element, index|
-          store[element] ||= self.class.new(index+1)
+          store[element] ||= self.class.new(index + 1)
           store = store[element]
         end
       end
@@ -36,13 +38,11 @@ module Junoser
           end
         else
           statement, store = inverse_match(deactivated_line)
-          if statement
-            store.deactivated = true
-          end
+          store.deactivated = true if statement
         end
       end
 
-      def each_with_inactive(str='', &block)
+      def each_with_inactive(str = '')
         each do |k, v|
           k = "inactive: #{k}" if v.deactivated
           yield k, v, str
@@ -52,7 +52,7 @@ module Junoser
       end
 
       def to_s
-        each_with_inactive('', &method(:hash_item_to_s))
+        each_with_inactive(+'', &method(:hash_item_to_s))
       end
 
       def_delegators :@hash, :[], :[]=, :each, :empty?
@@ -61,17 +61,17 @@ module Junoser
 
       def hash_item_to_s(key, value, str)
         if value.empty?
-          str << OFFSET*@depth << "#{key};\n"
+          str << (OFFSET * @depth) << "#{key};\n"
         else
-          str << OFFSET*@depth << "#{key} {\n"
+          str << (OFFSET * @depth) << "#{key} {\n"
           str << value.to_s.chop << "\n"
-          str << OFFSET*@depth << "}\n"
+          str << (OFFSET * @depth) << "}\n"
         end
       end
 
       def join_arg(str)
-        str.gsub!(/\narg\((.*)\)$/) { " #$1" }
-        str.gsub!(/arg\((.*)\)/) { "#$1" }
+        str.gsub!(/\narg\((.*)\)$/) { " #{::Regexp.last_match(1)}" }
+        str.gsub!(/arg\((.*)\)/) { ::Regexp.last_match(1).to_s }
         str
       end
 

data/lib/junoser/display/enumerable.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'junoser/display/config_store'
 
 module Junoser
@@ -20,10 +22,10 @@ module Junoser
         value.in_then = true if key == 'then'
         value.in_group = true if key =~ /^group /
 
-        if in_from && ['next-header', 'port', 'protocol'].include?(key) ||
-            in_then && key == 'origin' ||
-            in_group && key == 'type'
-          str << Junoser::Display::ConfigStore::OFFSET * @depth << "#{key} #{value.to_enum};\n"
+        if (in_from && %w[next-header port protocol].include?(key)) ||
+           (in_then && key == 'origin') ||
+           (in_group && key == 'type')
+          str << (Junoser::Display::ConfigStore::OFFSET * @depth) << "#{key} #{value.to_enum};\n"
         else
           super
         end

data/lib/junoser/display/set.rb

@@ -1,3 +1,6 @@
+# frozen_string_literal: true
+
+require 'English'
 require 'parslet'
 require 'junoser/input'
 
@@ -9,7 +12,7 @@ module Junoser
       end
 
       def transform
-        result = ''
+        result = +''
 
         process do |current_stack, str|
           result << transform_line(current_stack, str) << "\n"
@@ -18,11 +21,11 @@ module Junoser
         result
       end
 
-      def commit_check(&block)
+      def commit_check
         begin
           lines = transform
-        rescue
-          $stderr.puts $!
+        rescue StandardError
+          warn $ERROR_INFO
           return false
         end
 
@@ -30,24 +33,23 @@ module Junoser
         parser.parse_lines(lines)
       end
 
-
       private
 
-      def process(&block)
+      def process
         stack = []
 
         Junoser::Input.new(@input).read.split("\n").each do |line|
           case line
           when /(?!.*})(.*){/
-            stack.push $1.strip
+            stack.push ::Regexp.last_match(1).strip
           when /}\s*$/
             stack.pop
           when /((?!\[).*)\[(.*)\];/
-            $2.split("\s").each do |i|
-              yield stack, "#{$1.strip} #{i}"
+            ::Regexp.last_match(2).split.each do |i|
+              yield stack, "#{::Regexp.last_match(1).strip} #{i}"
             end
           when /(.*);/
-            yield stack, $1
+            yield stack, ::Regexp.last_match(1)
           else
             raise "ERROR: unknown statement:  #{line}"
           end
@@ -56,22 +58,18 @@ module Junoser
 
       def transform_line(current_stack, str)
         statements = []
-        current_statement = ''
+        current_statement = +''
 
         current_stack.each do |stack|
           stack.gsub! 'replace: ', ''
 
-          if stack.gsub!('inactive: ', '')
-            statements << "deactivate #{current_statement}#{stack}"
-          end
+          statements << "deactivate #{current_statement}#{stack}" if stack.gsub!('inactive: ', '')
           current_statement << "#{stack} "
         end
 
         str.gsub! 'replace: ', ''
 
-        if str.gsub!('inactive: ', '')
-          statements << "deactivate #{current_statement}#{str}"
-        end
+        statements << "deactivate #{current_statement}#{str}" if str.gsub!('inactive: ', '')
 
         statements.unshift "set #{current_statement}#{str}"
         statements.join("\n")

data/lib/junoser/display/structure.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'junoser/input'
 require 'junoser/display/config_store'
 require 'junoser/parser'
@@ -27,21 +29,19 @@ module Junoser
           end
 
           if line =~ /^deactivate *(.*)/
-            deactivated_lines << "#$1 #{apply_groups}".strip
+            deactivated_lines << "#{::Regexp.last_match(1)} #{apply_groups}".strip
             next
           end
 
           transformed = transform.apply(parser.parse(line))
           raise "ERROR: Failed to parse \"#{line}\"" unless transformed.is_a?(String)
 
-          if apply_groups
-            transformed << "\n#{apply_groups}"
-          end
+          transformed << "\n#{apply_groups}" if apply_groups
 
           @config << transformed
         end
 
-        deactivated_lines.each {|l| @config.deactivate l }
+        deactivated_lines.each { |l| @config.deactivate l }
 
         @config.to_s
       end
@@ -49,8 +49,8 @@ module Junoser
       private
 
       def trim_apply_groups(line)
-        line.gsub! /\s+(apply-groups(-except)?\s+.*)/, ''
-        return $1
+        line.gsub!(/\s+(apply-groups(-except)?\s+.*)/, '')
+        ::Regexp.last_match(1)
       end
     end
   end

data/lib/junoser/display.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'junoser/display/set'
 require 'junoser/display/structure'
 

data/lib/junoser/input.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Junoser
   class Input
     def initialize(io_or_string)
@@ -8,27 +10,26 @@ module Junoser
       content = if @io_or_string.respond_to?(:read)
                   @io_or_string.read
                 else
-                  @io_or_string.to_s
+                  +@io_or_string.to_s
                 end
 
       content = remove_blank_and_comment_line(content)
       content = unify_carriage_return(content)
-      content = unify_square_brackets(content)
+      unify_square_brackets(content)
     end
 
-
     private
 
     # As for comment line, a trailing comment after configuration will be processed by parslet
     def remove_blank_and_comment_line(str)
-      str.gsub! /^\s*#.*/, ''
-      str.gsub! /^\s*\/\*((?!\*\/).)*\*\//m, ''
-      str.gsub! /\n\s*/, "\n"
+      str.gsub!(/^\s*#.*/, '')
+      str.gsub!(%r{^\s*/\*((?!\*/).)*\*/}m, '')
+      str.gsub!(/\n\s*/, "\n")
       str.strip
     end
 
     def unify_carriage_return(str)
-      str.gsub! /\r\n?/, "\n"
+      str.gsub!(/\r\n?/, "\n")
       str
     end
 
@@ -38,12 +39,12 @@ module Junoser
 
       open_brackets = 0
       str.split("\n").each do |line|
-        raise "ERROR: invalid statement: #{line}" if open_brackets < 0
+        raise "ERROR: invalid statement: #{line}" if open_brackets.negative?
 
-        if open_brackets == 0
+        if open_brackets.zero?
           lines << line
         else
-          lines.last << " " << line
+          lines.last << ' ' << line
         end
 
         open_brackets += line.count('[') - line.count(']')