pwn 0.4.695 → 0.4.697

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 70b5ba0004d7791378ec5fcd656c39cca71f3a074e80a64eaf3aed243634ca6a
-  data.tar.gz: a01badbcbe18333492f4b563bedd6c20b6c4604645dd773e0acf72bd71b500cc
+  metadata.gz: 2572514219bb53ad28d5bdb441d795b192a4f18b8bcf371652ef8661be793d06
+  data.tar.gz: 6afc53d56f23965bebfed008a7e7819457e6fc0face0daa5c4dd21110e1d7c9a
 SHA512:
-  metadata.gz: 0fd88ba55522c645f697e69da1ecfbb867b0cc0a90f206272221a0ba8f5d29fdde8720d181494062b6a8d614209ef5a2c67b7e4d036424f5dc57547269f4e728
-  data.tar.gz: fb1bd375593ca142ce9b52ee0956f5b5e9090a3c300271128bc5546111a24743df8df273c8e3d538c2288e1554e641a0c5dc7d7e101721da0234666e67fafc81
+  metadata.gz: 986d271d939c0652a3c8c8ba943a51c56884e95102faad3ee36393f0e3c275af78c3edcdb8cde327424ab487dcc60fd87522010e6e2f587132d88fbd384fc573
+  data.tar.gz: 5158e21c12952017324123711dfb88776bc802c10a6cc5519cf10bff9607a8147bf452cae98f9769971c6f7e77510899d37376aba95bbf8d19b1fcf23089488a

data/Gemfile

@@ -49,6 +49,7 @@ gem 'net-openvpn', '0.8.7'
 gem 'net-smtp', '0.3.3'
 gem 'nexpose', '7.3.0'
 gem 'nokogiri', '1.15.0'
+gem 'nokogiri-diff', '0.2.0'
 gem 'oily_png', '1.2.1'
 gem 'os', '1.1.4'
 gem 'packetfu', '1.1.13'

data/README.md

@@ -37,7 +37,7 @@ $ rvm use ruby-3.2.2@pwn
 $ rvm list gemsets
 $ gem install --verbose pwn
 $ pwn
-pwn[v0.4.695]:001 >>> PWN.help
+pwn[v0.4.697]:001 >>> PWN.help
 ```
 
 [![Installing the pwn Security Automation Framework](https://raw.githubusercontent.com/0dayInc/pwn/master/documentation/pwn_install.png)](https://youtu.be/G7iLUY4FzsI)
@@ -52,7 +52,7 @@ $ rvm use ruby-3.2.2@pwn
 $ gem uninstall --all --executables pwn
 $ gem install --verbose pwn
 $ pwn
-pwn[v0.4.695]:001 >>> PWN.help
+pwn[v0.4.697]:001 >>> PWN.help
 ```
 
 

data/bin/pwn_diff_xml_files

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 # frozen_string_literal: true
 
-require 'nokogiri'
+require 'nokogiri/diff'
 require 'optparse'
 
 opts = {}
@@ -32,14 +32,37 @@ begin
   x2_path = opts[:x2_path]
   diff_path = opts[:diff_path]
 
-  x1 = Nokogiri::XML(File.open(x1_path))
-  x2 = Nokogiri::XML(File.open(x2_path))
+  x1 = Nokogiri::XML(File.read(x1_path))
+  x2 = Nokogiri::XML(File.read(x2_path))
 
-  diff = x1.diff(x2)
   diff_xml = Nokogiri::XML::Builder.new do |xml|
     xml.diff do
-      diff.each do |change|
-        xml.send(change.action, change.node.to_xml) unless change.action == '='
+      x1.root.traverse do |node|
+        next unless node.element?
+
+        node_name = node.name
+        node_x2 = x2.at_xpath(node.path)
+
+        if node_x2.nil?
+          xml.delete do
+            xml.send(node_name, node.attributes)
+          end
+        elsif node_x2 != node
+          xml.change do
+            xml.send(node_name, node.attributes)
+          end
+        end
+      end
+
+      x2.root.traverse do |node|
+        next unless node.element?
+
+        node_name = node.name
+        node_x1 = x1.at_xpath(node.path)
+
+        xml.add do
+          xml.send(node_name, node.attributes) if node_x1.nil?
+        end
       end
     end
   end

data/lib/pwn/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module PWN
-  VERSION = '0.4.695'
+  VERSION = '0.4.697'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pwn
 version: !ruby/object:Gem::Version
-  version: 0.4.695
+  version: 0.4.697
 platform: ruby
 authors:
 - 0day Inc.
@@ -542,6 +542,20 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 1.15.0
+- !ruby/object:Gem::Dependency
+  name: nokogiri-diff
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.2.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.2.0
 - !ruby/object:Gem::Dependency
   name: oily_png
   requirement: !ruby/object:Gem::Requirement