Commit Graph

3030 Commits (9ff5eabb4b9c7922edbd43966460308963e1d0bc)

Author SHA1 Message Date
HD Moore c504d295b2 Rescue EOFErrors by default as well (handle corner cases across a swath of modules)
git-svn-id: file:///home/svn/framework3/trunk@14200 4d416f70-5f16-0410-b530-b9f4589650da
2011-11-09 06:10:10 +00:00
Matt Weeks fdf13e5e0e Fixes #5927
git-svn-id: file:///home/svn/framework3/trunk@14196 4d416f70-5f16-0410-b530-b9f4589650da
2011-11-08 21:45:17 +00:00
Matt Weeks 4629c0867b Address #5887 and #5888 for RPC DB and msfgui
git-svn-id: file:///home/svn/framework3/trunk@14167 4d416f70-5f16-0410-b530-b9f4589650da
2011-11-05 18:12:10 +00:00
HD Moore cd3c3daae1 Allow SkipDatabaseInit to be passed to new consoles to skip over DB initialization. Combined with r14161 this fixes #5902 by allowing this option to be passed down
git-svn-id: file:///home/svn/framework3/trunk@14164 4d416f70-5f16-0410-b530-b9f4589650da
2011-11-04 22:25:09 +00:00
HD Moore d7199d243d This tweak allows a hash of options to be passed to console.create() and for this to bubble up to the WebConsole driver initialization
git-svn-id: file:///home/svn/framework3/trunk@14161 4d416f70-5f16-0410-b530-b9f4589650da
2011-11-04 20:38:12 +00:00
David Maloney 131ffe4ab2 Fixed inconsistencies in how data was being passed to report_auth_info(). The command dispatcher and filezilla
server cred module both used the accessor :ptype but report_auth_info looks for :type. 

While ptype is what the db field is called, almsot everything else references :type so it is better
for consistency to keep everything at :type.

Fixes #5906



git-svn-id: file:///home/svn/framework3/trunk@14141 4d416f70-5f16-0410-b530-b9f4589650da
2011-11-02 02:47:28 +00:00
Tod Beardsley 2a6b002054 Fixes #5338. Note that defined methods are always shared across bindings, no matter what. This patch allows for local variables and other locally-scoped things to behave the same way.
git-svn-id: file:///home/svn/framework3/trunk@14126 4d416f70-5f16-0410-b530-b9f4589650da
2011-10-31 17:48:03 +00:00
Tod Beardsley 667175c650 Fixes #5797, adds an environment variable controlled top level directory for msf config goodies. Thanks Kurt Grutzmacher!
git-svn-id: file:///home/svn/framework3/trunk@14125 4d416f70-5f16-0410-b530-b9f4589650da
2011-10-31 16:53:45 +00:00
HD Moore a4de179793 Bump versioning
git-svn-id: file:///home/svn/framework3/trunk@14121 4d416f70-5f16-0410-b530-b9f4589650da
2011-10-30 05:09:20 +00:00
HD Moore e4695b21ec Correct the use of auth.logout and make some other items more consistent
git-svn-id: file:///home/svn/framework3/trunk@14105 4d416f70-5f16-0410-b530-b9f4589650da
2011-10-28 22:47:26 +00:00
Carlos Perez 0fb9aad89e Typo
git-svn-id: file:///home/svn/framework3/trunk@14096 4d416f70-5f16-0410-b530-b9f4589650da
2011-10-28 13:34:05 +00:00
Tod Beardsley 4b4ef45e33 Fixes #3538, adds store_local, changes the dest directory of all fileformat exploits, allows "save" to be passed to db_nmap to save scan results.
git-svn-id: file:///home/svn/framework3/trunk@14091 4d416f70-5f16-0410-b530-b9f4589650da
2011-10-27 17:01:51 +00:00
HD Moore 993a56421e Version bumpwq
git-svn-id: file:///home/svn/framework3/trunk@14072 4d416f70-5f16-0410-b530-b9f4589650da
2011-10-26 09:12:44 +00:00
James Lee 5ce859d3ad add tab completion to 'route remove'. this has bugged me for years.
git-svn-id: file:///home/svn/framework3/trunk@14065 4d416f70-5f16-0410-b530-b9f4589650da
2011-10-25 16:54:21 +00:00
James Lee d218852f0a allow 'route del' as a synonym for 'route remove' since i can never remember to do it right; fix a bug with improper usage for cmd_route; add Prompt* to the list of known global options
git-svn-id: file:///home/svn/framework3/trunk@14063 4d416f70-5f16-0410-b530-b9f4589650da
2011-10-25 16:31:35 +00:00
Tod Beardsley e014401977 See #3472, deleting some extraneous commenting about a TODO that WASDONE.
git-svn-id: file:///home/svn/framework3/trunk@14059 4d416f70-5f16-0410-b530-b9f4589650da
2011-10-25 03:08:17 +00:00
Tod Beardsley 3d2e734ac1 Fixes #3472 with Jaime Filson's patch, with some extra pizzaz for reporting notes against the service, and reporting some notes as vulns as well.
See #5837 as well.



git-svn-id: file:///home/svn/framework3/trunk@14058 4d416f70-5f16-0410-b530-b9f4589650da
2011-10-25 03:07:15 +00:00
James Lee b016d8944e whitespace at eol
git-svn-id: file:///home/svn/framework3/trunk@14056 4d416f70-5f16-0410-b530-b9f4589650da
2011-10-25 00:13:32 +00:00
James Lee 06a3913910 print the number of loots deleted, fixes #5825, thanks CJR!
git-svn-id: file:///home/svn/framework3/trunk@14049 4d416f70-5f16-0410-b530-b9f4589650da
2011-10-24 19:33:00 +00:00
James Lee 07b402f29b more whitespace, in HttpClient
git-svn-id: file:///home/svn/framework3/trunk@14044 4d416f70-5f16-0410-b530-b9f4589650da
2011-10-24 04:58:59 +00:00
Jonathan Cran 78e507fe9b erb processing for RC files. Allows you to do more generic things w/ rc files:
<rc_file>
<%
rhost = "192.168.1.1"
smbuser = "test"
smbpass = "pass"
payload = "windows/meterpreter/reverse_http"
puts "This will happen while i preprocess an erb-enabled rc file" 
%>

use windows/smb/psexec
set RHOST <%= rhost %>
set SMBUser <%= smbuser %>
set SMBPass <%= smbpass %>
set PAYLOAD <%= payload %>
save

<ruby>
 puts "Now, i should print the system path while running the actual resource file! "
 puts ENV["PATH"]
 puts "end"
</ruby>

<%= puts "This will also happen when i preprocess too" %>

</rc_file>

which will give you output like this: 
<output>
[*] Processing /home/jcran/Desktop/test_erb_rc for ERB directives.
This will happen while i preprocess an erb-enabled rc file
This will also happen when i preprocess too
resource (/home/jcran/Desktop/test_erb_rc)> use windows/smb/psexec
resource (/home/jcran/Desktop/test_erb_rc)> set RHOST 192.168.1.1
RHOST => 192.168.1.1
resource (/home/jcran/Desktop/test_erb_rc)> set SMBUser test
SMBUser => test
resource (/home/jcran/Desktop/test_erb_rc)> set SMBPass pass
SMBPass => pass
resource (/home/jcran/Desktop/test_erb_rc)> set PAYLOAD windows/meterpreter/reverse_http
PAYLOAD => windows/meterpreter/reverse_http
resource (/home/jcran/Desktop/test_erb_rc)> save
Saved configuration to: /home/jcran/.msf4/config
[*] resource (/home/jcran/Desktop/test_erb_rc)> Ruby Code (115 bytes)
Now, i should print the system path while running the actual resource file! 
/home/jcran/.rvm/gems/ruby-1.9.4-p1/bin:/home/jcran/.rvm/gems/ruby-1.9.4-p1@global/bin:/home/jcran/.rvm/rubies/ruby-1.9.4-p1/bin:/home/jcran/.rvm/bin
end
msf  exploit(psexec) >
</output>




git-svn-id: file:///home/svn/framework3/trunk@14013 4d416f70-5f16-0410-b530-b9f4589650da
2011-10-20 06:41:07 +00:00
HD Moore fadeada83c Bump this to 4.1.0-release (incoming!)
git-svn-id: file:///home/svn/framework3/trunk@13988 4d416f70-5f16-0410-b530-b9f4589650da
2011-10-18 08:09:08 +00:00
HD Moore ef3c8aa70c Trailing slash is required after all
git-svn-id: file:///home/svn/framework3/trunk@13986 4d416f70-5f16-0410-b530-b9f4589650da
2011-10-18 07:17:13 +00:00
Tod Beardsley 39ecc19546 Give a warning about an unreadable db config file.
git-svn-id: file:///home/svn/framework3/trunk@13982 4d416f70-5f16-0410-b530-b9f4589650da
2011-10-17 21:41:22 +00:00
Tod Beardsley 3972fb1788 Just because you can't read database.yml shouldn't mean you crash.
git-svn-id: file:///home/svn/framework3/trunk@13981 4d416f70-5f16-0410-b530-b9f4589650da
2011-10-17 21:23:59 +00:00
HD Moore 8a0eddc795 Handle closed_at in a consistent way as it applies to UTC (closes #5572)
git-svn-id: file:///home/svn/framework3/trunk@13955 4d416f70-5f16-0410-b530-b9f4589650da
2011-10-16 19:03:59 +00:00
HD Moore 6d06ac3be1 Fixes #5405 by applying thelightcosine's patch
git-svn-id: file:///home/svn/framework3/trunk@13954 4d416f70-5f16-0410-b530-b9f4589650da
2011-10-16 18:59:27 +00:00
HD Moore 729cfe713c Applies a patch from Kieth Faber that fixes #5080
git-svn-id: file:///home/svn/framework3/trunk@13951 4d416f70-5f16-0410-b530-b9f4589650da
2011-10-16 09:58:18 +00:00
HD Moore cf8524b1b4 Fixes #5414 by applying Joshua Taylor's patch that corrects bad reference types
git-svn-id: file:///home/svn/framework3/trunk@13949 4d416f70-5f16-0410-b530-b9f4589650da
2011-10-16 09:53:53 +00:00
HD Moore 62740172e4 Officially remove support for the buggy/non-functional MySQL backend
git-svn-id: file:///home/svn/framework3/trunk@13948 4d416f70-5f16-0410-b530-b9f4589650da
2011-10-16 09:42:04 +00:00
James Lee 5c9ddb293d add a few comments to reduce the sanity-blasting-ness
git-svn-id: file:///home/svn/framework3/trunk@13942 4d416f70-5f16-0410-b530-b9f4589650da
2011-10-16 00:17:13 +00:00
James Lee b615055c89 Fix a bug where we weren't actually trying to get the correct case for lm/ntlm hashes
git-svn-id: file:///home/svn/framework3/trunk@13927 4d416f70-5f16-0410-b530-b9f4589650da
2011-10-15 04:35:06 +00:00
HD Moore 3c73c3c2f8 Pile of small bug fixes for the FTP server and mixin
git-svn-id: file:///home/svn/framework3/trunk@13924 4d416f70-5f16-0410-b530-b9f4589650da
2011-10-14 23:07:09 +00:00
James Lee ceb095b189 add -R and -o to the creds command
git-svn-id: file:///home/svn/framework3/trunk@13921 4d416f70-5f16-0410-b530-b9f4589650da
2011-10-14 02:46:03 +00:00
Tod Beardsley 550746e7c2 Adding a fingerprint for Metasploit. Turnabout is fair play and all.
git-svn-id: file:///home/svn/framework3/trunk@13918 4d416f70-5f16-0410-b530-b9f4589650da
2011-10-14 01:32:46 +00:00
HD Moore 0ff7f17cba Cosmetic module and service name fixes
git-svn-id: file:///home/svn/framework3/trunk@13917 4d416f70-5f16-0410-b530-b9f4589650da
2011-10-14 00:52:15 +00:00
HD Moore d0ab01d332 Bump the revision to match
git-svn-id: file:///home/svn/framework3/trunk@13916 4d416f70-5f16-0410-b530-b9f4589650da
2011-10-13 23:41:52 +00:00
Carlos Perez f6d1fcd591 Add Cisco as a platform
git-svn-id: file:///home/svn/framework3/trunk@13914 4d416f70-5f16-0410-b530-b9f4589650da
2011-10-13 22:41:48 +00:00
James Lee 4d56a8cad7 treat the user arg like a regex if it was given for a creds search; also, print the vulns help instead of creds help when the user types 'help vulns'
git-svn-id: file:///home/svn/framework3/trunk@13902 4d416f70-5f16-0410-b530-b9f4589650da
2011-10-12 23:50:14 +00:00
Tod Beardsley d9ea38d553 I blame bannedit for all his unless unless talk lately.
git-svn-id: file:///home/svn/framework3/trunk@13893 4d416f70-5f16-0410-b530-b9f4589650da
2011-10-12 21:34:03 +00:00
Tod Beardsley 153a73c75f Fixes #5684 by backing off of post module setup if we don't have enough of a meterpreter session to work with yet.
git-svn-id: file:///home/svn/framework3/trunk@13892 4d416f70-5f16-0410-b530-b9f4589650da
2011-10-12 21:25:56 +00:00
HD Moore a2f4e5ea28 Make it clear that db_autopwn is deprecated
git-svn-id: file:///home/svn/framework3/trunk@13849 4d416f70-5f16-0410-b530-b9f4589650da
2011-10-10 01:19:58 +00:00
Chao Mu 9575bb3780 Fixes #5639. added vprint_debug to module.rb alongside the other vprint_ methods. It calls print_debug when datastore['verbose']
git-svn-id: file:///home/svn/framework3/trunk@13840 4d416f70-5f16-0410-b530-b9f4589650da
2011-10-09 05:34:30 +00:00
HD Moore 292aae8ab5 This small patch causes any input to RangeWalker that contains a host name to expand to all A records returned for that name. This allows RHOSTS to be set to a dns name that returns multiple addresses and for all addresses corresponding to the name to be tested.
git-svn-id: file:///home/svn/framework3/trunk@13837 4d416f70-5f16-0410-b530-b9f4589650da
2011-10-09 01:07:51 +00:00
Jonathan Cran 1b4559199d add the ability to read an environment variable in an rc file. resolves #5334
git-svn-id: file:///home/svn/framework3/trunk@13820 4d416f70-5f16-0410-b530-b9f4589650da
2011-10-06 00:02:51 +00:00
HD Moore 77c86a2406 Fix a couple cosmetic warnings
git-svn-id: file:///home/svn/framework3/trunk@13818 4d416f70-5f16-0410-b530-b9f4589650da
2011-10-05 15:31:56 +00:00
Tod Beardsley f3663520f8 Deal with Windows 7 nexpose fingerprints a little better.
git-svn-id: file:///home/svn/framework3/trunk@13807 4d416f70-5f16-0410-b530-b9f4589650da
2011-09-30 20:46:20 +00:00
Tod Beardsley b79f4324f9 Quick model for my new table
git-svn-id: file:///home/svn/framework3/trunk@13806 4d416f70-5f16-0410-b530-b9f4589650da
2011-09-30 15:49:01 +00:00
HD Moore 616913c4c1 Handle situations where the user set LHOST to 0.0.0.0 in the handler by defaulting LHOST to our locally visible IP for the specific client. Solves some integration issues where 0.0.0.0 was accidentally used
git-svn-id: file:///home/svn/framework3/trunk@13782 4d416f70-5f16-0410-b530-b9f4589650da
2011-09-23 17:04:24 +00:00
Tod Beardsley 00f21c08ae Fixes bug reported by Jérôme to the framework list.
git-svn-id: file:///home/svn/framework3/trunk@13776 4d416f70-5f16-0410-b530-b9f4589650da
2011-09-23 01:22:00 +00:00