junoser 0.3.8 → 0.3.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a59ddeec41d5ea106a1c46995501305667b3777bf875499cb8c39cb41e40744d
-  data.tar.gz: 2ba6e1ca647f9bf8b2533bc52926afbffc2b09a73eb2be8f56ff57db05c1f76d
+  metadata.gz: 4593e83820c87e14eb51c1bc781a7ef739a30fd81ddbb0438a144b637897d8bc
+  data.tar.gz: 9334a3f8c869085ac0d435f48b0cbc3add246b105f49215d72b355a8d2880dc6
 SHA512:
-  metadata.gz: a889917be31856fa914e95ed76652bdec895f1b4f0c12c813838cb6f5428fac68d051ac99aa9de110e9010176baab733c3c701b270c864f55e3cb306aea48823
-  data.tar.gz: 1a6c01cbfbfd03145d89a1ba5bd09a3ae6b39c229e339e16125da383be95edbd7f18e97ef85f363bc2d6d9719de77c3ec2fcf969c9bb9882fb94df8ccf5ff941
+  metadata.gz: c7c4846a31f13cb84d6c82d08c6dd07b21cfa4941799bfff38f82e353db29bc8ffb8c8663b7b29cb658bc37eba9b49802d09c15c5c07ada303bdf7fee1654ca8
+  data.tar.gz: 1802d0a8ba430e735d4f5f6c96264adf71396c30010a7fc8d620ad5ccb040b15595bd9e0f88f5db5ccd6c4fc980887d7f25f74a29ff539a0477467b8c4c2ba09

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+## [0.3.9] - 2019-11-17
+
+### Fixed
+
+* security policies
+* "junoser -s" and "junoser -d" unexpectedly raises errors
+
 ## [0.3.8] - 2019-11-04
 
 ### Added

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    junoser (0.3.8)
+    junoser (0.3.9)
       parslet
 
 GEM

data/lib/junoser/cli.rb

@@ -18,11 +18,23 @@ module Junoser
       end
 
       def display_set(io_or_string)
-        Junoser::Display::Set.new(io_or_string).transform
+        config = Junoser::Input.new(io_or_string).read
+
+        if Junoser::Display.display_set?(config)
+          config
+        else
+          Junoser::Display::Set.new(config).transform
+        end
       end
 
       def struct(io_or_string)
-        Junoser::Display::Structure.new(io_or_string).transform
+        config = Junoser::Input.new(io_or_string).read
+
+        if Junoser::Display.display_set?(config)
+          Junoser::Display::Structure.new(config).transform
+        else
+          config
+        end
       end
 
 

data/lib/junoser/js_ruler.rb

@@ -165,6 +165,12 @@ module Junoser
     def process_reserved_word(str)
       # ieee-802.3ad  -> 802.3ad
       str.gsub! 'ieee-802.3ad', '802.3ad'
+
+      # "policy | Define a policy context from this zone" -> "from-zone | Define a policy context from this zone"
+      str.gsub! 'policy | Define a policy context from this zone', 'from-zone | Define a policy context from this zone'
+      # "to-zone-name | Destination zone" -> "to-zone | Destination zone"
+      str.gsub! 'to-zone-name | Destination zone', 'to-zone | Destination zone'
+
       fix_route_filter(str)
 
       str

data/lib/junoser/parser.rb

@@ -2862,7 +2862,6 @@ module Junoser
                       arg
                   )
               ).as(:oneline),
-
               # Ported from vSRX 18.3R1.9
               b(str("security"),
                   c(
@@ -4891,7 +4890,6 @@ module Junoser
                   )
               ),
               # End of vSRX 18.3R1.9
-
               b(str("interfaces"),
                   c(
                       b(a(str("pic-set"), arg),
@@ -97908,15 +97906,8 @@ module Junoser
                     a(str("flag"), enum(str("configuration") | str("routing-socket") | str("compilation") | str("ipc") | str("rules") | str("lookup") | str("all"))).as(:oneline)
                 )
             ),
-            b(str("policy"),
-                s(
-                        arg,
-                  a(str("to-zone-name"), arg),
-                  c(
-                    b(str("policy"),
-                      policy_type
-                    )
-                  )
+            b(s(str("from-zone"), arg, str("to-zone"), arg),
+                b(str("policy"), policy_type
                 )
             ),
             b(str("global"),

data/lib/junoser/ruler.rb

@@ -161,6 +161,12 @@ module Junoser
                 '    "path" (quote | arg)'], $1)
       end
 
+      str.gsub!(/^(\s*)"policy" \(\s*s\(\s*arg,\s*"to-zone-name" arg,\s*c\(\s*"policy" \(\s*policy_type\s*\)\s*\)/) do
+        format(['b(s("from-zone", arg, "to-zone", arg),',
+                '    b("policy", policy_type',
+               ], $1)
+      end
+
       str
     end
 

data/lib/junoser/version.rb

@@ -1,3 +1,3 @@
 module Junoser
-  VERSION = "0.3.8"
+  VERSION = "0.3.9"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: junoser
 version: !ruby/object:Gem::Version
-  version: 0.3.8
+  version: 0.3.9
 platform: ruby
 authors:
 - Shintaro Kojima
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-11-04 00:00:00.000000000 Z
+date: 2019-11-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parslet