Commit Graph

3063 Commits (7cbc566c7b73dc23b8868b4a1cf940eee3609a12)

Author SHA1 Message Date
Tod Beardsley 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
James Lee f6901861fa allow host specifications like 'range, range' e.g. '10.1.1.0/24, 10.2.2.1'. Note that the space is required
git-svn-id: file:///home/svn/framework3/trunk@9489 4d416f70-5f16-0410-b530-b9f4589650da
2010-06-11 17:20:14 +00:00
Joshua Drake e32abab8dc a HTTP -> an HTTP (http://www.english-zone.com/grammar/a-anlessn.html)
git-svn-id: file:///home/svn/framework3/trunk@9488 4d416f70-5f16-0410-b530-b9f4589650da
2010-06-11 16:12:05 +00:00
James Lee 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
Tod Beardsley 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
Tod Beardsley 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
HD Moore ef372a9d78 Adds the db_sync command
git-svn-id: file:///home/svn/framework3/trunk@9466 4d416f70-5f16-0410-b530-b9f4589650da
2010-06-09 21:47:57 +00:00
James Lee 4f2c63dae7 add templates for creating linux armle ELFs, thanks Civ
git-svn-id: file:///home/svn/framework3/trunk@9455 4d416f70-5f16-0410-b530-b9f4589650da
2010-06-09 07:20:21 +00:00
Tod Beardsley 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
Tod Beardsley 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
Tod Beardsley 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
James Lee 32c24b944a actually increment the loop variable; document the deficiencies of the employed technique
git-svn-id: file:///home/svn/framework3/trunk@9449 4d416f70-5f16-0410-b530-b9f4589650da
2010-06-07 23:56:35 +00:00
James Lee 7044c65f22 make sure we have a newline in a chunk length before parsing it, tighten up the regex. fixes 2063 (I hope)
git-svn-id: file:///home/svn/framework3/trunk@9448 4d416f70-5f16-0410-b530-b9f4589650da
2010-06-07 23:43:32 +00:00
Tod Beardsley 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
James Lee 6950cae916 more legible inspect for meterpreter packets
git-svn-id: file:///home/svn/framework3/trunk@9445 4d416f70-5f16-0410-b530-b9f4589650da
2010-06-07 15:20:24 +00:00
James Lee 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
et eee1194e82 Removing old wmap lib
git-svn-id: file:///home/svn/framework3/trunk@9443 4d416f70-5f16-0410-b530-b9f4589650da
2010-06-06 03:55:21 +00:00
Tod Beardsley 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
Tod Beardsley 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
Tod Beardsley 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
Tod Beardsley e4c2a74915 DIY on the iconv stuff. just load the arrays once, plz.
git-svn-id: file:///home/svn/framework3/trunk@9407 4d416f70-5f16-0410-b530-b9f4589650da
2010-06-03 17:35:58 +00:00
Tod Beardsley a5a318f623 Workaround for a lack of Iconv for performing EBCDIC/ASCII conversions
git-svn-id: file:///home/svn/framework3/trunk@9406 4d416f70-5f16-0410-b530-b9f4589650da
2010-06-03 17:28:45 +00:00
Joshua Drake 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
Tod Beardsley 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
Tod Beardsley 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
James Lee 055ec7d768 session handler stub for php meterpreter
git-svn-id: file:///home/svn/framework3/trunk@9387 4d416f70-5f16-0410-b530-b9f4589650da
2010-06-01 17:01:42 +00:00
James Lee c1371c8758 add a method for checking if we support ssl and make sure we do before trying initializing the client
git-svn-id: file:///home/svn/framework3/trunk@9386 4d416f70-5f16-0410-b530-b9f4589650da
2010-06-01 17:00:00 +00:00
HD Moore 87379e798a Bump the timeout for hashdump, handle large DCs better, thanks Chris!
git-svn-id: file:///home/svn/framework3/trunk@9385 4d416f70-5f16-0410-b530-b9f4589650da
2010-06-01 16:45:34 +00:00
James Lee 5b6b13e7e8 check for existence before using stuff
git-svn-id: file:///home/svn/framework3/trunk@9384 4d416f70-5f16-0410-b530-b9f4589650da
2010-06-01 16:35:10 +00:00
James Lee 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
HD Moore 766b591988 Add -o to db_hosts, write the list of hosts to a file
git-svn-id: file:///home/svn/framework3/trunk@9381 4d416f70-5f16-0410-b530-b9f4589650da
2010-05-30 13:49:28 +00:00
HD Moore 845407a356 Allow interrupts to break out of recvfrom
git-svn-id: file:///home/svn/framework3/trunk@9380 4d416f70-5f16-0410-b530-b9f4589650da
2010-05-29 06:52:47 +00:00
Joshua Drake 288b700e75 remove silly debugging statements
git-svn-id: file:///home/svn/framework3/trunk@9377 4d416f70-5f16-0410-b530-b9f4589650da
2010-05-26 22:46:22 +00:00
Joshua Drake 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
Joshua Drake ecba10c4fd switch to ::IO.select
git-svn-id: file:///home/svn/framework3/trunk@9374 4d416f70-5f16-0410-b530-b9f4589650da
2010-05-26 22:11:42 +00:00
James Lee 1e47a49b7e match whitespace to the rbreadline standard instead of the msf standard
git-svn-id: file:///home/svn/framework3/trunk@9373 4d416f70-5f16-0410-b530-b9f4589650da
2010-05-26 19:54:32 +00:00
James Lee 2555392fc8 tab complete OptPath options
git-svn-id: file:///home/svn/framework3/trunk@9372 4d416f70-5f16-0410-b530-b9f4589650da
2010-05-26 17:02:58 +00:00
Joshua Drake 350ac4fb7c grammar!
git-svn-id: file:///home/svn/framework3/trunk@9371 4d416f70-5f16-0410-b530-b9f4589650da
2010-05-26 15:40:12 +00:00
Joshua Drake 3ce61ca466 grammar!
git-svn-id: file:///home/svn/framework3/trunk@9370 4d416f70-5f16-0410-b530-b9f4589650da
2010-05-26 15:38:13 +00:00
Joshua Drake 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
Tod Beardsley 110e0c8404 Allow for an IP range notation of "10.1.1.1-10.255.255.255" . This is equivalent to "10.1-255.1-255.1-255" but is more natural for some people not familiar with the nmap-style notation. Note that there must be no spaces around the hyphen. In the case of "10.1.1.1 - 10.255.255.255", this will merely fail normally. In the case of "10.1.1.1- 10.255.255.255," you will end up with a funny range of 10.1.1.1-255 and 10.255.255.255, since the space after the hyphen denotes "until the end of the octet space."
git-svn-id: file:///home/svn/framework3/trunk@9368 4d416f70-5f16-0410-b530-b9f4589650da
2010-05-25 22:44:55 +00:00
Tod Beardsley 563ab310dc Strengthening up the checks for valid formats for CIDR address ranges when passed to Rex::Socket::RangeWalker
git-svn-id: file:///home/svn/framework3/trunk@9366 4d416f70-5f16-0410-b530-b9f4589650da
2010-05-25 20:46:00 +00:00
James Lee 6167fbe2a3 leave the database commands in all the time and warn if there's no connection, fixes #1923
git-svn-id: file:///home/svn/framework3/trunk@9361 4d416f70-5f16-0410-b530-b9f4589650da
2010-05-25 01:32:30 +00:00
James Lee 7b7e2f6e0c add tab completion to db_import
git-svn-id: file:///home/svn/framework3/trunk@9360 4d416f70-5f16-0410-b530-b9f4589650da
2010-05-24 23:38:45 +00:00
Mike Smith 8b9eb25664 Load rubygems before changing Encoding.default_internal (fixes #1914)
git-svn-id: file:///home/svn/framework3/trunk@9359 4d416f70-5f16-0410-b530-b9f4589650da
2010-05-24 23:07:56 +00:00
Mike Smith d90656be0e Improve error logging when modules fail to load.
* Don't print module file path twice on the same line
* Use print_error instead of print
* Remove unnecessary newlines

git-svn-id: file:///home/svn/framework3/trunk@9358 4d416f70-5f16-0410-b530-b9f4589650da
2010-05-24 23:07:52 +00:00
James Lee a6d39ca581 add tab completion for filenames. works fine with real readline, only does current directory in rbreadline, see #664
git-svn-id: file:///home/svn/framework3/trunk@9357 4d416f70-5f16-0410-b530-b9f4589650da
2010-05-24 22:57:27 +00:00
Ramon de C Valle afd52bd798 Change the base value used for calculating the system call numbers and
arguments in aix.rb



git-svn-id: file:///home/svn/framework3/trunk@9353 4d416f70-5f16-0410-b530-b9f4589650da
2010-05-24 18:07:15 +00:00
Ramon de C Valle d31dd35f62 Fixes #2004. Add back the timeout argument to sunrpc_call method.
git-svn-id: file:///home/svn/framework3/trunk@9349 4d416f70-5f16-0410-b530-b9f4589650da
2010-05-24 00:57:18 +00:00
Tod Beardsley 1a2be34a63 Fixes #2002. Needed to work with some pipelining to get this all to work right, but it seems to function now pretty well -- if the target takes Basic, do basic, if the target takes NTLM, do NTLM. Should implement Digest too, but I don't think hardly anyone uses that.
git-svn-id: file:///home/svn/framework3/trunk@9346 4d416f70-5f16-0410-b530-b9f4589650da
2010-05-22 17:58:01 +00:00