net-connector 0.7.3 → 0.9.0

data/lib/net/connector/vendor/palo_alto/running_config.rb

@@ -6,6 +6,7 @@ require_relative "../../device/running_config/strategy"
 module Net
   module Connector
     module PaloAlto
+      # 通过候选差异与 set 格式校验确认采集证据，拒绝将未提交配置当作运行配置。
       class RunningConfig < Net::Connector::RunningConfig::Strategy
         # 配置位于 show 步骤，最后的 exit 只负责离开候选视图。
         def result_step(result)
@@ -48,19 +49,39 @@ module Net
           return false if text.empty?
 
           pending = +""
+          quote = nil
           text.each_line do |line|
             next if pending.empty? && line.strip.empty?
             return false if pending.empty? && !line.start_with?("set ")
 
             pending << line
-            begin
-              Shellwords.split(pending)
-              pending.clear
-            rescue ArgumentError
-              # 未闭合引号继续读取；末尾仍未闭合则拒绝整个采集结果。
-            end
+            quote = quote_after(line, quote)
+            next if quote
+
+            Shellwords.split(pending)
+            pending.clear
           end
           pending.empty?
+        rescue ArgumentError
+          false
+        end
+
+        # 每行只扫描新增字节，整条逻辑命令闭合后才交给 Shellwords 校验。
+        # 单引号中的反斜杠是普通字符；其他位置的转义只影响紧随的一个字节。
+        def quote_after(line, quote)
+          escaped = false
+          line.each_byte do |byte|
+            if escaped
+              escaped = false
+            elsif byte == 92 && quote != 39
+              escaped = true
+            elsif byte == quote
+              quote = nil
+            elsif quote.nil? && (byte == 34 || byte == 39)
+              quote = byte
+            end
+          end
+          quote
         end
 
         # 去掉命令回显和提示符，保留真正需要校验的设备响应。

data/lib/net/connector/vendor/palo_alto/tftp_backup.rb

@@ -5,6 +5,7 @@ require_relative "../../device/tftp/strategy"
 module Net
   module Connector
     module PaloAlto
+      # PAN-OS 上传固定的 running-config.xml，调用方不能改名或指定其他源文件。
       class TftpBackup < Tftp::Strategy
         FILENAME = "running-config.xml"
 
@@ -20,6 +21,7 @@ module Net
           raise ArgumentError, "PAN-OS TFTP export uses the fixed filename #{FILENAME}"
         end
 
+        # 声明本厂商实际导出的配置种类与格式，不推断服务器文件已核验。
         def receipt_metadata(_target, **)
           { configuration_kind: :running, format: :xml, source_file: FILENAME }
         end

data/lib/net/connector/vendor/palo_alto/topology.rb

@@ -5,12 +5,14 @@ require_relative "../../device/topology/strategy"
 module Net
   module Connector
     module PaloAlto
+      # 仅开放 LLDP 和描述读取；未验证候选隔离协议前不开放自动提交。
       class Topology < Topology::Strategy
         # 候选配置缺少经固件实验确认的所有权/commit 协议，暂只提供读取能力。
         def self.supports?(capability)
           %i[neighbors interface_descriptions].include?(capability)
         end
 
+        # 关闭自动修改时返回固定领域错误，调用方不能把未实现能力当作成功。
         def change_error_code = :candidate_isolation_unavailable
 
         # 读取各本机接口的 LLDP 邻居详情。
@@ -35,22 +37,6 @@ module Net
           !blocks.empty? && blocks.all? { |block| empty_neighbor_block?(block) }
         end
 
-        private
-
-        # PAN-OS 会列出启用 LLDP、但没有邻居的本机接口；只有明确为空的
-        # Neighbor information 块可跳过，缺字段的非空块继续交给数量校验拒绝。
-        def neighbor_blocks(output)
-          output.split(/^\s*Local information:\s*$/i).select { |block| block.match?(/^\s*Local interface:\s*\S+/i) }
-        end
-
-        # 邻居字段区只有空行和提示符时，才视为明确的空块。
-        def empty_neighbor_block?(block)
-          tail = block.split(/^\s*Neighbor information:\s*$/i, 2)
-          tail.size == 2 && tail.last.lines.all? { |line| line.strip.empty? || line.match?(/^\S+[>#]\s*$/) }
-        end
-
-        public
-
         # 模板按行读取；未闭合的引号表示证据不完整，不能把首行当成旧描述。
         def decode_description(value)
           value = value.strip
@@ -69,6 +55,20 @@ module Net
         def script_command(command)
           command == "commit" ? Command.new(command, timeout: 300) : command
         end
+
+        private
+
+        # PAN-OS 会列出启用 LLDP、但没有邻居的本机接口；只有明确为空的
+        # Neighbor information 块可跳过，缺字段的非空块继续交给数量校验拒绝。
+        def neighbor_blocks(output)
+          output.split(/^\s*Local information:\s*$/i).select { |block| block.match?(/^\s*Local interface:\s*\S+/i) }
+        end
+
+        # 邻居字段区只有空行和提示符时，才视为明确的空块。
+        def empty_neighbor_block?(block)
+          tail = block.split(/^\s*Neighbor information:\s*$/i, 2)
+          tail.size == 2 && tail.last.lines.all? { |line| line.strip.empty? || line.match?(/^\S+[>#]\s*$/) }
+        end
       end
     end
   end

data/lib/net/connector/vendor/radware/running_config.rb

@@ -5,6 +5,7 @@ require_relative "../../device/running_config/strategy"
 module Net
   module Connector
     module Radware
+      # 复用终端渲染策略，在配置菜单中保持已认证的设备提示身份。
       class RunningConfig < Net::Connector::RunningConfig::Rendered
         # /cfg/dump 进入 Configuration 菜单；保留设备前缀，只替换菜单名称。
         def prompt_text(command)

data/lib/net/connector/vendor/radware/tftp_backup.rb

@@ -5,6 +5,7 @@ require_relative "../../device/tftp/strategy"
 module Net
   module Connector
     module Radware
+      # 交互导出 Alteon 原生 tgz 归档；回执不将归档推断为文本运行配置。
       class TftpBackup < Tftp::Strategy
         # Radware 原生导出生成压缩配置归档。
         def self.file_extension = "tgz"
@@ -15,6 +16,7 @@ module Net
           raise ArgumentError, "Radware TFTP backup does not use vrf" unless vrf.nil?
         end
 
+        # 声明本厂商实际导出的配置种类与格式，不推断服务器文件已核验。
         def receipt_metadata(_target, **) = { configuration_kind: :native_archive, format: :tgz }
 
         # 构造当前厂商的 TFTP 导出交互脚本。

data/lib/net/connector/vendor/radware/topology.rb

@@ -5,6 +5,7 @@ require_relative "../../device/topology/strategy"
 module Net
   module Connector
     module Radware
+      # 只读取 Alteon 端口名称，不声明邻居发现或描述改写能力。
       class Topology < Topology::Strategy
         # Alteon 只支持读取端口描述，不提供邻居发现或自动改写。
         def self.supports?(capability) = capability == :interface_descriptions

data/lib/net/connector/version.rb

@@ -2,6 +2,7 @@
 
 module Net
   module Connector
-    VERSION = "0.7.3"
+    # gemspec、CLI 与发布工具共用此版本，运行时读取不触发设备依赖加载。
+    VERSION = "0.9.0"
   end
 end

data/lib/net/connector.rb

@@ -4,6 +4,7 @@ require_relative "connector/version"
 require_relative "connector/device/base"
 
 module Net
+  # 设备 API 的公开加载入口；只登记厂商名称，实际连接器在首次选择时加载。
   module Connector
     VENDORS = {
       h3c: "H3c",

data/lib/net-connector.rb

@@ -1,3 +1,4 @@
 # frozen_string_literal: true
 
+# gem 名称加载入口与 net/connector 共用实现，不额外加载 Netdisco。
 require_relative "net/connector"

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: net-connector
 version: !ruby/object:Gem::Version
-  version: 0.7.3
+  version: 0.9.0
 platform: ruby
 authors:
 - net-connector contributors
-bindir: exe
+bindir: bin
 cert_chain: []
-date: 2026-10-07 00:00:00.000000000 Z
+date: 2026-10-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: expect-pty
@@ -65,20 +65,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '3.1'
-- !ruby/object:Gem::Dependency
-  name: english
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0.7'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0.7'
 - !ruby/object:Gem::Dependency
   name: fileutils
   requirement: !ruby/object:Gem::Requirement
@@ -333,7 +319,7 @@ dependencies:
         version: '0.2'
 description: 通过 SSH 或 Telnet 登录网络设备，采集配置、执行命令脚本、处理交互提示，并提供脱敏日志与基于 Netdisco 清单的批量备份。
 executables:
-- net-connector-backup
+- net-backup
 extensions: []
 extra_rdoc_files: []
 files:
@@ -341,13 +327,18 @@ files:
 - CONTRIBUTING.md
 - LICENSE
 - README.md
+- README.zh-CN.md
 - SECURITY.md
+- bin/net-backup
 - docs/RELEASING.md
 - docs/VERIFICATION.md
 - docs/architecture.md
+- docs/netdisco.md
+- docs/netdisco.zh-CN.md
+- docs/usage.md
+- docs/usage.zh-CN.md
 - examples/backup.yml
 - examples/inventory_sql.yml
-- exe/net-connector-backup
 - lib/net-connector.rb
 - lib/net/connector.rb
 - lib/net/connector/device/base.rb
@@ -382,6 +373,8 @@ files:
 - lib/net/connector/engine/log/messages.rb
 - lib/net/connector/engine/log/stream.rb
 - lib/net/connector/engine/recovery.rb
+- lib/net/connector/engine/redactor.rb
+- lib/net/connector/engine/response_reader.rb
 - lib/net/connector/engine/result.rb
 - lib/net/connector/engine/session.rb
 - lib/net/connector/engine/terminal_renderer.rb
@@ -410,7 +403,6 @@ files:
 - lib/net/connector/netdisco/rules.rb
 - lib/net/connector/netdisco/settings.rb
 - lib/net/connector/netdisco/tftp_archive.rb
-- lib/net/connector/netdisco/tftp_history.rb
 - lib/net/connector/netdisco/tftp_verification.rb
 - lib/net/connector/netdisco/worker.rb
 - lib/net/connector/storage.rb

data/lib/net/connector/netdisco/tftp_history.rb

@@ -1,16 +0,0 @@
-# frozen_string_literal: true
-
-require_relative "tftp_archive"
-
-module Net
-  module Connector
-    module Netdisco
-      # Compatibility with the first batch archive entry point.
-      class TftpHistory < TftpArchive
-        def initialize(server:, **options) # rubocop:disable Lint/UnusedMethodArgument -- Accept the former constructor keyword.
-          super(**options)
-        end
-      end
-    end
-  end
-end