067c612d9e
Make creds visible to RPC and GUI.
...
git-svn-id: file:///home/svn/framework3/trunk@11602 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-19 20:09:18 +00:00
5429c73b3b
don't try to store to the database if there isn't one. fixes #3540
...
git-svn-id: file:///home/svn/framework3/trunk@11594 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-17 23:41:01 +00:00
9df78e8f47
correct passive?() for post modules, see #3542
...
git-svn-id: file:///home/svn/framework3/trunk@11589 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-17 20:50:30 +00:00
63934c34ec
check for a ancestors instead of a straight comparison of classes when matching payloads for generics, fixes #3477
...
git-svn-id: file:///home/svn/framework3/trunk@11585 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-17 17:15:43 +00:00
a237122869
for Java version of Meterpreter options can not be included with the command, they have to be given apart updating mixin for this behavior
...
git-svn-id: file:///home/svn/framework3/trunk@11581 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-15 05:08:42 +00:00
e27e824755
rectify a lying comment
...
git-svn-id: file:///home/svn/framework3/trunk@11561 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-12 19:24:54 +00:00
e48aa7856a
Migration of Meterpreter mixin to post module mixin
...
git-svn-id: file:///home/svn/framework3/trunk@11550 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-12 00:10:32 +00:00
ffbea6199f
Do not wait for the DCERPC call to timeout
...
git-svn-id: file:///home/svn/framework3/trunk@11545 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-11 17:56:27 +00:00
18ee35149a
move script mixin code into Post mixins and include them back in for backwards compatibility
...
git-svn-id: file:///home/svn/framework3/trunk@11544 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-11 17:53:24 +00:00
d87b5ad3d2
Drops the DBImportError when you import a pcap file that doesn't actually contain any normal Eth::IP hosts. It doesn't add a whole lot or give the user any more information than merely failing to import anything.
...
git-svn-id: file:///home/svn/framework3/trunk@11543 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-11 17:35:45 +00:00
40fa5eebaf
Don't convert the timeout to an integer, it makes 0.1 -> 0 svn status eek. See #3483
...
git-svn-id: file:///home/svn/framework3/trunk@11536 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-10 19:42:58 +00:00
e776697f38
Fixes #3466 by detecting a second null handle and breaking the loop (happens with likewise servers)
...
git-svn-id: file:///home/svn/framework3/trunk@11508 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-07 19:51:59 +00:00
dbeae8df24
add support for running post modules from the meterpreter prompt. options are set in the same way as the -o arg to run, e.g. run post/escalate/bypassuac LHOST=192.168.0.1
...
git-svn-id: file:///home/svn/framework3/trunk@11496 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-06 21:28:00 +00:00
aafb30ba8c
update user agent string detection for some android, fedora, ipod/ipad/iphone
...
git-svn-id: file:///home/svn/framework3/trunk@11495 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-06 21:24:38 +00:00
bafd318ba7
replace exe_lhost with the more generic payload_lhost
...
git-svn-id: file:///home/svn/framework3/trunk@11463 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-04 01:13:03 +00:00
0b2f68aa3b
Fix error with TcpServer modules not properly cleaning up after job is killed.
...
Stops StreamServerListener and ClientMonitor threads from remaining after the job is killed and preventing rerunning such modules.
git-svn-id: file:///home/svn/framework3/trunk@11460 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-02 22:30:14 +00:00
a4571f927a
handle nessus xml files w/o a leading <xml> tag -- resolves #3369
...
git-svn-id: file:///home/svn/framework3/trunk@11438 4d416f70-5f16-0410-b530-b9f4589650da
2010-12-28 22:07:41 +00:00
02c555c4c6
use the module's platfrom if no session is set
...
git-svn-id: file:///home/svn/framework3/trunk@11430 4d416f70-5f16-0410-b530-b9f4589650da
2010-12-28 19:28:43 +00:00
de9c1286e6
missed file, makes post/hashdump work again
...
git-svn-id: file:///home/svn/framework3/trunk@11424 4d416f70-5f16-0410-b530-b9f4589650da
2010-12-27 18:11:43 +00:00
1351af8300
missed file. =(
...
git-svn-id: file:///home/svn/framework3/trunk@11422 4d416f70-5f16-0410-b530-b9f4589650da
2010-12-27 17:56:29 +00:00
f0cc6ff596
big commit for converting meterpreter scripts to modules, see #3377 . also fixes payload tab-completion and 'show payloads' after TARGET has changed
...
git-svn-id: file:///home/svn/framework3/trunk@11421 4d416f70-5f16-0410-b530-b9f4589650da
2010-12-27 17:46:42 +00:00
30affd4b2c
This commit adds a new set of discovery modules from wuntee and some useful utility methods for working with link-local addresses
...
git-svn-id: file:///home/svn/framework3/trunk@11417 4d416f70-5f16-0410-b530-b9f4589650da
2010-12-27 16:43:53 +00:00
0468dbeabe
Fixes a db_import bug introduced in r11355 .
...
git-svn-id: file:///home/svn/framework3/trunk@11416 4d416f70-5f16-0410-b530-b9f4589650da
2010-12-27 16:30:08 +00:00
a8311fd71d
Verify a host is actually a real string before using it
...
git-svn-id: file:///home/svn/framework3/trunk@11372 4d416f70-5f16-0410-b530-b9f4589650da
2010-12-18 03:37:27 +00:00
c28ad8ea0c
Minor improvements and corner case bug fixes to session handling. This fixes issues that can come up when a stream is shut down
...
git-svn-id: file:///home/svn/framework3/trunk@11371 4d416f70-5f16-0410-b530-b9f4589650da
2010-12-18 03:00:26 +00:00
c252d53c15
back to dev
...
git-svn-id: file:///home/svn/framework3/trunk@11370 4d416f70-5f16-0410-b530-b9f4589650da
2010-12-17 18:35:23 +00:00
f159678bf0
Rejigger the packet analysis to not suck up so much memory for no real reason. This ensures that the initial file read represents (pretty much) the entire overhead needed to process packets. I'd say this fixs bumps the ceiling up to about a million packets that can be read without too much trouble (assuming you have a serious amount of RAM available -- I'm testing with 8GB here).
...
git-svn-id: file:///home/svn/framework3/trunk@11364 4d416f70-5f16-0410-b530-b9f4589650da
2010-12-17 03:20:47 +00:00
3ed2d8b694
Add a pcap counter to the pcap importer.
...
git-svn-id: file:///home/svn/framework3/trunk@11356 4d416f70-5f16-0410-b530-b9f4589650da
2010-12-16 21:36:00 +00:00
743cdba360
Detect empty imports
...
git-svn-id: file:///home/svn/framework3/trunk@11355 4d416f70-5f16-0410-b530-b9f4589650da
2010-12-16 21:26:39 +00:00
93c26125aa
Recognize RO vs RW strings
...
git-svn-id: file:///home/svn/framework3/trunk@11337 4d416f70-5f16-0410-b530-b9f4589650da
2010-12-14 20:52:48 +00:00
55b21d4aaf
Fixes to enable password parsing and rw/ro detection in snmp brute force
...
git-svn-id: file:///home/svn/framework3/trunk@11336 4d416f70-5f16-0410-b530-b9f4589650da
2010-12-14 20:51:17 +00:00
1c2c3ed1f6
Adds an example protocol analyzer to pick out http basic auth credentials and do some server analysis for libpcap imports.
...
git-svn-id: file:///home/svn/framework3/trunk@11334 4d416f70-5f16-0410-b530-b9f4589650da
2010-12-14 19:04:12 +00:00
d12be5bd4d
testing -> release!
...
git-svn-id: file:///home/svn/framework3/trunk@11325 4d416f70-5f16-0410-b530-b9f4589650da
2010-12-14 05:28:32 +00:00
f45e03cd14
remove wait when DisablePayloadHandler was set
...
git-svn-id: file:///home/svn/framework3/trunk@11324 4d416f70-5f16-0410-b530-b9f4589650da
2010-12-13 23:34:43 +00:00
244dc18867
Fixes #3348 . Adds the PacketFu packet processing library from http://code.google.com/p/packetfu/ , and adds a db_import path for pcaps (it's straightforward -- db_import /path/to/file.pcap will import hosts and service ports from a pcap file.)
...
git-svn-id: file:///home/svn/framework3/trunk@11308 4d416f70-5f16-0410-b530-b9f4589650da
2010-12-12 17:44:48 +00:00
431a0e13aa
Store these in a format more friendly to JtR
...
git-svn-id: file:///home/svn/framework3/trunk@11305 4d416f70-5f16-0410-b530-b9f4589650da
2010-12-12 08:53:37 +00:00
68dc327222
Fix missing decode for enable password 7
...
git-svn-id: file:///home/svn/framework3/trunk@11304 4d416f70-5f16-0410-b530-b9f4589650da
2010-12-12 08:51:08 +00:00
4e4eb14887
This adds a TFTP version of #3345 (Pello's snmp config downloader). Still more work to do for the generic module
...
git-svn-id: file:///home/svn/framework3/trunk@11300 4d416f70-5f16-0410-b530-b9f4589650da
2010-12-11 23:36:37 +00:00
644633454d
Cleanups to credential type
...
git-svn-id: file:///home/svn/framework3/trunk@11297 4d416f70-5f16-0410-b530-b9f4589650da
2010-12-11 20:36:08 +00:00
e3f909cef9
Fixes for chunked http reply processing, additional cisco configuration support, and a scanner module for unprotected cisco device managers.
...
git-svn-id: file:///home/svn/framework3/trunk@11287 4d416f70-5f16-0410-b530-b9f4589650da
2010-12-11 07:37:09 +00:00
26aca9d6ba
Swap some module locations, add loot and cred reporting
...
git-svn-id: file:///home/svn/framework3/trunk@11271 4d416f70-5f16-0410-b530-b9f4589650da
2010-12-10 05:47:33 +00:00
493db14006
Adds a "duplicate_ok" option to report_auth_info to allow for multiple passwords on the same username. Never came up before I took a look at SNMP.
...
Also normalizes the print_status messages to be explicit about which module is reporting (important when you're running several at once).
git-svn-id: file:///home/svn/framework3/trunk@11267 4d416f70-5f16-0410-b530-b9f4589650da
2010-12-09 21:23:39 +00:00
5dd1f52349
Bump to testing
...
git-svn-id: file:///home/svn/framework3/trunk@11248 4d416f70-5f16-0410-b530-b9f4589650da
2010-12-07 20:16:39 +00:00
fbd340aae8
add an adodb based cmdstager, fixes #1431
...
git-svn-id: file:///home/svn/framework3/trunk@11247 4d416f70-5f16-0410-b530-b9f4589650da
2010-12-07 18:51:12 +00:00
1b6c0664e6
Add EmailTemplate fields: exploit_module, exploit_attach_name & attach_exploit
...
git-svn-id: file:///home/svn/framework3/trunk@11236 4d416f70-5f16-0410-b530-b9f4589650da
2010-12-06 22:18:33 +00:00
2d4af15581
Peerhost, not peerhot. :/
...
git-svn-id: file:///home/svn/framework3/trunk@11205 4d416f70-5f16-0410-b530-b9f4589650da
2010-12-02 17:33:20 +00:00
0204cedca6
Makes the print_status displays more consistent between smb_login and psexec by moving some of the domain display functions up into exploit/smb proper.
...
git-svn-id: file:///home/svn/framework3/trunk@11204 4d416f70-5f16-0410-b530-b9f4589650da
2010-12-02 17:29:26 +00:00
fed550d7e7
Fixes #3285 . Checks for nil for session.peerhost and session.tunnel_peer -- hard to test, though, since I can't tell what originally causes the issue -- with and without this fix I get idential results on a normal ssh session. But, with the nil check in place, it should clear up the stack trace listed.
...
git-svn-id: file:///home/svn/framework3/trunk@11203 4d416f70-5f16-0410-b530-b9f4589650da
2010-12-02 17:26:43 +00:00
b0a0a2413c
print the proper proto (https vs http) when ssl is in use
...
git-svn-id: file:///home/svn/framework3/trunk@11194 4d416f70-5f16-0410-b530-b9f4589650da
2010-12-01 16:57:20 +00:00
225bf0738e
improve handling of return from connect_from_privileged_port, rework rlogin fromuser merging
...
git-svn-id: file:///home/svn/framework3/trunk@11171 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-30 02:00:58 +00:00
7e15c97328
remove duplicate credentials before running
...
git-svn-id: file:///home/svn/framework3/trunk@11168 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-30 01:15:42 +00:00
778040ec5b
move rservices mixin to aux instead of exploit
...
git-svn-id: file:///home/svn/framework3/trunk@11142 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-25 06:02:35 +00:00
e74d023971
formatting, modularization, and optimization
...
git-svn-id: file:///home/svn/framework3/trunk@11137 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-25 05:59:15 +00:00
1fda94f438
improve error reporting
...
git-svn-id: file:///home/svn/framework3/trunk@11121 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-24 06:09:36 +00:00
db28497900
add an extra check for JAVA_HOME
...
git-svn-id: file:///home/svn/framework3/trunk@11118 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-24 01:11:17 +00:00
fb79d97bca
Allow for things external to a scanner module to come in an kill all the threads with the mod.seppuko!() method.
...
git-svn-id: file:///home/svn/framework3/trunk@11117 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-24 00:08:39 +00:00
7581ce0153
try the payload's arch/platform if we don't have an associated exploit
...
git-svn-id: file:///home/svn/framework3/trunk@11116 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-23 20:37:32 +00:00
b3b43bbb8b
fix a bug in arch detection when an EncodedPayload's pinst is an EncodedPayload instead of a Payload
...
git-svn-id: file:///home/svn/framework3/trunk@11115 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-23 20:34:27 +00:00
9c668b8daf
Super-duper rservices commit -
...
1. Added rsh, rlogin, and rexec auth brute scanners
2. Login negotation moved into new Msf::Auxiliary::Login mixin
3. Centralized session registration for auth brute scanners
4. Telnet and SSH auth brute scanners updated to use new mixins
5. Previously committed rservices mixin (r11093)
git-svn-id: file:///home/svn/framework3/trunk@11106 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-23 01:23:24 +00:00
04f9aec2d8
Pass framework into the TcpReverseDoubleSessionChannel class
...
git-svn-id: file:///home/svn/framework3/trunk@11100 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-22 19:18:24 +00:00
9df192497b
make sure we're not turning nil into [nil], since it breaks the arch detection
...
git-svn-id: file:///home/svn/framework3/trunk@11098 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-22 17:48:35 +00:00
14e147c931
add the rservices mixin
...
git-svn-id: file:///home/svn/framework3/trunk@11093 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-22 13:18:02 +00:00
b495ca8aab
add a mixin for pdf gen, see #2841
...
git-svn-id: file:///home/svn/framework3/trunk@11092 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-22 12:21:49 +00:00
fe9710b836
add a rand: special case for OptAddress options
...
git-svn-id: file:///home/svn/framework3/trunk@11071 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-19 18:31:14 +00:00
1c5481dcfb
add a method for getting the full uri from an HttpServer to complement get_resource
...
git-svn-id: file:///home/svn/framework3/trunk@11069 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-19 18:15:20 +00:00
4c69fc7b84
Fix typo
...
git-svn-id: file:///home/svn/framework3/trunk@11028 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-13 06:58:24 +00:00
432a2e0ee8
Nuke the old mixin
...
git-svn-id: file:///home/svn/framework3/trunk@11027 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-13 06:55:53 +00:00
dc5116f9df
Move the crawler mixin to an auxiliary
...
git-svn-id: file:///home/svn/framework3/trunk@11026 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-13 06:55:19 +00:00
f457ccb8f7
Add the crawler mixin and a sample form extractor crawler
...
git-svn-id: file:///home/svn/framework3/trunk@11025 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-13 06:40:56 +00:00
bc2d43d86d
Raise thread errors instead of eating them
...
git-svn-id: file:///home/svn/framework3/trunk@11024 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-13 06:22:40 +00:00
29073a519a
Small tweaks to the thread code, add an update method
...
git-svn-id: file:///home/svn/framework3/trunk@11011 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-12 17:28:40 +00:00
9df4c2bccf
don't fail if we were given a peerhost of 'Remote Pipe'. Fixes #3049 , thanks Raphael M for the patch
...
git-svn-id: file:///home/svn/framework3/trunk@11010 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-12 16:43:00 +00:00
a12d9f8dbf
This patch adds detailed thread tracking across the metasploit framework, along with a new console command (threads) to manage these. This level of tracking is required to accurately monitor background tasks, assist with debugging, and kill orphaned threads.
...
git-svn-id: file:///home/svn/framework3/trunk@11003 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-12 06:19:49 +00:00
326dc42bca
add EncodedPayload#encoded_exe, encoded_jar, and encoded_war. simplifies exploits that need java and native payloads. see #406 and #3009
...
git-svn-id: file:///home/svn/framework3/trunk@10999 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-11 23:01:35 +00:00
3992eb7ef8
Mass RE-update: fix all framework URL references
...
git-svn-id: file:///home/svn/framework3/trunk@10998 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-11 22:43:22 +00:00
9fc6f2f3a3
Mass update: fix all framework URL references
...
git-svn-id: file:///home/svn/framework3/trunk@10996 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-11 22:25:13 +00:00
0b8f0c51bc
use a random name for the app if one is not supplied
...
git-svn-id: file:///home/svn/framework3/trunk@10976 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-10 23:35:02 +00:00
4aae717312
only need metasploit.dat in WEB-INF/classes/
...
git-svn-id: file:///home/svn/framework3/trunk@10975 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-10 23:22:00 +00:00
bed66d4f64
Change the default domain to "." (local host) from WORKGROUP. Suggestion from Rob Fuller (mubix)
...
git-svn-id: file:///home/svn/framework3/trunk@10952 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-08 20:07:17 +00:00
d75e7885d4
remove has_badchars? in favor of Rex::Text.badchar_index
...
git-svn-id: file:///home/svn/framework3/trunk@10949 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-08 17:00:07 +00:00
2037262950
turn verbosity off by default
...
git-svn-id: file:///home/svn/framework3/trunk@10948 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-08 16:59:20 +00:00
5c692aa034
genericize the message since we now support LOGIN as well as PLAIN
...
git-svn-id: file:///home/svn/framework3/trunk@10945 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-08 05:03:15 +00:00
289c068f2a
add support for LOGIN authentication, thanks Ricardo Gandara for the patch. fixes #3072
...
git-svn-id: file:///home/svn/framework3/trunk@10944 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-08 05:01:18 +00:00
bc983ea52c
Run meterpreter GUI commands in background to not interfere with active shell or other channel interaction.
...
Also simplify calling commands in file browser and process viewer.
git-svn-id: file:///home/svn/framework3/trunk@10929 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-06 16:51:48 +00:00
f6415186a8
Adds the imported_creds table.
...
git-svn-id: file:///home/svn/framework3/trunk@10923 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-06 01:01:20 +00:00
cf70f322d0
This minor syntax change allows rubinius to at least start the console
...
git-svn-id: file:///home/svn/framework3/trunk@10921 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-05 21:16:33 +00:00
8353bf7bf3
move 100-continue processing into Rex, fixes #3109
...
git-svn-id: file:///home/svn/framework3/trunk@10919 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-05 16:20:13 +00:00
66fd9f71b7
Typo.
...
git-svn-id: file:///home/svn/framework3/trunk@10906 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-04 23:05:01 +00:00
fe03497d57
Make tab completion work for meterpreter sessions over rpc.
...
git-svn-id: file:///home/svn/framework3/trunk@10905 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-04 23:01:03 +00:00
bbfcaefffb
Fix the double-up data directory
...
git-svn-id: file:///home/svn/framework3/trunk@10903 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-04 22:12:50 +00:00
652764ebd3
Merge in nCircle support from Dave Lassalle, handle file reads more consistently
...
git-svn-id: file:///home/svn/framework3/trunk@10902 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-04 21:44:16 +00:00
e6da9729c0
Handle invalid dates
...
git-svn-id: file:///home/svn/framework3/trunk@10888 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-03 15:31:28 +00:00
b15ba92567
Add rank; fix issue with searching.
...
git-svn-id: file:///home/svn/framework3/trunk@10873 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-02 23:35:12 +00:00
90500eebd1
Enable running scripts independent of console state. Fixes issue with running scripts from GUI while shell/channel is active.
...
git-svn-id: file:///home/svn/framework3/trunk@10872 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-02 23:33:22 +00:00
8e44f66d31
add a simple method for adding multiple files to a Jar from the file system. may eventually bubble this up to Rex::Zip::Archive
...
git-svn-id: file:///home/svn/framework3/trunk@10871 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-02 23:10:35 +00:00
db4c6ae246
Properly show compatible payloads. Important for cross-platform exploits.
...
git-svn-id: file:///home/svn/framework3/trunk@10870 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-02 22:41:49 +00:00
492268b066
See #3104 . Make exporting/importing funny characters more convenient. Export inactive credentials by default.
...
git-svn-id: file:///home/svn/framework3/trunk@10867 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-02 22:11:45 +00:00
6048580919
See #3104 . This adds a parser for the file format created in r10862, so that these exported credentials can be read back in to Metasploit.
...
git-svn-id: file:///home/svn/framework3/trunk@10866 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-02 21:27:26 +00:00
313317224f
fix keys, not hashes, in db_export
...
git-svn-id: file:///home/svn/framework3/trunk@10863 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-02 19:18:37 +00:00
754d1a3b90
Fixes #3104 . Adds the "pwdump" format to db_export.
...
git-svn-id: file:///home/svn/framework3/trunk@10862 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-02 19:13:15 +00:00
761acdc419
Fixes the db_export command to deal with nil values as self-closed tags (rather than NULL) and to correctly handle some binary values.
...
git-svn-id: file:///home/svn/framework3/trunk@10854 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-01 16:11:37 +00:00
dc4b7b6641
Fixes #3067 . Raise DBImportErrors when the contents of a zip archive isn't a Metasploit ZIP report.
...
git-svn-id: file:///home/svn/framework3/trunk@10842 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-28 15:59:40 +00:00
5fc69f1597
Fix charset handling, fixes #3053 , thanks Rami
...
git-svn-id: file:///home/svn/framework3/trunk@10818 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-25 14:57:30 +00:00
a2801e5dc1
Add detach/kill support to interacting meterpreter channels over RPC. Also clean some duplicated code in session interaction.
...
git-svn-id: file:///home/svn/framework3/trunk@10794 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-23 17:05:48 +00:00
27cc50f29a
missed this in the java payload updates, r10781
...
git-svn-id: file:///home/svn/framework3/trunk@10786 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-22 20:40:25 +00:00
56839ccf36
stupid debug prints
...
git-svn-id: file:///home/svn/framework3/trunk@10782 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-22 10:24:28 +00:00
f33d7cc670
revamp java payloads and make shells work with tomcat_mgr_deploy. tested java_trusted_chain and java_tester to verify that this doesn't break other java payload usage. see #3009 and #2973 , meterpreter doesn't work yet, so not marking resolved.
...
git-svn-id: file:///home/svn/framework3/trunk@10781 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-22 10:19:51 +00:00
0e04505232
Fixes #3027 , a set of bugs introduced during the meterpreter posix work.
...
git-svn-id: file:///home/svn/framework3/trunk@10773 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-21 04:43:54 +00:00
3ece16e0d9
3.5.0 is out! back to work :)
...
git-svn-id: file:///home/svn/framework3/trunk@10771 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-21 00:48:17 +00:00
869d930588
Bugfix for db_events. Fixes #2982 .
...
git-svn-id: file:///home/svn/framework3/trunk@10770 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-20 23:32:42 +00:00
fe410df0fd
mark this rev as release. Releasesvn diff lib/msf/core/framework.rb
...
git-svn-id: file:///home/svn/framework3/trunk@10765 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-20 12:05:10 +00:00
cafb8d1ac2
Yield back on pages, vulns, forms, and sites
...
git-svn-id: file:///home/svn/framework3/trunk@10760 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-20 01:13:26 +00:00
bf28203159
Try to recover from binary in the XML import, report in the dlog if you run into trouble.
...
git-svn-id: file:///home/svn/framework3/trunk@10756 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-19 22:51:37 +00:00
2d6b995623
rename/clarify PrintfUtil encoder, fixes #2308
...
git-svn-id: file:///home/svn/framework3/trunk@10729 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-18 15:41:13 +00:00
f88033f0cc
Merge in R3L1K's Powershell enhancements and powerdump code (hashdump through powershell)
...
git-svn-id: file:///home/svn/framework3/trunk@10721 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-17 17:39:43 +00:00
6e118045eb
Patch from scriptjunkie to enable EXITFUNC=none; this is only useful in some limited situations, but was requested. Fixes #2969
...
git-svn-id: file:///home/svn/framework3/trunk@10720 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-17 05:40:56 +00:00
59b2620d2c
This commit adds the db_export command, which will export a workspace as an XML file. This can be re-imported with db_import
...
git-svn-id: file:///home/svn/framework3/trunk@10718 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-17 04:50:15 +00:00
9a4caf65a1
add ua fingerprinting for chrome and opera
...
git-svn-id: file:///home/svn/framework3/trunk@10717 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-17 04:35:44 +00:00
54df2c1e6c
Fixes #2977 ; error when checking non-interactive channels.
...
git-svn-id: file:///home/svn/framework3/trunk@10704 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-16 15:21:06 +00:00
865b711b5c
Fixes #2974 . Adds an "Unknown" level to Exploit::CheckCode, fixes the URI check for exploit/unix/webapp/php_include (which was relying on Unknown).
...
git-svn-id: file:///home/svn/framework3/trunk@10694 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-15 12:24:17 +00:00
238242ecb9
add latest nessus plugin patches from Zate, fixes #2704
...
git-svn-id: file:///home/svn/framework3/trunk@10685 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-14 18:54:35 +00:00
756e6d2ad8
Remove unsupported msfweb interface. ( fixes #503 )
...
* This will significantly decrease the size of the msf install (~5 MB)
* ActiveRecord & ActiveSupport are still used, and have been moved to lib/
git-svn-id: file:///home/svn/framework3/trunk@10682 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-14 18:45:16 +00:00
ebfe771872
Fixes #2261 . Provide input stream for interacting with channels.
...
git-svn-id: file:///home/svn/framework3/trunk@10674 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-14 00:22:45 +00:00
0477789bee
Update to reflect the next target stable release
...
git-svn-id: file:///home/svn/framework3/trunk@10669 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-13 07:59:10 +00:00
567e42fafa
Three more minor changs to ensure that HTTP response data is always treated as binary.
...
git-svn-id: file:///home/svn/framework3/trunk@10654 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-12 16:29:35 +00:00
7b576be821
only create the database if it doesn't exist
...
git-svn-id: file:///home/svn/framework3/trunk@10646 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-11 23:48:53 +00:00
b6c4d1fc00
add web_urihost
...
git-svn-id: file:///home/svn/framework3/trunk@10640 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-11 05:56:18 +00:00
6f981e7b08
Add missing confidence field from import
...
git-svn-id: file:///home/svn/framework3/trunk@10636 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-11 03:35:15 +00:00
5a2444eb24
Clean up web_vuln import, use additional fields
...
git-svn-id: file:///home/svn/framework3/trunk@10635 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-11 02:57:07 +00:00
e7fe407106
Update to the report_web_vuln method to take into account the schema update
...
git-svn-id: file:///home/svn/framework3/trunk@10632 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-10 19:36:31 +00:00
39be54970b
Fix a typo in the exception handler
...
git-svn-id: file:///home/svn/framework3/trunk@10625 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-09 22:09:35 +00:00
b99be2dae6
Unbreak this
...
git-svn-id: file:///home/svn/framework3/trunk@10621 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-09 18:27:09 +00:00
f19be2ca3f
Try harder to figure out who ran the module
...
git-svn-id: file:///home/svn/framework3/trunk@10620 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-09 18:11:11 +00:00
abf19e002d
tweak the models
...
git-svn-id: file:///home/svn/framework3/trunk@10618 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-09 08:35:41 +00:00
8aa73c2951
add a filename
...
git-svn-id: file:///home/svn/framework3/trunk@10616 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-09 03:50:04 +00:00
014ed847b2
actually save the campaign
...
git-svn-id: file:///home/svn/framework3/trunk@10609 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-08 20:32:32 +00:00
dbcd8619e1
break report_user_agent into a fingerprint method and a report method, pass extra arguments on to report_client
...
git-svn-id: file:///home/svn/framework3/trunk@10608 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-08 20:28:14 +00:00
988bbd13f1
associate clients with a campaign
...
git-svn-id: file:///home/svn/framework3/trunk@10601 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-08 17:20:57 +00:00
d8b9cf5cac
Slight speed improvement to request processing
...
git-svn-id: file:///home/svn/framework3/trunk@10599 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-08 06:14:44 +00:00
9e01b0f4e5
Fix a race condition in concurrent session handling
...
git-svn-id: file:///home/svn/framework3/trunk@10596 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-08 04:46:53 +00:00
2e9138ebbc
This commit overhauls much of the meterpreter timeouts and staging processes. This fixes a bug with concurrent session handling, reduces CPU load by caching a single SSL certificate for all sessions, increases all of the critical timeouts, and generally makes mass ownage work better. We still need to limit the maximum number of concurrent on_session() threads to something sane to prevent sesssion spikes from dragging out the process even longer. The C-side meterpreter change is minimal and will only help with future compatibility if we move to non-blocking fd's for the SSL socket.
...
git-svn-id: file:///home/svn/framework3/trunk@10595 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-08 04:11:47 +00:00
6a47af814a
Basic, still buggy support for NetSparker XML
...
git-svn-id: file:///home/svn/framework3/trunk@10585 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-07 06:24:26 +00:00
2e25245e9b
Remove threading, caused slowdowns
...
git-svn-id: file:///home/svn/framework3/trunk@10583 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-07 03:57:51 +00:00
3250ab13e0
Add a parser for Retina XML
...
git-svn-id: file:///home/svn/framework3/trunk@10582 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-07 02:33:57 +00:00
352b4cf1c8
Dispatch incoming requests as threads
...
git-svn-id: file:///home/svn/framework3/trunk@10579 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-06 23:20:13 +00:00
b98732ae0a
This change allows the auth modules to automatically remove their input files when requested. This makes scripting with temporary files much easier
...
git-svn-id: file:///home/svn/framework3/trunk@10576 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-06 21:04:16 +00:00
cbcebc0cc8
Bug fixes to the importer
...
git-svn-id: file:///home/svn/framework3/trunk@10575 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-06 20:24:26 +00:00
af28507c36
Cleaner regex
...
git-svn-id: file:///home/svn/framework3/trunk@10571 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-06 18:10:39 +00:00
222c418fee
Accept MetasploitV4 as well as a base tag, preparing for 3.5.0
...
git-svn-id: file:///home/svn/framework3/trunk@10570 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-06 18:09:06 +00:00
0127137151
Reorganize methods and add recognition of v4
...
git-svn-id: file:///home/svn/framework3/trunk@10569 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-06 18:00:21 +00:00
683a82bfee
Switch out msfx/msfe terminology for just msf
...
git-svn-id: file:///home/svn/framework3/trunk@10565 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-06 15:55:28 +00:00
e492136567
Handle slightly malformed MSFX zip imports. This introduces the nils_for_nulls function that basically takes any instance of NULL in the XML of an MSFX import and turns it into a proper Ruby nil. This helps avoid a lot of problems for reports that were created with NULLs accidentally included.
...
git-svn-id: file:///home/svn/framework3/trunk@10563 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-06 05:10:16 +00:00
7041102df7
Fixes #2848 , uses the half-guessing method of figuring out the "right" protocol.
...
git-svn-id: file:///home/svn/framework3/trunk@10562 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-06 04:18:01 +00:00
8fe655fce7
add unknown command override, see #2793
...
git-svn-id: file:///home/svn/framework3/trunk@10542 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-04 08:05:09 +00:00
3b99c58cb1
Drop this to 75 to take into account other processes accessing the same db. Theoretically the AR pool manager will kick in when this is hit anyways
...
git-svn-id: file:///home/svn/framework3/trunk@10541 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-04 07:11:07 +00:00
31b8fcf7f2
Reduce the default pool size to match reasonable database limits
...
git-svn-id: file:///home/svn/framework3/trunk@10540 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-04 06:55:34 +00:00
f69a1190a4
Commit the EICAR Canary check for meddling AVs
...
git-svn-id: file:///home/svn/framework3/trunk@10536 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-04 03:07:58 +00:00
adeae9fdec
Expose ReverseListenerComm to the reverse_https and passivex handlers as well
...
git-svn-id: file:///home/svn/framework3/trunk@10535 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-04 02:17:09 +00:00
1b4190df38
This commit brings configurability to TCP Servers as to which Comm they use. The ReverseListenerComm and ListenerComm advanced options can be used to prevent a given listener from trying to bind a listener over the pivoted routed. This is useful for a number of situations and not possible to configure explicitly before.
...
git-svn-id: file:///home/svn/framework3/trunk@10534 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-04 02:11:22 +00:00
6a06a95f2f
Faster unique form sort
...
git-svn-id: file:///home/svn/framework3/trunk@10532 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-03 03:34:58 +00:00
555f6840fa
Remove the port when its the default for the protocol
...
git-svn-id: file:///home/svn/framework3/trunk@10531 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-03 01:57:07 +00:00
02b1979c27
Tweaks for vuln reporting
...
git-svn-id: file:///home/svn/framework3/trunk@10530 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-03 01:04:33 +00:00
6319d95456
Actually store the additional fields
...
git-svn-id: file:///home/svn/framework3/trunk@10529 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-03 00:45:44 +00:00
ddcb07bf97
Typos
...
git-svn-id: file:///home/svn/framework3/trunk@10528 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-03 00:23:18 +00:00
8a567dd3a8
Add query to web_form/web_path
...
git-svn-id: file:///home/svn/framework3/trunk@10526 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-02 22:55:54 +00:00
8a0fdf7e14
Add some helper methods to the workspace
...
git-svn-id: file:///home/svn/framework3/trunk@10524 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-02 19:52:50 +00:00
5b7296931d
This patch merges in support for four new database tables focused on tracking web application information along with a tweak to the task manager code to allow tasks to be run from within tasks without fear of deadlock.
...
git-svn-id: file:///home/svn/framework3/trunk@10523 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-02 18:48:29 +00:00
86f6ecdadd
add bools
...
git-svn-id: file:///home/svn/framework3/trunk@10517 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-01 13:36:32 +00:00
6743dbfc62
Actually respect the allow_yaml status for imports on everything that might be serialized, and also streamlines unserialized_object a little.
...
git-svn-id: file:///home/svn/framework3/trunk@10505 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-28 17:52:48 +00:00
7409e34738
See #2717 . Fixes session reaping (VNC, specifically)
...
git-svn-id: file:///home/svn/framework3/trunk@10502 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-28 15:06:09 +00:00
ddb2f71674
Ensuring binary file reads, always.
...
git-svn-id: file:///home/svn/framework3/trunk@10501 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-28 03:13:10 +00:00
dc79d360ac
Quick fix to avoid dying on badly formatted imported data (looks like a Nessus import problem, actually)
...
git-svn-id: file:///home/svn/framework3/trunk@10499 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-27 23:06:13 +00:00
331f7a7b26
Handles REXML::ParseErrors without making a terrible mess.
...
git-svn-id: file:///home/svn/framework3/trunk@10497 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-27 15:40:33 +00:00
337a0be8fc
adjust templates, move SerializedPrefs into its own file
...
git-svn-id: file:///home/svn/framework3/trunk@10494 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-27 04:12:04 +00:00
7b2a29365f
fix report_note taking a Service obj in opts[:service]
...
git-svn-id: file:///home/svn/framework3/trunk@10493 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-27 03:52:39 +00:00
f07f354472
tidy pass on exploit mixins
...
git-svn-id: file:///home/svn/framework3/trunk@10487 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-26 21:02:00 +00:00
e4bef2ce51
turn off payload handler by default for fileformat modules
...
git-svn-id: file:///home/svn/framework3/trunk@10486 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-26 18:28:58 +00:00
cdc97316b5
Automatically close dead sessions (finally), also, automatically mark meterpreter sessions as dead when writes start to trigger exceptions
...
git-svn-id: file:///home/svn/framework3/trunk@10475 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-25 03:57:30 +00:00
faf58c2b62
Allows 0.0.0.0/::0 to be used in place of the real "any" address regardless of socket type when the bind address is specified
...
git-svn-id: file:///home/svn/framework3/trunk@10473 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-25 03:28:19 +00:00
3b31f56894
This commit adds a new option to all reverse handlers: ReverseListenerBindAddress. This setting determines exactly what address is bound on the local system
...
git-svn-id: file:///home/svn/framework3/trunk@10472 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-25 03:25:09 +00:00
478a15f827
doc the use of :name for services
...
git-svn-id: file:///home/svn/framework3/trunk@10465 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-24 21:25:18 +00:00
7878273131
try to preserve the service name in the case of incorrect report_note usage
...
git-svn-id: file:///home/svn/framework3/trunk@10464 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-24 21:11:36 +00:00
c00d56d560
Deal with services a little more intelligently if they're not already there when you report a note.
...
git-svn-id: file:///home/svn/framework3/trunk@10463 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-24 20:51:38 +00:00
09cab24dbf
Report_note no longer tries to re-report a service name; it just re-reports port numbers and protocols. This is to avoid unidentifying identified services.
...
git-svn-id: file:///home/svn/framework3/trunk@10458 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-24 17:52:25 +00:00
84c031d620
document smtp_deliver a little better
...
git-svn-id: file:///home/svn/framework3/trunk@10456 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-24 16:54:09 +00:00
224891387a
add exploit number to prefix
...
git-svn-id: file:///home/svn/framework3/trunk@10443 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-23 02:16:29 +00:00
87b8b9ae8f
tighten up response code check
...
git-svn-id: file:///home/svn/framework3/trunk@10441 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-23 01:55:19 +00:00
cabbe1a84a
oops, hehehe -- fixes exe generation
...
git-svn-id: file:///home/svn/framework3/trunk@10440 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-23 01:43:42 +00:00
5800274b8f
avoid sending email data when the server says it doesn't like our DATA, don't send creds if the server doesn't ask, fix the slowness in TLS
...
git-svn-id: file:///home/svn/framework3/trunk@10438 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-22 22:34:37 +00:00
000c05ff86
allow external control of the arch/platform, fix for aux modules
...
git-svn-id: file:///home/svn/framework3/trunk@10435 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-22 20:55:26 +00:00
2a58f7433e
revamp report_note to compare data in ruby instead of SQL which was causing headaches with serialization
...
git-svn-id: file:///home/svn/framework3/trunk@10432 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-22 05:37:21 +00:00
7a58e611e6
don't log plaintext passwords
...
git-svn-id: file:///home/svn/framework3/trunk@10422 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-21 07:00:50 +00:00
b8bcc2fedb
Continue processing even if the exploit's on_new_session override triggers an exception
...
git-svn-id: file:///home/svn/framework3/trunk@10413 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-21 03:05:55 +00:00
001a6ffbdb
really use simple substitution method, oops
...
git-svn-id: file:///home/svn/framework3/trunk@10412 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-21 02:59:42 +00:00
048b21e3b9
Ensure that errors in the PHPInclude mixin lead to the service being stopped. Handle unreachable services in the php_include module better. Fix database-enabled tab completion to be workspace friendly
...
git-svn-id: file:///home/svn/framework3/trunk@10410 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-21 02:52:49 +00:00
9f02523ab9
allow forcing use of substitution method
...
git-svn-id: file:///home/svn/framework3/trunk@10408 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-21 02:34:43 +00:00
8e5cf31e9a
big exe/dll update, see #2017
...
NOTE: These changes specifically affect payload encoding via RPC, "use
payload", and msfencode
1. consolidate user-specified exe generation routine (now
Msf::Util::EXE.to_executable_fmt)
2. supported format types are now queried/checked using arrays
3. cleaned up and standardized exe option passing
4. rename data store options for EXE mixin
5. add generate_payload_exe_service for psexec/smb_relay
6. reworked default template handling in Msf::Util::EXE
a. added template search path option (not used if template includes
a path separator)
b. "fallback" flag to enable using default if specified file doesn't
exist
7. added Msf::Util::EXE.to_win64pe_dll
8. improved error messages from exe generation
git-svn-id: file:///home/svn/framework3/trunk@10404 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-21 00:13:30 +00:00
771fc82c8c
add a unique cid to attachments
...
git-svn-id: file:///home/svn/framework3/trunk@10399 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-20 21:41:50 +00:00
bd1eeb3722
rework to_jsp_war a bit, fix uses, default msfencode -t war to x86/win32
...
git-svn-id: file:///home/svn/framework3/trunk@10397 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-20 15:59:46 +00:00
21d88b36c1
rename generate_exe -> generate_payload_exe
...
git-svn-id: file:///home/svn/framework3/trunk@10388 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-20 04:37:25 +00:00
25315ec3ea
Store the module instance itself in an accessor on the session. You have to be careful when using this, as the contents can change if the owner of the module is still working with it.
...
git-svn-id: file:///home/svn/framework3/trunk@10386 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-20 03:51:38 +00:00
711fe18ac2
typo fix
...
git-svn-id: file:///home/svn/framework3/trunk@10379 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-19 23:22:32 +00:00
940a096769
typo fix
...
git-svn-id: file:///home/svn/framework3/trunk@10378 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-19 23:13:02 +00:00
5f0cc946b1
document report_note a little better, and modify several modules to use it correctly. fixes #2568
...
git-svn-id: file:///home/svn/framework3/trunk@10377 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-19 22:25:56 +00:00
136ab04a22
Add msfencode capability to rpc.
...
git-svn-id: file:///home/svn/framework3/trunk@10373 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-19 02:42:33 +00:00
73bec8b819
many-to-many switch
...
git-svn-id: file:///home/svn/framework3/trunk@10355 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-17 21:05:11 +00:00
99e2218d13
Be a little more careful with credential sources and update new services in the current workspace.
...
git-svn-id: file:///home/svn/framework3/trunk@10339 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-16 19:45:51 +00:00
ab1ac7ab22
make sure attachments are included
...
git-svn-id: file:///home/svn/framework3/trunk@10329 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-16 08:43:08 +00:00
fa38a19ada
Adding the missing report_template.rb.
...
git-svn-id: file:///home/svn/framework3/trunk@10304 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-13 13:20:49 +00:00
088e862e16
Adds a migration for report template tracking.
...
git-svn-id: file:///home/svn/framework3/trunk@10303 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-13 12:17:57 +00:00
cd7dd926e2
use the models from the last commit. i suck at getting all the files in a single commit. =/
...
git-svn-id: file:///home/svn/framework3/trunk@10302 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-13 08:26:48 +00:00
c8bd48dbb0
add models for campaigns and stuff.
...
git-svn-id: file:///home/svn/framework3/trunk@10301 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-13 08:25:27 +00:00
eddd6d481d
add some documentation for request_cgi
...
git-svn-id: file:///home/svn/framework3/trunk@10293 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-11 17:31:26 +00:00
cb41474f49
fix typo and import errors.
...
git-svn-id: file:///home/svn/framework3/trunk@10291 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-11 16:17:12 +00:00
995b289635
Add session upgrade capability to command shells.
...
git-svn-id: file:///home/svn/framework3/trunk@10289 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-11 15:59:19 +00:00
7f3cc47da9
Only add platform for meterpreter sessions. Unbreaks shell sessions.
...
git-svn-id: file:///home/svn/framework3/trunk@10286 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-10 23:33:33 +00:00
8716609aaf
add the platform to the session attributes returned by rpc
...
git-svn-id: file:///home/svn/framework3/trunk@10285 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-10 20:56:21 +00:00
6422d8c2de
unbreak payloads over rpc
...
git-svn-id: file:///home/svn/framework3/trunk@10271 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-09 05:19:04 +00:00
85cdc7ad78
ugh, i'm bouncing between too many languages, this syntax doesn't even work in php. fixes #2495
...
git-svn-id: file:///home/svn/framework3/trunk@10240 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-05 16:13:17 +00:00
e42d2c1ef4
make sure we read the whole file
...
git-svn-id: file:///home/svn/framework3/trunk@10234 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-03 23:00:28 +00:00
b24a7db785
Add workspace support throughout GUI; add/select/remove db workspace and set default workspace when running modules.
...
git-svn-id: file:///home/svn/framework3/trunk@10233 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-03 17:13:53 +00:00
f5bc508370
Fix db.vulns typos
...
git-svn-id: file:///home/svn/framework3/trunk@10232 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-03 16:09:10 +00:00
57dac0dbf8
remove newlines when importing from an ip list
...
git-svn-id: file:///home/svn/framework3/trunk@10230 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-03 15:04:09 +00:00
b65be82387
Handle updating the updated_at time for just-checked credentials better.
...
git-svn-id: file:///home/svn/framework3/trunk@10213 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-01 22:06:52 +00:00
21540e22ed
Checking in missing reporting stuff for bruteforce. Namely, report_exploit, also changes ftp's pw type to just "password" and re-opens newly verified sessions.
...
git-svn-id: file:///home/svn/framework3/trunk@10205 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-31 20:33:16 +00:00
9253085d13
Add plugin support to rpc. Fixes #2292
...
git-svn-id: file:///home/svn/framework3/trunk@10177 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-28 18:21:17 +00:00
1d508a7acd
Fixes #2464
...
git-svn-id: file:///home/svn/framework3/trunk@10175 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-28 17:37:27 +00:00
8dd489ad3b
expose the payload exe filename, remove the concat operator
...
git-svn-id: file:///home/svn/framework3/trunk@10169 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-27 17:23:47 +00:00
330281eadd
see #684 , adds checksum support, updates modules to use it, fixes some wfs_delay/WfsDelay issues
...
git-svn-id: file:///home/svn/framework3/trunk@10150 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-25 20:55:37 +00:00
c473d20927
default badchars to payload_badchars
...
git-svn-id: file:///home/svn/framework3/trunk@10149 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-25 20:54:20 +00:00
34eb75af73
overhaul smtp to add support for authentication and STARTTLS. can now send email through a gmail account
...
git-svn-id: file:///home/svn/framework3/trunk@10148 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-25 20:31:46 +00:00
623e4ef3ac
add forward search, reset between eggs, move options into a hash
...
git-svn-id: file:///home/svn/framework3/trunk@10132 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-25 01:21:12 +00:00
1db9d8eb01
Fixes #2444 . Adds an ExploitedHost table, adds the db_exploited command, adds the report_exploit() function.
...
Tested with meterpreter, shell, and clientside exploit sessions.
git-svn-id: file:///home/svn/framework3/trunk@10130 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-24 21:57:04 +00:00
b6577681c6
another omelet update from Peter, this time with in-line assembly
...
git-svn-id: file:///home/svn/framework3/trunk@10118 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-23 21:03:00 +00:00
6e66831517
couple minor fixes to omelet mixin/class
...
git-svn-id: file:///home/svn/framework3/trunk@10116 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-23 19:53:15 +00:00
2b11577ae1
fix broken free, type in require
...
git-svn-id: file:///home/svn/framework3/trunk@10112 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-23 18:05:37 +00:00
acef967d5a
Updating importing to deal with importing credentials from Metasploit Express XML.
...
git-svn-id: file:///home/svn/framework3/trunk@10111 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-23 17:45:36 +00:00
08fc366d0b
add omlet mixin from Peter Van Eeckhoutte
...
git-svn-id: file:///home/svn/framework3/trunk@10108 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-23 17:35:41 +00:00
8c9d08b1e8
add egg override param for egghunter
...
git-svn-id: file:///home/svn/framework3/trunk@10098 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-22 20:19:19 +00:00
09af63c1fb
generate returning nil in payload.size
...
git-svn-id: file:///home/svn/framework3/trunk@10087 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-20 20:35:48 +00:00
0e896261cb
1.8.6 compatibility fix
...
git-svn-id: file:///home/svn/framework3/trunk@10086 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-20 20:31:39 +00:00
198cc37f8a
load java payload mixin, fixes #2432
...
git-svn-id: file:///home/svn/framework3/trunk@10081 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-20 18:04:48 +00:00
5b38990e70
missed this
...
git-svn-id: file:///home/svn/framework3/trunk@10076 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-20 07:13:35 +00:00
5d95f48848
add preliminary support for the new java payloads. Working meterpreter and shell stages with tcp bind and reverse stagers, see #406
...
git-svn-id: file:///home/svn/framework3/trunk@10073 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-20 07:01:23 +00:00
d0ea2737c5
Don't overwrite source_id just because we don't have one.
...
git-svn-id: file:///home/svn/framework3/trunk@10067 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-19 23:19:34 +00:00
7d560e9c18
rescue NoCompatiblePayloadError inside size method, fixes #1604
...
git-svn-id: file:///home/svn/framework3/trunk@10051 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-19 00:10:06 +00:00
ad2b69dced
add database access to rpc. thanks Ryan Linn for the patch\!
...
git-svn-id: file:///home/svn/framework3/trunk@10043 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-18 21:26:26 +00:00
6d6a547b34
Fixes #2412 . Adds a creds table, modifies the db_report_auth API, adds the db_creds and db_add_cred commands.
...
git-svn-id: file:///home/svn/framework3/trunk@10034 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-18 00:58:20 +00:00
cb445588e0
fix problem with unclosed sockets
...
git-svn-id: file:///home/svn/framework3/trunk@10012 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-14 04:58:27 +00:00
c94663c1fd
check the os before adding output redirection to commands
...
git-svn-id: file:///home/svn/framework3/trunk@10007 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-13 19:46:04 +00:00
7b521b8ef2
change the timeout to something sane
...
git-svn-id: file:///home/svn/framework3/trunk@10006 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-13 17:24:59 +00:00
bcbd691ea7
add a list chunk function
...
git-svn-id: file:///home/svn/framework3/trunk@9997 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-13 16:09:31 +00:00
1b31a44b57
move riff support from ani_loadimage browser sploit to mixin
...
git-svn-id: file:///home/svn/framework3/trunk@9984 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-12 16:56:41 +00:00
040a292181
Create a new mixin that changes SMBUser/SMBPass to normal options, include this mixin within SMB modules that more often than not require authentication
...
git-svn-id: file:///home/svn/framework3/trunk@9981 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-12 15:00:58 +00:00
d540818f01
split http exploit mixin into http/server and http/client
...
git-svn-id: file:///home/svn/framework3/trunk@9971 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-07 06:59:16 +00:00
9dacf8116e
remove rails dependency from module.replicant
...
git-svn-id: file:///home/svn/framework3/trunk@9969 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-07 05:57:58 +00:00
7f8bbbc535
add dhcp/pxe stuff from scriptjunkie, see #2329
...
git-svn-id: file:///home/svn/framework3/trunk@9963 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-06 17:37:28 +00:00
53e2a010cd
add -n (disable database) option for msfconsole, gives 33% startup time reduction
...
git-svn-id: file:///home/svn/framework3/trunk@9959 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-05 02:24:40 +00:00
d7a4cd2096
fix next/break handling inside new loop -- fixes #2310
...
git-svn-id: file:///home/svn/framework3/trunk@9951 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-03 16:00:45 +00:00
2f384cde82
add alias for calling Msf::Exploit regenerate_payload explicitly -- fixes #2312
...
git-svn-id: file:///home/svn/framework3/trunk@9950 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-03 15:14:34 +00:00
e26d4ded08
Import the scanner and utility modules for the VxWorks WDB Agent service
...
git-svn-id: file:///home/svn/framework3/trunk@9945 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-02 05:56:26 +00:00
9a583b9e09
fix encoding. =/
...
git-svn-id: file:///home/svn/framework3/trunk@9918 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-24 01:04:58 +00:00
e957a7a90e
add support for doing everything msfpayload does into msfconsole and xmlrpc, fixes #589 . Thanks, Ryan Linn for the patch
...
git-svn-id: file:///home/svn/framework3/trunk@9914 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-23 20:22:36 +00:00
6e34bc5420
further clean up exception handling / session waiting for exploits
...
git-svn-id: file:///home/svn/framework3/trunk@9910 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-21 23:25:20 +00:00
fed1e88b7d
missed a file
...
git-svn-id: file:///home/svn/framework3/trunk@9908 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-21 22:37:49 +00:00
671d243aaa
put the stop command in core instead of base and default the extra argument to nil. this should allow a cleaner exit without breaking existing code (i hope). see #2247 (again) and also fixes #1010
...
git-svn-id: file:///home/svn/framework3/trunk@9907 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-21 22:37:26 +00:00
b8b5d0586d
generate job info from available properties in rpc. fixes #2236
...
git-svn-id: file:///home/svn/framework3/trunk@9902 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-21 08:57:11 +00:00
8c5f10006f
style compliance fixes
...
git-svn-id: file:///home/svn/framework3/trunk@9899 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-21 06:03:42 +00:00
276a83d7b4
allow specifing which code to use for the exe
...
git-svn-id: file:///home/svn/framework3/trunk@9895 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-21 00:01:45 +00:00
45c869d015
revert the rpc.stop patch as it breaks other rpc stuff. i'll have a better fix for this later today.
...
git-svn-id: file:///home/svn/framework3/trunk@9890 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-20 20:36:09 +00:00
88c6bf13dd
apply patch from scriptjunkie to stop the xmlrpc daemon. fixes #2247
...
git-svn-id: file:///home/svn/framework3/trunk@9887 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-20 19:12:09 +00:00
33b479e696
adjust https handler status message
...
git-svn-id: file:///home/svn/framework3/trunk@9872 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-20 00:17:58 +00:00
bcb62247dd
explicitly clear a module's job_id in case it was set in a previous run. Fixes #2267
...
git-svn-id: file:///home/svn/framework3/trunk@9847 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-16 21:47:00 +00:00
63595d1ce2
update exception handling to bail on RuntimeError or Interrupt, but wait otherwise.
...
git-svn-id: file:///home/svn/framework3/trunk@9845 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-16 19:58:41 +00:00
d9402edde3
Handle cases where the exploit succeeds but then throws an exception, printing the "exploit failed" message. Closes #2260
...
git-svn-id: file:///home/svn/framework3/trunk@9840 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-15 21:28:21 +00:00
3c199b0364
Fixes #824 . PcapLog now works, and doesn't use racket nor packetfu -- just straight pcaprub, since I'm not doing anything exciting with them aside from saving to a file.
...
Also, it's a proper plugin now, not just a singleton, with a command dispather and everything.
Pretty much totoally rewritten. Since it hasn't worked for at least 5 months, I doubt anyone will be shocked by the API change.
git-svn-id: file:///home/svn/framework3/trunk@9834 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-14 20:38:19 +00:00
ac69cf72bb
Clone the module_store while we are at it
...
git-svn-id: file:///home/svn/framework3/trunk@9832 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-14 20:18:39 +00:00
97d3c9da8b
This may solve both of the scanner/bap cases for module cloning
...
git-svn-id: file:///home/svn/framework3/trunk@9831 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-14 20:16:22 +00:00
7710528432
Duplicate the report info string
...
git-svn-id: file:///home/svn/framework3/trunk@9825 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-14 17:06:44 +00:00
5c2f104ade
Fix module.replicant(), closes #2252
...
git-svn-id: file:///home/svn/framework3/trunk@9824 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-14 17:06:12 +00:00
ff204324e0
Do not fall through to YAML
...
git-svn-id: file:///home/svn/framework3/trunk@9823 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-14 17:05:47 +00:00
4b44fdb8c2
adds ftp data functionality from Thomas Ring, after some modifications
...
git-svn-id: file:///home/svn/framework3/trunk@9821 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-14 14:04:27 +00:00
c19e533ec9
Don't call it a success if AIX complains about all upcase logins.
...
git-svn-id: file:///home/svn/framework3/trunk@9813 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-13 22:30:45 +00:00
5b3fa182ba
Switch back to dev mode
...
git-svn-id: file:///home/svn/framework3/trunk@9791 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-12 07:25:30 +00:00
1dd2dd2315
add java as a regular platform
...
git-svn-id: file:///home/svn/framework3/trunk@9782 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-11 19:46:55 +00:00
cc963785fc
Bump to -release, final should be cut soon
...
git-svn-id: file:///home/svn/framework3/trunk@9763 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-10 15:18:34 +00:00
42f8dc10c0
Change the timeout from 0
...
git-svn-id: file:///home/svn/framework3/trunk@9750 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-09 18:03:48 +00:00
4b1286522d
version bump for beta release
...
git-svn-id: file:///home/svn/framework3/trunk@9731 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-07 23:15:03 +00:00
c0aca105de
closes #2205 . This is actually part of the bigger datastore bug
...
git-svn-id: file:///home/svn/framework3/trunk@9722 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-07 18:14:51 +00:00
3aa3a642ac
move fingerprint verification to mixin
...
git-svn-id: file:///home/svn/framework3/trunk@9717 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-07 17:36:33 +00:00
2c5336dabb
attach job_id to the exploit, not just the driver; regenerate the uuid when replicating a module; generate the payload after copying the exploit module for a new job; fixes #2203 , see #2098 and #2096
...
git-svn-id: file:///home/svn/framework3/trunk@9714 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-07 16:37:23 +00:00
01c1d1d6df
Makes sure that Qualys reports only try to report sensible data -- fixes DB complaints about null in non-null contrained columns.
...
git-svn-id: file:///home/svn/framework3/trunk@9707 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-07 14:53:16 +00:00
dffd8c0c97
Deal with marshaled data for msfx imports.
...
git-svn-id: file:///home/svn/framework3/trunk@9699 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-07 00:28:34 +00:00
ce44b02a35
avoid returning nil info, try to look it up
...
git-svn-id: file:///home/svn/framework3/trunk@9693 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-06 21:53:24 +00:00
8898e2de8f
go back to copying the module for jobs. 'exploit -j' appears to work with the current changes. fixes #2096 and #2098 (for real this time)
...
git-svn-id: file:///home/svn/framework3/trunk@9692 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-06 21:09:53 +00:00
d5e9453a9c
Allow yaml for v1/v2, not for v3, tested
...
git-svn-id: file:///home/svn/framework3/trunk@9691 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-06 19:33:27 +00:00
812d715c35
Validate base64 before demarshal
...
git-svn-id: file:///home/svn/framework3/trunk@9690 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-06 18:40:19 +00:00
ef3dbf3841
Workaround for Ruby 1.8's fragile Marshal code
...
git-svn-id: file:///home/svn/framework3/trunk@9689 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-06 18:35:49 +00:00
8f967af2f3
Dont fallback to yaml for service.info, its either base64 or a string
...
git-svn-id: file:///home/svn/framework3/trunk@9686 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-06 18:17:14 +00:00
618b377d58
let's try this again. don't convert datastore values to strings when copying, only dup things that are already Strings, see #2189 , #2098 , #2096
...
git-svn-id: file:///home/svn/framework3/trunk@9684 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-06 17:59:36 +00:00
5df5991d95
revert r9651, fixes #2189 . Clearly there is more going on when copying a datastore object
...
git-svn-id: file:///home/svn/framework3/trunk@9683 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-06 17:26:06 +00:00
7847a645cd
Remove the 'delete'
...
git-svn-id: file:///home/svn/framework3/trunk@9681 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-06 16:44:04 +00:00
fbdf5dca3c
Try the three-way fallback for serialized fields (service.info and note.data)
...
git-svn-id: file:///home/svn/framework3/trunk@9680 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-06 16:33:27 +00:00
a482f66cb9
Serialize service.info, handle all 3 forms of possible serialized data (marshal, yaml, and string)
...
git-svn-id: file:///home/svn/framework3/trunk@9679 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-06 16:20:04 +00:00
0d40a69f16
Dont mangle the service.info field this way
...
git-svn-id: file:///home/svn/framework3/trunk@9678 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-06 16:10:05 +00:00
5cff86cc1e
Use the module-defined workspace if specified
...
git-svn-id: file:///home/svn/framework3/trunk@9676 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-06 15:43:22 +00:00
6a20b8f5f5
Fixing a typing error for banner timeouts on telnet.
...
git-svn-id: file:///home/svn/framework3/trunk@9665 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-02 21:33:38 +00:00
01139ed655
Adding an autoroute meterpreter script, and enabling route housekeeping to be stored and retrived via Sessions directly, rather than through Rex::Socket::SwitchBoard.
...
git-svn-id: file:///home/svn/framework3/trunk@9663 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-02 17:38:56 +00:00
07ef50e4e1
don't copy modules for jobs. fixes 'exploit -j' which was unable to create sessions, but reopens #2096 and #2098
...
git-svn-id: file:///home/svn/framework3/trunk@9662 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-02 02:46:07 +00:00
1c9059eeb1
standardize job context as an Array and always copy datastore for jobs. fixes #2096 and fixes #2098
...
git-svn-id: file:///home/svn/framework3/trunk@9652 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-01 22:02:46 +00:00
37da4be3e4
do a deep copy of the datastore when replicating a module
...
git-svn-id: file:///home/svn/framework3/trunk@9651 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-01 21:57:24 +00:00
c0eaed263c
abstract some copy-paste; add DataStore#copy for doing a deep copy instead of the shallow copy performed by #dup and #clone
...
git-svn-id: file:///home/svn/framework3/trunk@9650 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-01 21:56:38 +00:00
f1c7fc79de
remove to_s methods that reference a non-existent attribute. fixes .inspect on instances of Opt*. I have no idea how this bug never showed up before
...
git-svn-id: file:///home/svn/framework3/trunk@9649 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-01 21:52:30 +00:00
03918eeeda
Adds an explicit function for import file validation acceptability.
...
git-svn-id: file:///home/svn/framework3/trunk@9636 4d416f70-5f16-0410-b530-b9f4589650da
2010-06-30 15:28:49 +00:00
7e247e2f29
db migration to convert services info from varchar(65535) to text, and save info as a yaml'ed form in order to preserve funny characters.
...
git-svn-id: file:///home/svn/framework3/trunk@9633 4d416f70-5f16-0410-b530-b9f4589650da
2010-06-28 22:42:50 +00:00
d4c558b0d0
use the calculated address for :target_host since session.target_host is nil for client exploits
...
git-svn-id: file:///home/svn/framework3/trunk@9625 4d416f70-5f16-0410-b530-b9f4589650da
2010-06-25 18:33:41 +00:00
63a563c20b
Add disclosure_date method
...
git-svn-id: file:///home/svn/framework3/trunk@9619 4d416f70-5f16-0410-b530-b9f4589650da
2010-06-25 04:21:23 +00:00
f0a4812644
add special encoder for piranha_passwd_exec vuln (rh62)
...
git-svn-id: file:///home/svn/framework3/trunk@9613 4d416f70-5f16-0410-b530-b9f4589650da
2010-06-24 22:36:51 +00:00
32fa35d53f
Undoing r9607.
...
git-svn-id: file:///home/svn/framework3/trunk@9610 4d416f70-5f16-0410-b530-b9f4589650da
2010-06-24 16:44:09 +00:00
6280c51382
Adding Java to the platform list (mainly so module_ports.rb will work again)
...
git-svn-id: file:///home/svn/framework3/trunk@9607 4d416f70-5f16-0410-b530-b9f4589650da
2010-06-24 14:17:09 +00:00
4953b3b69f
If the :fix_services option is used for nmap, actually fix the services, and in addition, skip hosts which only present filtered ports.
...
git-svn-id: file:///home/svn/framework3/trunk@9585 4d416f70-5f16-0410-b530-b9f4589650da
2010-06-22 22:37:14 +00:00
3591143f3a
When importing MSFX data, just report unique collateral once.
...
git-svn-id: file:///home/svn/framework3/trunk@9584 4d416f70-5f16-0410-b530-b9f4589650da
2010-06-22 20:30:43 +00:00
3f7dbaaaac
check the database for a previous fingerprint before going out to the network
...
git-svn-id: file:///home/svn/framework3/trunk@9580 4d416f70-5f16-0410-b530-b9f4589650da
2010-06-22 06:30:48 +00:00
f14b3221ca
move http version reporting into the HttpClient mixin
...
git-svn-id: file:///home/svn/framework3/trunk@9579 4d416f70-5f16-0410-b530-b9f4589650da
2010-06-22 01:39:43 +00:00
20dd7ca26b
make 100% line up correctly
...
git-svn-id: file:///home/svn/framework3/trunk@9554 4d416f70-5f16-0410-b530-b9f4589650da
2010-06-18 03:37:23 +00:00
50c59a9ab1
Skip nmap port imports where the result is unknown and the target is really localhost.
...
git-svn-id: file:///home/svn/framework3/trunk@9553 4d416f70-5f16-0410-b530-b9f4589650da
2010-06-18 03:03:11 +00:00
b35baa39f7
allow PHPInclude modules to run automatically
...
git-svn-id: file:///home/svn/framework3/trunk@9545 4d416f70-5f16-0410-b530-b9f4589650da
2010-06-16 21:16:15 +00:00
9924a8d40e
Incorporates a service name map that makes nmap scanning a little more useful for MSFX out of the gate.
...
git-svn-id: file:///home/svn/framework3/trunk@9536 4d416f70-5f16-0410-b530-b9f4589650da
2010-06-16 18:22:42 +00:00
cb69b0c134
Fixes #2101 . Introduces a proper :skip_user, and adds better comment docs to auth_brute to describe the intended use of each return code.
...
git-svn-id: file:///home/svn/framework3/trunk@9529 4d416f70-5f16-0410-b530-b9f4589650da
2010-06-15 19:10:15 +00:00
1b5e35b059
Fixes #2089 . Getting rid of zip_requires() in favor of always loading Zip, Dirtmp, and FileUtils.
...
git-svn-id: file:///home/svn/framework3/trunk@9496 4d416f70-5f16-0410-b530-b9f4589650da
2010-06-11 21:21:59 +00:00
d4e6e75f7d
Handle loot, tasks, and report times that come from a MSFX ZIP report.
...
git-svn-id: file:///home/svn/framework3/trunk@9493 4d416f70-5f16-0410-b530-b9f4589650da
2010-06-11 18:56:16 +00:00
6fc84364b5
make PlatformList a little more like an Array
...
git-svn-id: file:///home/svn/framework3/trunk@9479 4d416f70-5f16-0410-b530-b9f4589650da
2010-06-11 05:20:40 +00:00
6f37ea2aeb
Adding a 3rd party zip library (rubyzip by Thomas Sondergaard and Technorama Ltd, released under the Ruby license), and a method to import ZIP reports generated by Metasploit Express (still needs work, but is mildly functional right now).
...
git-svn-id: file:///home/svn/framework3/trunk@9478 4d416f70-5f16-0410-b530-b9f4589650da
2010-06-10 21:06:06 +00:00
ec439354b0
Dropping the summary info. It's often incorrect.
...
git-svn-id: file:///home/svn/framework3/trunk@9469 4d416f70-5f16-0410-b530-b9f4589650da
2010-06-10 13:24:43 +00:00
d4e1da2fc9
Fixes amap log importing, hopefully once and for all.
...
git-svn-id: file:///home/svn/framework3/trunk@9454 4d416f70-5f16-0410-b530-b9f4589650da
2010-06-08 22:14:25 +00:00
38674cf62f
Implements callbacks for importing data from vulnerability scanners.
...
git-svn-id: file:///home/svn/framework3/trunk@9452 4d416f70-5f16-0410-b530-b9f4589650da
2010-06-08 19:16:20 +00:00
dd71e4ac58
Fixes #2034 . Adds the SINGLE_SESSION option, adds an ftp_quit method to handle sending QUIT and disconnecting.
...
git-svn-id: file:///home/svn/framework3/trunk@9451 4d416f70-5f16-0410-b530-b9f4589650da
2010-06-08 16:30:03 +00:00
a0e252ad75
See #2034 . This adds a pretty decent reconnection handler -- keep trying until you're dropped, so this is handy for sites that greylist the banner display.
...
Also ensures that anonymous:somebrowserID is always checked.
git-svn-id: file:///home/svn/framework3/trunk@9447 4d416f70-5f16-0410-b530-b9f4589650da
2010-06-07 21:37:29 +00:00
394f292c4a
fix handling of '100 Continue' responses
...
git-svn-id: file:///home/svn/framework3/trunk@9444 4d416f70-5f16-0410-b530-b9f4589650da
2010-06-06 19:48:33 +00:00
432284ce5a
Handle multiple versions of Metasploit Express XML files.
...
git-svn-id: file:///home/svn/framework3/trunk@9431 4d416f70-5f16-0410-b530-b9f4589650da
2010-06-04 18:54:50 +00:00
c6da645a93
First part of a db import overhaul. Next up: implementing callbacks so the user can follow along with the import to get a sense of where they're at.
...
git-svn-id: file:///home/svn/framework3/trunk@9426 4d416f70-5f16-0410-b530-b9f4589650da
2010-06-04 14:57:58 +00:00
694b70208a
Fix rhost/rport for auth_brute
...
git-svn-id: file:///home/svn/framework3/trunk@9408 4d416f70-5f16-0410-b530-b9f4589650da
2010-06-03 17:58:57 +00:00
7039bc3461
change "local port" to "listen port", see #2005
...
git-svn-id: file:///home/svn/framework3/trunk@9395 4d416f70-5f16-0410-b530-b9f4589650da
2010-06-02 16:23:46 +00:00
d242143518
Allow for spaces and funny characters in usernames and passwords
...
git-svn-id: file:///home/svn/framework3/trunk@9390 4d416f70-5f16-0410-b530-b9f4589650da
2010-06-01 22:44:50 +00:00
d41e94050e
See #2034 . This adds a basic FTP bruteforce module. It also makes some minor changes to auth_brute (allows for both SMB and FTP credentials to get mapped to the basic 'USERNAME' and 'PASSWORD' datastores), and touches up the other FTP modules slightly.
...
git-svn-id: file:///home/svn/framework3/trunk@9388 4d416f70-5f16-0410-b530-b9f4589650da
2010-06-01 18:17:26 +00:00
0dfe0c38be
use quotes to avoid php warnings, encoders should take care of it anyway
...
git-svn-id: file:///home/svn/framework3/trunk@9383 4d416f70-5f16-0410-b530-b9f4589650da
2010-06-01 16:26:48 +00:00
6d1e7bdaa5
big commit - lots of cmdstager changes
...
created 4 cmd stagers (instead of just one): CmdStagerVBS, CmdStagerDebugAsm, CmdStagerDebugWrite, CmdStagerTFTP
created a TFTPServer mixin
created Msf::Exploit::EXE mixin to generate executables
updated all uses of CmdStager to use CmdStagerVBS for the time being
add exploit for cve-2001-0333 using CmdStagerTFTP
updated tftp server to wait for transfers to finish (up to 30 seconds) before shutting down
write debug.exe stager stub in 16-bit assembly (used in CmdStagerDebugAsm)
git-svn-id: file:///home/svn/framework3/trunk@9375 4d416f70-5f16-0410-b530-b9f4589650da
2010-05-26 22:39:56 +00:00
350ac4fb7c
grammar!
...
git-svn-id: file:///home/svn/framework3/trunk@9371 4d416f70-5f16-0410-b530-b9f4589650da
2010-05-26 15:40:12 +00:00
3ce61ca466
grammar!
...
git-svn-id: file:///home/svn/framework3/trunk@9370 4d416f70-5f16-0410-b530-b9f4589650da
2010-05-26 15:38:13 +00:00
def1af53ad
remove executable property
...
git-svn-id: file:///home/svn/framework3/trunk@9369 4d416f70-5f16-0410-b530-b9f4589650da
2010-05-26 01:14:46 +00:00
Matt Weeks
James Lee
Carlos Perez
Joshua Drake
Tod Beardsley
HD Moore
Jonathan Cran
Mike Smith