148a5ba78e
A better solution for the spec coverage
2015-09-01 13:45:46 -05:00
31087ff33e
Refresh after cache rebuild should use the active module paths
2015-09-01 13:39:15 -05:00
5addf899b2
Refactor, same intent as before, just faster and correct.
2015-09-01 13:15:44 -05:00
2b03487e1f
Fix the module cache rebuild logic
2015-09-01 12:38:20 -05:00
d84caeca72
Ignore cached modules outside of load path, only load cache once on startup
2015-09-01 12:31:05 -05:00
299ceb7087
Add timeout option for migration
...
This commit changes the migrate function so that an optional timeout parameter can be given. This means that people in high-latency scenarios can extend the timeout when migration in order to increase the chances that things will work.
2015-09-01 22:53:30 +10:00
696bc95838
Merge branch 'upstream/master' into adsi-file-output
2015-09-01 17:25:13 +10:00
ef73f56201
Add -o parameter to adsi query functions
...
This allows for the output of the query to be written to a file.
2015-09-01 17:03:41 +10:00
abfeb204b3
Move help functionality for ps command
2015-09-01 16:45:35 +10:00
ff6fbfa738
Land #5895 , rework of ADSI modules
2015-08-31 14:10:41 -07:00
92d74ffb3b
Default to SSLv23 (autonegotiate), fixes #5870
2015-08-31 13:30:05 -07:00
30830ad9e5
Land #5262 , fix webcam_chat and tidy adjacent code
2015-08-31 14:21:24 -05:00
fe69fc84de
expand the path environment variables before executing
2015-08-31 13:38:08 -05:00
fba751a986
Disable early returns
2015-08-31 12:13:42 -05:00
80f21b50c9
Fix #4227 by improving parsing of nested elements
2015-08-31 11:47:43 -05:00
8d0e0b973e
Fix array syntax
2015-08-28 14:12:23 -05:00
06712817cf
Fix specs
2015-08-28 14:06:04 -05:00
9c7f97d124
Fix methods name schema
2015-08-28 13:26:52 -05:00
6a75ad0162
Fix yard documentation
2015-08-28 13:23:30 -05:00
be7db10e7d
Fix busybox_write_file
2015-08-28 13:15:07 -05:00
50f7d99674
Clean get_writable_directory
2015-08-28 13:02:10 -05:00
3f7c8e03e2
Update workspace command to support deleting all workspaces
2015-08-28 10:23:41 -07:00
c4a3b4f18e
Add busy_box_file_exist?
2015-08-28 11:56:12 -05:00
8faf6f9cd0
Fix require
2015-08-28 11:51:26 -05:00
9db65ea8e5
Change module filename
2015-08-28 11:48:55 -05:00
0a95a1543f
Add spaces
2015-08-28 11:47:50 -05:00
b8b68983b0
Merge remote-tracking branch 'upstream/master' into adsi_group_enum_improvements
2015-08-28 15:11:27 +01:00
3a5ce02e8e
Changed the other print\n lines to print_line() for consistency
2015-08-28 14:05:44 +01:00
266a6e7dc4
Changed to print_line() at the request of hdm
2015-08-28 11:35:51 +01:00
a2d5511e39
Land #5379 , new post modules to load into powershell sessions
2015-08-26 17:11:40 -05:00
b14889ad5c
Small typo fix
2015-08-26 17:09:33 -05:00
c1ba0aae7a
Land #5884 , fixes #5816 , nil exception in DNS resolver.
2015-08-26 14:55:58 -07:00
5cdf1aeef4
Added examples to the usage-help and run through msftidy
2015-08-26 19:33:09 +01:00
4bac21b7b9
Added command to list the domain controllers
...
Also added more information relating to the computers from LDAP
2015-08-26 15:33:54 +01:00
59cf75c5a8
Updated description to make it more obvious & added specific DC enumeration
2015-08-26 15:03:28 +01:00
7cee4d0ad1
Added the following commands:
...
adsi_group_enum - Lists all groups on the specified domain
adsi_nested_group_user_enum - Lists all users on the specified domain who are members of a given group DN (taking into account recursive/nested groups)
2015-08-26 14:14:15 +01:00
3f994e964d
Change method name and update rspec
2015-08-25 23:23:26 -05:00
6c89d0997c
Land #5855 , android offline collection support
2015-08-25 17:44:51 -05:00
1181600a69
Land #5575 , interactive channel logging
2015-08-25 16:23:51 -05:00
7ff828d000
Land #5573 , console and session log timestamps
2015-08-25 15:35:25 -05:00
026e6626f2
Added regular expression filtering for excess characters
2015-08-25 14:59:20 -05:00
3412f31f85
Add Android POST API
2015-08-24 18:37:25 -05:00
54dcd312f6
more style issues resolved
2015-08-24 18:07:31 -05:00
90a46fbcd0
update style issues
2015-08-24 17:58:24 -05:00
573f2b51a5
fix some crashes running webcam commands on webcamless machines
2015-08-24 16:51:43 -05:00
dfd00ad50b
prefer catching RuntimeError
2015-08-24 16:42:33 -05:00
6977a12dd8
whitespace fixups
2015-08-24 16:39:17 -05:00
f96236d61f
remove redundant to_s and RuntimeError
2015-08-24 16:21:34 -05:00
4e8cc47299
remove superfluous SYSTEMDRIVE path
2015-08-24 16:19:16 -05:00
d372a6a16d
Gemify metasm
2015-08-24 15:53:24 -05:00
ec7a07e0bb
Move DLL prefix calculation to its own method
2015-08-24 14:05:24 -05:00
3c90ae1ebd
Use mov instead of lea for 64-bit absolute addrs
2015-08-24 13:51:54 -05:00
ed1065b297
Create MatchResult with status Failure on session failure
...
MSP-13104
2015-08-24 12:56:32 -05:00
6962fcf2fd
Check the query result before accessing the header
2015-08-24 09:22:42 -05:00
b37efd29b0
Modified module busybox_pingnet.rb to avoid sending an ash script but executing each ping command separately. Added some fixes. Modified spec file for busybox.rb.
2015-08-23 12:17:17 +02:00
b99f5bc672
Land #5874 , Consistency and API conformance changes to LES
2015-08-22 21:57:24 -05:00
83ca4e984f
Land #5772 , @wchen-r7's fixes #5753 , support Origin for the creds command
2015-08-21 16:07:45 -05:00
717b1bdd6a
Fix bugs: Empty -O, empty origins
2015-08-21 15:46:18 -05:00
d264802ce0
Consistency and API conformance changes to LES
2015-08-21 12:38:58 -05:00
0bb9324c8d
Pass HTTP::version_random_valid and HTTP::version_random_invalid
...
Fixes #5871
2015-08-20 10:05:42 -07:00
407d701fd9
Remove unnecessary version_random_case option
2015-08-20 10:05:16 -07:00
2e4944b8ec
Remove unnecessary version_random_case option
2015-08-20 10:05:04 -07:00
870e9f448e
Added PacketStorm (PKT) in References Display
2015-08-20 00:36:27 -03:00
21c349494f
Fix default buffer_register for x64
2015-08-19 19:01:35 -05:00
d71467f9e7
Allow x64 registers for buffer_register
2015-08-19 17:06:29 -05:00
bf39f53066
Add proper CreateThread stub for x64
2015-08-19 16:16:58 -05:00
68a802b980
Merge pull request #5834 from gmikeska-r7/bug/MSP-13064/SVV-validations-not-created
...
Bug/msp 13064/svv validations not created
2015-08-19 12:47:59 -05:00
99ab64727d
Land #5859 , add comparison cases for IP/IPv6 addresses in rex tables
2015-08-19 11:52:33 -05:00
f1ec92aba0
Land #5749 , http large file download fixes
2015-08-18 15:57:31 -05:00
015d045730
read max_size bytes at a time
2015-08-18 15:56:57 -05:00
56db3f2f87
Added YARD comments for busybox mixin.
2015-08-18 21:15:02 +02:00
5b173319f2
Fix up level rendering
2015-08-19 00:22:26 +10:00
884760f11d
Update the output format for the Wifi collection
2015-08-18 17:27:48 +10:00
5b35134f98
Land #5820 , DispatcherShell: Ensure exceptions don't interfere with busy state
2015-08-17 17:53:55 -05:00
98f6c7f01f
Land #5857 , use correct deserialization for hosts data
2015-08-17 17:33:07 -05:00
02e3e9af16
Allow to compare ipv4 vs ipv6 hosts
2015-08-17 14:52:26 -05:00
0bb01c8b6b
Fix nil bug with an empty database.yml
...
Use an empty hash instead of false.
2015-08-17 14:45:11 -05:00
0aa958dac0
Allow unserialization on hosts v5
2015-08-17 13:47:52 -05:00
a9ad7b7c6f
Modifications to use cmd_exec instead of session.shell_write.
...
Refactoring of common functions to a new Post mixin /lib/msf/core/post/linux/busybox.rb.
2015-08-17 18:24:22 +02:00
241593117b
First pass of the android interval collection
2015-08-18 00:53:25 +10:00
bf631869a7
Land #5835 , allow overriding stage2 lhost and lport values
2015-08-16 11:22:13 -05:00
92958bdf8b
prefer && to 'and' for consistent order-of-operations
2015-08-16 11:21:22 -05:00
ad149a1aec
Land #5819 , update stage_payload call arguments
2015-08-16 11:17:28 -05:00
5dd015150c
Land #5748 , refactor google geolocate, add wlan_geolocate and send_sms to android meterpreter
2015-08-16 10:58:17 -05:00
422bba87d3
style fixes, moved google_geolocate to google/geolocate
2015-08-15 19:49:32 -05:00
875ac289e0
wait up to time_out seconds for output from the command
2015-08-15 19:44:48 -05:00
3615bd094d
limit the # of bssids sent to google, log more error details
2015-08-14 17:58:33 -05:00
f4031d87fc
light ruby style cleanups
2015-08-14 17:26:05 -05:00
3aab9aa74c
move BSSID checker to tools, fixup rubocop warnings, add OS X example
2015-08-14 17:13:11 -05:00
470779aae7
some doc fixes
2015-08-14 16:36:41 -05:00
3d92e9d71c
Land #5802 , add support for background colors in prompts
2015-08-14 15:02:51 -05:00
f25a5da46f
Do Minor fixes
2015-08-14 12:37:49 -05:00
3aa1f93196
Fixed string->uint
2015-08-14 17:45:47 +01:00
6b1e911041
Instantiate payload modules so parameter validation occurs
...
Calling .new on payload modules does not perform parameter validation, leading
to a number cached sizes based on invalid parameters. Most notably,
normalization does not occur either, which makes all OptBool params default to
true.
2015-08-14 11:35:39 -05:00
02a58d459b
Merge remote-tracking branch 'upstream/master' into pageant_extension
2015-08-14 17:05:38 +01:00
c257f8945b
Don't use now-removed files
2015-08-13 11:51:39 -07:00
9c77669ebf
Remove unnecessary files
2015-08-13 11:41:05 -07:00
92d0e212d9
Update Auxiliary::UDPScanner to collect all responses by default
2015-08-13 11:30:20 -07:00
61e23ad23e
Switch back to ::Net::DNS::Packet.new
2015-08-13 11:29:56 -07:00
4b41e8e42c
Fix Net::DNS::RR merge conflicts. really
2015-08-13 08:55:09 -07:00
3a7cea51b4
Merge master and fix Net::DNS::RR merge conflicts
2015-08-13 08:53:25 -07:00
6e75db090f
Fix comment
2015-08-12 21:11:48 -05:00
e9203060b0
Allow the hostname and port to be overridden, necessary for complex NAT setups
2015-08-12 16:20:14 -05:00
790356bac8
add infer_vuln_from_session to other valid case
...
MSP-13065
2015-08-12 15:45:37 -05:00
01b3ae2dd8
Revert "added infer_vuln_from_session to other valid case"
...
This reverts commit 53e747ce2e
2015-08-12 15:43:16 -05:00
53e747ce2e
added infer_vuln_from_session to other valid case
...
MSP-13064
2015-08-12 15:35:03 -05:00
802e35ff67
YARD Documentation for EXE.rb
2015-08-11 11:48:35 -05:00
6e684d46f2
Ensure exceptions don't interfere with `busy`
2015-08-10 12:11:37 -04:00
e141d1451c
Fix calls to stage_payload
2015-08-10 09:33:38 +10:00
0b6a52e162
bump metasploit-framework gemspec version to match pro
2015-08-04 14:25:44 -05:00
ef33f36bda
Remove untrusted il
2015-08-01 23:20:00 +01:00
2d9bc64457
Fix WMIC Post Library for SYSTEM
...
SYSTEM doesn't have a proper clipboard?
2015-08-01 23:11:09 +01:00
5bcb63476d
Add high integrity level check
2015-08-01 23:10:51 +01:00
de47f4752b
Added feature to add color background (Prompt)
2015-08-01 18:54:01 -03:00
deb6f5638e
Update WinSCP Gather
...
* Refactor parsing to common library to support command line tool
* Look in APPDATA not just ProgramFiles
* Iterate over user APPDATA
2015-08-01 20:44:14 +01:00
fcb7981199
Add BIND TKEY DoS
2015-08-01 06:01:35 -05:00
b40c36688c
check send retry count and abort in excess
2015-07-31 16:17:34 -05:00
6e146794a2
fix indents and style
2015-07-31 14:48:02 -05:00
629afd86fc
Land #5788 , local exploit suggestor
...
Good luck getting Mr. Robot, Elliot.
2015-07-31 11:43:53 -05:00
a112ccd023
Lnad #5660 , @wchen-r7's warbird check
...
* Fixes #4380
2015-07-31 10:25:43 -05:00
08338b73b2
Add get_target_arch and get_target_os
...
We cannot use session.platform to fingerprint the target's platform
and arch, because it's not really meant to be used that way.
2015-07-30 18:26:41 -05:00
61b2ca6675
Land #5781 , Msf::Format::Webarchive rename
2015-07-29 13:38:42 -05:00
e6a932eadb
Land #5778 , final cmdstager generic payload fix
2015-07-29 11:48:01 -05:00
5ff46a5dbd
Fix indentation
2015-07-29 11:45:49 -05:00
bf96b34108
Tweak module->class
2015-07-28 04:13:35 -07:00
7681d73e01
Relocate Webarchive into the Exploit namespace, fixes #5717
2015-07-28 04:11:17 -07:00
e53419a911
use password_prompt? not @password_prompt
2015-07-27 19:21:59 -05:00
768de00214
Automatically pass arch & platform from cmdstager
...
This allows the cmdstager mixin to automatically pass the arch
and platform information without changing the modules. This should
address the following tickets:
Fix #5727
Fix #5718
Fix #5761
2015-07-27 14:17:21 -05:00
226516ef20
restore PPID to the meterpreter process list table
...
This restores pre-66bd881ac5a6de636c2eea7528946bc2d3abd52c behavior, but merges
the current search and output fixups currently in the tree.
2015-07-25 18:10:10 -05:00
eb70ecb448
Land #5752 , synchronize calls to payload.stop_handler
2015-07-24 17:49:54 -05:00
347f48b0ec
Land #5762 , adjust PHP stager to work in and outside of eval()
2015-07-24 17:43:26 -05:00
c30127cfe8
Land #5729 , add user-agent list, MeterpreterUserAgent derives from this
...
Later PRs will convert modules to use this. A random user agent might be nice
for meterpreter actually.
2015-07-24 17:39:30 -05:00
18636e3b9b
Land #5739 , @wchen-r7 fixes #5738 updating L/URI HOST/PORT options
2015-07-24 15:45:31 -05:00
ec7bf606c6
Land #5735 , @rcvalle's for CVE-2015-1793 OpenSSL mitm
2015-07-24 14:38:27 -05:00
75d59be87d
Resolve #5753 , Support Origin for the creds command
...
Resolve #5753 . Add an Origin column and allow the user to search
by origin.
2015-07-24 14:04:23 -05:00
45b4334006
Use Rex::Socket::SslTcpServer
...
* Also add rex sockets managing
2015-07-24 11:16:09 -05:00
1f95491b45
Drop bang method and tweak formatting
2015-07-24 10:35:47 -05:00
981d98443f
fix local mods
...
Fixed some local modifications that were unintentionally pushed.
2015-07-23 17:04:12 +01:00
31dcae6828
bug fixes
2015-07-23 16:58:55 +01:00
6720a57659
Fix #5761 , pass the correct arch and platform for exe generation
...
Fix #5761
2015-07-23 01:34:44 -05:00
0929d7695a
Fix PHP stagers
2015-07-23 14:50:04 +10:00
264bc0f921
Land #5726 , support multiple glob patterns with search
2015-07-22 17:58:33 -05:00
a52bf4526d
Use uniq on the globs array
...
This avoids search repetition.
2015-07-22 14:25:49 -05:00
fe67be0ece
Land #5734 , notes -o
2015-07-22 13:52:40 -05:00
121fe1adda
Land #5654 : Python Meterpreter Transport
2015-07-22 10:39:06 +10:00
85e806dc99
Add simple class for getting geo data from Google
2015-07-20 19:28:19 -05:00
a59fa059dc
Fix #5675 Synchronize access to stop_handler
2015-07-20 16:09:13 -05:00
035c0a8a38
Fix #5078 by improving actual_timeout calculation
2015-07-20 11:27:48 -05:00
1a9664fcba
Delete default option
2015-07-20 09:54:51 -05:00
0771d5ec39
minor fixes
2015-07-20 01:22:45 +01:00
97f4ec72f9
minor fixes
2015-07-20 01:20:36 +01:00
ad86a72918
send_sms + wlan_geolocate
2015-07-20 01:16:58 +01:00
844b47e8ce
Additional changes
2015-07-18 14:10:46 +07:00
da445a52aa
Update URIHOST and URIPORT
2015-07-16 14:27:46 -05:00
1fdbcc71c1
Support URIHOST and URIPORT for exploit URI generation
2015-07-16 14:10:49 -05:00
7f05403ae0
Added certutil cmdstager
2015-07-16 13:20:05 +07:00
73fd4bd853
Allow the notes command to save notes as a file
...
The -o option can save notes as a file.
2015-07-16 00:28:15 -05:00
18ca617c23
Land #5649 , Fix undefined sysinfo method error in meterpreter.rb
2015-07-15 23:27:02 -05:00
f6cdbb65dd
Land #5706 , Kiwi creds_* -o write to file
2015-07-15 15:43:29 +00:00
886ca47dfb
Land #5650 , @wchen-r7's browser autopwn 2
2015-07-15 10:21:44 -05:00
b6e25506d0
Add a common user agent list, use the shortest for Meterpreter
2015-07-15 13:03:47 +10:00
4f8f640189
Rename autopwnv2 to just autopwn2
2015-07-14 17:38:51 -05:00
709676e6cc
Make exploits quiet
2015-07-14 17:00:44 -05:00
219d0032fa
Do print_good to make this important stand up more
2015-07-14 15:36:35 -05:00
6685fc479b
Add multi-glob filesystem search to Meterpreter
2015-07-14 20:23:23 +00:00
1992a5648d
Make up our damn mind
2015-07-14 15:09:23 -05:00
d64f4be691
Check if URIPORT is 0
2015-07-14 14:45:10 -05:00
5e63b5f93e
Can't use cli
2015-07-14 14:37:45 -05:00
cf714fe4aa
Change port logic too
2015-07-14 14:19:00 -05:00
61d49f29e8
Check nil for SRVHOST option
2015-07-14 14:16:49 -05:00
8efb4df8af
Change the HOST IP logic again
2015-07-14 14:15:32 -05:00
9980e8f285
Change SRVHOST vs URIHOST vs Rex again
2015-07-14 14:06:33 -05:00
f76fe07872
Fix SRVHOST
2015-07-14 13:49:28 -05:00
9be030bbff
Fix nil in executable generation
2015-07-14 18:47:33 +00:00
9dddb13d0b
Slow down on killing exploits
...
Jobs aren't thread safe, so we kind of have to take it easy.
2015-07-14 13:10:57 -05:00
2264efac15
Reduce output
2015-07-14 12:22:38 -05:00
100d3c8d46
A number of small fixes for BAPv2
...
* Use module.register_parent() to pass WORKSPACE and other fields
* Prevent partial resource matching in URIs
* Make disclosure_date sorting resilient
2015-07-14 11:40:28 -05:00
60444c208b
Land #5658 , MSF version includes git hash now
2015-07-14 09:21:25 -05:00
0582e7e3ca
Return nil instead of "null"
...
A scenario is when FF disables Flash, BES returns "null", and when
modules try to use Gem::Version, the "null" is considered a malformed
data and it won't be able to continue.
2015-07-14 01:25:41 -05:00
8384be6466
Fix rand_text_alpha and bump max exploit count to 21
2015-07-14 01:02:01 -05:00
d6565a9aee
Merge branch 'bes_flash' into bapv2_flash_test
2015-07-14 00:34:54 -05:00
8fb6bedd94
Delete as3 detecotr
2015-07-13 18:23:39 -05:00
8928c5529c
Fix Javascript code
2015-07-13 17:43:04 -05:00
244d9bae64
Add max timeout
2015-07-13 16:52:25 -05:00
9116460cb0
Add prototype with AS3
2015-07-13 16:33:55 -05:00
07d05828d0
Land #5688 , remove msfcli
2015-07-13 15:27:38 -05:00
93f154b395
Land #5695 , SMTPDeliver STARTTLS unspecific SSL
2015-07-13 18:54:41 +00:00
0a5119a4ac
Land #5702 , vprint_* optional parameter
2015-07-13 18:47:22 +00:00
53bcee011b
Land #5709 , s/Filed/Failed/ typo fixes
2015-07-13 18:37:46 +00:00
884b779b36
Land #5593 , CVE-2015-1155 Safari file:// Redirection Sandbox Escape
2015-07-13 11:28:39 -05:00
4cd6e0c72b
Added "Failed" to line 121 of kdc_request.rb
2015-07-13 11:27:32 -05:00
6a5645d747
Changed "Filed" to "Failed" in multiple files
2015-07-13 11:21:20 -05:00
0a581be9f9
put -u back for removing transports
2015-07-13 12:10:32 -04:00
4fc258ec0c
Remove duplicate entries, allow for output to file
...
This commit does a few tidies of code, as well as adds the ability to
write all the kiwi output to disk as well as to the console. We can't
yet add this stuff to the credential DB because it's tied to machine,
where the creds that come out of kiwi are often tied to domains.
This also removes duplicate creds from the output list, and gets rid of
the auth id stuff from the output too (not sure why it was useful
before).
2015-07-13 14:17:31 +10:00
e638d85f30
Merge branch 'upstream-master' into bapv2
2015-07-12 02:01:09 -05:00
8d40d30d47
Comemnt
2015-07-11 23:24:01 -05:00
88357857a0
These datastore options don't need to set anymore
2015-07-11 23:22:05 -05:00
eaa0d0a44e
first msg was better
2015-07-11 22:50:38 -04:00
508c9f55df
specify transports by index
2015-07-11 22:22:50 -04:00
a4dc409c12
Add empty default vprint value
2015-07-11 19:38:27 +01:00
HD Moore
OJ
Brent Cook
jvazquez-r7
Jon Hart
Stuart Morgan
wchen-r7
Mo Sadek
James Lee
Fernando Arias
jvicente
Roberto Soares
Dev Mohanty
William Vu
Greg Mikeska
Alex Watt
Meatballs
Jack64
Jack64
xistence
Samuel Huckins
rwhitcroft
g0tmi1k