pwn 0.4.458 → 0.4.459

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 85a03a42892f8f86f382af989d14ecb6abdff9043de8d4e6b45609c659d25a5a
-  data.tar.gz: 5ad007f33886674f720ab1ba73fff4da5cb1cfdeec8a5f5202de8fd4707c60ce
+  metadata.gz: 34af764fdd574b15da3c45adb4097933e47a3aaca2de6dcb4c8f8005b6608f1d
+  data.tar.gz: 5bf7e7551c6c62d12a2c2811493034ba31a0545f59aa3a72483aa3701b04b626
 SHA512:
-  metadata.gz: 831872dde165783f8f102c094d29b6d73b7556b29ec6d97567b97324cddf4fdf72e87861100e2cd4d9cbf302f453ede7b0f79ddb8369c4018e4d5d44a9990c0d
-  data.tar.gz: 3cef3140532c9f1368aec2f9290dc79a52c19b810a0861a982655c35681d6ff8b35fe04a72aa4314bfd974909aab42c7171f2aec685096d3d5e0b3d8eecafa49
+  metadata.gz: 95f9def16df7e14a69731c08b4b7f4d3cf5e9e2e4b2c618b7c5b75dfba4bbbeed142f2aa03328ef3412c8bc95bc5ee87292ded504adc2d50d197113ce80c648d
+  data.tar.gz: 98d0f7cc871533e29b2c1321ae65ef48f56be4debc0bad1cb0617504567e0b12adf1d363c295746c5c1241c3666b42e95a46eaded7028467228cb799d0a33416

data/README.md

@@ -37,7 +37,7 @@ $ rvm use ruby-3.1.2@pwn
 $ rvm list gemsets
 $ gem install --verbose pwn
 $ pwn
-pwn[v0.4.458]:001 >>> PWN.help
+pwn[v0.4.459]: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.1.2@pwn
 $ gem uninstall --all --executables pwn
 $ gem install --verbose pwn
 $ pwn
-pwn[v0.4.458]:001 >>> PWN.help
+pwn[v0.4.459]:001 >>> PWN.help
 ```
 
 

data/lib/pwn/plugins/msr206.rb

@@ -88,6 +88,98 @@ module PWN
         raise e
       end
 
+      # Supported Method Parameters::
+      # cmd_response_arr = get_cmd_responses(
+      #   msr206_obj: 'required - msr206_obj returned from #connect method'
+      # )
+
+      public_class_method def self.get_cmd_responses(opts = {})
+        msr206_obj = opts[:msr206_obj]
+
+        raw_byte_arr = PWN::Plugins::Serial.dump_session_data(
+          serial_obj: msr206_obj
+        )
+
+        hex_esc_raw_resp = ''
+        raw_byte_arr.each do |byte|
+          this_byte = byte.unpack1('H*')
+          # Needed when #unpack1 returns 2 bytes instead of one
+          # e.g."ް" translates to deb0 (that's not a double quote ")
+          # instead of de b0
+          # this condition is ghetto-hacker-ish.
+          if this_byte.length == 4
+            byte_one = this_byte[1..2]
+            byte_two = this_byte[-2..-1]
+            hex_esc_raw_resp = "#{hex_esc_raw_resp}\s#{byte_one}"
+            hex_esc_raw_resp = "#{hex_esc_raw_resp}\s#{byte_two}"
+          else
+            hex_esc_raw_resp = "#{hex_esc_raw_resp}\s#{this_byte}"
+          end
+        end
+
+        # Return command response array in space-delimited hex
+        cmd_response_arr = hex_esc_raw_resp.upcase.strip.split(/(?=FF)/)
+        cmd_response_arr.map(&:strip)
+      rescue StandardError => e
+        # Flush Responses for Next Request
+        PWN::Plugins::Serial.flush_session_data(
+          serial_obj: msr206_obj
+        )
+
+        raise e
+      end
+
+      # Supported Method Parameters::
+      # parsed_cmd_resp_arr = parse_responses(
+      #   cmd_resp: 'required - command response string'
+      # )
+
+      private_class_method def self.parse_responses(opts = {})
+        msr206_obj = opts[:msr206_obj]
+        cmd = opts[:cmd].to_s.scrub.strip.chomp
+
+        keep_parsing_responses = true
+        next_response_detected = false
+        all_cmd_responses = []
+        a_cmd_r_len = 0
+        last_a_cmd_r_len = 0
+
+        parsed_cmd_resp_arr = []
+        bytes_in_cmd_resp = 0
+        cmd_resp = ''
+
+        while keep_parsing_responses
+          until next_response_detected
+            all_cmd_responses = get_cmd_responses(
+              msr206_obj: msr206_obj
+            )
+            # bytes_in_cmd_resp = cmd_resp.split.length if cmd_resp
+            a_cmd_r_len = all_cmd_responses.length
+
+            next_response_detected = true if a_cmd_r_len > last_a_cmd_r_len
+          end
+
+          #   cmd_resp = all_cmd_responses.last
+          #   case cmd_resp
+          #   when '21', '28', '29', '2A', '2B', '2D', '2F', '3A', '31', '32', '33', '3E', '3F', '5E', '7E', '98 FE'
+          #     next_response_detected = true
+          #   end
+          next_response_detected = false
+          last_a_cmd_r_len = a_cmd_r_len
+          print "\n"
+          keep_parsing_responses = false
+        end
+
+        all_cmd_responses
+      rescue StandardError => e
+        raise e
+      ensure
+        # Flush Responses for Next Request
+        PWN::Plugins::Serial.flush_session_data(
+          serial_obj: msr206_obj
+        )
+      end
+
       # Supported Method Parameters::
       #  PWN::Plugins::MSR206.exec(
       #   msr206_obj: 'required - msr206_obj returned from #connect method'
@@ -101,70 +193,76 @@ module PWN
 
         params_bytes = []
         case cmd.to_sym
-        when :version_report
-          cmd_bytes = [0x39]
-        when :simulate_power_cycle_warm_reset
-          cmd_bytes = [0x7F]
-        when :configuration_request
-          cmd_bytes = [0x23]
-        when :reproduce_last_command
-          cmd_bytes = [0x25]
         when :resume_transmission_to_host
           cmd_bytes = [0x11]
         when :pause_transmission_to_host
           cmd_bytes = [0x13]
         when :abort_command
           cmd_bytes = [0x1B]
-        when :red_on
-          cmd_bytes = [0x4D]
-        when :red_off
-          cmd_bytes = [0x6D]
-        when :red_flash
-          cmd_bytes = [0x29]
-        when :green_on
-          cmd_bytes = [0x4C]
-        when :green_off
-          cmd_bytes = [0x6C]
+        when :configuration_request
+          cmd_bytes = [0x23]
+        when :reproduce_last_command
+          cmd_bytes = [0x25]
+        when :card_edge_detect
+          cmd_bytes = [0x26]
         when :green_flash
           cmd_bytes = [0x28]
+        when :red_flash
+          cmd_bytes = [0x29]
+        when :version_report
+          cmd_bytes = [0x39]
+        when :power_on_report
+          cmd_bytes = [0x3A]
+        when :set_write_density
+          cmd_bytes = [0x3B]
+        when :set_temp_write_current
+          cmd_bytes = [0x3C]
+        when :view_temp_write_current
+          cmd_bytes = [0x3E]
+        when :write_verify
+          cmd_bytes = [0x3F]
+        when :arm_to_write_with_raw
+          cmd_bytes = [0x40]
+        when :load_iso_std_data_for_writing_track1
+          cmd_bytes = [0x41]
+        when :load_iso_std_data_for_writing_track2
+          cmd_bytes = [0x42]
+        when :load_iso_std_data_for_writing_track3
+          cmd_bytes = [0x43]
+        when :tx_custom_data_forward_track1, :load_custom_data_for_writing_track1
+          cmd_bytes = [0x45]
+        when :tx_custom_data_forward_track2, :load_custom_data_for_writing_track2
+          cmd_bytes = [0x46]
+        when :tx_custom_data_forward_track3, :load_custom_data_for_writing_track3
+          cmd_bytes = [0x47]
+        when :tx_error_data
+          cmd_bytes = [0x49]
         when :yellow_on
           cmd_bytes = [0x4B]
-        when :yellow_off
-          cmd_bytes = [0x6B]
-        when :yellow_flash
-          cmd_bytes = [0x7C]
+        when :green_on
+          cmd_bytes = [0x4C]
+        when :red_on
+          cmd_bytes = [0x4D]
+        when :set_write_density_210_bpi_tracks2
+          cmd_bytes = [0x4E]
+        when :set_write_density_210_bpi_tracks13
+          cmd_bytes = [0x4F]
         when :arm_to_read
           cmd_bytes = [0x50]
-        when :arm_to_read_w_speed_prompts
-          cmd_bytes = [0x70]
         when :tx_iso_std_data_track1
           cmd_bytes = [0x51]
         when :tx_iso_std_data_track2
           cmd_bytes = [0x52]
         when :tx_iso_std_data_track3
           cmd_bytes = [0x53]
-        when :tx_error_data
-          cmd_bytes = [0x49]
-        when :tx_custom_data_forward_track1, :load_custom_data_for_writing_track1
-          cmd_bytes = [0x45]
-        when :tx_custom_data_forward_track2, :load_custom_data_for_writing_track2
-          cmd_bytes = [0x46]
-        when :tx_custom_data_forward_track3, :load_custom_data_for_writing_track3
-          cmd_bytes = [0x47]
         when :tx_passbook_data
           cmd_bytes = [0x58]
-        when :alt_tx_passbook_data
-          cmd_bytes = [0x78]
-        when :write_verify
-          cmd_bytes = [0x3F]
-        when :card_edge_detect
-          cmd_bytes = [0x26]
-        when :load_iso_std_data_for_writing_track1
-          cmd_bytes = [0x41]
-        when :load_iso_std_data_for_writing_track2
-          cmd_bytes = [0x42]
-        when :load_iso_std_data_for_writing_track3
-          cmd_bytes = [0x43]
+        when :arm_to_write_no_raw
+          cmd_bytes = [0x5A]
+        when :set_default_write_current
+          cmd_bytes = [0x5B]
+        when :view_default_write_current
+          cmd_bytes = [0x5D]
         when :alt_load_iso_std_data_for_writing_track1
           cmd_bytes = [0x61]
         when :alt_load_iso_std_data_for_writing_track2
@@ -173,30 +271,32 @@ module PWN
           cmd_bytes = [0x63]
         when :load_passbook_data_for_writing
           cmd_bytes = [0x6A]
-        when :set_write_density
-          cmd_bytes = [0x3B]
-        when :set_write_density_210_bpi_tracks13
-          cmd_bytes = [0x4F]
-        when :set_write_density_75_bpi_tracks13
-          cmd_bytes = [0x6F]
-        when :set_write_density_210_bpi_tracks2
-          cmd_bytes = [0x4E]
+        when :yellow_off
+          cmd_bytes = [0x6B]
+        when :green_off
+          cmd_bytes = [0x6C]
+        when :red_off
+          cmd_bytes = [0x6D]
         when :set_write_density_75_bpi_tracks2
           cmd_bytes = [0x6E]
-        when :set_default_write_current
-          cmd_bytes = [0x5B]
-        when :view_default_write_current
-          cmd_bytes = [0x5D]
-        when :set_temp_write_current
-          cmd_bytes = [0x3C]
-        when :view_temp_write_current
-          cmd_bytes = [0x3E]
-        when :arm_to_write_with_raw
-          cmd_bytes = [0x40]
-        when :arm_to_write_no_raw
-          cmd_bytes = [0x5A]
+        when :set_write_density_75_bpi_tracks13
+          cmd_bytes = [0x6F]
+        when :arm_to_read_w_speed_prompts
+          cmd_bytes = [0x70]
+        when :alt_tx_iso_std_data_track1
+          cmd_bytes = [0x71]
+        when :alt_tx_iso_std_data_track2
+          cmd_bytes = [0x72]
+        when :alt_tx_iso_std_data_track3
+          cmd_bytes = [0x73]
+        when :alt_tx_passbook_data
+          cmd_bytes = [0x78]
         when :arm_to_write_with_raw_speed_prompts
           cmd_bytes = [0x7A]
+        when :yellow_flash
+          cmd_bytes = [0x7C]
+        when :simulate_power_cycle_warm_reset
+          cmd_bytes = [0x7F]
         else
           raise "Unsupported Command: #{cmd}.  Supported commands are:\n#{list_cmds}\n\n\n"
         end
@@ -205,13 +305,13 @@ module PWN
         cmd_bytes += params_bytes unless params_bytes.empty?
         # Execute the command.
         cmd_bytes.each do |byte|
-          son_micro_rfid_obj[:serial_conn].putc(byte)
+          msr206_obj[:serial_conn].putc(byte)
         end
 
         # Parse commands response(s).
         # Return an array of hashes.
         parse_responses(
-          son_micro_rfid_obj: son_micro_rfid_obj,
+          msr206_obj: msr206_obj,
           cmd: cmd.to_sym
         )
       rescue StandardError => e

data/lib/pwn/plugins/son_micro_rfid.rb

@@ -151,7 +151,7 @@ module PWN
       end
 
       # Supported Method Parameters::
-      # parsed_cmd_resp_arr = parse_cmd_resp(
+      # parsed_cmd_resp_arr = parse_responses(
       #   cmd_resp: 'required - command response string'
       # )
 

data/lib/pwn/version.rb

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

metadata

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