net-connector 0.7.2 → 0.8.0

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

@@ -61,15 +61,14 @@ module Net
                           policy: policy, duration_ms: duration_ms, report_diagnostic: diagnostic, log_directory: log_directory)
         end
 
-        # 手工构造的批次同样经过诊断白名单，不序列化任意异常内容。
-        def summary
+        # 统计不创建逐设备明细；文本与进度输出复用此入口，不缓存调用方持有的批次。
+        def statistics
           batch_data = batch_summary
           batch_data.merge(
             schema_version: 2, policy: policy, policy_success: policy_success?, duration_ms: duration_ms,
             coverage: { complete: !outcomes.empty? && outcomes.all? { |outcome| ATTEMPTED_STATUSES.include?(outcome.status) },
                         attempted: outcomes.count { |outcome| ATTEMPTED_STATUSES.include?(outcome.status) },
                         skipped: outcomes.count { |outcome| !ATTEMPTED_STATUSES.include?(outcome.status) } },
-            devices: device_summaries(batch_data.fetch(:devices)),
             callback_errors: callback_errors.map { |entry| { host: entry[:host], error_type: ErrorMetadata.type(entry[:error_type]) } },
             report_location: report_location, report_error: ErrorMetadata.type(report_error),
             verification: mode == :tftp ? { verified: outcomes.count { |outcome| server_verified?(outcome) },
@@ -78,6 +77,9 @@ module Net
           )
         end
 
+        # 手工构造的批次同样经过诊断白名单，不序列化任意异常内容。
+        def summary = statistics.merge(devices: device_summaries)
+
         def inspect = "#<#{self.class} policy=#{policy} status=#{status} policy_success=#{policy_success?}>"
 
         private
@@ -92,19 +94,7 @@ module Net
             failed: outcomes.count { |outcome| outcome.status == :failed },
             skipped: outcomes.count(&:skipped?),
             counts: counts,
-            callback_errors: callback_errors,
-            devices: outcomes.map do |outcome|
-              { host: outcome.device.host || outcome.device.source_ip, name: outcome.device.name,
-                vendor: outcome.device.vendor,
-                status: outcome.status, path: outcome.backup&.path,
-                bytes: outcome.backup.is_a?(Backup) ? outcome.backup.bytes : nil,
-                sha256: outcome.backup.is_a?(Backup) ? outcome.backup.sha256 : nil,
-                change: outcome.backup.is_a?(Backup) ? outcome.backup.change : nil,
-                previous_sha256: outcome.backup.is_a?(Backup) ? outcome.backup.previous_sha256 : nil,
-                started_at: outcome.started_at&.iso8601, finished_at: outcome.finished_at&.iso8601,
-                duration_ms: outcome.duration_ms,
-                error_code: outcome.error_code, error_type: outcome.error_type }
-            end
+            callback_errors: callback_errors
           }
         end
 
@@ -122,13 +112,22 @@ module Net
             bytes: receipt&.server_bytes, sha256: receipt&.server_sha256 }
         end
 
-        def device_summaries(entries)
-          entries.zip(outcomes).map do |entry, outcome|
+        def device_summaries
+          outcomes.map do |outcome|
             diagnostic = outcome.diagnostic || Diagnostic.new(error_code: outcome.error_code, error_type: outcome.error_type)
+            entry = { host: outcome.device.host || outcome.device.source_ip, name: outcome.device.name,
+                      vendor: outcome.device.vendor, status: outcome.status, path: outcome.backup&.path,
+                      bytes: outcome.backup.is_a?(Backup) ? outcome.backup.bytes : nil,
+                      sha256: outcome.backup.is_a?(Backup) ? outcome.backup.sha256 : nil,
+                      change: outcome.backup.is_a?(Backup) ? outcome.backup.change : nil,
+                      previous_sha256: outcome.backup.is_a?(Backup) ? outcome.backup.previous_sha256 : nil,
+                      started_at: outcome.started_at&.iso8601, finished_at: outcome.finished_at&.iso8601,
+                      duration_ms: outcome.duration_ms,
+                      error_code: diagnostic.error_code, error_type: diagnostic.error_type,
+                      diagnostic: diagnostic.to_h.except(:error_code, :error_type) }
             entry = entry.merge(tftp_summary(outcome)) if mode == :tftp
             entry[:session_log] = File.join(log_directory, "#{outcome.device.host.tr(":", "_")}.log") if log_directory && outcome.device.host && outcome.started_at
-            entry.merge(error_code: diagnostic.error_code, error_type: diagnostic.error_type,
-                        diagnostic: diagnostic.to_h.except(:error_code, :error_type))
+            entry
           end
         end
       end

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

@@ -12,17 +12,15 @@ module Net
         # 每批保存一份私有 JSON 报告，通过重命名防止半写文件。
         class Json
           # 以临时文件和重命名原子写入私有 JSON 报告。
-          def write(batch, directory:)
+          def write(report, directory:)
             destination = File.expand_path(directory)
             FileUtils.mkdir_p(destination, mode: 0o700)
-            filename = "netdisco-#{batch.mode}-#{batch.started_at.strftime("%Y%m%dT%H%M%SZ")}-#{SecureRandom.hex(4)}.json"
+            filename = "netdisco-#{report.mode}-#{report.started_at.strftime("%Y%m%dT%H%M%SZ")}-#{SecureRandom.hex(4)}.json"
             path = File.join(destination, filename)
-            Storage::PrivateFile.write(path, JSON.pretty_generate(batch.summary)).path
+            Storage::PrivateFile.write(path, JSON.pretty_generate(report.summary)).path
           end
         end
 
-        Text = Json # Compatibility with the former name of the JSON writer.
-
         # 数据库仓储由调用方提供，可使用 Active Record 或其他对象。
         # 仓储须实现 create!，本项目不负责数据库表结构。
         class Database
@@ -34,8 +32,8 @@ module Net
           end
 
           # 把批量摘要写入调用方仓储并返回记录位置。
-          def write(batch, **_options)
-            record = @repository.create!(batch.summary)
+          def write(report, **_options)
+            record = @repository.create!(report.summary)
             record.respond_to?(:id) ? "database:#{record.id}" : "database"
           end
         end

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

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require "ipaddr"
+require_relative "../../connector"
 
 module Net
   module Connector

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

@@ -1,6 +1,12 @@
 # frozen_string_literal: true
 
 require "json"
+require_relative "../../connector"
+require_relative "client"
+require_relative "database_client"
+require_relative "config_file"
+require_relative "rules"
+require_relative "planner"
 
 module Net
   module Connector

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

@@ -2,10 +2,12 @@
 
 require "fileutils"
 require "tempfile"
+require "digest"
 require_relative "../storage/backup_lock"
 require_relative "../storage/private_file"
 require_relative "../storage/safe_file"
 require_relative "tftp_verification"
+require_relative "diagnostic"
 
 module Net
   module Connector
@@ -32,6 +34,7 @@ module Net
         def initialize(directory:, root: nil)
           @report_directory = File.expand_path(directory)
           @server_root = root && File.realpath(root)
+          FileUtils.mkdir_p(@report_directory, mode: 0o700)
           @server_archive_directory = create_server_archive_directory if @server_root
           @remote_suffix = reserve_remote_suffix unless @server_root
           @verifier = TftpVerification.new(root: @server_root)
@@ -68,9 +71,6 @@ module Net
           end
         end
 
-        alias path_for upload_filename
-        alias capture upload_and_archive
-
         private
 
         # 文件系统的 mtime 可能落后于 Time.now；用同一服务器目录的时间建立上传边界。
@@ -137,7 +137,7 @@ module Net
 
         def archive_uploaded_file(outcome)
           receipt = outcome.backup
-          saved_batch_path = nil
+          saved_paths = { local_path: nil, archive_path: nil }
           batch_directory = File.join(@report_directory, "tftp")
           FileUtils.mkdir_p(batch_directory, mode: 0o700)
           extension = File.extname(receipt.path)
@@ -152,9 +152,8 @@ module Net
           end
           raise ArchiveFailed.new(host: outcome.device.host) unless Digest::SHA256.hexdigest(bytes) == receipt.server_sha256
 
-          Storage::PrivateFile.write(batch_archive_path, bytes)
-          saved_batch_path = batch_archive_path
-          Storage::PrivateFile.write(server_archive_path, bytes)
+          persist_archive(saved_paths, :local_path, batch_archive_path, bytes)
+          persist_archive(saved_paths, :archive_path, server_archive_path, bytes)
           if outcome.success?
             uploaded_fingerprint = Storage::SafeFile.fingerprint(uploaded_path)
             raise ArchiveFailed.new(host: outcome.device.host) unless uploaded_fingerprint.sha256 == receipt.server_sha256
@@ -162,16 +161,32 @@ module Net
 
             File.unlink(uploaded_path)
           end
-          outcome.with(backup: receipt.with(local_path: batch_archive_path, archive_path: server_archive_path))
-        rescue StandardError
-          retained = outcome.with(backup: receipt.with(local_path: saved_batch_path))
-          outcome.success? ? archive_failure(retained) : retained
+          outcome.with(backup: receipt.with(**saved_paths))
+        rescue StandardError => error
+          retained = outcome.with(backup: receipt.with(**saved_paths))
+          outcome.success? ? archive_failure(retained, persistence_error: error) : retained
+        end
+
+        # 路径仅由本次写入器的可信回执确认；同步或清理失败不能抹掉已替换的文件。
+        def persist_archive(saved_paths, field, path, bytes)
+          Storage::PrivateFile.write(path, bytes)
+          saved_paths[field] = path
+        rescue StandardError => error
+          if Storage::PrivateFile.receipt_error?(error) && error.receipt.committed? && error.receipt.path == path
+            saved_paths[field] = path
+          end
+          raise
         end
 
-        def archive_failure(outcome)
+        def archive_failure(outcome, persistence_error: nil)
           error = ArchiveFailed.new(host: outcome.device.host)
+          diagnostic = Diagnostic.from(error, backup: outcome.backup)
+          if Storage::PrivateFile.receipt_error?(persistence_error)
+            diagnostic = diagnostic.with(artifact_state: persistence_error.receipt.state, artifact_phase: persistence_error.receipt.phase,
+                                          underlying_type: persistence_error.underlying_type)
+          end
           outcome.with(status: :reported_with_error, error_code: error.code, error_type: error.class.name,
-                       diagnostic: Diagnostic.from(error, backup: outcome.backup))
+                       diagnostic: diagnostic)
         end
 
         def archive_filename(device, extension)

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

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require_relative "../storage/safe_file"
+require_relative "../device/tftp/receipt"
 
 module Net
   module Connector

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

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require_relative "settings"
+
 module Net
   module Connector
     module Netdisco

data/lib/net/connector/netdisco.rb

@@ -1,25 +1,5 @@
 # frozen_string_literal: true
 
-require_relative "../connector"
-require_relative "netdisco/client"
-require_relative "netdisco/database_client"
-require_relative "netdisco/rules"
-require_relative "netdisco/device"
-require_relative "netdisco/config_file"
-require_relative "netdisco/settings"
-require_relative "netdisco/worker"
-require_relative "netdisco/result_store"
-require_relative "netdisco/batch"
-require_relative "netdisco/planner"
-require_relative "netdisco/fleet"
-require_relative "netdisco/progress"
+# 公共入口只组合应用流程；每个模块自行声明依赖，不要求调用方维护加载顺序。
 require_relative "netdisco/cli"
-require_relative "storage/batch_directory"
-require_relative "netdisco/report/text"
-require_relative "netdisco/connection"
-require_relative "netdisco/cli/options"
-require_relative "netdisco/report/files"
-require_relative "netdisco/tftp_verification"
-require_relative "netdisco/tftp_archive"
-require_relative "netdisco/tftp_history"
 require_relative "netdisco/backup_run"

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

@@ -48,19 +48,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/version.rb

@@ -2,6 +2,6 @@
 
 module Net
   module Connector
-    VERSION = "0.7.2"
+    VERSION = "0.8.0"
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: net-connector
 version: !ruby/object:Gem::Version
-  version: 0.7.2
+  version: 0.8.0
 platform: ruby
 authors:
 - net-connector contributors
-bindir: exe
+bindir: bin
 cert_chain: []
-date: 2026-10-06 00:00:00.000000000 Z
+date: 2026-10-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: expect-pty
@@ -333,7 +333,7 @@ dependencies:
         version: '0.2'
 description: 通过 SSH 或 Telnet 登录网络设备，采集配置、执行命令脚本、处理交互提示，并提供脱敏日志与基于 Netdisco 清单的批量备份。
 executables:
-- net-connector-backup
+- net-backup
 extensions: []
 extra_rdoc_files: []
 files:
@@ -342,12 +342,12 @@ files:
 - LICENSE
 - README.md
 - SECURITY.md
+- bin/net-backup
 - docs/RELEASING.md
 - docs/VERIFICATION.md
 - docs/architecture.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 +382,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 +412,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