Addressing PR feedback.

Removing the audio_stream_pool.rb class file for now, we can recreate for MS-2749 if we really need one.

Author: pbarry-r7

lib/rex/post/meterpreter/channels/pools/audio_stream_pool.rb

@@ -1,7 +1,7 @@
 # -*- coding: binary -*-
 
 require 'rex/post/meterpreter/channel'
-require 'rex/post/meterpreter/channels/pools/audio_stream_pool'
+require 'rex/post/meterpreter/channels/pools/stream_pool'
 
 module Rex
   module Post
@@ -16,8 +16,6 @@ module Mic
             #
             ###
             class Mic
-              include Msf::Post::Common
-
               def initialize(client)
                 @client = client
               end
@@ -30,8 +28,10 @@ def session
               def mic_list
                 response = client.send_request(Packet.create_request('audio_mic_list'))
                 names = []
-                response.get_tlvs(TLV_TYPE_AUDIO_INTERFACE_NAME).each do |tlv|
-                  names << tlv.value
+                if response.result == 0
+                  response.get_tlvs(TLV_TYPE_AUDIO_INTERFACE_NAME).each do |tlv|
+                    names << tlv.value
+                  end
                 end
                 names
               end
@@ -41,8 +41,9 @@ def mic_start(device_id)
                 request = Packet.create_request('audio_mic_start')
                 request.add_tlv(TLV_TYPE_AUDIO_INTERFACE_ID, device_id)
                 response = client.send_request(request)
+                return nil unless response.result == 0
 
-                channel = Channel.create(client, 'audio_mic', Rex::Post::Meterpreter::Channels::Pools::AudioStreamPool, CHANNEL_FLAG_SYNCHRONOUS)
+                channel = Channel.create(client, 'audio_mic', Rex::Post::Meterpreter::Channels::Pools::StreamPool, CHANNEL_FLAG_SYNCHRONOUS)
               end
 
               # Stop recording from microphone

lib/rex/post/meterpreter/extensions/stdapi/mic/mic.rb

@@ -57,7 +57,7 @@ def cmd_mic_list
             end
           end
 
-          def audio_file_wave_header(sample_rate_hz, num_channels, bits_per_sample, data_size)
+          def audio_file_wave_header(sample_rate_hz:, num_channels:, bits_per_sample:, data_size:)
             subchunk1_size = 16
             chunk_size = 4 + (8 + subchunk1_size) + (8 + data_size)
             byte_rate = sample_rate_hz * num_channels * bits_per_sample / 8
@@ -104,17 +104,17 @@ def cmd_mic_start(*args)
 
             mic_start_opts.parse(args) do |opt, _idx, val|
               case opt
-                when "-h"
-                  print_line("Usage: mic_start [options]\n")
-                  print_line("Streams and records audio from the target microphone.")
-                  print_line(mic_start_opts.usage)
-                  return
-                when "-d"
-                  duration = val.to_i
-                when "-m"
-                  device_id = val.to_i
-                when "-s"
-                  saved_audio_path = val
+              when "-h"
+                print_line("Usage: mic_start [options]\n")
+                print_line("Streams and records audio from the target microphone.")
+                print_line(mic_start_opts.usage)
+                return
+              when "-d"
+                duration = val.to_i
+              when "-m"
+                device_id = val.to_i
+              when "-s"
+                saved_audio_path = val
               end
             end
 
@@ -128,14 +128,19 @@ def cmd_mic_start(*args)
               return
             end
 
+            channel = client.mic.mic_start(device_id)
+            if channel.nil?
+              print_error("Mic failed to start streaming.")
+              return
+            end
             print_status("Saving to audio file: #{saved_audio_path}")
+            print_status("Streaming started...")
             total_data_len = 0
             begin
-              channel = client.mic.mic_start(device_id)
-              mic_started = true
-              print_status("Streaming started...")
               ::File.open(saved_audio_path, 'wb') do |outfile|
-                audio_file_wave_header(11025, 1, 16, 2000000000).each { |e| e.write(outfile) }
+                audio_file_wave_header(sample_rate_hz: 11025, num_channels: 1, bits_per_sample: 16, data_size: 2_000_000_000).each {
+                  |e| e.write(outfile)
+                }
               end
               ::Timeout.timeout(duration) do
                 while client do
@@ -145,15 +150,15 @@ def cmd_mic_start(*args)
               end
             rescue ::Timeout::Error
             ensure
-              if mic_started
-                total_data_len += get_data.call(channel, saved_audio_path)
-                client.mic.mic_stop
-                print_status("Streaming stopped.")
-                # Now that we know the actual length of data, update the file header.
-                ::File.open(saved_audio_path, 'rb+') do |outfile|
-                  outfile.seek(0, ::IO::SEEK_SET)
-                  audio_file_wave_header(11025, 1, 16, total_data_len).each { |e| e.write(outfile) }
-                end
+              total_data_len += get_data.call(channel, saved_audio_path)
+              client.mic.mic_stop
+              print_status("Streaming stopped.")
+              # Now that we know the actual length of data, update the file header.
+              ::File.open(saved_audio_path, 'rb+') do |outfile|
+                outfile.seek(0, ::IO::SEEK_SET)
+                audio_file_wave_header(sample_rate_hz: 11025, num_channels: 1, bits_per_sample: 16, data_size: total_data_len).each {
+                  |e| e.write(outfile)
+                }
               end
             end
           end
@@ -168,13 +173,13 @@ def cmd_listen(*args)
 
             listen_opts.parse(args) do |opt, _idx, val|
               case opt
-                when "-h"
-                  print_line("Usage: listen -f <filename>\n")
-                  print_line("Plays saved audio from a file.")
-                  print_line(listen_opts.usage)
-                  return
-                when "-f"
-                  filename = val
+              when "-h"
+                print_line("Usage: listen -f <filename>\n")
+                print_line("Plays saved audio from a file.")
+                print_line(listen_opts.usage)
+                return
+              when "-f"
+                filename = val
               end
             end