Adam Cammack
eeef8fa6ad
Add new arches to UUIDs
2016-12-08 16:29:43 -06:00
Adam Cammack
c5641c9681
Factor out mettle configuration
...
Also cleans up some stuff: s/url/uri/ and base-64 encodes UUIDs
2016-12-06 18:28:48 -06:00
Adam Cammack
1ec7474067
Don't embed ELFs in ELF templates
2016-12-06 14:14:40 -06:00
Brent Cook
b4a2a6ed60
Merge remote-tracking branch 'upstream/master' into land-7625-
2016-12-06 06:23:32 -06:00
Metasploit
7edb5e19e2
Bump version of framework to 4.13.5
2016-12-05 15:09:06 -08:00
Jeffrey Martin
9ba6797d19
use arch for session_compatible? to support shell sessions
2016-12-05 15:56:28 -06:00
Jeffrey Martin
483228c4ea
use platform for session_compatible? to support shell sessions
2016-12-05 14:14:37 -06:00
Brendan
86ec5861f9
Land #7649 , update session_compatible? for changes from PR#7507
...
Fixing the ability to find compatible post scripts for sessions
2016-12-02 16:29:08 -06:00
Jeffrey Martin
b218c7690a
cleanup stray comment
2016-12-02 15:25:58 -06:00
Jeffrey Martin
0be166e719
update session_compatible? for changes from PR#7507
2016-12-02 14:55:38 -06:00
wchen-r7
7ee9408da3
Land #7647 , Search with an intersect instead of a union
2016-12-02 13:55:50 -06:00
darkbushido
889de05af4
removing some commented code
2016-12-02 13:06:22 -06:00
darkbushido
486f8cd2a3
adding arch to search
2016-12-02 13:05:23 -06:00
darkbushido
f6694992ce
changing module search to use the new scopes
2016-12-02 13:05:23 -06:00
dmohanty-r7
f45b0e3c88
Land #7643 , only use ANSI ctrl chars in stdio output
2016-12-02 12:54:46 -06:00
Metasploit
76db530a86
Bump version of framework to 4.13.4
2016-12-02 10:02:53 -08:00
wchen-r7
374763e991
Land #7636 , support sleep command for android meterpreter
2016-12-02 11:48:26 -06:00
David Maloney
c9b5e43201
only use ANSI ctrl chars in stdio output
...
the async output fix was put in the parent UI IO
class when it only really makes sense in stdio.
Those ctrl sequences will noly be understood if output to a
terminal.
MS-2298
2016-12-01 11:06:17 -06:00
David Maloney
2a065cd220
Land #7591 , sinn3r's warbird check fix
...
Lands sinn3r's fix to the warbird license verification
check in the payload segment injector
2016-11-30 15:45:04 -06:00
Tim
8f3fab4b1b
fix sleep and transport on android
2016-11-30 21:59:01 +08:00
OJ
e5db0f4610
Fix unpack causing puid breakage in some cases
2016-11-30 15:51:17 +10:00
Tim
468bf4696f
stdapi_fs_file_copy
2016-11-29 13:56:27 +08:00
Metasploit
f46ca66858
Bump version of framework to 4.13.3
2016-11-28 06:35:44 -08:00
Brent Cook
d76c3033a7
Land #7596 , fixes for console corruption on Linux and Windows
2016-11-27 22:13:12 -06:00
Brent Cook
34aa79ca27
remove captured delimiter characters from output
2016-11-27 20:14:16 -06:00
Metasploit
79e8ffd983
Bump version of framework to 4.13.2
2016-11-25 10:03:24 -08:00
Jin Qian
9f4784354a
Disconnect after making the HTTP transaction in send_request_cgi
...
Add a disconnect call after cgi is done.
2016-11-23 11:20:10 -06:00
Pearce Barry
3640e87a37
Land #7599 , Don't complain when Proxies is an empty string
2016-11-22 10:14:40 -06:00
James Lee
b45a36180e
Don't complain when Proxies is an empty string
2016-11-22 09:29:04 -06:00
Dylan Davis
991409fdd6
Make truthiness checks consistent
2016-11-21 19:37:48 -07:00
Dylan Davis
72609b3112
Don't use ANSI terminal sequences on Windows
2016-11-21 19:25:24 -07:00
Brent Cook
6d85330dad
Land #7594 , check if opts['var_get'] exists before using it
2016-11-21 18:06:32 -06:00
Jin Qian
cdc82891d8
Fix the issue 7593 where I get a stacktrace when running module auxiliary/scanner/http/blind_sql_query
...
Add a guard against the case when opts['vars_get'] is nil
2016-11-21 17:39:09 -06:00
wchen-r7
b2cc8e2b95
Fix #7569 , Fix warbird check for missing text section
...
Fix #7569
2016-11-21 14:57:01 -06:00
Brent Cook
16b5f40dae
Revert "Rework XOR code to make more sense"
...
This reverts commit 699a8e91d2
.
2016-11-20 19:09:45 -06:00
Brent Cook
f313389be4
Merge remote-tracking branch 'upstream/master' into land-7507-uuid-arch
2016-11-20 19:08:56 -06:00
Metasploit
643a5511cf
Bump version of framework to 4.13.1
2016-11-18 10:01:48 -08:00
h00die
cd01b07682
Land #7565
...
Lands print_bad and vprint_bad from todb-r7
2016-11-18 13:29:39 -05:00
David Maloney
202009b50b
Land #7570 , async print fix
...
Land's jennamagius' fix for async console printing
outoupt from jobs no longers screws the console prompt
up. w00t!
2016-11-18 11:25:18 -06:00
Tim
66ba2b077b
Land #7567 , fix apk injection when template has no permissions
2016-11-17 11:42:54 +00:00
Dylan Davis
739c9c1315
Ensure cursor is positioned appropriately if it is not at the end of a line when async prints arrive
2016-11-16 21:07:50 -07:00
Dylan Davis
491a3a3162
Prevent the input prompt from being mangled by asynchronous prints.
2016-11-16 20:43:07 -07:00
Metasploit
383314530a
Bump version of framework to 4.13.0
2016-11-16 07:48:26 -08:00
Brian Yip
927e195e28
Generate payload apk from permissionless apk
2016-11-16 00:48:10 -04:00
Tod Beardsley
1deacad2be
Add a print_bad alias for print_error
...
Came up on Twitter, where Justin may have been trolling a little:
https://twitter.com/jstnkndy/status/798671298302017536
We have a `print_good` method, but not a `print_bad`, which seems a
little weird for Ruby -- opposite methods should be intuitive as Justin
is implying.
Anyway, I went with alias_method, thanks to the compelling argument at
https://github.com/bbatsov/ruby-style-guide#alias-method
...since Metasploit is all about the singleton, and didn't want to risk
some unexpected scoping thing.
Also dang, we define the `print_` methods like fifty billion times!
Really should fix that some day.
2016-11-15 19:20:42 -06:00
Brendan
7e4645afb3
Land #7527 , Add LURI support to the reverse_http/s stagers
2016-11-15 16:31:20 -06:00
Brent Cook
5490fda0ae
Merge remote-tracking branch 'upstream/master' into land-7261
2016-11-14 16:49:28 -06:00
Brent Cook
98a54cd458
Merge branch 'upstream-master' into land-7456-android-hide-app
2016-11-14 02:43:04 -06:00
David Maloney
fbcc4baf58
Land #7553 , apk inject cert fix
...
Lands dana-at-cp's fix for the certtool localization
issues for the APK injection routine.
Fixes #7524
2016-11-11 12:54:41 -06:00
Metasploit
f116ad2c59
Bump version of framework to 4.12.42
2016-11-11 10:02:14 -08:00