pwn 0.4.456 → 0.4.460

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b3b1843c0855572815309240a50172a80b69cb45ac5deb69680209ad1a8c7d67
-  data.tar.gz: 943a67a010803ace7adc4aac78c18b43c168dfb5014a29058a7245a84ae07424
+  metadata.gz: 4aff2b2297397beff4fba5e51932807f004fc20a7887e841f86a108e2c172963
+  data.tar.gz: fd217091245e04376f6355e9ae95f7e78a6611b01446f855291843631cb89891
 SHA512:
-  metadata.gz: 4f46dc1fa6e26ddab03a457400456670b6ce163669ed26b89932d27f22e597535f0b4e92d95035df91bb0eec7b2650e3a2e8d8a05eef01b71716433cc83a10b5
-  data.tar.gz: 1732ba89f610c2a50c20f932bee5fb9707e292ca3cb667f4bd937b7aa7fd27e80a8a431bc0a5032866c41d215d0f8e95b55a6407e3daacf32962a3d3ccadebca
+  metadata.gz: 3818021d9ceac8a67ecd67d59c71a483cdfff3048f44897f41f7ffb383ce46df038af62a9cebc0e19715fe465839c1dd95a0d6ffe2234ba63fd684cbc21aa6c9
+  data.tar.gz: 6c3c935cf2d5bc4590a28b6f8da486db377a16e3880af813835540a0adbdfe54f6e959aea8a9c1083feab9eb4e405e42b38ee3919b7b89f098a0b2bbc6333d39

data/Gemfile

@@ -59,7 +59,7 @@ gem 'rex', '2.0.13'
 gem 'rmagick', '4.2.5'
 gem 'rspec', '3.11.0'
 gem 'rtesseract', '3.1.2'
-gem 'rubocop', '1.29.1'
+gem 'rubocop', '1.30.0'
 gem 'rubocop-rake', '0.6.0'
 gem 'rubocop-rspec', '2.11.1'
 gem 'ruby-audio', '1.6.1'

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.456]:001 >>> PWN.help
+pwn[v0.4.460]: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.456]:001 >>> PWN.help
+pwn[v0.4.460]:001 >>> PWN.help
 ```
 
 

data/bin/pwn_serial_check_voicemail

@@ -35,7 +35,7 @@ serial_obj = PWN::Plugins::Serial.connect
 
 PWN::Plugins::Serial.request(
   serial_obj: serial_obj,
-  request: "ATDT#{voicemail_num};\r\n"
+  payload: "ATDT#{voicemail_num};\r\n"
 )
 
 # TODO: Loop until data received indicates call picked up instead of sleep
@@ -44,18 +44,18 @@ sleep 13
 voicemail_pin.each_char do |pin_char|
   PWN::Plugins::Serial.request(
     serial_obj: serial_obj,
-    request: "AT+VTS=#{pin_char}\r\n"
+    payload: "AT+VTS=#{pin_char}\r\n"
   )
 end
 
 PWN::Plugins::Serial.request(
   serial_obj: serial_obj,
-  request: "AT+VTS=#\r\n"
+  payload: "AT+VTS=#\r\n"
 )
 
 PWN::Plugins::Serial.request(
   serial_obj: serial_obj,
-  request: "AT+CHUP;\r\n"
+  payload: "AT+CHUP;\r\n"
 )
 
 session_data = PWN::Plugins::Serial.dump_session_data

data/bin/pwn_serial_qualcomm_commands

@@ -7,7 +7,7 @@ serial_obj = PWN::Plugins::Serial.connect
 
 PWN::Plugins::Serial.request(
   serial_obj: serial_obj,
-  request: "AT+CLAC\r\n"
+  payload: "AT+CLAC\r\n"
 )
 
 session_data = PWN::Plugins::Serial.dump_session_data

data/lib/pwn/plugins/bus_pirate.rb

@@ -63,28 +63,28 @@ module PWN
         case mode
         when 'BBI01'
           # Enter reset binary mode
-          PWN::Plugins::Serial.request(serial_obj: bus_pirate_obj, request: '\x00')
+          PWN::Plugins::Serial.request(serial_obj: bus_pirate_obj, byte_arr: [0x00])
         when 'SPI1'
           # Enter binary SPI mode
-          PWN::Plugins::Serial.request(serial_obj: bus_pirate_obj, request: '\x01')
+          PWN::Plugins::Serial.request(serial_obj: bus_pirate_obj, byte_arr: [0x01])
         when 'I2C1'
           # Enter I2C mode
-          PWN::Plugins::Serial.request(serial_obj: bus_pirate_obj, request: '\x02')
+          PWN::Plugins::Serial.request(serial_obj: bus_pirate_obj, byte_arr: [0x02])
         when 'ART1'
           # Enter UART mode
-          PWN::Plugins::Serial.request(serial_obj: bus_pirate_obj, request: '\x03')
+          PWN::Plugins::Serial.request(serial_obj: bus_pirate_obj, byte_arr: [0x03])
         when '1W01'
           # Enter 1-Wire mode
-          PWN::Plugins::Serial.request(serial_obj: bus_pirate_obj, request: '\x04')
+          PWN::Plugins::Serial.request(serial_obj: bus_pirate_obj, byte_arr: [0x04])
         when 'RAW1'
           # Enter raw-wire mode
-          PWN::Plugins::Serial.request(serial_obj: bus_pirate_obj, request: '\x05')
+          PWN::Plugins::Serial.request(serial_obj: bus_pirate_obj, byte_arr: [0x05])
         when 'RESET'
           # Reset Bus Pirate
-          PWN::Plugins::Serial.request(serial_obj: bus_pirate_obj, request: '\x0F')
+          PWN::Plugins::Serial.request(serial_obj: bus_pirate_obj, byte_arr: [0x0F])
         when 'STEST'
           # Bus Pirate self-tests
-          PWN::Plugins::Serial.request(serial_obj: bus_pirate_obj, request: '\x10')
+          PWN::Plugins::Serial.request(serial_obj: bus_pirate_obj, byte_arr: [0x10])
         else
           raise "Invalid mode: #{mode}"
         end

data/lib/pwn/plugins/msr206.rb

@@ -9,21 +9,276 @@ module PWN
       # msr206_obj = PWN::Plugins::MSR206.connect(
       #   block_dev: 'optional - serial block device path (defaults to /dev/ttyUSB0)',
       #   baud: 'optional - (defaults to 9600)',
-      #   data_bits: 'optional - (defaults to 8)',
+      #   data_bits: 'optional - (defaults to 7)',
       #   stop_bits: 'optional - (defaults to 1)',
-      #   parity: 'optional - (defaults to SerialPort::NONE)',
+      #   parity: 'optional - (defaults to SerialPort::ODD)',
       #   flow_control: 'optional - (defaults to SerialPort::HARD) SerialPort::NONE|SerialPort::SOFT|SerialPort::HARD'
       # )
 
       public_class_method def self.connect(opts = {})
         # Default Baud Rate for this Device is 19200
-        opts[:baud] = 19_200 if opts[:baud].nil?
+        opts[:baud] = 9_600 unless opts[:baud]
+        opts[:data_bits] = 7 unless opts[:data_bits]
+        opts[:stop_bits] = 1 unless opts[:stop_bits]
+        opts[:parity] = :odd unless opts[:parity]
         msr206_obj = PWN::Plugins::Serial.connect(opts)
       rescue StandardError => e
         disconnect(msr206_obj: msr206_obj) unless msr206_obj.nil?
         raise e
       end
 
+      # Supported Method Parameters::
+      #  cmds = PWN::Plugins::MSR206.list_cmds
+      public_class_method def self.list_cmds
+        # Returns an Array of Symbols
+        cmds = %i[
+          version_report
+          simulate_power_cycle_warm_reset
+          configuration_request
+          reproduce_last_command
+          resume_transmission_to_host
+          pause_transmission_to_host
+          abort_command
+          red_on
+          red_off
+          red_flash
+          green_on
+          green_off
+          green_flash
+          yellow_on
+          yellow_off
+          yellow_flash
+          arm_to_read
+          arm_to_read_w_speed_prompts
+          tx_iso_std_data_track1
+          tx_iso_std_data_track2
+          tx_iso_std_data_track3
+          alt_tx_iso_std_data_track1
+          alt_tx_iso_std_data_track2
+          alt_tx_iso_std_data_track3
+          tx_error_data
+          tx_custom_data_forward_track1
+          tx_custom_data_forward_track2
+          tx_custom_data_forward_track3
+          tx_passbook_data
+          alt_tx_passbook_data
+          write_verify
+          card_edge_detect
+          load_iso_std_data_for_writing_track1
+          load_iso_std_data_for_writing_track2
+          load_iso_std_data_for_writing_track3
+          alt_load_iso_std_data_for_writing_track1
+          alt_load_iso_std_data_for_writing_track2
+          alt_load_iso_std_data_for_writing_track3
+          load_passbook_data_for_writing
+          load_custom_data_for_writing_track1
+          load_custom_data_for_writing_track2
+          load_custom_data_for_writing_track3
+          set_write_density
+          set_write_density_210_bpi_tracks13
+          set_write_density_75_bpi_tracks13
+          set_write_density_210_bpi_tracks2
+          set_write_density_75_bpi_tracks2
+          set_default_write_current
+          view_default_write_current
+          set_temp_write_current
+          view_temp_write_current
+          arm_to_write_with_raw
+          arm_to_write_no_raw
+          arm_to_write_with_raw_speed_prompts
+        ]
+      rescue StandardError => e
+        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 = PWN::Plugins::Serial.response(serial_obj: msr206_obj)
+            cmd_resp = all_cmd_responses.last
+            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
+      end
+
+      # Supported Method Parameters::
+      #  PWN::Plugins::MSR206.exec(
+      #   msr206_obj: 'required - msr206_obj returned from #connect method'
+      #   cmd: 'required - cmd returned from #list_cmds method',
+      #   params: 'optional - parameters for specific command returned from #list_params method'
+      # )
+      public_class_method def self.exec(opts = {})
+        msr206_obj = opts[:msr206_obj]
+        cmd = opts[:cmd].to_s.scrub.strip.chomp
+        params = opts[:params].to_s.scrub.strip.chomp
+
+        params_bytes = []
+        case cmd.to_sym
+        when :resume_transmission_to_host
+          cmd_bytes = [0x11]
+        when :pause_transmission_to_host
+          cmd_bytes = [0x13]
+        when :abort_command
+          cmd_bytes = [0x1B]
+        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 :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 :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 :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_passbook_data
+          cmd_bytes = [0x58]
+        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
+          cmd_bytes = [0x62]
+        when :alt_load_iso_std_data_for_writing_track3
+          cmd_bytes = [0x63]
+        when :load_passbook_data_for_writing
+          cmd_bytes = [0x6A]
+        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_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
+
+        # If parameters to a command are set, append them.
+        cmd_bytes += params_bytes unless params_bytes.empty?
+        # Execute the command.
+        PWN::Plugins::Serial.request(
+          serial_obj: msr206_obj,
+          payload: cmd_bytes
+        )
+
+        # Parse commands response(s).
+        # Return an array of hashes.
+        parse_responses(
+          msr206_obj: msr206_obj,
+          cmd: cmd.to_sym
+        )
+      rescue StandardError => e
+        raise e
+      ensure
+        # Flush Responses for Next Request
+        PWN::Plugins::Serial.flush_session_data
+      end
+
       # Supported Method Parameters::
       # PWN::Plugins::MSR206.disconnect(
       #   msr206_obj: 'required - msr206_obj returned from #connect method'
@@ -52,12 +307,20 @@ module PWN
           msr206_obj = #{self}.connect(
             block_dev: 'optional serial block device path (defaults to /dev/ttyUSB0)',
             baud: 'optional (defaults to 9600)',
-            data_bits: 'optional (defaults to 8)',
+            data_bits: 'optional (defaults to 7)',
             stop_bits: 'optional (defaults to 1)',
-            parity: 'optional (defaults to SerialPort::NONE)',
+            parity: 'optional (defaults to SerialPort::ODD)',
             flow_control: 'optional (defaults to SerialPort::NONE)'
           )
 
+          cmds = #{self}.list_cmds
+
+          parsed_cmd_resp_arr = #{self}.exec(
+            msr206_obj: 'required msr206_obj returned from #connect method',
+            cmd: 'required - cmd returned from #list_cmds method',
+            params: 'optional - parameters for specific command returned from #list_params method'
+          )
+
           #{self}.disconnect(
             msr206_obj: 'required msr206_obj returned from #connect method'
           )

data/lib/pwn/plugins/serial.rb

@@ -8,7 +8,6 @@ module PWN
     # This plugin is used for interacting with serial devices including, but not limited to,
     # modems (including cellphone radios), legacy equipment, arduinos, & other misc ftdi devices
     module Serial
-      # @session_data = ""
       @session_data = []
 
       # Supported Method Parameters::
@@ -45,17 +44,27 @@ module PWN
                       opts[:stop_bits].to_i
                     end
 
-        parity = if opts[:parity].nil?
-                   SerialPort::NONE
-                 else
-                   opts[:parity]
-                 end
+        case opts[:parity]
+        when :even
+          parity = SerialPort::EVEN
+        when :mark
+          parity = SerialPort::MARK
+        when :odd
+          parity = SerialPort::ODD
+        when :space
+          parity = SerialPort::SPACE
+        else
+          parity = SerialPort::NONE
+        end
 
-        flow_control = if opts[:flow_control].nil?
-                         SerialPort::HARD
-                       else
-                         opts[:flow_control]
-                       end
+        case opts[:flow_control]
+        when :hard
+          flow_control = SerialPort::HARD
+        when :soft
+          flow_control = SerialPort::SOFT
+        else
+          flow_control = SerialPort::NONE
+        end
 
         serial_conn = SerialPort.new(
           block_dev,
@@ -138,21 +147,39 @@ module PWN
       # Supported Method Parameters::
       # PWN::Plugins::Serial.request(
       #   serial_obj: 'required serial_obj returned from #connect method',
-      #   request: 'required - string to write to serial device'
+      #   payload: 'required - array of bytes OR string to write to serial device (e.g. [0x00, 0x41, 0x90, 0x00] OR "ATDT+15555555\r\n"'
       # )
 
       public_class_method def self.request(opts = {})
         serial_obj = opts[:serial_obj]
-        request = opts[:request].to_s.scrub
+        payload = opts[:payload]
         serial_conn = serial_obj[:serial_conn]
-        chars_written = serial_conn.write(request)
+
+        byte_arr = payload
+        byte_arr = payload.chars if payload.instance_of?(String)
+
+        byte_arr.each do |byte|
+          serial_conn.putc(byte)
+        end
+
         serial_conn.flush
-        chars_written
       rescue StandardError => e
         disconnect(serial_obj: serial_obj) unless serial_obj.nil?
         raise e
       end
 
+      # public_class_method def self.request(opts = {})
+      #   serial_obj = opts[:serial_obj]
+      #   request = opts[:request].to_s.scrub
+      #   serial_conn = serial_obj[:serial_conn]
+      #   chars_written = serial_conn.write(request)
+      #   serial_conn.flush
+      #   chars_written
+      # rescue StandardError => e
+      #   disconnect(serial_obj: serial_obj) unless serial_obj.nil?
+      #   raise e
+      # end
+
       # Supported Method Parameters::
       # PWN::Plugins::Serial.response(
       #   serial_obj: 'required - serial_obj returned from #connect method'
@@ -160,37 +187,60 @@ module PWN
 
       public_class_method def self.response(opts = {})
         serial_obj = opts[:serial_obj]
-        @session_data.last
+
+        raw_byte_arr = dump_session_data
+
+        hex_esc_raw_resp = ''
+        raw_byte_arr.each do |byte|
+          # this_byte = "\s#{byte.unpack1('H*')}"
+          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
-        disconnect(serial_obj: serial_obj) unless serial_obj.nil?
+        # Flush Responses for Next Request
+        flush_session_data(serial_obj: serial_obj)
+
         raise e
       end
 
-      # Supported Method Parameters::
-      # session_data = PWN::Plugins::Serial.dump_session_data(
-      #   serial_obj: 'required - serial_obj returned from #connect method'
-      # )
+      # public_class_method def self.response(opts = {})
+      #   serial_obj = opts[:serial_obj]
+      #   @session_data.last
+      # rescue StandardError => e
+      #   disconnect(serial_obj: serial_obj) unless serial_obj.nil?
+      #   raise e
+      # end
 
-      public_class_method def self.dump_session_data(opts = {})
-        serial_obj = opts[:serial_obj]
+      # Supported Method Parameters::
+      # session_data = PWN::Plugins::Serial.dump_session_data
 
+      public_class_method def self.dump_session_data
         @session_data
       rescue StandardError => e
-        disconnect(serial_obj: serial_obj) unless serial_obj.nil?
         raise e
       end
 
       # Supported Method Parameters::
-      # session_data = PWN::Plugins::Serial.flush_session_data(
-      #   serial_obj: 'required - serial_obj returned from #connect method'
-      # )
-
-      public_class_method def self.flush_session_data(opts = {})
-        serial_obj = opts[:serial_obj]
+      # session_data = PWN::Plugins::Serial.flush_session_data
 
+      public_class_method def self.flush_session_data
         @session_data.clear
       rescue StandardError => e
-        disconnect(serial_obj: serial_obj) unless serial_obj.nil?
         raise e
       end
 
@@ -203,7 +253,7 @@ module PWN
         serial_obj = opts[:serial_obj]
         serial_conn = serial_obj[:serial_conn]
         session_thread = serial_obj[:session_thread]
-        flush_session_data(serial_obj: serial_obj)
+        flush_session_data
         session_thread.terminate
         serial_conn.close
         serial_conn = nil
@@ -242,20 +292,16 @@ module PWN
 
           #{self}.request(
             serial_obj: 'required serial_obj returned from #connect method',
-            request: 'required string to write to serial device'
+            payload: 'required - array of bytes OR string to write to serial device (e.g. [0x00, 0x41, 0x90, 0x00] OR \"ATDT+15555555\r\n\"'
           )
 
           #{self}.response(
             serial_obj: 'required serial_obj returned from #connect method'
           )
 
-          session_data_arr = #{self}.dump_session_data(
-            serial_obj: 'required serial_obj returned from #connect method'
-          )
+          session_data_arr = #{self}.dump_session_data
 
           #{self}.flush_session_data
-            serial_obj: 'required serial_obj returned from #connect method'
-          )
 
           #{self}.disconnect(
             serial_obj: 'required serial_obj returned from #connect method'

data/lib/pwn/plugins/son_micro_rfid.rb

@@ -8,7 +8,7 @@ module PWN
       # Supported Method Parameters::
       # son_micro_rfid_obj = PWN::Plugins::SonMicroRFID.connect(
       #   block_dev: 'optional - serial block device path (defaults to /dev/ttyUSB0)',
-      #   baud: 'optional - (defaults to 9600)',
+      #   baud: 'optional - (defaults to 19_200)',
       #   data_bits: 'optional - (defaults to 8)',
       #   stop_bits: 'optional - (defaults to 1)',
       #   parity: 'optional - (defaults to SerialPort::NONE)',
@@ -17,7 +17,10 @@ module PWN
 
       public_class_method def self.connect(opts = {})
         # Default Baud Rate for this Device is 19200
-        opts[:baud] = 19_200 if opts[:baud].nil?
+        opts[:baud] = 19_200 unless opts[:baud]
+        opts[:data_bits] = 8 unless opts[:data_bits]
+        opts[:stop_bits] = 1 unless opts[:stop_bits]
+        opts[:parity] = :none unless opts[:parity]
         son_micro_rfid_obj = PWN::Plugins::Serial.connect(opts)
       rescue StandardError => e
         disconnect(son_micro_rfid_obj: son_micro_rfid_obj) unless son_micro_rfid_obj.nil?
@@ -109,49 +112,8 @@ module PWN
       end
 
       # Supported Method Parameters::
-      # cmd_response_arr = get_cmd_responses(
+      # parsed_cmd_resp_arr = parse_responses(
       #   son_micro_rfid_obj: 'required - son_micro_rfid_obj returned from #connect method'
-      # )
-
-      public_class_method def self.get_cmd_responses(opts = {})
-        son_micro_rfid_obj = opts[:son_micro_rfid_obj]
-
-        raw_byte_arr = PWN::Plugins::Serial.dump_session_data(
-          serial_obj: son_micro_rfid_obj
-        )
-
-        hex_esc_raw_resp = ''
-        raw_byte_arr.each do |byte|
-          # this_byte = "\s#{byte.unpack1('H*')}"
-          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: son_micro_rfid_obj
-        )
-
-        raise e
-      end
-
-      # Supported Method Parameters::
-      # parsed_cmd_resp_arr = parse_cmd_resp(
       #   cmd_resp: 'required - command response string'
       # )
 
@@ -173,13 +135,14 @@ module PWN
         while keep_parsing_responses
           until next_response_detected
             print '.'
-            all_cmd_responses = get_cmd_responses(
-              son_micro_rfid_obj: son_micro_rfid_obj
+            all_cmd_responses = PWN::Plugins::Serial.response(
+              serial_obj: son_micro_rfid_obj
             )
             cmd_resp = all_cmd_responses.last
             bytes_in_cmd_resp = cmd_resp.split.length if cmd_resp
             a_cmd_r_len = all_cmd_responses.length
 
+            # Dont proceed until the expected_cmd_resp_byte_len byte appears
             next_response_detected = true if bytes_in_cmd_resp > 3 &&
                                              a_cmd_r_len > last_a_cmd_r_len
           end
@@ -194,8 +157,8 @@ module PWN
           cmd_hex = cmd_resp.split[3]
 
           while bytes_in_cmd_resp < expected_cmd_resp_byte_len
-            all_cmd_responses = get_cmd_responses(
-              son_micro_rfid_obj: son_micro_rfid_obj
+            all_cmd_responses = PWN::Plugins::Serial.response(
+              serial_obj: son_micro_rfid_obj
             )
 
             cmd_resp = all_cmd_responses.last
@@ -210,6 +173,7 @@ module PWN
           puts "#{all_cmd_responses}\n\n\n"
 
           parsed_cmd_resp_hash = {}
+          parsed_cmd_resp_hash[:raw_resp] = PWN::Plugins::Serial.dump_session_data.inspect
           parsed_cmd_resp_hash[:hex_resp] = cmd_resp
           parsed_cmd_resp_hash[:cmd_hex] = cmd_hex
           parsed_cmd_resp_hash[:cmd_desc] = cmd.to_sym
@@ -268,9 +232,7 @@ module PWN
         raise e
       ensure
         # Flush Responses for Next Request
-        PWN::Plugins::Serial.flush_session_data(
-          serial_obj: son_micro_rfid_obj
-        )
+        PWN::Plugins::Serial.flush_session_data
       end
 
       # Supported Method Parameters::
@@ -355,9 +317,10 @@ module PWN
         # If parameters to a command are set, append them.
         cmd_bytes += params_bytes unless params_bytes.empty?
         # Execute the command.
-        cmd_bytes.each do |byte|
-          son_micro_rfid_obj[:serial_conn].putc(byte)
-        end
+        PWN::Plugins::Serial.request(
+          serial_obj: son_micro_rfid_obj,
+          payload: cmd_bytes
+        )
 
         # Parse commands response(s).
         # Return an array of hashes.
@@ -369,9 +332,7 @@ module PWN
         raise e
       ensure
         # Flush Responses for Next Request
-        PWN::Plugins::Serial.flush_session_data(
-          serial_obj: son_micro_rfid_obj
-        )
+        PWN::Plugins::Serial.flush_session_data
       end
 
       # Supported Method Parameters::
@@ -401,7 +362,7 @@ module PWN
         puts "USAGE:
           son_micro_rfid_obj = #{self}.connect(
             block_dev: 'optional serial block device path (defaults to /dev/ttyUSB0)',
-            baud: 'optional (defaults to 9600)',
+            baud: 'optional (defaults to 19_200)',
             data_bits: 'optional (defaults to 8)',
             stop_bits: 'optional (defaults to 1)',
             parity: 'optional (defaults to SerialPort::NONE)',

data/lib/pwn/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pwn
 version: !ruby/object:Gem::Version
-  version: 0.4.456
+  version: 0.4.460
 platform: ruby
 authors:
 - 0day Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-05-25 00:00:00.000000000 Z
+date: 2022-05-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -674,14 +674,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.29.1
+        version: 1.30.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.29.1
+        version: 1.30.0
 - !ruby/object:Gem::Dependency
   name: rubocop-rake
   requirement: !ruby/object:Gem::Requirement