vxlan 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ec6112b96a159497c2b87ac94ef257e7a3baf710a43b9449ff450f757afe3c36
-  data.tar.gz: c8766a7269d4dab9bbacc40026a045fcaf9522fb8052145e22f7d61619919dfb
+  metadata.gz: 715f96e8f586f8a7bacd62d8a7d5e47d4665884cdc20c3953d75c6282184955d
+  data.tar.gz: c3e70fb64cb7677d3e960d05f11622720f0a5842fc0171c7775047d0fd6b8d8a
 SHA512:
-  metadata.gz: d40b5df068d87188cf5eda73ac5cbd4cbb70bc4133424caf641f9cc0a4a6f7bdbe0b7a1439682a0b7b54d266de4c425f712fcc13d721a017b7fefa9d2edf596a
-  data.tar.gz: c4dc37ebef89f10a0692b26510f46b74f65e54a31bf7be3f134e84732bc45327239568bdc4acbdedc85fba25d188c53ef3f4addfec8bfef6f9c522bab6acdc5c
+  metadata.gz: c13eb74ea3ec0e75a8985a3bdf92503db849a6fc55e90af1a7a8ce051eaa810cdf50b25ab90869dae9696ca85bec142a83f0b7bbd649c5e6a7c6aea4019a09b6
+  data.tar.gz: 2bbb1204ab00cfcc50998a878b3d61c8614b03cc158833fecb1c3f1a2835672751bdd89d36e9dd79eca3cd893f91dfb4870c5ff8499817a2fe53bc758ec5eee4

data/CHANGELOG.md

@@ -2,6 +2,16 @@
 
 Changes to the public contract are recorded here. Versions follow Semantic Versioning.
 
+## 0.2.3 (2026-10-18)
+
+- Validate optional IPv4 next hops following static-route output interfaces without changing route fields or option text.
+
+- Clear Bundler bootstrap variables when verifying packages in an isolated gem installation, including calls made through bundle exec.
+
+- Reject unsupported or misplaced VRF address families before projecting targets and policy consumers, and validate anycast gateway MAC values and static-route next-hop forms.
+
+- Parse runtime line boundaries and wrapped records independently of the host Ruby input/output record separators.
+
 ## 0.2.2 (2026-10-18)
 
 ### Changed

data/lib/vxlan/cisco_nxos/evpn_l2route.rb

@@ -22,7 +22,7 @@ module Vxlan
         type = self.class::TYPE
         @totals = []
         fields = previous = next_hop_index = nil
-        text.each_line.with_index(1) do |source, number|
+        text.each_line("\n").with_index(1) do |source, number|
           line = source.strip
           next if line.empty? || line.match?(/\A[-=\s]+\z/) || line.match?(/\A(?:Flags\s*-\s*)?(?:\([A-Za-z0-9]+\):[A-Za-z0-9 ,\/-]+\s*)+\z/)
           if line.match?(/\ATopology\b/i)

data/lib/vxlan/cisco_nxos/parser.rb

@@ -25,7 +25,7 @@ module Vxlan
           return CtxParser::Result.new(status: :partial, issues: [ { code: :invalid_encoding } ])
         end
         if Terminal.invalid_output?(text)
-          line = text.each_line.with_index(1).find { |source, _number| Terminal.invalid_output?(source) }.last
+          line = text.each_line("\n").with_index(1).find { |source, _number| Terminal.invalid_output?(source) }.last
           return CtxParser::Result.new(status: :partial, issues: [ { code: :invalid_terminal_output, line: line } ])
         end
         if self.class::UNSUPPORTED&.match?(text)
@@ -72,7 +72,7 @@ module Vxlan
 
       # 逐行提供有效表格内容，并记录明确空表证据。
       def each_content_line(text, separators: false)
-        text.each_line.with_index(1) do |source, number|
+        text.each_line("\n").with_index(1) do |source, number|
           line = source.strip
           next if line.empty? || (!separators && line.match?(/\A[-=+\s]+\z/))
           if self.class::EMPTY && line.match?(/\A(?:No #{self.class::EMPTY}(?: found)?|0 #{self.class::EMPTY})\.?\z/i)

data/lib/vxlan/cisco_nxos/parsers/show_bgp_l2vpn_evpn_summary.rb

@@ -67,14 +67,14 @@ module Vxlan
         # 归一化平台值，同时保留未知或不支持的状态。
         def normalize(text)
           output = []
-          super.each_line do |line|
+          super.each_line("\n") do |line|
             if output.last&.strip&.end_with?("State/") && line.strip == "PfxRcd"
               output[-1] = output.last.rstrip + line.strip + "\n"
             else
               output << line
             end
           end
-          output.join
+          output.join("")
         end
       end
     end

data/lib/vxlan/cisco_nxos/parsers/show_nve_peers.rb

@@ -31,7 +31,7 @@ module Vxlan
         # 归一化平台值，同时保留未知或不支持的状态。
         def normalize(text)
           output = []
-          super.each_line do |line|
+          super.each_line("\n") do |line|
             tail, previous = line.strip, output.last&.strip
             header = previous && previous.end_with?("Route") && tail == "r-Mac"
             mac = previous && tail.match?(/\A[\da-f]{4}\.[\da-f]{4}\z/i) && previous.match?(/\Anve\d+\s+\d+(?:\.\d+){3}\s+(?:Up|Down)\s+\S+\s+\S+\s+[\da-f]{4}\.\z/i)
@@ -41,7 +41,7 @@ module Vxlan
               output << line
             end
           end
-          output.join
+          output.join("")
         end
       end
     end

data/lib/vxlan/cisco_nxos/parsers/show_running_config.rb

@@ -111,7 +111,7 @@ module Vxlan
             analyze_children(block) do |child|
               if (match = /\Avni (\d+) (l[23])\z/i.match(child.text))
                 id = integer(match[1], 1..16_777_215)
-                store_unique_fact(data[:evpn], id, child, path: [ :evpn, id ]) { vrf(child).merge(type: match[2].downcase) }
+                store_unique_fact(data[:evpn], id, child, path: [ :evpn, id ]) { vrf(child, address_families: false).merge(type: match[2].downcase) }
               else
                 issue(child)
               end
@@ -156,7 +156,9 @@ module Vxlan
             assign(data, :nv_overlay_evpn, block.text == "nv overlay evpn", block)
             capture(block, data[:nv_overlay_evpn], [ :nv_overlay_evpn ]) if data.key?(:nv_overlay_evpn)
           when /\Afabric forwarding anycast-gateway-mac (\S+)\z/
-            assign(data, :anycast_mac, $1, block)
+            mac = $1
+            CtxParser::Values.mac_address(mac)
+            assign(data, :anycast_mac, mac, block)
             capture(block, data[:anycast_mac], [ :anycast_mac ]) if data.key?(:anycast_mac)
           when /\A(?:interface|vlan|vrf|router|vpc|evpn|feature|ip prefix-list|ipv6 prefix-list|route-map)\b/ then issue(block)
           when /\A(?:%|ERROR:|Invalid command|--More--)/i then issue(block, :invalid_command_output)
@@ -166,7 +168,7 @@ module Vxlan
         end
 
         # 解析 VRF 定义及其 VNI 或 route-target 关联。
-        def vrf(block)
+        def vrf(block, address_families: true)
           values = { route_targets: [], routes: [] }
           analyze_children(block) do |child|
             case child.text
@@ -175,6 +177,8 @@ module Vxlan
             when /\Aroute-target / then values[:route_targets] << route_target(child)
             when /\Aaddress-family (.+)\z/
               family = $1
+              next issue(child) unless address_families && %w[ipv4\ unicast ipv6\ unicast].include?(family)
+
               targets_start = values[:route_targets].size
               exports_start = values.fetch(:exports, []).size
               analyze_children(child) do |setting|
@@ -242,9 +246,31 @@ module Vxlan
         def static_route(block)
           words = block.text.split
           raise ArgumentError if words.size < 4
+          validate_static_next_hop(words.drop(3))
+
           { prefix: ipv4_prefix(words[2]), next_hop: words[3], options: words.drop(4).join(" ") }
         end
 
+        # IP route 的下一跳是 IPv4 或出接口；接口分词形式不能误当作地址拒绝。
+        def validate_static_next_hop(words)
+          hop = words.first
+          interface = /\A(?:ethernet\d+(?:\/\d+){1,2}(?:\.\d+)?|port-channel\d+(?:\.\d+)?|vlan\d+|mgmt\d+|null0)\z/i
+          offset = if interface.match?(hop)
+            1
+          elsif /\A(?:ethernet|port-channel|vlan|mgmt|null)\z/i.match?(hop)
+            raise ArgumentError unless words[1] && interface.match?(hop + words[1])
+
+            2
+          else
+            0
+          end
+          hop = words[offset]
+          # 出接口之后可直接跟已有选项；其余词须先作为 IPv4 下一跳校验。
+          return if offset.positive? && (hop.nil? || /\A(?:name|tag|track|vrf|\d+)\z/.match?(hop))
+
+          raise ArgumentError unless IPAddr.new(ip_address(hop)).ipv4?
+        end
+
         # 解析十进制整数，并校验声明的边界。
         def integer(value, range)
           raise ArgumentError unless value.is_a?(String)

data/lib/vxlan/cisco_nxos/parsers/show_vpc_brief.rb

@@ -30,7 +30,7 @@ module Vxlan
                 end
                 row.merge!(consistency: member[1], reason: member[2], active_vlans_summary: member[3])
               elsif match[4].match?(/\A[\d, .-]+\z/)
-                row[:active_vlans_summary] = rest.join
+                row[:active_vlans_summary] = rest.join("")
               else
                 unparsed_records(number)
                 next

data/lib/vxlan/version.rb

@@ -2,5 +2,5 @@
 
 module Vxlan
   # 公开包版本，供 RubyGems 元数据和运行时调用方共用。
-  VERSION = "0.2.2"
+  VERSION = "0.2.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vxlan
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Gatework contributors