pwn 0.5.353 → 0.5.355

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 520c14131726908d9abb9e798087982d6d85e97fee79a4072f57379d71b4ec81
-  data.tar.gz: 7352109003e96f827c4ba7b4a49be75217216d6450c12e8c30067832712c52a5
+  metadata.gz: 1a1c25778cca78de03158bfd515b79afe966f47c3696619c02a2a8b6c54e8f48
+  data.tar.gz: 727062f71c704907703d87877d009eb7b9cf91669e72257458592178dd89dd6f
 SHA512:
-  metadata.gz: 4d69ceb6ad6da3d4c6534a3a009c8f9a9d3bdd6501f113b7bd5c3b30fb0bb6c2b5b2ad4578976bb3b51ae243a5e9ae006f0d1bfa5ff168a951cf791dd13eb0cb
-  data.tar.gz: 6d505d50654d71114a4c6691e3114229531cd59ff05d6bc047b7ad3df3fb2f650c91a224dd60a90333e1d7ad608c074e73918feebc647fc4c36fe8594e9f7d8e
+  metadata.gz: 961c1695548771ae13d9a56d2a4170d52c2b660a55de3ae387d1a0fd5bf38e7ff9c8bd1f18366cb2b8eee40d1ee12779ce834eb0620f200b5e952ea0a2f0ed02
+  data.tar.gz: 208f0401332646eafec405fa2b8ff0e05932591145fa088f639290b25729085eb286d80cc6fa774d655a26c7caa3f4e5e2545d3c573fe7165d781f833ab5b06a

data/README.md

@@ -37,7 +37,7 @@ $ cd /opt/pwn
 $ ./install.sh
 $ ./install.sh ruby-gem
 $ pwn
-pwn[v0.5.353]:001 >>> PWN.help
+pwn[v0.5.355]: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.4.4@pwn
 $ gem uninstall --all --executables pwn
 $ gem install --verbose pwn
 $ pwn
-pwn[v0.5.353]:001 >>> PWN.help
+pwn[v0.5.355]:001 >>> PWN.help
 ```
 
 If you're using a multi-user install of RVM do:
@@ -62,7 +62,7 @@ $ rvm use ruby-3.4.4@pwn
 $ rvmsudo gem uninstall --all --executables pwn
 $ rvmsudo gem install --verbose pwn
 $ pwn
-pwn[v0.5.353]:001 >>> PWN.help
+pwn[v0.5.355]:001 >>> PWN.help
 ```
 
 PWN periodically upgrades to the latest version of Ruby which is reflected in `/opt/pwn/.ruby-version`.  The easiest way to upgrade to the latest version of Ruby from a previous PWN installation is to run the following script:

data/bin/pwn_phone

@@ -81,6 +81,7 @@ begin
   baresip_bin = opts[:baresip_bin]
   sox_bin = opts[:sox_bin]
   session_root = opts[:session_root] ||= '.'
+  # session_root = opts[:session_root] ||= Dir.pwd
 
   # Optional Flag Variables
   randomize = opts[:randomize]

data/lib/pwn/plugins/burp_suite.rb

@@ -40,7 +40,7 @@ module PWN
       end
 
       # Supported Method Parameters::
-      # burp_obj = PWN::Plugins::BurpSuite.start(
+      # burp_obj1 = PWN::Plugins::BurpSuite.start(
       #   burp_jar_path: 'optional - path of burp suite pro jar file (defaults to /opt/burpsuite/burpsuite_pro.jar)',
       #   headless: 'optional - run burp headless if set to true',
       #   browser_type: 'optional - defaults to :firefox. See PWN::Plugins::TransparentBrowser.help for a list of types',
@@ -60,12 +60,10 @@ module PWN
 
         browser_type = opts[:browser_type] ||= :firefox
         burp_ip = opts[:burp_ip] ||= '127.0.0.1'
-        burp_port = opts[:burp_port] ||= 8080
-        # burp_port = opts[:burp_port] ||= PWN::Plugins::Sock.get_random_unused_port
-        #
+        burp_port = opts[:burp_port] ||= PWN::Plugins::Sock.get_random_unused_port
+
         pwn_burp_ip = opts[:pwn_burp_ip] ||= '127.0.0.1'
-        pwn_burp_port = opts[:pwn_burp_port] ||= 1337
-        # pwn_burp_port = opts[:pwn_burp_port] ||= PWN::Plugins::Sock.get_random_unused_port
+        pwn_burp_port = opts[:pwn_burp_port] ||= PWN::Plugins::Sock.get_random_unused_port
 
         burp_cmd_string = 'java -Xmx4G'
         burp_cmd_string = "#{burp_cmd_string} -Djava.awt.headless=true" if opts[:headless]
@@ -103,14 +101,13 @@ module PWN
           next
         end
 
-        # USE THIS WHEN Updating Proxy Listener settings become
-        # available in the BurpSuite Montoya API
         # Update proxy listener to use the burp_ip and burp_port
-        # update_proxy_listener(
-        #   burp_obj: burp_obj,
-        #   address: burp_ip,
-        #   port: burp_port
-        # )
+        update_proxy_listener(
+          burp_obj: burp_obj,
+          id: '0',
+          address: burp_ip,
+          port: burp_port
+        )
 
         burp_obj
       rescue StandardError => e
@@ -246,6 +243,113 @@ module PWN
         raise e
       end
 
+      # Supported Method Parameters::
+      # json_proxy_listeners = PWN::Plugins::BurpSuite.get_proxy_listeners(
+      #   burp_obj: 'required - burp_obj returned by #start method'
+      # )
+
+      public_class_method def self.get_proxy_listeners(opts = {})
+        burp_obj = opts[:burp_obj]
+        rest_browser = burp_obj[:rest_browser]
+        pwn_burp_api = burp_obj[:pwn_burp_api]
+
+        listeners = rest_browser.get("http://#{pwn_burp_api}/proxy/listeners", content_type: 'application/json; charset=UTF8')
+        JSON.parse(listeners, symbolize_names: true)
+      rescue StandardError => e
+        stop(burp_obj: burp_obj) unless burp_obj.nil?
+        raise e
+      end
+
+      # Supported Method Parameters::
+      # json_proxy_listener = PWN::Plugins::BurpSuite.add_proxy_listener(
+      #   burp_obj: 'required - burp_obj returned by #start method',
+      #   bind_address: 'required - bind address for the proxy listener (e.g., "127.0.0.1")',
+      #   port: 'required - port for the proxy listener (e.g., 8081)',
+      #   enabled: 'optional - enable the listener (defaults to true)'
+      # )
+
+      public_class_method def self.add_proxy_listener(opts = {})
+        burp_obj = opts[:burp_obj]
+        rest_browser = burp_obj[:rest_browser]
+        pwn_burp_api = burp_obj[:pwn_burp_api]
+        bind_address = opts[:bind_address]
+        raise 'ERROR: bind_address parameter is required' if bind_address.nil?
+
+        port = opts[:port]
+        raise 'ERROR: port parameter is required' if port.nil?
+
+        enabled = opts[:enabled] != false # Default to true if not specified
+
+        proxy_listeners = get_proxy_listeners(burp_obj: burp_obj)
+        last_known_proxy_id = proxy_listeners.last[:id].to_i ||= 0
+        next_id = last_known_proxy_id + 1
+
+        post_body = {
+          id: next_id.to_s,
+          bind_address: bind_address,
+          port: port,
+          enabled: enabled
+        }.to_json
+
+        listener = rest_browser.post("http://#{pwn_burp_api}/proxy/listeners", post_body, content_type: 'application/json; charset=UTF8')
+        JSON.parse(listener, symbolize_names: true)
+      rescue StandardError => e
+        stop(burp_obj: burp_obj) unless burp_obj.nil?
+        raise e
+      end
+
+      # Supported Method Parameters::
+      # json_proxy_listener = PWN::Plugins::BurpSuite.update_proxy_listener(
+      #   burp_obj: 'required - burp_obj returned by #start method',
+      #   id: 'optional - ID of the proxy listener (defaults to "0")',
+      #   bind_address: 'optional - bind address for the proxy listener (defaults to "127.0.0.1")',
+      #   port: 'optional - port for the proxy listener (defaults to 8080)',
+      #   enabled: 'optional - enable or disable the listener (defaults to true)'
+      # )
+
+      public_class_method def self.update_proxy_listener(opts = {})
+        burp_obj = opts[:burp_obj]
+        rest_browser = burp_obj[:rest_browser]
+        pwn_burp_api = burp_obj[:pwn_burp_api]
+        id = opts[:id] ||= '0'
+        bind_address = opts[:bind_address] ||= '127.0.0.1'
+        port = opts[:port] ||= 8080
+        enabled = opts[:enabled] != false # Default to true if not specified
+
+        post_body = {
+          id: id,
+          bind_address: bind_address,
+          port: port,
+          enabled: enabled
+        }.to_json
+
+        listener = rest_browser.put("http://#{pwn_burp_api}/proxy/listeners/#{id}", post_body, content_type: 'application/json; charset=UTF8')
+        JSON.parse(listener, symbolize_names: true)
+      rescue StandardError => e
+        stop(burp_obj: burp_obj) unless burp_obj.nil?
+        raise e
+      end
+
+      # Supported Method Parameters::
+      # PWN::Plugins::BurpSuite.delete_proxy_listener(
+      #   burp_obj: 'required - burp_obj returned by #start method',
+      #   id: 'required - ID of the proxy listener (defaults to "0")'
+      # )
+
+      public_class_method def self.delete_proxy_listener(opts = {})
+        burp_obj = opts[:burp_obj]
+        rest_browser = burp_obj[:rest_browser]
+        pwn_burp_api = burp_obj[:pwn_burp_api]
+        id = opts[:id] ||= '0'
+        raise 'ERROR: id parameter is required' if id.nil?
+
+        rest_browser.delete("http://#{pwn_burp_api}/proxy/listeners/#{id}")
+        true # Return true to indicate successful deletion (or error if API fails)
+      rescue StandardError => e
+        stop(burp_obj: burp_obj) unless burp_obj.nil?
+        raise e
+      end
+
       # Supported Method Parameters::
       # json_sitemap = PWN::Plugins::BurpSuite.get_sitemap(
       #   burp_obj: 'required - burp_obj returned by #start method',
@@ -788,109 +892,6 @@ module PWN
         raise e
       end
 
-      # Supported Method Parameters::
-      # json_proxy_listeners = PWN::Plugins::BurpSuite.get_proxy_listeners(
-      #   burp_obj: 'required - burp_obj returned by #start method'
-      # )
-
-      public_class_method def self.get_proxy_listeners(opts = {})
-        burp_obj = opts[:burp_obj]
-        rest_browser = burp_obj[:rest_browser]
-        pwn_burp_api = burp_obj[:pwn_burp_api]
-
-        listeners = rest_browser.get("http://#{pwn_burp_api}/proxy/listeners", content_type: 'application/json; charset=UTF8')
-        JSON.parse(listeners, symbolize_names: true)
-      rescue StandardError => e
-        stop(burp_obj: burp_obj) unless burp_obj.nil?
-        raise e
-      end
-
-      # Supported Method Parameters::
-      # json_proxy_listener = PWN::Plugins::BurpSuite.add_proxy_listener(
-      #   burp_obj: 'required - burp_obj returned by #start method',
-      #   bind_address: 'required - bind address for the proxy listener (e.g., "127.0.0.1")',
-      #   port: 'required - port for the proxy listener (e.g., 8081)',
-      #   enabled: 'optional - enable the listener (defaults to true)'
-      # )
-
-      public_class_method def self.add_proxy_listener(opts = {})
-        burp_obj = opts[:burp_obj]
-        rest_browser = burp_obj[:rest_browser]
-        pwn_burp_api = burp_obj[:pwn_burp_api]
-        bind_address = opts[:bind_address]
-        raise 'ERROR: bind_address parameter is required' if bind_address.nil?
-
-        port = opts[:port]
-        raise 'ERROR: port parameter is required' if port.nil?
-
-        enabled = opts[:enabled] != false # Default to true if not specified
-
-        post_body = {
-          id: "#{bind_address}:#{port}",
-          bind_address: bind_address,
-          port: port,
-          enabled: enabled
-        }.to_json
-
-        listener = rest_browser.post("http://#{pwn_burp_api}/proxy/listeners", post_body, content_type: 'application/json; charset=UTF8')
-        JSON.parse(listener, symbolize_names: true)
-      rescue StandardError => e
-        stop(burp_obj: burp_obj) unless burp_obj.nil?
-        raise e
-      end
-
-      # Supported Method Parameters::
-      # json_proxy_listener = PWN::Plugins::BurpSuite.update_proxy_listener(
-      #   burp_obj: 'required - burp_obj returned by #start method',
-      #   id: 'optional - ID of the proxy listener (defaults to "127.0.0.1:8080")',
-      #   bind_address: 'optional - bind address for the proxy listener (defaults to "127.0.0.1")',
-      #   port: 'optional - port for the proxy listener (defaults to 8080)',
-      #   enabled: 'optional - enable or disable the listener (defaults to true)'
-      # )
-
-      public_class_method def self.update_proxy_listener(opts = {})
-        burp_obj = opts[:burp_obj]
-        rest_browser = burp_obj[:rest_browser]
-        pwn_burp_api = burp_obj[:pwn_burp_api]
-        id = opts[:id] ||= '127.0.0.1:8080'
-        bind_address = opts[:bind_address] ||= '127.0.0.1'
-        port = opts[:port] ||= 8080
-        enabled = opts[:enabled] != false # Default to true if not specified
-
-        post_body = {
-          id: id,
-          bind_address: bind_address,
-          port: port,
-          enabled: enabled
-        }.to_json
-
-        listener = rest_browser.put("http://#{pwn_burp_api}/proxy/listeners/#{id}", post_body, content_type: 'application/json; charset=UTF8')
-        JSON.parse(listener, symbolize_names: true)
-      rescue StandardError => e
-        stop(burp_obj: burp_obj) unless burp_obj.nil?
-        raise e
-      end
-
-      # Supported Method Parameters::
-      # PWN::Plugins::BurpSuite.delete_proxy_listener(
-      #   burp_obj: 'required - burp_obj returned by #start method',
-      #   id: 'required - ID of the proxy listener (e.g., "127.0.0.1:8080")'
-      # )
-
-      public_class_method def self.delete_proxy_listener(opts = {})
-        burp_obj = opts[:burp_obj]
-        rest_browser = burp_obj[:rest_browser]
-        pwn_burp_api = burp_obj[:pwn_burp_api]
-        id = opts[:id]
-        raise 'ERROR: id parameter is required' if id.nil?
-
-        rest_browser.delete("http://#{pwn_burp_api}/proxy/listeners/#{id}")
-        true # Return true to indicate successful deletion (or error if API fails)
-      rescue StandardError => e
-        stop(burp_obj: burp_obj) unless burp_obj.nil?
-        raise e
-      end
-
       # Supported Method Parameters::
       # PWN::Plugins::BurpSuite.update_burp_jar(
       # )
@@ -929,7 +930,7 @@ module PWN
 
       public_class_method def self.help
         puts "USAGE:
-          burp_obj = #{self}.start(
+          burp_obj1 = #{self}.start(
             burp_jar_path: 'optional - path of burp suite pro jar file (defaults to /opt/burpsuite/burpsuite_pro.jar)',
             headless: 'optional - run headless if set to true',
             browser_type: 'optional - defaults to :firefox. See PWN::Plugins::TransparentBrowser.help for a list of types'
@@ -958,6 +959,30 @@ module PWN
             burp_obj: 'required - burp_obj returned by #start method'
           )
 
+          #{self}.get_proxy_listeners(
+            burp_obj: 'required - burp_obj returned by #start method'
+          )
+
+          json_proxy_listener = #{self}.add_proxy_listener(
+            burp_obj: 'required - burp_obj returned by #start method',
+            bind_address: 'required - bind address for the proxy listener (e.g., \"127.0.0.1\")',
+            port: 'required - port for the proxy listener (e.g., 8081)',
+            enabled: 'optional - enable the listener (defaults to true)'
+          )
+
+          json_proxy_listener = #{self}.update_proxy_listener(
+            burp_obj: 'required - burp_obj returned by #start method',
+            id: 'optional - ID of the proxy listener (defaults to \"0\")',
+            bind_address: 'required - bind address for the proxy listener (e.g., \"127.0.0.1\")',
+            port: 'required - port for the proxy listener (e.g., 8081)',
+            enabled: 'optional - enable the listener (defaults to true)'
+          )
+
+          #{self}.delete_proxy_listener(
+            burp_obj: 'required - burp_obj returned by #start method',
+            id: 'required - ID of the proxy listener (defaults to \"0\")'
+          )
+
           json_sitemap = #{self}.get_sitemap(
             burp_obj: 'required - burp_obj returned by #start method',
             target_url: 'optional - target URL to filter sitemap results (defaults to entire sitemap)'

data/lib/pwn/reports/fuzz.rb

@@ -70,16 +70,12 @@ module PWN
                 border-spacing:0px;
               }
 
-              table.squish {
-                table-layout: fixed;
-              }
-
               td {
                 vertical-align: top;
                 word-wrap: break-word !important;
               }
 
-              tr.highlighted td {
+              tr.selected td {
                 background-color: #FFF396 !important;
               }
             </style>
@@ -99,7 +95,6 @@ module PWN
             </h1><br /><br />
 
             <div>
-              <!--<button type="button" id="button">Rows Selected</button>-->
               <button type="button" id="export_selected">Export Selected to JSON</button>
             </div><br />
 
@@ -108,9 +103,9 @@ module PWN
               <a class="toggle-vis" data-column="1" href="#">Timestamp</a>&nbsp;|&nbsp;
               <a class="toggle-vis" data-column="2" href="#">Request</a>&nbsp;|&nbsp;
               <a class="toggle-vis" data-column="3" href="#">Request Encoding</a>&nbsp;|&nbsp;
-              <a class="toggle-vis" data-column="3" href="#">Request Length</a>&nbsp;|&nbsp;
-              <a class="toggle-vis" data-column="3" href="#">Response</a>&nbsp;|&nbsp;
-              <a class="toggle-vis" data-column="3" href="#">Response Length</a>&nbsp;|&nbsp;
+              <a class="toggle-vis" data-column="4" href="#">Request Length</a>&nbsp;|&nbsp;
+              <a class="toggle-vis" data-column="5" href="#">Response</a>&nbsp;|&nbsp;
+              <a class="toggle-vis" data-column="6" href="#">Response Length</a>&nbsp;|&nbsp;
             </div>
             <br /><br />
 
@@ -119,7 +114,7 @@ module PWN
             </div><br />
 
             <div>
-              <table id="pwn_fuzz_net_app_proto" class="display squish" cellspacing="0">
+              <table id="pwn_fuzz_net_app_proto" class="display" cellspacing="0">
                 <thead>
                   <tr>
                     <th>#</th>
@@ -145,7 +140,6 @@ module PWN
             <script>
               var htmlEntityEncode = $.fn.dataTable.render.text().display;
 
-              var line_entry_uri = "";
               $(document).ready(function() {
                 var oldStart = 0;
                 var table = $('#pwn_fuzz_net_app_proto').DataTable( {
@@ -170,13 +164,16 @@ module PWN
                   //"deferRender": true,
                   "dom": "fplitfpliS",
                   "autoWidth": false,
+                  "select": {
+                    "style": "multi"
+                  },
                   "columnDefs": [
                     {
-                      targets: 3,
+                      targets: 4,
                       className: 'dt-body-center'
                     },
                     {
-                      targets: 5,
+                      targets: 6,
                       className: 'dt-body-center'
                     }
                   ],
@@ -269,54 +266,16 @@ module PWN
                   column.visible( ! column.visible() );
                 });
 
-                $('#button').click( function () {
-                  alert($('.multi_line_select tr.highlighted').length +' row(s) highlighted');
-                });
-
                 $('#export_selected').click( function () {
-                  if ($('.multi_line_select tr.highlighted').length === 0) {
+                  var selectedRows = table.rows({ selected: true });
+                  if (selectedRows.count() === 0) {
                     alert('No rows selected');
                     return;
                   }
 
                   $.getJSON(table.ajax.url(), function(original_json) {
-                    var selected_results = {};
-
-                    $('.multi_line_select tr.highlighted').each(function() {
-                      var inner_tr = $(this);
-                      var main_tr = inner_tr.closest('td').parent();
-                      var row = table.row(main_tr);
-                      var row_index = row.index();
-                      var line_index = inner_tr.index();
-
-                      if (selected_results[row_index] === undefined) {
-                        selected_results[row_index] = {
-                          row: row,
-                          lines: []
-                        };
-                      }
-
-                      selected_results[row_index].lines.push(line_index);
-                    });
-
-                    var new_data = [];
-
-                    Object.keys(selected_results).forEach(function(ri) {
-                      var sel = selected_results[ri];
-                      var orig_row_data = sel.row.data();
-                      var new_row_data = JSON.parse(JSON.stringify(orig_row_data));
-
-                      sel.lines.sort((a, b) => a - b);
-                      new_row_data.line_no_and_contents = sel.lines.map(function(li) {
-                        return orig_row_data.line_no_and_contents[li];
-                      });
-
-                      new_row_data.raw_content = new_row_data.line_no_and_contents.map(l => l.contents).join('\\n');
-
-                      new_data.push(new_row_data);
-                    });
-
-                    original_json.data = new_data;
+                    var selected_data = selectedRows.data().toArray();
+                    original_json.data = selected_data;
 
                     if (original_json.report_name) {
                       original_json.report_name += '_selected';

data/lib/pwn/reports/phone.rb

@@ -62,16 +62,12 @@ module PWN
                 border-spacing:0px;
               }
 
-              table.squish {
-                table-layout: fixed;
-              }
-
               td {
                 vertical-align: top;
                 word-wrap: break-word !important;
               }
 
-              tr.highlighted td {
+              tr.selected td {
                 background-color: #FFF396 !important;
               }
             </style>
@@ -159,7 +155,7 @@ module PWN
 
             <script>
               var htmlEntityEncode = $.fn.dataTable.render.text().display;
-              var line_entry_uri = "";
+
               $(document).ready(function() {
                 var oldStart = 0;
                 var table = $('#pwn_phone_results').DataTable( {
@@ -184,6 +180,9 @@ module PWN
                   //"deferRender": true,
                   "dom": "fplitfpliS",
                   "autoWidth": false,
+                  "select": {
+                    "style": "multi"
+                  },
                   "columns": [
                     { "data": null },
                     {
@@ -324,54 +323,16 @@ module PWN
                   column.visible( ! column.visible() );
                 });
 
-                $('#button').click( function () {
-                  alert($('.multi_line_select tr.highlighted').length +' row(s) highlighted');
-                });
-
                 $('#export_selected').click( function () {
-                  if ($('.multi_line_select tr.highlighted').length === 0) {
+                  var selectedRows = table.rows({ selected: true });
+                  if (selectedRows.count() === 0) {
                     alert('No rows selected');
                     return;
                   }
 
                   $.getJSON(table.ajax.url(), function(original_json) {
-                    var selected_results = {};
-
-                    $('.multi_line_select tr.highlighted').each(function() {
-                      var inner_tr = $(this);
-                      var main_tr = inner_tr.closest('td').parent();
-                      var row = table.row(main_tr);
-                      var row_index = row.index();
-                      var line_index = inner_tr.index();
-
-                      if (selected_results[row_index] === undefined) {
-                        selected_results[row_index] = {
-                          row: row,
-                          lines: []
-                        };
-                      }
-
-                      selected_results[row_index].lines.push(line_index);
-                    });
-
-                    var new_data = [];
-
-                    Object.keys(selected_results).forEach(function(ri) {
-                      var sel = selected_results[ri];
-                      var orig_row_data = sel.row.data();
-                      var new_row_data = JSON.parse(JSON.stringify(orig_row_data));
-
-                      sel.lines.sort((a, b) => a - b);
-                      new_row_data.line_no_and_contents = sel.lines.map(function(li) {
-                        return orig_row_data.line_no_and_contents[li];
-                      });
-
-                      new_row_data.raw_content = new_row_data.line_no_and_contents.map(l => l.contents).join('\\n');
-
-                      new_data.push(new_row_data);
-                    });
-
-                    original_json.data = new_data;
+                    var selected_data = selectedRows.data().toArray();
+                    original_json.data = selected_data;
 
                     if (original_json.report_name) {
                       original_json.report_name += '_selected';

data/lib/pwn/reports/uri_buster.rb

@@ -62,16 +62,12 @@ module PWN
                 border-spacing:0px;
               }
 
-              table.squish {
-                table-layout: fixed;
-              }
-
               td {
                 vertical-align: top;
                 word-wrap: break-word !important;
               }
 
-              tr.highlighted td {
+              tr.selected td {
                 background-color: #FFF396 !important;
               }
             </style>
@@ -147,7 +143,7 @@ module PWN
 
             <script>
               var htmlEntityEncode = $.fn.dataTable.render.text().display;
-              var line_entry_uri = "";
+
               $(document).ready(function() {
                 var oldStart = 0;
                 var table = $('#pwn_www_uri_buster_results').DataTable( {
@@ -172,6 +168,9 @@ module PWN
                   //"deferRender": true,
                   "dom": "fplitfpliS",
                   "autoWidth": false,
+                  "select": {
+                    "style": "multi"
+                  },
                   "columns": [
                     { "data": null },
                     {
@@ -275,54 +274,16 @@ module PWN
                   column.visible( ! column.visible() );
                 });
 
-                $('#button').click( function () {
-                  alert($('.multi_line_select tr.highlighted').length +' row(s) highlighted');
-                });
-
                 $('#export_selected').click( function () {
-                  if ($('.multi_line_select tr.highlighted').length === 0) {
+                  var selectedRows = table.rows({ selected: true });
+                  if (selectedRows.count() === 0) {
                     alert('No rows selected');
                     return;
                   }
 
                   $.getJSON(table.ajax.url(), function(original_json) {
-                    var selected_results = {};
-
-                    $('.multi_line_select tr.highlighted').each(function() {
-                      var inner_tr = $(this);
-                      var main_tr = inner_tr.closest('td').parent();
-                      var row = table.row(main_tr);
-                      var row_index = row.index();
-                      var line_index = inner_tr.index();
-
-                      if (selected_results[row_index] === undefined) {
-                        selected_results[row_index] = {
-                          row: row,
-                          lines: []
-                        };
-                      }
-
-                      selected_results[row_index].lines.push(line_index);
-                    });
-
-                    var new_data = [];
-
-                    Object.keys(selected_results).forEach(function(ri) {
-                      var sel = selected_results[ri];
-                      var orig_row_data = sel.row.data();
-                      var new_row_data = JSON.parse(JSON.stringify(orig_row_data));
-
-                      sel.lines.sort((a, b) => a - b);
-                      new_row_data.line_no_and_contents = sel.lines.map(function(li) {
-                        return orig_row_data.line_no_and_contents[li];
-                      });
-
-                      new_row_data.raw_content = new_row_data.line_no_and_contents.map(l => l.contents).join('\\n');
-
-                      new_data.push(new_row_data);
-                    });
-
-                    original_json.data = new_data;
+                    var selected_data = selectedRows.data().toArray();
+                    original_json.data = selected_data;
 
                     if (original_json.report_name) {
                       original_json.report_name += '_selected';

data/lib/pwn/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pwn
 version: !ruby/object:Gem::Version
-  version: 0.5.353
+  version: 0.5.355
 platform: ruby
 authors:
 - 0day Inc.