cd2088ee96
Import the OpenVAS bridge from Kost. Go see his talk: http://www.berlinsides.org/node/14
...
git-svn-id: file:///home/svn/framework3/trunk@11428 4d416f70-5f16-0410-b530-b9f4589650da
2010-12-28 17:45:05 +00:00
1ac8b5abe9
fix a nil.dup by returning a proper platformlist when we don't have a session, dump actual info with 'info' command instead of nothing
...
git-svn-id: file:///home/svn/framework3/trunk@11425 4d416f70-5f16-0410-b530-b9f4589650da
2010-12-27 18:21:33 +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
1df394638e
Remove an annoying warning
...
git-svn-id: file:///home/svn/framework3/trunk@11413 4d416f70-5f16-0410-b530-b9f4589650da
2010-12-25 06:33:04 +00:00
2bb7528e26
Switch to 8.8.8.8 from 50.50.50.50 now that the 50 block has been allocated. Note that this isn't actually sending data to the target
...
git-svn-id: file:///home/svn/framework3/trunk@11384 4d416f70-5f16-0410-b530-b9f4589650da
2010-12-20 22:13:49 +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
925e4a66f0
See #3371 . Uncommits the database logging of smb_hash credentials.
...
This kind of meterpreter update may not actually be desirable, given the introduction of a dependency on Metasploit Framework in to the stand-alone Rex library.
#3371 will remain open until this debate is resolved. In the meantime, need to back this out. :/
git-svn-id: file:///home/svn/framework3/trunk@11351 4d416f70-5f16-0410-b530-b9f4589650da
2010-12-16 16:53:28 +00:00
9627194330
Hashdump will now save found credentials to the database.
...
git-svn-id: file:///home/svn/framework3/trunk@11347 4d416f70-5f16-0410-b530-b9f4589650da
2010-12-16 02:42:45 +00:00
e92c073c22
Sync RbReadline with TIP, some diffs remain Metasploit specific
...
git-svn-id: file:///home/svn/framework3/trunk@11338 4d416f70-5f16-0410-b530-b9f4589650da
2010-12-14 22:09:38 +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
c6dd53b5c0
look for database configuration in environment variable as well as command line arguments and configuration directory
...
git-svn-id: file:///home/svn/framework3/trunk@11327 4d416f70-5f16-0410-b530-b9f4589650da
2010-12-14 09:59:49 +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
256d3409d4
Fixes #3351 . Suppress the warning message about pcaprub. It's not a big deal at all in Metasploit
...
Note that while missing pcaprub is fine, loading the wrong versions of pcaprub is still not fine, and raises actual exceptions.
git-svn-id: file:///home/svn/framework3/trunk@11319 4d416f70-5f16-0410-b530-b9f4589650da
2010-12-13 18:30:42 +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
5b43ea2c15
Buffer data before sending it to the response parser, handle buffered data on disconnect
...
git-svn-id: file:///home/svn/framework3/trunk@11286 4d416f70-5f16-0410-b530-b9f4589650da
2010-12-11 06:19:36 +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
fa29afaece
Handle character echoing sessions more gracefully
...
git-svn-id: file:///home/svn/framework3/trunk@11268 4d416f70-5f16-0410-b530-b9f4589650da
2010-12-09 22:44:17 +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
2742475ae0
fix refactoring scrap
...
git-svn-id: file:///home/svn/framework3/trunk@11258 4d416f70-5f16-0410-b530-b9f4589650da
2010-12-08 22:30:01 +00:00
e5dc368b57
Add WoW64 detection
...
git-svn-id: file:///home/svn/framework3/trunk@11256 4d416f70-5f16-0410-b530-b9f4589650da
2010-12-08 21:05:07 +00:00
19ba0164f6
fix bad socket reference
...
git-svn-id: file:///home/svn/framework3/trunk@11255 4d416f70-5f16-0410-b530-b9f4589650da
2010-12-08 20:37:31 +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
284e568f7c
fix 'search -o', thanks Larry Wert for the patch! fixes #3306
...
git-svn-id: file:///home/svn/framework3/trunk@11243 4d416f70-5f16-0410-b530-b9f4589650da
2010-12-07 16:02:44 +00:00
2192d06189
Handle cases where the class has already been loaded
...
git-svn-id: file:///home/svn/framework3/trunk@11242 4d416f70-5f16-0410-b530-b9f4589650da
2010-12-07 13:45:49 +00:00
ebaf100a9f
Add RangeWalker#include_range?
...
git-svn-id: file:///home/svn/framework3/trunk@11237 4d416f70-5f16-0410-b530-b9f4589650da
2010-12-06 22:18:49 +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
185f50212f
use TCPServer instead of Socket + bind and work around JRuby's broken Socket#getsockname (see http://jira.codehaus.org/browse/JRUBY-5232 )
...
git-svn-id: file:///home/svn/framework3/trunk@11211 4d416f70-5f16-0410-b530-b9f4589650da
2010-12-02 23:49:02 +00:00
b89fe64e74
whitespace
...
git-svn-id: file:///home/svn/framework3/trunk@11209 4d416f70-5f16-0410-b530-b9f4589650da
2010-12-02 22:13:39 +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
9e03e8a142
fix service name handling
...
git-svn-id: file:///home/svn/framework3/trunk@11198 4d416f70-5f16-0410-b530-b9f4589650da
2010-12-02 02:23:27 +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
5a01ede38a
only assign the original request if a response was returned
...
git-svn-id: file:///home/svn/framework3/trunk@11193 4d416f70-5f16-0410-b530-b9f4589650da
2010-12-01 16:32:40 +00:00
bf24e44114
avoid creating a second manifest.mf entry if one already exists
...
git-svn-id: file:///home/svn/framework3/trunk@11175 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-30 07:10:57 +00:00
c5c2b37c8b
dont mangle offset 0x88 if using sub_method
...
git-svn-id: file:///home/svn/framework3/trunk@11174 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-30 04:53:43 +00:00
85113deb04
allow modifying the data in a Zip::Entry to support the previous commit (r11172)
...
git-svn-id: file:///home/svn/framework3/trunk@11173 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-30 03:52:46 +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
1061baba8d
fix some potential bugs from Edward Kolodka, fixes #3256
...
git-svn-id: file:///home/svn/framework3/trunk@11165 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-30 00:16:07 +00:00
ee7d5827d5
prevent mangling the input string
...
git-svn-id: file:///home/svn/framework3/trunk@11148 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-25 07:42:34 +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
20dc5d57cf
force key length to 8, pad if less and truncate if more
...
git-svn-id: file:///home/svn/framework3/trunk@11131 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-24 20:57:26 +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
fc5fcaea57
Handle unlicensed nexpose instances better
...
git-svn-id: file:///home/svn/framework3/trunk@11109 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-23 05:03:58 +00:00
23a6874954
add support for browsers other than firefox, starting with sensible-browser to try to use the system default. fixes #3059 , thanks Larry Wert for the patch
...
git-svn-id: file:///home/svn/framework3/trunk@11108 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-23 04:42:59 +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
2e72926638
Add audio (microphone) recording support to stdapi.
...
git-svn-id: file:///home/svn/framework3/trunk@11087 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-22 00:32:39 +00:00
4c93eb974f
this fixes #3602 , incompatabilities TBD
...
git-svn-id: file:///home/svn/framework3/trunk@11077 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-19 22:36:38 +00:00
51fd4fb550
this fixes #3602 , incompatabilities TBD
...
git-svn-id: file:///home/svn/framework3/trunk@11076 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-19 22:32:29 +00:00
b5c5e21b24
this fixes #3602 , incompatabilities TBD
...
git-svn-id: file:///home/svn/framework3/trunk@11075 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-19 22:28:35 +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
9d0cf722fa
Spelling!
...
git-svn-id: file:///home/svn/framework3/trunk@11042 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-14 20:00:52 +00:00
77bc5cf6cd
Big VNC update:
...
* Created Rex::Proto::RFB
* Updated vnc_none_auth scanner to use Rex::Proto::RFB::Client
* Added vnc_login (refactored from carstein)
* Created an initial vnc_passwords.txt file
* Removed cipher/des.rb - incompatible license
* Updated getvncpw script to use new Rex::Proto::RFB::Cipher.decrypt
git-svn-id: file:///home/svn/framework3/trunk@11033 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-14 03:37:45 +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
54f3563c7e
Store the http request in the http response object when Rex::HTTP::Client.send_recv() is used. Let Anemone store the request as well, passing it into the Page object for further analysis.
...
git-svn-id: file:///home/svn/framework3/trunk@11023 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-13 05:25:39 +00:00
510f61ac37
A working Rex backend for Anemone
...
git-svn-id: file:///home/svn/framework3/trunk@11022 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-13 05:20:51 +00:00
a0b76b1979
This merges in support for Rex sockets to anemone
...
git-svn-id: file:///home/svn/framework3/trunk@11016 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-13 03:33:36 +00:00
375a655317
Fix windows platform detection
...
git-svn-id: file:///home/svn/framework3/trunk@11012 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-12 19:46:33 +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
b171d5192e
Changes to handle errors and to output print
...
git-svn-id: file:///home/svn/framework3/trunk@11001 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-12 01:27:15 +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
594a46bfc7
Merge webcam extension into stdapi.
...
git-svn-id: file:///home/svn/framework3/trunk@10997 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-11 22:36:54 +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
8afc9ebb41
Revert, this is causing threading issues with Windows.
...
git-svn-id: file:///home/svn/framework3/trunk@10989 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-11 19:54:27 +00:00
3edccbc118
fix help message
...
git-svn-id: file:///home/svn/framework3/trunk@10986 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-11 16:55:36 +00:00
b143c8eac1
Only load priv on win32/win64 sessions
...
git-svn-id: file:///home/svn/framework3/trunk@10984 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-11 16:15:26 +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
75cd356803
a less obnoxious .inspect
...
git-svn-id: file:///home/svn/framework3/trunk@10974 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-10 23:04:01 +00:00
73d9135c91
merge patch from Larry Wert, fixes #2510
...
git-svn-id: file:///home/svn/framework3/trunk@10955 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-09 02:31:21 +00:00
db602dd478
Add functional in-memory webcam support.
...
git-svn-id: file:///home/svn/framework3/trunk@10954 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-09 02:24:28 +00:00
dc9274229a
Reapply Yoann's patch from r7247 to the new tree
...
git-svn-id: file:///home/svn/framework3/trunk@10953 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-08 22:51:29 +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
8f4cb4fbf6
Merge Zate Berg's latest patch
...
git-svn-id: file:///home/svn/framework3/trunk@10938 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-07 01:57:17 +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
dc43689578
Make a note about the second callback
...
git-svn-id: file:///home/svn/framework3/trunk@10926 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-06 04:48:41 +00:00
1460e7134b
Merge in some minor tweaks to Anemone, overhaul to the HTTP class still in the works
...
git-svn-id: file:///home/svn/framework3/trunk@10925 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-06 04:45:27 +00:00
b3cc6e19b6
Initial import of an Anemone snapshot
...
git-svn-id: file:///home/svn/framework3/trunk@10924 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-06 04:34:43 +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
97d7290440
Fix an inadvertant change to close_key()
...
git-svn-id: file:///home/svn/framework3/trunk@10878 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-03 04:20:42 +00:00
1e4eed0559
Let recursive downloads skip over locked files
...
git-svn-id: file:///home/svn/framework3/trunk@10877 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-03 03:16:23 +00:00
fba2cb6d2d
Remove the response wait for close calls triggered by the finalizer, should help in a few corner cases that currently result in a timeout or hang.
...
git-svn-id: file:///home/svn/framework3/trunk@10876 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-03 03:03:29 +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
33e11421b4
fix sytax error bugs in dhcp server
...
git-svn-id: file:///home/svn/framework3/trunk@10868 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-02 22:37:11 +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
245cfd3b61
Fixed problem when running cmd_exec in PHP Meterpreter on Linux
...
git-svn-id: file:///home/svn/framework3/trunk@10850 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-31 00:32:03 +00:00
9432991951
Rescue if priv is not available
...
git-svn-id: file:///home/svn/framework3/trunk@10848 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-30 19:37:01 +00:00
0f8a6b138b
Remove the IsAdmin check for now, always load priv instead. This works around a performance issue with railgun demand loading, once thats fixed we can re-enable
...
git-svn-id: file:///home/svn/framework3/trunk@10844 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-29 04:14:22 +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
2021b1628e
Nod to http://videos.revision3.com/revision3/web/hak5/0810/hak5--0810--ipv6-mubix-metasploit--hd720p30.h264.mp4 @ 20:00
...
git-svn-id: file:///home/svn/framework3/trunk@10809 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-24 18:26:02 +00:00
c03da4fedf
add -y to db_connect, fixes #3046
...
git-svn-id: file:///home/svn/framework3/trunk@10802 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-23 23:20:43 +00:00
ed52da9ee9
automatically load ~/.msf3/database.yml if it exists, see #3046
...
git-svn-id: file:///home/svn/framework3/trunk@10800 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-23 22:51:28 +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
745f31b20f
make the sessions command a little more useful, see #2097
...
git-svn-id: file:///home/svn/framework3/trunk@10791 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-23 00:02:09 +00:00
e3dac1d148
Add search option to find modules with specific options, or specific default values.
...
git-svn-id: file:///home/svn/framework3/trunk@10790 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-22 22:59:31 +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
2dbf731946
fix ArgumentError in everything that closes a process handle
...
git-svn-id: file:///home/svn/framework3/trunk@10776 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-21 17:10:46 +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
44fa5c67a6
fix a latent issue with windows paths surrounded by quotes
...
git-svn-id: file:///home/svn/framework3/trunk@10763 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-20 09:50:12 +00:00
182943fe6c
This change allows IPv6 addresses to be ignored by passing false as a second parameter to getaddress()
...
git-svn-id: file:///home/svn/framework3/trunk@10761 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-20 01:27:00 +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
9d99bf1039
Store the original error code in the RequestError object as well, use this code to determine whether to raise a connect error or not
...
git-svn-id: file:///home/svn/framework3/trunk@10759 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-20 01:05:50 +00:00
c27749db8e
add default lookup_error function, fixes #2993
...
git-svn-id: file:///home/svn/framework3/trunk@10757 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-19 22:53:15 +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
432f235cfd
dont use the module table anymore
...
git-svn-id: file:///home/svn/framework3/trunk@10749 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-19 15:03:30 +00:00
f5f7f555b0
Allow a database config file to be specified
...
git-svn-id: file:///home/svn/framework3/trunk@10743 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-19 07:51:58 +00:00
1a03e528fa
Fix for properly backgrounding shell sessions over RPC.
...
git-svn-id: file:///home/svn/framework3/trunk@10740 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-19 00:15:37 +00:00
a7a769c443
Fixes #2984 by taking a 1/8th of a second nap.
...
git-svn-id: file:///home/svn/framework3/trunk@10733 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-18 21:08:48 +00:00
10a36d9398
Fixes #2979 . The bug is triggered when the en locale is used in activerecord -- this fix appears to have no ill effects when both the /vendor version or a local (current) version of i18n is installed, since the percent notation appears to be okay for both versions. In any event, db_nmap 127.0.0.1 fails correctly for both.
...
git-svn-id: file:///home/svn/framework3/trunk@10731 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-18 19:58:56 +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
e114f373b0
move content-disposition header before content-type, per rfc1867 examples
...
git-svn-id: file:///home/svn/framework3/trunk@10724 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-18 07:01:54 +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
467fceb2a7
Fixes #2692 by retrying writes when the sendQ is full.
...
git-svn-id: file:///home/svn/framework3/trunk@10712 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-16 21:50:03 +00:00
3e09fc30ae
Fixes #2070 by adding finalizers to process, event, thread, registry, and channels.
...
git-svn-id: file:///home/svn/framework3/trunk@10711 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-16 19:39:11 +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
4f40459498
Support backgrounding/killing active channels in meterpreter sessions; and not just the sessions themselves.
...
git-svn-id: file:///home/svn/framework3/trunk@10699 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-15 22:38:06 +00:00
f7bb3b82de
Fixes #2952 . Instead of raising an error when we hit the end of all possibles in converge_sets, just return what's left in the buffer, since it happens to be right anyway.
...
The associated test cases demonstrate that this doesn't cause any trouble (even with silly values) and nothing uses converged_sets except for pattern_create.
git-svn-id: file:///home/svn/framework3/trunk@10696 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-15 19:40:33 +00:00
303fa4784f
Allow multiple workspaces to be added/deleted with one command. ( fixes #2554 )
...
* db_workspace -a one two three
* db_workspace -d one two three
git-svn-id: file:///home/svn/framework3/trunk@10695 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-15 18:06:21 +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
87d2b6dfe5
Squash bug with service mixins & lazy loading of advapi32 exports.
...
git-svn-id: file:///home/svn/framework3/trunk@10692 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-15 05:25:53 +00:00
4e14aa1842
try to load win32api regardless of ruby version, so we correctly fall back to unixy stty stuff
...
git-svn-id: file:///home/svn/framework3/trunk@10687 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-14 19:35:41 +00:00
b10c04b865
Purge the old GTK code since we have a much nicer gui via Java now.
...
git-svn-id: file:///home/svn/framework3/trunk@10686 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-14 18:56:32 +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
e9df13c761
Reapply ActiveRecord patch from r9281 & r9282
...
git-svn-id: file:///home/svn/framework3/trunk@10684 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-14 18:45:51 +00:00
bd3bdfba00
Reapply ActiveRecord patch from r8017
...
git-svn-id: file:///home/svn/framework3/trunk@10683 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-14 18:45:44 +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
a10b3cf9fc
getch() blocks all background threads until the user hits a key, make sure there is something there to read before calling it. also, use the windowsy stuff on mingw since official ruby installer uses mingw now. this fixes a long-standing bug on windows that originally forced us to use cygwin.
...
git-svn-id: file:///home/svn/framework3/trunk@10681 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-14 18:38:59 +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
c7fc361140
apply patch from Peter, see #684
...
git-svn-id: file:///home/svn/framework3/trunk@10657 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-12 17:29:35 +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
dbbd0dc07e
This ensures that even if some wonky string encoding is passed as the body of a HTTP reply, it will be treated as binary. Fixes some of the HTTP Server exploits on Windows
...
git-svn-id: file:///home/svn/framework3/trunk@10653 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-12 16:16:39 +00:00
0b82de4846
Force binmode for Tempfile use to prevent issues with Windows
...
git-svn-id: file:///home/svn/framework3/trunk@10650 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-12 01:48:42 +00:00
2d425d2e67
Make our Quickfile's always binary mode
...
git-svn-id: file:///home/svn/framework3/trunk@10649 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-12 01:42:08 +00:00
026d411660
fix silly test bug
...
git-svn-id: file:///home/svn/framework3/trunk@10648 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-12 00:27: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
8ffe70c2a8
include the local path so you can just require lab_controller in irb
...
git-svn-id: file:///home/svn/framework3/trunk@10630 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-10 02:22:50 +00:00
c76f88245d
Cleaned up the gidance on the labs, and fixed the lab.rb require
...
git-svn-id: file:///home/svn/framework3/trunk@10629 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-10 02:18:41 +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
d6f8b689ee
fix bug in default case
...
git-svn-id: file:///home/svn/framework3/trunk@10606 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-08 19:49:57 +00:00
e408d5a155
add windows error messages for windows meterpreter sessions, minor cleanups
...
git-svn-id: file:///home/svn/framework3/trunk@10605 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-08 19:36:34 +00:00
504be7e7e2
Dont put the load_priv into the timeout block
...
git-svn-id: file:///home/svn/framework3/trunk@10603 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-08 17:31:08 +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
7f9fe3b527
bring metasm to tip
...
git-svn-id: file:///home/svn/framework3/trunk@10600 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-08 16:01:37 +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
41183d3395
Bump the packet queue timeout as well (10 minutes), which should handle even the worst lag
...
git-svn-id: file:///home/svn/framework3/trunk@10598 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-08 05:00:03 +00:00
9489c2fa58
Note on thread safety
...
git-svn-id: file:///home/svn/framework3/trunk@10597 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-08 04:55:06 +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
e4a00b2fd1
Handle a larger backlog
...
git-svn-id: file:///home/svn/framework3/trunk@10594 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-08 03:20:09 +00:00
754225a80d
Implement per dispatch run channel_write of packets, remove __FUNCTION__ due to dprintf changes, and fix shutting down networkpug interfaces. Re-add networkpug binary.
...
git-svn-id: file:///home/svn/framework3/trunk@10586 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-07 11:52:38 +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
1afba58f94
Fix typos
...
git-svn-id: file:///home/svn/framework3/trunk@10584 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-07 04:16:48 +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
eb6da40f69
fix thread rssh param, indentation, rescue close errors
...
git-svn-id: file:///home/svn/framework3/trunk@10581 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-07 00:12:12 +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
eee1e52f14
remove extra padding that messes everything up
...
git-svn-id: file:///home/svn/framework3/trunk@10577 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-06 21:44:23 +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
da459f7712
fix typo
...
git-svn-id: file:///home/svn/framework3/trunk@10574 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-06 19:42:14 +00:00
87cc978ed9
fix/redo OLD_DHGEX compat
...
git-svn-id: file:///home/svn/framework3/trunk@10573 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-06 19:40:13 +00:00
64ad40dc17
oops, the transport socket was getting removed prematurely, causing interact fail
...
git-svn-id: file:///home/svn/framework3/trunk@10572 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-06 19:39:16 +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
1e75603894
Add a Quickfile class that is identical to Tempfile except for the finalizer
...
git-svn-id: file:///home/svn/framework3/trunk@10568 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-06 17:57:56 +00:00
4e7e69f768
Avoid GC issue with Tempfiles in meterpreter's command dispatcher.
...
git-svn-id: file:///home/svn/framework3/trunk@10567 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-06 17:26:33 +00:00
fd0195133d
add socket so cleanup happens
...
git-svn-id: file:///home/svn/framework3/trunk@10566 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-06 16:59:57 +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
bf4cda0374
add a disclosure date column to module list (search and 'show exploits' output), fixes #2090
...
git-svn-id: file:///home/svn/framework3/trunk@10555 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-05 22:32:21 +00:00
e2ed2f0d75
Fix a long-standing issue with Resolv.getaddress() being broken on Ruby 1.9.1 Windows
...
git-svn-id: file:///home/svn/framework3/trunk@10544 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-04 14:49:19 +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
HD Moore
James Lee
Tod Beardsley
Carlos Perez
Joshua Drake
Mike Smith
Matt Weeks
Jonathan Cran
pks