pwn 0.4.458 → 0.4.462

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 85a03a42892f8f86f382af989d14ecb6abdff9043de8d4e6b45609c659d25a5a
-  data.tar.gz: 5ad007f33886674f720ab1ba73fff4da5cb1cfdeec8a5f5202de8fd4707c60ce
+  metadata.gz: 37d931b296420b63615c112480340d40f4acbdfb6bb256e913c455c8295c719c
+  data.tar.gz: 55217d2337393257a470dd1fdc2db4ca06c51181aa58051d60c7abfdcee98c88
 SHA512:
-  metadata.gz: 831872dde165783f8f102c094d29b6d73b7556b29ec6d97567b97324cddf4fdf72e87861100e2cd4d9cbf302f453ede7b0f79ddb8369c4018e4d5d44a9990c0d
-  data.tar.gz: 3cef3140532c9f1368aec2f9290dc79a52c19b810a0861a982655c35681d6ff8b35fe04a72aa4314bfd974909aab42c7171f2aec685096d3d5e0b3d8eecafa49
+  metadata.gz: 6a091c103a8fb6e5d57fa2016cde91ea6df3c3e48d6df55dc1e90aaab59c6c1a5ef22fa77b22560bf732dab9e7a74a7e4de8e00d83cbed203b9ed67ec322c7ea
+  data.tar.gz: 621f3fadae40efe379949ea7f85cba3ed62b78740296daac6a08646468bade05c74b34da1399cb46a3c1f16c1c739a882e5d2d5b0f720d7c441987a780c06e87

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.458]:001 >>> PWN.help
+pwn[v0.4.462]: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.462]: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, payload: [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, payload: [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, payload: [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, payload: [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, payload: [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, payload: [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, payload: [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, payload: [0x10])
         else
           raise "Invalid mode: #{mode}"
         end

data/lib/pwn/plugins/msr206.rb

@@ -9,15 +9,18 @@ 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?
@@ -88,6 +91,54 @@ module PWN
         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'
@@ -101,70 +152,74 @@ 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 :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 +228,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
@@ -204,18 +261,22 @@ 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: msr206_obj,
+          payload: cmd_bytes
+        )
 
         # 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
         raise e
+      ensure
+        # Flush Responses for Next Request
+        PWN::Plugins::Serial.flush_session_data
       end
 
       # Supported Method Parameters::
@@ -246,9 +307,9 @@ 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)'
           )
 

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.458'
+  VERSION = '0.4.462'
 end

data/pwn.gemspec

@@ -24,7 +24,6 @@ Gem::Specification.new do |spec|
     File.basename(f)
   end
 
-  spec.test_files = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
   dev_dependency_arr = %i[

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pwn
 version: !ruby/object:Gem::Version
-  version: 0.4.458
+  version: 0.4.462
 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
@@ -1974,218 +1974,4 @@ rubygems_version: 3.3.14
 signing_key: 
 specification_version: 4
 summary: Automated Security Testing for CI/CD Pipelines & Beyond
-test_files:
-- spec/lib/pwn/aws/acm_spec.rb
-- spec/lib/pwn/aws/api_gateway_spec.rb
-- spec/lib/pwn/aws/app_stream_spec.rb
-- spec/lib/pwn/aws/application_auto_scaling_spec.rb
-- spec/lib/pwn/aws/application_discovery_service_spec.rb
-- spec/lib/pwn/aws/auto_scaling_spec.rb
-- spec/lib/pwn/aws/batch_spec.rb
-- spec/lib/pwn/aws/budgets_spec.rb
-- spec/lib/pwn/aws/cloud_formation_spec.rb
-- spec/lib/pwn/aws/cloud_front_spec.rb
-- spec/lib/pwn/aws/cloud_hsm_spec.rb
-- spec/lib/pwn/aws/cloud_search_domain_spec.rb
-- spec/lib/pwn/aws/cloud_search_spec.rb
-- spec/lib/pwn/aws/cloud_trail_spec.rb
-- spec/lib/pwn/aws/cloud_watch_events_spec.rb
-- spec/lib/pwn/aws/cloud_watch_logs_spec.rb
-- spec/lib/pwn/aws/cloud_watch_spec.rb
-- spec/lib/pwn/aws/code_build_spec.rb
-- spec/lib/pwn/aws/code_commit_spec.rb
-- spec/lib/pwn/aws/code_deploy_spec.rb
-- spec/lib/pwn/aws/code_pipeline_spec.rb
-- spec/lib/pwn/aws/cognito_identity_provider_spec.rb
-- spec/lib/pwn/aws/cognito_identity_spec.rb
-- spec/lib/pwn/aws/cognito_sync_spec.rb
-- spec/lib/pwn/aws/config_service_spec.rb
-- spec/lib/pwn/aws/data_pipleline_spec.rb
-- spec/lib/pwn/aws/database_migration_service_spec.rb
-- spec/lib/pwn/aws/device_farm_spec.rb
-- spec/lib/pwn/aws/direct_connect_spec.rb
-- spec/lib/pwn/aws/directory_service_spec.rb
-- spec/lib/pwn/aws/dynamo_db_spec.rb
-- spec/lib/pwn/aws/dynamo_db_streams_spec.rb
-- spec/lib/pwn/aws/ec2_spec.rb
-- spec/lib/pwn/aws/ecr_spec.rb
-- spec/lib/pwn/aws/ecs_spec.rb
-- spec/lib/pwn/aws/efs_spec.rb
-- spec/lib/pwn/aws/elasti_cache_spec.rb
-- spec/lib/pwn/aws/elastic_beanstalk_spec.rb
-- spec/lib/pwn/aws/elastic_load_balancing_spec.rb
-- spec/lib/pwn/aws/elastic_load_balancing_v2_spec.rb
-- spec/lib/pwn/aws/elastic_transcoder_spec.rb
-- spec/lib/pwn/aws/elasticsearch_service_spec.rb
-- spec/lib/pwn/aws/emr_spec.rb
-- spec/lib/pwn/aws/firehose_spec.rb
-- spec/lib/pwn/aws/game_lift_spec.rb
-- spec/lib/pwn/aws/glacier_spec.rb
-- spec/lib/pwn/aws/health_spec.rb
-- spec/lib/pwn/aws/iam_spec.rb
-- spec/lib/pwn/aws/import_export_spec.rb
-- spec/lib/pwn/aws/inspector_spec.rb
-- spec/lib/pwn/aws/iot_data_plane_spec.rb
-- spec/lib/pwn/aws/iot_spec.rb
-- spec/lib/pwn/aws/kinesis_analytics_spec.rb
-- spec/lib/pwn/aws/kinesis_spec.rb
-- spec/lib/pwn/aws/kms_spec.rb
-- spec/lib/pwn/aws/lambda_preview_spec.rb
-- spec/lib/pwn/aws/lambda_spec.rb
-- spec/lib/pwn/aws/lex_spec.rb
-- spec/lib/pwn/aws/lightsail_spec.rb
-- spec/lib/pwn/aws/machine_learning_spec.rb
-- spec/lib/pwn/aws/marketplace_commerce_analytics_spec.rb
-- spec/lib/pwn/aws/marketplace_metering_spec.rb
-- spec/lib/pwn/aws/ops_works_cm_spec.rb
-- spec/lib/pwn/aws/ops_works_spec.rb
-- spec/lib/pwn/aws/pinpoint_spec.rb
-- spec/lib/pwn/aws/polly_spec.rb
-- spec/lib/pwn/aws/rds_spec.rb
-- spec/lib/pwn/aws/redshift_spec.rb
-- spec/lib/pwn/aws/rekognition_spec.rb
-- spec/lib/pwn/aws/route53_domains_spec.rb
-- spec/lib/pwn/aws/route53_spec.rb
-- spec/lib/pwn/aws/s3_spec.rb
-- spec/lib/pwn/aws/service_catalog_spec.rb
-- spec/lib/pwn/aws/ses_spec.rb
-- spec/lib/pwn/aws/shield_spec.rb
-- spec/lib/pwn/aws/simple_db_spec.rb
-- spec/lib/pwn/aws/sms_spec.rb
-- spec/lib/pwn/aws/snowball_spec.rb
-- spec/lib/pwn/aws/sns_spec.rb
-- spec/lib/pwn/aws/sqs_spec.rb
-- spec/lib/pwn/aws/ssm_spec.rb
-- spec/lib/pwn/aws/states_spec.rb
-- spec/lib/pwn/aws/storage_gateway_spec.rb
-- spec/lib/pwn/aws/sts_spec.rb
-- spec/lib/pwn/aws/support_spec.rb
-- spec/lib/pwn/aws/swf_spec.rb
-- spec/lib/pwn/aws/waf_regional_spec.rb
-- spec/lib/pwn/aws/waf_spec.rb
-- spec/lib/pwn/aws/workspaces_spec.rb
-- spec/lib/pwn/aws/x_ray_spec.rb
-- spec/lib/pwn/aws_spec.rb
-- spec/lib/pwn/banner/bubble_spec.rb
-- spec/lib/pwn/banner/matrix_spec.rb
-- spec/lib/pwn/banner/ninja_spec.rb
-- spec/lib/pwn/banner/off_the_air_spec.rb
-- spec/lib/pwn/banner/pirate_spec.rb
-- spec/lib/pwn/banner_spec.rb
-- spec/lib/pwn/ffi_spec.rb
-- spec/lib/pwn/plugins/android_spec.rb
-- spec/lib/pwn/plugins/authentication_helper_spec.rb
-- spec/lib/pwn/plugins/basic_auth_spec.rb
-- spec/lib/pwn/plugins/beef_spec.rb
-- spec/lib/pwn/plugins/burp_suite_spec.rb
-- spec/lib/pwn/plugins/bus_pirate_spec.rb
-- spec/lib/pwn/plugins/char_spec.rb
-- spec/lib/pwn/plugins/credit_card_spec.rb
-- spec/lib/pwn/plugins/dao_ldap_spec.rb
-- spec/lib/pwn/plugins/dao_mongo_spec.rb
-- spec/lib/pwn/plugins/dao_postgres_spec.rb
-- spec/lib/pwn/plugins/dao_sqlite3_spec.rb
-- spec/lib/pwn/plugins/defect_dojo_spec.rb
-- spec/lib/pwn/plugins/detect_os_spec.rb
-- spec/lib/pwn/plugins/ein_spec.rb
-- spec/lib/pwn/plugins/file_fu_spec.rb
-- spec/lib/pwn/plugins/fuzz_spec.rb
-- spec/lib/pwn/plugins/git_spec.rb
-- spec/lib/pwn/plugins/hacker_one_spec.rb
-- spec/lib/pwn/plugins/ibm_appscan_spec.rb
-- spec/lib/pwn/plugins/ip_info_spec.rb
-- spec/lib/pwn/plugins/jenkins_spec.rb
-- spec/lib/pwn/plugins/json_pathify_spec.rb
-- spec/lib/pwn/plugins/mail_agent_spec.rb
-- spec/lib/pwn/plugins/metasploit_spec.rb
-- spec/lib/pwn/plugins/msr206_spec.rb
-- spec/lib/pwn/plugins/nessus_cloud_spec.rb
-- spec/lib/pwn/plugins/nexpose_vuln_scan_spec.rb
-- spec/lib/pwn/plugins/nmap_it_spec.rb
-- spec/lib/pwn/plugins/oauth2_spec.rb
-- spec/lib/pwn/plugins/ocr_spec.rb
-- spec/lib/pwn/plugins/openvas_spec.rb
-- spec/lib/pwn/plugins/owasp_zap_spec.rb
-- spec/lib/pwn/plugins/packet_spec.rb
-- spec/lib/pwn/plugins/pdf_parse_spec.rb
-- spec/lib/pwn/plugins/pony_spec.rb
-- spec/lib/pwn/plugins/rabbit_mq_spec.rb
-- spec/lib/pwn/plugins/rfidler_spec.rb
-- spec/lib/pwn/plugins/serial_spec.rb
-- spec/lib/pwn/plugins/shodan_spec.rb
-- spec/lib/pwn/plugins/slack_client_spec.rb
-- spec/lib/pwn/plugins/sock_spec.rb
-- spec/lib/pwn/plugins/son_micro_rfid_spec.rb
-- spec/lib/pwn/plugins/spider_spec.rb
-- spec/lib/pwn/plugins/ssn_spec.rb
-- spec/lib/pwn/plugins/thread_pool_spec.rb
-- spec/lib/pwn/plugins/transparent_browser_spec.rb
-- spec/lib/pwn/plugins/twitter_api_spec.rb
-- spec/lib/pwn/plugins/uri_scheme_spec.rb
-- spec/lib/pwn/plugins/vsphere_spec.rb
-- spec/lib/pwn/plugins_spec.rb
-- spec/lib/pwn/reports/fuzz_spec.rb
-- spec/lib/pwn/reports/sast_spec.rb
-- spec/lib/pwn/reports_spec.rb
-- spec/lib/pwn/sast/amqp_connect_as_guest_spec.rb
-- spec/lib/pwn/sast/apache_file_system_util_api_spec.rb
-- spec/lib/pwn/sast/aws_spec.rb
-- spec/lib/pwn/sast/banned_function_calls_c_spec.rb
-- spec/lib/pwn/sast/base64_spec.rb
-- spec/lib/pwn/sast/beef_hook_spec.rb
-- spec/lib/pwn/sast/cmd_execution_java_spec.rb
-- spec/lib/pwn/sast/cmd_execution_python_spec.rb
-- spec/lib/pwn/sast/cmd_execution_ruby_spec.rb
-- spec/lib/pwn/sast/cmd_execution_scala_spec.rb
-- spec/lib/pwn/sast/csrf_spec.rb
-- spec/lib/pwn/sast/deserial_java_spec.rb
-- spec/lib/pwn/sast/emoticon_spec.rb
-- spec/lib/pwn/sast/eval_spec.rb
-- spec/lib/pwn/sast/factory_spec.rb
-- spec/lib/pwn/sast/file_permission_spec.rb
-- spec/lib/pwn/sast/http_authorization_header_spec.rb
-- spec/lib/pwn/sast/inner_html_spec.rb
-- spec/lib/pwn/sast/keystore_spec.rb
-- spec/lib/pwn/sast/location_hash_spec.rb
-- spec/lib/pwn/sast/log4j_spec.rb
-- spec/lib/pwn/sast/logger_spec.rb
-- spec/lib/pwn/sast/password_spec.rb
-- spec/lib/pwn/sast/pom_version_spec.rb
-- spec/lib/pwn/sast/port_spec.rb
-- spec/lib/pwn/sast/private_key_spec.rb
-- spec/lib/pwn/sast/redirect_spec.rb
-- spec/lib/pwn/sast/redos_spec.rb
-- spec/lib/pwn/sast/shell_spec.rb
-- spec/lib/pwn/sast/signature_spec.rb
-- spec/lib/pwn/sast/sql_spec.rb
-- spec/lib/pwn/sast/ssl_spec.rb
-- spec/lib/pwn/sast/sudo_spec.rb
-- spec/lib/pwn/sast/task_tag_spec.rb
-- spec/lib/pwn/sast/throw_errors_spec.rb
-- spec/lib/pwn/sast/token_spec.rb
-- spec/lib/pwn/sast/version_spec.rb
-- spec/lib/pwn/sast/window_location_hash_spec.rb
-- spec/lib/pwn/sast_spec.rb
-- spec/lib/pwn/www/app_cobalt_io_spec.rb
-- spec/lib/pwn/www/bing_spec.rb
-- spec/lib/pwn/www/bug_crowd.rb
-- spec/lib/pwn/www/checkip_spec.rb
-- spec/lib/pwn/www/coinbase_pro_spec.rb
-- spec/lib/pwn/www/duckduckgo_spec.rb
-- spec/lib/pwn/www/facebook_spec.rb
-- spec/lib/pwn/www/google_spec.rb
-- spec/lib/pwn/www/hacker_one_spec.rb
-- spec/lib/pwn/www/linkedin_spec.rb
-- spec/lib/pwn/www/pandora_spec.rb
-- spec/lib/pwn/www/pastebin_spec.rb
-- spec/lib/pwn/www/paypal_spec.rb
-- spec/lib/pwn/www/synack_spec.rb
-- spec/lib/pwn/www/torch_spec.rb
-- spec/lib/pwn/www/trading_view_spec.rb
-- spec/lib/pwn/www/twitter_spec.rb
-- spec/lib/pwn/www/uber_spec.rb
-- spec/lib/pwn/www/upwork_spec.rb
-- spec/lib/pwn/www/youtube_spec.rb
-- spec/lib/pwn/www_spec.rb
-- spec/lib/pwn_spec.rb
-- spec/spec_helper.rb
+test_files: []