infosecn1nja
/
metasploit-framework
mirror of https://github.com/infosecn1nja/metasploit-framework.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
37,376 Commits
7 Branches
556 Tags
421 MiB
Commit Graph

1127 Commits (9e7a330ac849a746b4e68798a9bacd44a829837c)

Author SHA1 Message Date
Tod Beardsley 85d1b77ed3 Fix up notes search implementation 
Uses delete_if and a negative assertion, rather than the (much nicer but
unavailable) keep_if method.
 2012-03-05 13:40:26 -06:00
Tod Beardsley a957c45daf Tidies up sempervictus's search patch 
Affects the console's db commands of hosts, services, vulns, creds, notes,
loot

Skips searching entirely unless a search term is provided, and
explicitly casts the term as a Regexp object from the outset.

Avoids using Object#to_sym in preference of Object#intern (safer in
nearly all cases)

Temporarily disables functionality on notes since Array#keep_if isn't
available prior to Ruby 1.9.2
 2012-03-05 13:40:26 -06:00
RageLtMan fb475ca49c Search functionality for db dispatcher commands 2012-03-05 13:40:26 -06:00
James Lee 65c0cbdc00 Allow tab completion for resource files in current dir 2012-03-02 11:19:46 -07:00
James Lee 8380d0e9e0 No need to set the driver anymore 
Fixes a ridiculous stack trace when connecting with a yaml file.
 2012-02-29 15:47:45 -07:00
James Lee 624e19fd8b Merge session-host-rework branch back to master 
Squashed commit of the following:

commit 2f4e8df33c5b4baa8d6fd67b400778a3f93482aa
Author: James Lee <egypt@metasploit.com>
Date:   Tue Feb 28 16:31:03 2012 -0700

    Clean up some rdoc comments

    This adds categories for the various interfaces that meterpreter and
    shell sessions implement so they are grouped logically in the docs.

commit 9d31bc1b35845f7279148412f49bda56a39c9d9d
Author: James Lee <egypt@metasploit.com>
Date:   Tue Feb 28 13:00:25 2012 -0700

    Combine the docs into one output dir

    There's really no need to separate the API sections into their own
    directory.  Combining them makes it much easier to read.

commit eadd7fc136a9e7e4d9652d55dfb86e6f318332e0
Author: James Lee <egypt@metasploit.com>
Date:   Tue Feb 28 08:27:22 2012 -0700

    Keep the order of iface attributes the same accross rubies

    1.8 doesn't maintain insertion order for Hash keys like 1.9 does so we
    end up with ~random order for the display with the previous technique.
    Switch to an Array instead of a Hash so it's always the same.

commit 6f66dd40f39959711f9bacbda99717253a375d21
Author: James Lee <egypt@metasploit.com>
Date:   Tue Feb 28 08:23:35 2012 -0700

    Fix a few more compiler warnings

commit f39cb536a80c5000a5b9ca1fec5902300ae4b440
Author: James Lee <egypt@metasploit.com>
Date:   Tue Feb 28 08:17:39 2012 -0700

    Fix a type-safety warning

commit 1e52785f38146515409da3724f858b9603d19454
Author: James Lee <egypt@metasploit.com>
Date:   Mon Feb 27 15:21:36 2012 -0700

    LHOST should be OptAddress, not OptAddressRange

commit acef978aa4233c7bd0b00ef63646eb4da5457f67
Author: James Lee <egypt@metasploit.com>
Date:   Sun Feb 26 17:45:59 2012 -0700

    Fix a couple of warnings and a typo

commit 29d87f88790aa1b3e5db6df650ecfb3fb93c675b
Author: HD Moore <hdm@digitaloffense.net>
Date:   Mon Feb 27 11:54:29 2012 -0600

    Fix ctype vs content_type typo

commit 83b5400356c47dd1973e6be3aa343084dfd09c73
Author: Gregory Man <man.gregory@gmail.com>
Date:   Sun Feb 26 15:38:33 2012 +0200

    Fixed scripts/meterpreter/enum_firefox to work with firefox > 3.6.x

commit 49c2c80b347820d02348d694cc71f1b3028b4365
Author: Steve Tornio <swtornio@gmail.com>
Date:   Sun Feb 26 07:13:13 2012 -0600

    add osvdb ref

commit e18e1fe97b89c3a2b8c22bc6c18726853d2c2bee
Author: Matt Andreko <mandreko@gmail.com>
Date:   Sat Feb 25 18:02:56 2012 -0500

    Added aspx target to msfvenom.  This in turn added it to msfencode as well.
    Ref: https://github.com/rapid7/metasploit-framework/pull/188
    Tested on winxp with IIS in .net 1.1 and 2.0 modes

commit e6aa5072112d79bbf8a4d2289cf8d301db3932f5
Author: Joshua J. Drake <github.jdrake@qoop.org>
Date:   Sat Feb 25 13:00:48 2012 -0600

    Fixes #6308: Fall back to 127.0.0.1 when SocketError is raised from the resolver

commit b3371e8bfeea4d84f9d0cba100352b57d7e9e78b
Author: James Lee <egypt@metasploit.com>
Date:   Tue Feb 28 17:07:42 2012 -0700

    Simplify logic for whether an inner iface has the same address

commit 5417419f35a40d1c08ca11ca40744722692d3b0d
Author: James Lee <egypt@metasploit.com>
Date:   Tue Feb 28 16:58:16 2012 -0700

    Whitespace

commit 9036875c2918439ae23e11ee7b958e30ccc29545
Author: James Lee <egypt@metasploit.com>
Date:   Tue Feb 28 16:53:45 2012 -0700

    Set session info before worrying about address

    get_interfaces can take a while on Linux, grab uid and hostname earlier
    so we can give the user an idea of what they popped as soon as possible.

commit f34b51c6291031ab25b5bfb1ac6307a516ab0ee9
Author: James Lee <egypt@metasploit.com>
Date:   Tue Feb 28 16:48:42 2012 -0700

    Clean up rdoc

commit e61a0663454400ec66f59a80d18b0baff4cb8cd9
Author: HD Moore <hd_moore@rapid7.com>
Date:   Tue Feb 28 04:54:45 2012 -0600

    Ensure the architecture is only the first word (not the full WOW64
    message in some cases)

commit 4c701610976a92298c1182eecc9291a1b301e43b
Author: HD Moore <hd_moore@rapid7.com>
Date:   Tue Feb 28 04:49:17 2012 -0600

    More paranoia code, just in case RHOST is set to whitespace

commit c5ff89fe3dc9061e0fa9f761e6530f6571989d28
Author: HD Moore <hd_moore@rapid7.com>
Date:   Tue Feb 28 04:47:01 2012 -0600

    A few more small bug fixes to handle cases with an empty string target
    host resulting in a bad address

commit 462d0188a1298f29ac83b10349aec6737efc5b19
Author: HD Moore <hd_moore@rapid7.com>
Date:   Tue Feb 28 03:55:10 2012 -0600

    Fix up the logic (reversed by accident)

commit 2b2b0adaec2448423dbd3ec54d90a5721965e2df
Author: HD Moore <hd_moore@rapid7.com>
Date:   Mon Feb 27 23:29:52 2012 -0600

    Automatically parse system information and populate the db, identify and
    report NAT when detected, show the real session_host in the sessions -l
    listing

commit 547a4ab4c62dc3248f847dd5d305ad3b74157348
Author: HD Moore <hd_moore@rapid7.com>
Date:   Mon Feb 27 22:16:03 2012 -0600

    Fix typo introduced

commit 27a7b7961e61894bdecd55310a8f45d0917c5a5c
Author: HD Moore <hd_moore@rapid7.com>
Date:   Mon Feb 27 22:11:38 2012 -0600

    More session.session_host tweaks

commit e447302a1a9915795e89b5e29c89ff2ab9b6209b
Author: HD Moore <hd_moore@rapid7.com>
Date:   Mon Feb 27 22:08:20 2012 -0600

    Additional tunnel_peer changes

commit 93369fcffaf8c6b00d992526b4083acfce036bb3
Author: HD Moore <hd_moore@rapid7.com>
Date:   Mon Feb 27 22:06:21 2012 -0600

    Additional changes to session.session_host

commit c3552f66d158685909e2c8b51dfead7c240c4f40
Author: HD Moore <hd_moore@rapid7.com>
Date:   Mon Feb 27 22:00:19 2012 -0600

    Merge changes into the new branch
 2012-02-28 18:29:39 -07:00
James Lee 0e375fc555 Remove superfluous db_driver command now that only pg is supported 2012-02-21 10:10:42 -07:00
sinn3r b96beb0680 Correct regex syntax. Also some whitespace fix. 2012-01-30 15:49:06 -06:00
Carlos Perez 5acc0c62d2 Have the the load command also look at the ~/.msf4/plugins folder 2012-01-29 15:03:18 -04:00
sinn3r 955b02e227 Allow 'port' option in module searching (idea originally from Brandon Perry's blog) 2012-01-18 11:19:37 -06:00
Tod Beardsley cfca791480 Version info toggle for git vs svn checkouts 
Version numbers are kind of meaningless in git development branches, but
are reportedly useful for SVN checkouts.

[See #6254]
 2012-01-17 14:35:33 -06:00
James Lee c2406e0e65 Fix whitespace at EOL 2012-01-06 21:13:17 -07:00
James Lee c35c7f5fab Add tab completion for pushm 
[See #6165]
 2012-01-06 21:10:59 -07:00
Joshua Smith 29b6d0d1e3 Adds previous, pushm, popm to msfconsole 
Adds the ability to set and use a stack of modules, and to easily switch
between the last two modules used.

[Fixes #6165][Closes #84]
Squashed commit of the following:

commit e41e7f704888b1ce5ad5f23caeee1de13052e3d5
Author: Joshua Smith <kernelsmith@kernelsmith.com>
Date:   Mon Dec 26 15:52:08 2011 -0500

    pushm/popm working great, let me know if you find bugs

commit 23da8d56ea08ca196e649431e8188b4f29ba97b9
Author: Joshua Smith <kernelsmith@kernelsmith.com>
Date:   Mon Dec 26 14:37:18 2011 -0500

    Adds the 'previous' command to msfconsole which will load the previously active module as the currently active module, adds @previous_module as a class variable
 2011-12-30 15:30:55 -06:00
Tod Beardsley bc22b7de99 MSFConsole should display hostless loot, also typo fix. 
Fixes the console to display loot not associated with a host, as when
the CorpWatch modules save loot. Also fixes a typo on
corpwatch_lookup_id.rb

Fixes #6177
 2011-12-29 15:11:15 -06:00
Joshua Smith 5166bdcb01 initial, working resource file tab completion, completes from <install_dir>/scripts/resource, see redmine no. 4611 2011-12-15 17:27:52 -05:00
Jonathan Cran 6165b7a1eb This commit adds a junit_success method, which can be called to 
generate a test case success xml. This is necessary for the parser to
recognize that tests were indeed run.
 2011-12-13 21:13:31 -06:00
HD Moore e46745b761 Add support for link-local scopes 2011-12-10 13:24:58 -06:00
James Lee bf105f48cb massive removal of spaces at EOL and some bad tabs 2011-11-20 12:32:06 +11:00
andurin 97f62d955f Fixed very small typo 2011-11-14 11:19:16 +01:00
HD Moore c30f328560 Purge code deprecated in the 4.1.0 release 2011-11-10 20:16:14 -06:00
HD Moore 6cf59fc695 Small tweak to test mirroring 2011-11-09 22:45:49 -06:00
HD Moore 818ece916f Add missing commit 2011-11-09 21:40:02 -06:00
Jonathan Cran 7885699ab1 rename the attribute to classname so parser doesn't barf 
git-svn-id: file:///home/svn/framework3/trunk@14204 4d416f70-5f16-0410-b530-b9f4589650da
 2011-11-09 22:21:39 +00:00
HD Moore 2c47475aee This adds the ability for RC scripts to generate junit/xunit style XML output files for error conditions 
git-svn-id: file:///home/svn/framework3/trunk@14203 4d416f70-5f16-0410-b530-b9f4589650da
 2011-11-09 21:32:48 +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
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 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
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
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
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
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 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 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
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
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
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
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
Matt Weeks a20195d9a4 Display all notes when no host specified, since not all notes include a host. 
git-svn-id: file:///home/svn/framework3/trunk@13645 4d416f70-5f16-0410-b530-b9f4589650da
 2011-08-27 15:39:42 +00:00
James Lee 21604f33e6 add a pry command to modules, move the ModuleCommandDispatcher into its own file 
git-svn-id: file:///home/svn/framework3/trunk@13630 4d416f70-5f16-0410-b530-b9f4589650da
 2011-08-24 21:41:03 +00:00
James Lee 660d7ccfc6 superfluous whitespace 
git-svn-id: file:///home/svn/framework3/trunk@13581 4d416f70-5f16-0410-b530-b9f4589650da
 2011-08-18 23:37:38 +00:00
James Lee 778d6b4bb6 add help for the last few commands that lacked it in core and move the methods around into a more logical order, see #564 
git-svn-id: file:///home/svn/framework3/trunk@13580 4d416f70-5f16-0410-b530-b9f4589650da
 2011-08-18 23:36:51 +00:00
HD Moore dc9c395a7f Handle a range with a nil length 
git-svn-id: file:///home/svn/framework3/trunk@13548 4d416f70-5f16-0410-b530-b9f4589650da
 2011-08-12 19:09:05 +00:00
James Lee 75c4553bb8 add prompt options to list of globals for tab completion 
git-svn-id: file:///home/svn/framework3/trunk@13380 4d416f70-5f16-0410-b530-b9f4589650da
 2011-07-27 19:46:16 +00:00
James Lee a5573b986d update urls 
git-svn-id: file:///home/svn/framework3/trunk@13379 4d416f70-5f16-0410-b530-b9f4589650da
 2011-07-27 19:45:22 +00:00
James Lee 91790d186a add path to the loot table printout, use the proper help for vulns 
git-svn-id: file:///home/svn/framework3/trunk@13378 4d416f70-5f16-0410-b530-b9f4589650da
 2011-07-27 19:38:34 +00:00
David Rude 25bdbe6568 More prompt bug fixes, back and use commands should work properly now 
git-svn-id: file:///home/svn/framework3/trunk@13326 4d416f70-5f16-0410-b530-b9f4589650da
 2011-07-24 18:41:23 +00:00
David Rude a54b8c26c3 Fix prompt updates to show the last set prompt variable 
git-svn-id: file:///home/svn/framework3/trunk@13291 4d416f70-5f16-0410-b530-b9f4589650da
 2011-07-22 01:49:29 +00:00
HD Moore 3046896204 This commit makes the new unicode string encoding optional, it can be disabled by setting EnableUnicodeEncoding to false or through the 'disable_unicode_encoding' console command in the Meterpreter shell. Fixes #4986 
git-svn-id: file:///home/svn/framework3/trunk@13278 4d416f70-5f16-0410-b530-b9f4589650da
 2011-07-21 15:44:54 +00:00
David Rude f6e3065a51 camel case the advanced options 
git-svn-id: file:///home/svn/framework3/trunk@13274 4d416f70-5f16-0410-b530-b9f4589650da
 2011-07-21 14:35:02 +00:00
David Rude 98e99ea2e6 add prompt_char support 
git-svn-id: file:///home/svn/framework3/trunk@13273 4d416f70-5f16-0410-b530-b9f4589650da
 2011-07-21 06:17:44 +00:00
David Rude 1902b92878 Merge custom prompt code 
git-svn-id: file:///home/svn/framework3/trunk@13272 4d416f70-5f16-0410-b530-b9f4589650da
 2011-07-21 06:14:25 +00:00
James Lee 19c4ded9c7 remove the unnecessary db_ prefix on commands that do not manipulate the database infrastructure. fixes #4963 
git-svn-id: file:///home/svn/framework3/trunk@13267 4d416f70-5f16-0410-b530-b9f4589650da
 2011-07-20 08:39:35 +00:00
James Lee ce604977b9 remove deprecated db_create and db_destroy 
git-svn-id: file:///home/svn/framework3/trunk@13266 4d416f70-5f16-0410-b530-b9f4589650da
 2011-07-20 08:25:01 +00:00
James Lee dd4bebf1dd add a list of supported file types for import, fixes #4509 
git-svn-id: file:///home/svn/framework3/trunk@13265 4d416f70-5f16-0410-b530-b9f4589650da
 2011-07-20 07:51:52 +00:00
James Lee 18ce54c11f require a note type when adding notes 
git-svn-id: file:///home/svn/framework3/trunk@13264 4d416f70-5f16-0410-b530-b9f4589650da
 2011-07-20 07:34:52 +00:00
James Lee 00b9af40a1 add RangeWalker support for db_notes, see #4963 
git-svn-id: file:///home/svn/framework3/trunk@13263 4d416f70-5f16-0410-b530-b9f4589650da
 2011-07-20 07:29:42 +00:00
James Lee 26e74e2c4e add RangeWalker and portspec support for db_vulns, see #4963 
git-svn-id: file:///home/svn/framework3/trunk@13262 4d416f70-5f16-0410-b530-b9f4589650da
 2011-07-20 06:32:40 +00:00
James Lee 14f5e2bd9c remove deprecated db_exploited, see #4217 
git-svn-id: file:///home/svn/framework3/trunk@13261 4d416f70-5f16-0410-b530-b9f4589650da
 2011-07-20 05:53:40 +00:00
James Lee f3f94f24a8 db_loot: print a table instead of a big line, accept RangeWalker addrs 
git-svn-id: file:///home/svn/framework3/trunk@13260 4d416f70-5f16-0410-b530-b9f4589650da
 2011-07-20 05:13:59 +00:00
James Lee 03b6eee19e print a table instead of a big line for db_creds 
git-svn-id: file:///home/svn/framework3/trunk@13259 4d416f70-5f16-0410-b530-b9f4589650da
 2011-07-20 04:48:55 +00:00
James Lee 60d6357070 db_hosts and db_services should have full support for RangeWalker and portspec now. see #4963 
git-svn-id: file:///home/svn/framework3/trunk@13258 4d416f70-5f16-0410-b530-b9f4589650da
 2011-07-20 04:39:52 +00:00
James Lee 1023a4a393 allow RangeWalker syntax for args to db_hosts, see #4963 
git-svn-id: file:///home/svn/framework3/trunk@13257 4d416f70-5f16-0410-b530-b9f4589650da
 2011-07-20 03:58:25 +00:00
James Lee 047f509c75 allow portspecs for db_services -p 
git-svn-id: file:///home/svn/framework3/trunk@13255 4d416f70-5f16-0410-b530-b9f4589650da
 2011-07-20 02:07:14 +00:00
James Lee 4bfb342ad6 abstract parsing of hosts and ports in preperation of adding the same facilities to other commands 
git-svn-id: file:///home/svn/framework3/trunk@13253 4d416f70-5f16-0410-b530-b9f4589650da
 2011-07-20 00:33:52 +00:00
James Lee 5e245afe48 make db_creds search a little nicer, allow adding and deleting. see r13233 
git-svn-id: file:///home/svn/framework3/trunk@13247 4d416f70-5f16-0410-b530-b9f4589650da
 2011-07-19 22:53:02 +00:00
James Lee 25d8365aca unbreak db_loot when given no addresses, see r13233 
git-svn-id: file:///home/svn/framework3/trunk@13234 4d416f70-5f16-0410-b530-b9f4589650da
 2011-07-19 19:42:45 +00:00
James Lee 8f7d935cf7 unbreak db_notes when given no addresses 
git-svn-id: file:///home/svn/framework3/trunk@13233 4d416f70-5f16-0410-b530-b9f4589650da
 2011-07-19 19:18:12 +00:00
James Lee 578d3bc101 refactor hosts -> hostlist in db_loot to match other methdos. see #4963 
git-svn-id: file:///home/svn/framework3/trunk@13232 4d416f70-5f16-0410-b530-b9f4589650da
 2011-07-19 19:05:16 +00:00
James Lee 8a9eb35c54 remove deprecated db_add_* and db_del_* commands see #4963 
git-svn-id: file:///home/svn/framework3/trunk@13231 4d416f70-5f16-0410-b530-b9f4589650da
 2011-07-19 18:50:10 +00:00
James Lee c5ef30f0eb remove deprecated import commands. see #4963 
git-svn-id: file:///home/svn/framework3/trunk@13229 4d416f70-5f16-0410-b530-b9f4589650da
 2011-07-19 17:41:20 +00:00
James Lee becf8d756c standardize db_creds and db_exploited, hopefully keeping the same level of flexibility. see #4963 
git-svn-id: file:///home/svn/framework3/trunk@13222 4d416f70-5f16-0410-b530-b9f4589650da
 2011-07-19 11:16:36 +00:00
James Lee 115a331e6b remove db_add_{note,host}; replace them with options to db_{notes,hosts}, see #4963 
git-svn-id: file:///home/svn/framework3/trunk@13219 4d416f70-5f16-0410-b530-b9f4589650da
 2011-07-19 08:13:55 +00:00
James Lee 7b7b9670d2 add -a to db_hosts to replace db_add_hots, see #4963 
git-svn-id: file:///home/svn/framework3/trunk@13218 4d416f70-5f16-0410-b530-b9f4589650da
 2011-07-19 06:09:10 +00:00
James Lee 642cddf620 fix startup-time plugin loading when there is a space in the path. 
git-svn-id: file:///home/svn/framework3/trunk@13189 4d416f70-5f16-0410-b530-b9f4589650da
 2011-07-15 23:46:37 +00:00
HD Moore 483abeab72 Change this to query the class name of the input 
git-svn-id: file:///home/svn/framework3/trunk@13182 4d416f70-5f16-0410-b530-b9f4589650da
 2011-07-15 04:22:32 +00:00
Matt Weeks b1afbfeb96 Fix rpc error with console detect code. 
Un-breaks rpc/msfgui/armitage.
Reference r13160 r13161 r13179 



git-svn-id: file:///home/svn/framework3/trunk@13180 4d416f70-5f16-0410-b530-b9f4589650da
 2011-07-14 22:45:20 +00:00
James Lee bc77523a01 revert r13161, hopefully unbreaking msfgui and armitage 
git-svn-id: file:///home/svn/framework3/trunk@13179 4d416f70-5f16-0410-b530-b9f4589650da
 2011-07-14 22:01:28 +00:00
HD Moore 9fc5470023 Exit makes more sense here 
git-svn-id: file:///home/svn/framework3/trunk@13161 4d416f70-5f16-0410-b530-b9f4589650da
 2011-07-13 05:06:01 +00:00
HD Moore 65702f64b6 Check to make sure we are running under Console2; all sorts of gremlins and threading bugs appear when running under a bare cmd.exe console, this should save us a few bug reports. 
git-svn-id: file:///home/svn/framework3/trunk@13160 4d416f70-5f16-0410-b530-b9f4589650da
 2011-07-13 05:01:37 +00:00
HD Moore 71488d37c1 Add the interact payload to the defaults 
git-svn-id: file:///home/svn/framework3/trunk@13138 4d416f70-5f16-0410-b530-b9f4589650da
 2011-07-09 06:57:30 +00:00
Jonathan Cran 4ac2e9111e add a missing require, and ensure the proper namespace is referenced - thanks ricky 
git-svn-id: file:///home/svn/framework3/trunk@13126 4d416f70-5f16-0410-b530-b9f4589650da
 2011-07-08 03:51:48 +00:00
James Lee 59ef021bd6 cosmetic documentation fix 
git-svn-id: file:///home/svn/framework3/trunk@13065 4d416f70-5f16-0410-b530-b9f4589650da
 2011-06-29 14:50:15 +00:00
HD Moore da7cc53c38 Add the spool command for redirecting output to both the console and a file 
git-svn-id: file:///home/svn/framework3/trunk@13028 4d416f70-5f16-0410-b530-b9f4589650da
 2011-06-25 18:51:07 +00:00
James Lee 515eda1fff add help about new search keyword options 
git-svn-id: file:///home/svn/framework3/trunk@13017 4d416f70-5f16-0410-b530-b9f4589650da
 2011-06-23 22:32:44 +00:00
James Lee 29c12fd064 treat non-option args to db_hosts as an address to search for, removes -a. 
git-svn-id: file:///home/svn/framework3/trunk@12943 4d416f70-5f16-0410-b530-b9f4589650da
 2011-06-14 22:17:07 +00:00
HD Moore 618c438ffd Move keyward parsing into the module base class 
git-svn-id: file:///home/svn/framework3/trunk@12753 4d416f70-5f16-0410-b530-b9f4589650da
 2011-05-28 02:29:22 +00:00
HD Moore 52f7863890 Add keyword searching to msfconsole 
git-svn-id: file:///home/svn/framework3/trunk@12752 4d416f70-5f16-0410-b530-b9f4589650da
 2011-05-28 02:26:04 +00:00
Tod Beardsley a891d53be4 Adding a Nokogiri stream parser for Nexpose raw XML files. 
git-svn-id: file:///home/svn/framework3/trunk@12740 4d416f70-5f16-0410-b530-b9f4589650da
 2011-05-27 17:30:11 +00:00
HD Moore c5c679cdb7 Remove all calls to framework.db.sync and make this method a no-op now that the task manager is no longer used. 
git-svn-id: file:///home/svn/framework3/trunk@12708 4d416f70-5f16-0410-b530-b9f4589650da
 2011-05-25 00:30:03 +00:00
Tod Beardsley 81e1b41840 Fixes #4578. If the user has Nokogiri of a reasonable version installed, use that to parse Nmap-created XML documents. Otherwise, fall back to the existing REXML parser. 
git-svn-id: file:///home/svn/framework3/trunk@12702 4d416f70-5f16-0410-b530-b9f4589650da
 2011-05-24 19:40:50 +00:00
James Lee 3d5cf03af6 move help into its own method for a couple more commands 
git-svn-id: file:///home/svn/framework3/trunk@12651 4d416f70-5f16-0410-b530-b9f4589650da
 2011-05-17 20:43:04 +00:00
HD Moore 9ce47c01bd Reverting the autoload changes until we can upgrade to a new ActiveSupport library or find a workaround 
git-svn-id: file:///home/svn/framework3/trunk@12600 4d416f70-5f16-0410-b530-b9f4589650da
 2011-05-12 20:03:55 +00:00
James Lee 06779bc8c0 remove unnecessary requires for stuff in rex. autoload and a high-level require 'rex' in lib/msf/core.rb should take care of everything. see #4371, #4373, r12587, and r12554. 
git-svn-id: file:///home/svn/framework3/trunk@12588 4d416f70-5f16-0410-b530-b9f4589650da
 2011-05-12 00:53:33 +00:00
Tod Beardsley 50b26cb2d6 Adds another Qualys formatted XML importer for ASSET_DATA_REPORT files. 
git-svn-id: file:///home/svn/framework3/trunk@12575 4d416f70-5f16-0410-b530-b9f4589650da
 2011-05-10 19:10:02 +00:00
James Lee 27c1e757e1 add post count to the banner 
git-svn-id: file:///home/svn/framework3/trunk@12537 4d416f70-5f16-0410-b530-b9f4589650da
 2011-05-04 08:50:38 +00:00
HD Moore d942442bcd Officially remove sqlite3 support (its been deprecated for approximately a year). SQLite3 has not been usable for a long time due to thread concurrency and stability issues. This is the final nail in the coffin now that the DB backend has gone through an overhaul. 
git-svn-id: file:///home/svn/framework3/trunk@12469 4d416f70-5f16-0410-b530-b9f4589650da
 2011-04-29 17:22:53 +00:00
HD Moore 743a401a47 Add the ability to reset the last read pointer from the ringer buffer 
git-svn-id: file:///home/svn/framework3/trunk@12467 4d416f70-5f16-0410-b530-b9f4589650da
 2011-04-29 16:02:24 +00:00
James Lee f04782904e move @@reload_opts to the correct class, fixes 'help reload' from a non-exploit module context 
git-svn-id: file:///home/svn/framework3/trunk@12447 4d416f70-5f16-0410-b530-b9f4589650da
 2011-04-26 21:53:45 +00:00
James Lee 537e312c13 set RHOSTS directly when we have a short list 
git-svn-id: file:///home/svn/framework3/trunk@12404 4d416f70-5f16-0410-b530-b9f4589650da
 2011-04-22 18:31:55 +00:00
James Lee 96ee780967 merge the_listener's patch for adding ability to set RHOSTS from db_services. extends it by adding the same support in db_hosts and db_notes, see #308 
git-svn-id: file:///home/svn/framework3/trunk@12401 4d416f70-5f16-0410-b530-b9f4589650da
 2011-04-22 05:08:08 +00:00
James Lee 1be4b0831b add support for dumping services as a csv file like hosts. merges partial patch from the_listener, thanks! fixes #3120 
git-svn-id: file:///home/svn/framework3/trunk@12400 4d416f70-5f16-0410-b530-b9f4589650da
 2011-04-22 02:22:21 +00:00
HD Moore 545025dbea Add a warning when the imported vulnerability data is missing the service protocol/port (looks like just one vendor today has this problem). 
git-svn-id: file:///home/svn/framework3/trunk@12381 4d416f70-5f16-0410-b530-b9f4589650da
 2011-04-20 18:33:27 +00:00
Tod Beardsley 41cc038eca Undoing r12379 in anticipation of a different version. 
git-svn-id: file:///home/svn/framework3/trunk@12380 4d416f70-5f16-0410-b530-b9f4589650da
 2011-04-20 18:29:04 +00:00
Tod Beardsley 93a07df541 Add a :warning handler for db_import. 
git-svn-id: file:///home/svn/framework3/trunk@12379 4d416f70-5f16-0410-b530-b9f4589650da
 2011-04-20 18:22:18 +00:00
James Lee 5effb0ca04 use Table#to_csv to generate csv a file that isn't broken when data contains commas 
git-svn-id: file:///home/svn/framework3/trunk@12343 4d416f70-5f16-0410-b530-b9f4589650da
 2011-04-17 01:07:53 +00:00
James Lee 05f0f3739f add help for several db commands 
git-svn-id: file:///home/svn/framework3/trunk@12338 4d416f70-5f16-0410-b530-b9f4589650da
 2011-04-16 22:49:31 +00:00
Matt Weeks b53545e875 Seach post modules by default too. 
git-svn-id: file:///home/svn/framework3/trunk@12336 4d416f70-5f16-0410-b530-b9f4589650da
 2011-04-16 18:03:13 +00:00
Jonathan Cran c5c7ca3657 loglevel max is actually 5 
git-svn-id: file:///home/svn/framework3/trunk@12312 4d416f70-5f16-0410-b530-b9f4589650da
 2011-04-13 21:22:38 +00:00
Mike Smith d5d9d56081 Create a dedicated db table to track sessions & session events. 
* Add new db tables for session & session_events
* Migrate existing session data from events db table
* Modify session report methods to log to the new tables


git-svn-id: file:///home/svn/framework3/trunk@12273 4d416f70-5f16-0410-b530-b9f4589650da
 2011-04-07 21:59:32 +00:00
James Lee 16eac54a39 and now back to your regular scheduled msfconsole 
git-svn-id: file:///home/svn/framework3/trunk@12220 4d416f70-5f16-0410-b530-b9f4589650da
 2011-04-02 15:51:48 +00:00
James Lee a305d3bd27 deprecate windows. What day is it today? 
git-svn-id: file:///home/svn/framework3/trunk@12200 4d416f70-5f16-0410-b530-b9f4589650da
 2011-04-01 06:35:25 +00:00
HD Moore fea84dccda Text alignment 
git-svn-id: file:///home/svn/framework3/trunk@12199 4d416f70-5f16-0410-b530-b9f4589650da
 2011-04-01 06:03:42 +00:00
HD Moore f97790ec8b Cosmetic change 
git-svn-id: file:///home/svn/framework3/trunk@12198 4d416f70-5f16-0410-b530-b9f4589650da
 2011-04-01 06:01:25 +00:00
James Lee 8bb95f02c5 load the config after adding any module paths so we can start msfconsole using a module from a non-default path 
git-svn-id: file:///home/svn/framework3/trunk@12105 4d416f70-5f16-0410-b530-b9f4589650da
 2011-03-23 16:19:55 +00:00
James Lee e72a4e36bd add 'show actions' for post mods, oversight from r12008. see #3965 
git-svn-id: file:///home/svn/framework3/trunk@12058 4d416f70-5f16-0410-b530-b9f4589650da
 2011-03-21 17:07:11 +00:00
HD Moore 3d59be3586 This patch adds a 'reload_all' command to msfconsole. This will flush and reload all modules from all module paths 
git-svn-id: file:///home/svn/framework3/trunk@12040 4d416f70-5f16-0410-b530-b9f4589650da
 2011-03-20 22:22:07 +00:00
HD Moore 2e267bdca3 This patch removes the unimplemented "persist" command. This has been sitting in half-done state for too many years and its time to go. 
git-svn-id: file:///home/svn/framework3/trunk@12039 4d416f70-5f16-0410-b530-b9f4589650da
 2011-03-20 21:41:09 +00:00
Matt Weeks c4bd210eae Fixes #3959. 
git-svn-id: file:///home/svn/framework3/trunk@12006 4d416f70-5f16-0410-b530-b9f4589650da
 2011-03-17 04:12:51 +00:00
Tod Beardsley 98a6b7db4c Missing space between hosts and services in db_notes 
git-svn-id: file:///home/svn/framework3/trunk@11919 4d416f70-5f16-0410-b530-b9f4589650da
 2011-03-09 22:11:29 +00:00
HD Moore 3b5c467c47 Fix db_hosts when -c is passed 
git-svn-id: file:///home/svn/framework3/trunk@11862 4d416f70-5f16-0410-b530-b9f4589650da
 2011-03-02 17:12:10 +00:00
HD Moore f912d2e0c2 Add db_loot (basic) 
git-svn-id: file:///home/svn/framework3/trunk@11843 4d416f70-5f16-0410-b530-b9f4589650da
 2011-02-27 16:30:17 +00:00
HD Moore 30c14fe45c Remove a duplicate host column from db_services 
git-svn-id: file:///home/svn/framework3/trunk@11842 4d416f70-5f16-0410-b530-b9f4589650da
 2011-02-27 15:58:08 +00:00
HD Moore 1f3000dc41 Cleaner default output for db_hosts and db_services 
git-svn-id: file:///home/svn/framework3/trunk@11837 4d416f70-5f16-0410-b530-b9f4589650da
 2011-02-26 17:42:03 +00:00
James Lee 21b1945cd4 add a commandline switch for loading plugins at startup 
git-svn-id: file:///home/svn/framework3/trunk@11748 4d416f70-5f16-0410-b530-b9f4589650da
 2011-02-13 22:19:43 +00:00
James Lee f6b5974feb add help for use command 
git-svn-id: file:///home/svn/framework3/trunk@11744 4d416f70-5f16-0410-b530-b9f4589650da
 2011-02-11 23:42:46 +00:00
Joshua Drake c61fc6cfa5 Fixes #3623, make RC <ruby> block start/stop handling more liberal 
git-svn-id: file:///home/svn/framework3/trunk@11684 4d416f70-5f16-0410-b530-b9f4589650da
 2011-01-31 07:11:33 +00:00
James Lee 9163a7f0dd exploit should call run, like in aux modules 
git-svn-id: file:///home/svn/framework3/trunk@11681 4d416f70-5f16-0410-b530-b9f4589650da
 2011-01-30 21:43:38 +00:00
James Lee 3af1cf8279 failure to reload is an error 
git-svn-id: file:///home/svn/framework3/trunk@11665 4d416f70-5f16-0410-b530-b9f4589650da
 2011-01-29 02:39:27 +00:00
James Lee 88a5b1982e always reload post modules when run from meterpreter prompt, fail and error out instead of running the old one when a reload fails. Fixes #3557 
git-svn-id: file:///home/svn/framework3/trunk@11659 4d416f70-5f16-0410-b530-b9f4589650da
 2011-01-28 17:02:26 +00:00
James Lee a7b5e831f7 clean up how help works, pull cmd_reload up so all module types can use it 
git-svn-id: file:///home/svn/framework3/trunk@11658 4d416f70-5f16-0410-b530-b9f4589650da
 2011-01-28 03:29:20 +00:00
Joshua Drake a2e6f0e96c add -q option to suppress banner, improve -n warning 
git-svn-id: file:///home/svn/framework3/trunk@11642 4d416f70-5f16-0410-b530-b9f4589650da
 2011-01-25 22:58:21 +00:00
James Lee 7226a43bea move tab completion helpers up to ShellDispatcher to avoid copy-paste and allow non-msf shells to complete filenames 
git-svn-id: file:///home/svn/framework3/trunk@11562 4d416f70-5f16-0410-b530-b9f4589650da
 2011-01-12 22:09:32 +00:00
Joshua Drake a7d92937df Fixes #3500, Copy pasta find/replace bug 
git-svn-id: file:///home/svn/framework3/trunk@11553 4d416f70-5f16-0410-b530-b9f4589650da
 2011-01-12 01:21:52 +00:00
Joshua Drake 855f8b0752 fix more silly tab completion behavior 
git-svn-id: file:///home/svn/framework3/trunk@11546 4d416f70-5f16-0410-b530-b9f4589650da
 2011-01-11 18:55:37 +00:00
James Lee 972fdc8cc3 display module's fullname when dumping options or info, thanks chao-mu for the patch, fixes #3486 
git-svn-id: file:///home/svn/framework3/trunk@11539 4d416f70-5f16-0410-b530-b9f4589650da
 2011-01-10 23:34:05 +00:00
Joshua Drake 5efb5e318b fix various tab completions so they dont recurse/add silly spaces 
git-svn-id: file:///home/svn/framework3/trunk@11519 4d416f70-5f16-0410-b530-b9f4589650da
 2011-01-08 05:36:00 +00:00
James Lee 713db12a39 add post modules to the search command 
git-svn-id: file:///home/svn/framework3/trunk@11486 4d416f70-5f16-0410-b530-b9f4589650da
 2011-01-06 17:49:46 +00:00
James Lee 3b67ea5124 print usage when the route command is given an argument we don't understand 
git-svn-id: file:///home/svn/framework3/trunk@11471 4d416f70-5f16-0410-b530-b9f4589650da
 2011-01-04 17:13:30 +00:00
James Lee 0ba8cbd8a1 don't complain about no session being created when DisablePayloadHandler is true 
git-svn-id: file:///home/svn/framework3/trunk@11470 4d416f70-5f16-0410-b530-b9f4589650da
 2011-01-04 17:06:22 +00:00
James Lee efafb793c4 only add a / if one wasn't there before; update comments/documentation to reflect the current reality now that #968 and #664 are fixed 
git-svn-id: file:///home/svn/framework3/trunk@11452 4d416f70-5f16-0410-b530-b9f4589650da
 2010-12-29 21:10:14 +00:00
Joshua Drake c25b08452b remove LocalInput as a string (no Rex::Ui::Text::Input::File class exists), see #3426 
git-svn-id: file:///home/svn/framework3/trunk@11440 4d416f70-5f16-0410-b530-b9f4589650da
 2010-12-29 02:15:18 +00:00
Jonathan Cran 93e1f56cd8 `butane's patch for my msfrpcd breakage 
git-svn-id: file:///home/svn/framework3/trunk@11439 4d416f70-5f16-0410-b530-b9f4589650da
 2010-12-29 00:35:27 +00:00
Jonathan Cran a1af22d330 applying a patch to enable easy output to file: ./msfconsole -o output.txt -r input.msfrc 
git-svn-id: file:///home/svn/framework3/trunk@11436 4d416f70-5f16-0410-b530-b9f4589650da
 2010-12-28 20:24:17 +00:00
James Lee 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
Tod Beardsley 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
James Lee 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
Tod Beardsley 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
James Lee 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
HD Moore 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
Joshua Drake 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
HD Moore 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
Tod Beardsley 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
Tod Beardsley 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
James Lee 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
James Lee 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
James Lee 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
Matt Weeks 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
Joshua Drake 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
HD Moore 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
Tod Beardsley 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
HD Moore 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
Mike Smith 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
HD Moore 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
James Lee 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
HD Moore 4a12f9529e Choose a reasonable default if none is set 
git-svn-id: file:///home/svn/framework3/trunk@10539 4d416f70-5f16-0410-b530-b9f4589650da
 2010-10-04 04:50:10 +00:00
HD Moore 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
Tod Beardsley 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
HD Moore 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
Joshua Drake 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
James Lee 0b008d6c3c remove some duplicate code and make output more useful when there is a service with no name 
git-svn-id: file:///home/svn/framework3/trunk@10382 4d416f70-5f16-0410-b530-b9f4589650da
 2010-09-20 01:54:23 +00:00
Tod Beardsley 6336c01771 Deprecates db_import_* file type commands, and suggests the user use db_import instead. 
git-svn-id: file:///home/svn/framework3/trunk@10246 4d416f70-5f16-0410-b530-b9f4589650da
 2010-09-06 18:33:17 +00:00
Tod Beardsley 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
Joshua Drake 49beb83081 add the "makerc" command for quick resource script generation, fixes #738 
git-svn-id: file:///home/svn/framework3/trunk@10119 4d416f70-5f16-0410-b530-b9f4589650da
 2010-08-23 21:19:01 +00:00
Joshua Drake b1411084ff add -h and invalid param error to cmd_show 
git-svn-id: file:///home/svn/framework3/trunk@10083 4d416f70-5f16-0410-b530-b9f4589650da
 2010-08-20 18:45:33 +00:00
Tod Beardsley 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
HD Moore aca547ac48 Remove the 10,000 banner 
git-svn-id: file:///home/svn/framework3/trunk@10023 4d416f70-5f16-0410-b530-b9f4589650da
 2010-08-16 17:13:35 +00:00
Joshua Drake d848732254 stop leaking sockets/jobs when using rerun on aux modules 
git-svn-id: file:///home/svn/framework3/trunk@10014 4d416f70-5f16-0410-b530-b9f4589650da
 2010-08-14 06:47:11 +00:00
HD Moore cc99ceac52 10,000 
git-svn-id: file:///home/svn/framework3/trunk@10000 4d416f70-5f16-0410-b530-b9f4589650da
 2010-08-13 16:10:30 +00:00
Jonathan Cran fb6b993492 added validation for the route command - thanks robin wood 
git-svn-id: file:///home/svn/framework3/trunk@9992 4d416f70-5f16-0410-b530-b9f4589650da
 2010-08-13 06:11:10 +00:00
Joshua Drake 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
James Lee 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
Joshua Drake fbc4be6af4 support outputing selected columns instead of just address 
git-svn-id: file:///home/svn/framework3/trunk@9913 4d416f70-5f16-0410-b530-b9f4589650da
 2010-07-22 16:53:11 +00:00
Joshua Drake 0d8e98a519 handle validation errors more gracefully, check job_id, fixes #2279 
git-svn-id: file:///home/svn/framework3/trunk@9898 4d416f70-5f16-0410-b530-b9f4589650da
 2010-07-21 00:50:25 +00:00
HD Moore 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
HD Moore 37f4783d55 Adds -u to the connect command 
git-svn-id: file:///home/svn/framework3/trunk@9788 4d416f70-5f16-0410-b530-b9f4589650da
 2010-07-12 03:15:45 +00:00
Joshua Drake 2de94b910b more specificity 
git-svn-id: file:///home/svn/framework3/trunk@9725 4d416f70-5f16-0410-b530-b9f4589650da
 2010-07-07 18:25:04 +00:00
James Lee 49955d2ca0 check for fileness instead of just existence, fixes #2204 
git-svn-id: file:///home/svn/framework3/trunk@9720 4d416f70-5f16-0410-b530-b9f4589650da
 2010-07-07 17:42:18 +00:00
Joshua Drake 7384dec65e add virtual columns back per egyp7 request, see #2055 
git-svn-id: file:///home/svn/framework3/trunk@9688 4d416f70-5f16-0410-b530-b9f4589650da
 2010-07-06 18:18:26 +00:00
Joshua Drake 7c9e39ab1d make db_hosts -c conform to the -h text, fixes #2055 
git-svn-id: file:///home/svn/framework3/trunk@9685 4d416f70-5f16-0410-b530-b9f4589650da
 2010-07-06 18:05:41 +00:00
James Lee 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
James Lee d488f133cf log the number of modules db_autopwn will try 
git-svn-id: file:///home/svn/framework3/trunk@9628 4d416f70-5f16-0410-b530-b9f4589650da
 2010-06-25 22:32:39 +00:00
Carlos Perez f4670b26d0 sessions -s was passing unnecesary arguments to scripts, fixeed conflict for scripts that use the -s option 
git-svn-id: file:///home/svn/framework3/trunk@9508 4d416f70-5f16-0410-b530-b9f4589650da
 2010-06-13 01:25:18 +00:00
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
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
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
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
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
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
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 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
James Lee 15cee53b41 move tab completion setup out of init_ui. fixes #1180 
git-svn-id: file:///home/svn/framework3/trunk@9332 4d416f70-5f16-0410-b530-b9f4589650da
 2010-05-20 23:47:49 +00:00
James Lee 851b68d9ab make sure the session has ui handles before running the upexec, see #1982 
git-svn-id: file:///home/svn/framework3/trunk@9331 4d416f70-5f16-0410-b530-b9f4589650da
 2010-05-20 23:30:03 +00:00
HD Moore dfa7fb7d0b Move away from Kernel.select in exchange for IO.select, solves some issues with windows compatibility 
git-svn-id: file:///home/svn/framework3/trunk@9330 4d416f70-5f16-0410-b530-b9f4589650da
 2010-05-20 20:42:17 +00:00
James Lee 8e648dc7e0 proto is not required, fixes #1976 
git-svn-id: file:///home/svn/framework3/trunk@9326 4d416f70-5f16-0410-b530-b9f4589650da
 2010-05-19 19:08:08 +00:00
James Lee 5e920cad93 whitespace and a clearer warning message 
git-svn-id: file:///home/svn/framework3/trunk@9312 4d416f70-5f16-0410-b530-b9f4589650da
 2010-05-17 15:20:30 +00:00
James Lee eb29533ee1 get rid of unnecessary dbms-specific disconnect methods 
git-svn-id: file:///home/svn/framework3/trunk@9311 4d416f70-5f16-0410-b530-b9f4589650da
 2010-05-17 04:49:17 +00:00
James Lee a17dd47908 move a method closer to where it's used 
git-svn-id: file:///home/svn/framework3/trunk@9310 4d416f70-5f16-0410-b530-b9f4589650da
 2010-05-17 04:39:07 +00:00
James Lee f754b9178a convert db_autopwn -I and -X to use RangeWalker; this has bugged me for a long time 
git-svn-id: file:///home/svn/framework3/trunk@9309 4d416f70-5f16-0410-b530-b9f4589650da
 2010-05-17 04:35:33 +00:00
James Lee bfe47b85d8 whitespace and a typo 
git-svn-id: file:///home/svn/framework3/trunk@9308 4d416f70-5f16-0410-b530-b9f4589650da
 2010-05-17 04:01:26 +00:00
Joshua Drake 5dabc4ba3f add more validation to return value from exploit check methods 
git-svn-id: file:///home/svn/framework3/trunk@9305 4d416f70-5f16-0410-b530-b9f4589650da
 2010-05-14 19:53:06 +00:00
James Lee fc793f3cfc print an error if a resource file doesn't exist, fixes #1358 
git-svn-id: file:///home/svn/framework3/trunk@9280 4d416f70-5f16-0410-b530-b9f4589650da
 2010-05-11 03:20:44 +00:00
James Lee c5efb3c557 add db_status command, fixes #1159 
git-svn-id: file:///home/svn/framework3/trunk@9270 4d416f70-5f16-0410-b530-b9f4589650da
 2010-05-10 09:23:53 +00:00
James Lee 29c222d575 document that sqlite is not supported, clarify the db_create deprecation warning to indicate the new ability of db_connect to also create the database 
git-svn-id: file:///home/svn/framework3/trunk@9268 4d416f70-5f16-0410-b530-b9f4589650da
 2010-05-10 06:27:47 +00:00
James Lee fd5b26ad43 add a timestamp to session opened messages, fixes #1776 
git-svn-id: file:///home/svn/framework3/trunk@9216 4d416f70-5f16-0410-b530-b9f4589650da
 2010-05-03 20:06:25 +00:00
HD Moore 49932f9ef5 Deprecate db_create, change the suggested postgres driver to 'postgres' 
git-svn-id: file:///home/svn/framework3/trunk@9195 4d416f70-5f16-0410-b530-b9f4589650da
 2010-05-02 02:07:30 +00:00
Tod Beardsley 1b910c1862 Expose a means to import MSFE reports to the user. 
git-svn-id: file:///home/svn/framework3/trunk@9144 4d416f70-5f16-0410-b530-b9f4589650da
 2010-04-26 19:10:40 +00:00
James Lee 4243ce5bf4 preliminary fix for the meterpreter-breaks-tab-completion bug pending some testing, see #1180 
git-svn-id: file:///home/svn/framework3/trunk@9113 4d416f70-5f16-0410-b530-b9f4589650da
 2010-04-20 03:59:27 +00:00
Joshua Drake df16eec4d7 revert r9038, see r9039, fixes #1531, fixes #531 
git-svn-id: file:///home/svn/framework3/trunk@9040 4d416f70-5f16-0410-b530-b9f4589650da
 2010-04-07 23:42:04 +00:00
James Lee a502c2647d tell readline that the color escapes shouldn't be counted as part of the line length, thanks to Niklas Baumstark. fixes 1531, fixes 531 
git-svn-id: file:///home/svn/framework3/trunk@9038 4d416f70-5f16-0410-b530-b9f4589650da
 2010-04-07 23:24:54 +00:00
HD Moore b2568a33df Change the gem name 
git-svn-id: file:///home/svn/framework3/trunk@9034 4d416f70-5f16-0410-b530-b9f4589650da
 2010-04-07 16:21:14 +00:00
Joshua Drake 71426f1af7 fix db_destory help 
git-svn-id: file:///home/svn/framework3/trunk@9033 4d416f70-5f16-0410-b530-b9f4589650da
 2010-04-07 16:09:01 +00:00
HD Moore af10ee5e57 Handle timeout errors more gracefully 
git-svn-id: file:///home/svn/framework3/trunk@9023 4d416f70-5f16-0410-b530-b9f4589650da
 2010-04-06 02:05:50 +00:00
HD Moore 09dd8c1fcc Adds portlist_to_portspec and portspec_to_portlist. Merges in Qualys XML support from Sertan Kolat 
git-svn-id: file:///home/svn/framework3/trunk@8949 4d416f70-5f16-0410-b530-b9f4589650da
 2010-03-28 23:02:28 +00:00
HD Moore 2b419a421d Add default timeouts to autopwn, control with -T 
git-svn-id: file:///home/svn/framework3/trunk@8892 4d416f70-5f16-0410-b530-b9f4589650da
 2010-03-24 00:11:21 +00:00
HD Moore 05bd6b816d Fix this for when users dont have msfconsole.rc 
git-svn-id: file:///home/svn/framework3/trunk@8877 4d416f70-5f16-0410-b530-b9f4589650da
 2010-03-22 15:50:42 +00:00
HD Moore 0bea440dcb Add the ability to process ruby blocks in resource scripts. Fixes #1288 
git-svn-id: file:///home/svn/framework3/trunk@8876 4d416f70-5f16-0410-b530-b9f4589650da
 2010-03-22 14:26:02 +00:00
James Lee 1678a0f74a move\ vuln\ reporting\ out\ of\ the\ console\ so\ it works in all\ UIs 
git-svn-id: file:///home/svn/framework3/trunk@8855 4d416f70-5f16-0410-b530-b9f4589650da
 2010-03-19 22:17:07 +00:00
James Lee 99414acc54 fixes #1120. only wait for the jobs we spawned 
git-svn-id: file:///home/svn/framework3/trunk@8850 4d416f70-5f16-0410-b530-b9f4589650da
 2010-03-18 18:26:53 +00:00
Joshua Drake ec325f9ab1 adjust help text, see #394 
git-svn-id: file:///home/svn/framework3/trunk@8809 4d416f70-5f16-0410-b530-b9f4589650da
 2010-03-12 23:06:33 +00:00
Joshua Drake a811ad0c32 clean up, add comments, and fix bug in command dispatcher, fixes #394 
git-svn-id: file:///home/svn/framework3/trunk@8808 4d416f70-5f16-0410-b530-b9f4589650da
 2010-03-12 22:59:19 +00:00
Joshua Drake 7b41d08387 remove dupe "-s" option from help, add "-u" option to upgrade command shell session to meterpreter 
git-svn-id: file:///home/svn/framework3/trunk@8807 4d416f70-5f16-0410-b530-b9f4589650da
 2010-03-12 21:51:55 +00:00
HD Moore 6bd2a954cf Lots of small changes, the big one is moving from sysread -> readpartial in the stream base class 
git-svn-id: file:///home/svn/framework3/trunk@8764 4d416f70-5f16-0410-b530-b9f4589650da
 2010-03-10 06:43:46 +00:00
HD Moore e05921b297 Report the workspace object not the name 
git-svn-id: file:///home/svn/framework3/trunk@8763 4d416f70-5f16-0410-b530-b9f4589650da
 2010-03-10 06:16:57 +00:00
HD Moore d8c900aabb Report the workspace based on the session 
git-svn-id: file:///home/svn/framework3/trunk@8741 4d416f70-5f16-0410-b530-b9f4589650da
 2010-03-08 05:31:21 +00:00
Joshua Drake 607752f141 dont try to run cmds on meterpreter sessions with a "sys" member, see #803 
git-svn-id: file:///home/svn/framework3/trunk@8732 4d416f70-5f16-0410-b530-b9f4589650da
 2010-03-06 04:58:38 +00:00
Joshua Drake 2f3b54efe3 use happy color printer functions for cmd_check 
git-svn-id: file:///home/svn/framework3/trunk@8727 4d416f70-5f16-0410-b530-b9f4589650da
 2010-03-05 17:03:59 +00:00
James Lee 37159d6b41 move this up so all database drivers have a bigger pool, see #976 
git-svn-id: file:///home/svn/framework3/trunk@8706 4d416f70-5f16-0410-b530-b9f4589650da
 2010-03-04 07:10:20 +00:00
Joshua Drake 9148068acc pass unlink_now flag to close for Tempfile instances 
git-svn-id: file:///home/svn/framework3/trunk@8697 4d416f70-5f16-0410-b530-b9f4589650da
 2010-03-03 04:58:12 +00:00
James Lee 467a7a5f3e merge mubix's patch to allow importing a simple list of ip addresses from a file, closes #999 
git-svn-id: file:///home/svn/framework3/trunk@8695 4d416f70-5f16-0410-b530-b9f4589650da
 2010-03-03 00:34:16 +00:00
James Lee 76745eed81 bump the connection pool up to 30 for sqlite; see #976. Not closing the bug, since I don't know how this will work in the long term 
git-svn-id: file:///home/svn/framework3/trunk@8689 4d416f70-5f16-0410-b530-b9f4589650da
 2010-03-02 14:27:36 +00:00
James Lee 9f9d97d735 make sure the sys extension is available before using it. this appears to fix #803 
git-svn-id: file:///home/svn/framework3/trunk@8617 4d416f70-5f16-0410-b530-b9f4589650da
 2010-02-24 06:45:12 +00:00
Joshua Drake cc4b13a0a0 check for empty args to sessions -c 
git-svn-id: file:///home/svn/framework3/trunk@8616 4d416f70-5f16-0410-b530-b9f4589650da
 2010-02-24 04:46:59 +00:00
Joshua Drake b391abd32d adds scripting for command shell sessions 
1. InitialAutoRunScript and AutoRunScript vars work
2. scripts/shells was created to hold them
3. *_shell methods were renamed shell_*
4. added "shell_command" method to command shell sessions
5. converted all uses of *_shell to shell_*
6. all payloads that produce command shell sessions include Msf::Sessions::CommandShellOptions



git-svn-id: file:///home/svn/framework3/trunk@8615 4d416f70-5f16-0410-b530-b9f4589650da
 2010-02-24 01:19:59 +00:00
Joshua Drake b98868e32f check for script before trying to run it for all sessions 
git-svn-id: file:///home/svn/framework3/trunk@8612 4d416f70-5f16-0410-b530-b9f4589650da
 2010-02-23 20:54:18 +00:00
HD Moore a71e8d2af0 Fix up meterpreter script changes 
git-svn-id: file:///home/svn/framework3/trunk@8611 4d416f70-5f16-0410-b530-b9f4589650da
 2010-02-23 20:16:45 +00:00
James Lee 4ad6c24a95 look for dead sesions with a reaper thread instead of on other session events, add Session#alive accessor for all session types; still need to figure out when a shell session is dead and set it accordingly. Add a reason argument to on_session_close to distinguish between killed sessions and dead sessions 
git-svn-id: file:///home/svn/framework3/trunk@8596 4d416f70-5f16-0410-b530-b9f4589650da
 2010-02-23 05:59:30 +00:00
Mike Smith e59082f6b5 Added "created_at" and "updated_at" timestamps all primary tables (fixes #838) 
git-svn-id: file:///home/svn/framework3/trunk@8555 4d416f70-5f16-0410-b530-b9f4589650da
 2010-02-18 21:57:01 +00:00
HD Moore 4c4c747caf Update all db methods to have a workspace parameter, default to the db.workspace where possible, updated the command dispatchers. 
git-svn-id: file:///home/svn/framework3/trunk@8546 4d416f70-5f16-0410-b530-b9f4589650da
 2010-02-18 06:40:38 +00:00
HD Moore 52dc906ba2 Port states can now be open/closed/filtered; removed the "up" syntax 
git-svn-id: file:///home/svn/framework3/trunk@8372 4d416f70-5f16-0410-b530-b9f4589650da
 2010-02-05 15:43:24 +00:00
James Lee ea0f4d2e46 allow multiple resource files on the command line 
git-svn-id: file:///home/svn/framework3/trunk@8357 4d416f70-5f16-0410-b530-b9f4589650da
 2010-02-02 23:13:42 +00:00
et 96d6e7bd9b In progress. crawling 
git-svn-id: file:///home/svn/framework3/trunk@8236 4d416f70-5f16-0410-b530-b9f4589650da
 2010-01-26 04:21:07 +00:00
Joshua Drake c147575255 fix error message 
git-svn-id: file:///home/svn/framework3/trunk@8196 4d416f70-5f16-0410-b530-b9f4589650da
 2010-01-22 17:39:51 +00:00
HD Moore b6b25b7f03 allow the default workspace to be purged and recreated 
git-svn-id: file:///home/svn/framework3/trunk@8134 4d416f70-5f16-0410-b530-b9f4589650da
 2010-01-15 15:58:13 +00:00
James Lee 53662ed46e save events to the database. fixes 618 
git-svn-id: file:///home/svn/framework3/trunk@8126 4d416f70-5f16-0410-b530-b9f4589650da
 2010-01-15 00:32:48 +00:00
HD Moore de4add3a1f Whitespace cleanups 
git-svn-id: file:///home/svn/framework3/trunk@8096 4d416f70-5f16-0410-b530-b9f4589650da
 2010-01-11 19:18:49 +00:00
James Lee e1ba7b9618 print a useful message instead of nothing when the given file doesn't exist 
git-svn-id: file:///home/svn/framework3/trunk@8092 4d416f70-5f16-0410-b530-b9f4589650da
 2010-01-10 17:49:28 +00:00
James Lee 93a673fa1f allow multiple filename arguments to db_import and handle globs, see 750 
git-svn-id: file:///home/svn/framework3/trunk@8089 4d416f70-5f16-0410-b530-b9f4589650da
 2010-01-07 21:51:18 +00:00
James Lee 30b897b6cd add a generic db_import command that auto-detects filetype, move import parsing into msf/core/db. fixes 750 
git-svn-id: file:///home/svn/framework3/trunk@8085 4d416f70-5f16-0410-b530-b9f4589650da
 2010-01-07 19:06:29 +00:00
James Lee a9b1462e9d add a callback for session commands. fixes 618 
git-svn-id: file:///home/svn/framework3/trunk@8075 4d416f70-5f16-0410-b530-b9f4589650da
 2010-01-06 05:06:12 +00:00
James Lee b365a86aa1 save nmap version detections 
git-svn-id: file:///home/svn/framework3/trunk@8073 4d416f70-5f16-0410-b530-b9f4589650da
 2010-01-05 18:23:28 +00:00
James Lee 58cfcd99f8 record a vuln when opening a session. the format may need some more thought 
git-svn-id: file:///home/svn/framework3/trunk@8066 4d416f70-5f16-0410-b530-b9f4589650da
 2010-01-04 21:54:32 +00:00
James Lee cb4ab4b0f6 sort the output for the show command 
git-svn-id: file:///home/svn/framework3/trunk@8065 4d416f70-5f16-0410-b530-b9f4589650da
 2010-01-04 21:10:26 +00:00
HD Moore adc1c18f26 Fix the old warning url 
git-svn-id: file:///home/svn/framework3/trunk@8052 4d416f70-5f16-0410-b530-b9f4589650da
 2010-01-01 15:17:02 +00:00
Mike Smith de55508a03 fix 'db_workspace -a' 
git-svn-id: file:///home/svn/framework3/trunk@8043 4d416f70-5f16-0410-b530-b9f4589650da
 2009-12-31 01:51:12 +00:00
James Lee 90b2b4c77c fix the db_add* and db_del* commands, make note output readable on 1.8 
git-svn-id: file:///home/svn/framework3/trunk@8042 4d416f70-5f16-0410-b530-b9f4589650da
 2009-12-31 01:27:04 +00:00
James Lee 3bc1f935fa fix amap mlog import 
git-svn-id: file:///home/svn/framework3/trunk@8041 4d416f70-5f16-0410-b530-b9f4589650da
 2009-12-31 01:11:53 +00:00
James Lee 7fc5ada4c6 fix nessus nbe parsing 
git-svn-id: file:///home/svn/framework3/trunk@8040 4d416f70-5f16-0410-b530-b9f4589650da
 2009-12-30 23:49:29 +00:00
James Lee 02eb7ab80d massive changes to the database api. Auxiliary::Report is now just a bunch of stubs into the main DBManager, most aux modules should just work, but they haven't all been tested. introduces a get_auth_info method for pulling credentials out of the db. other db api methods should be more standardized now. cross your fingers 
git-svn-id: file:///home/svn/framework3/trunk@8028 4d416f70-5f16-0410-b530-b9f4589650da
 2009-12-29 23:48:45 +00:00
Joshua Drake 036ac8fb90 show warning if -L was specified but readline failed to load 
git-svn-id: file:///home/svn/framework3/trunk@8024 4d416f70-5f16-0410-b530-b9f4589650da
 2009-12-29 21:54:03 +00:00
Mike Smith 488b0cba5d Fix "dbfile" deprecation warning when using SQLite. 
Replaced the deprecated "dbfile" option with "database" so that Rails
2.3.5 will not print a warning message.


git-svn-id: file:///home/svn/framework3/trunk@8018 4d416f70-5f16-0410-b530-b9f4589650da
 2009-12-29 01:27:11 +00:00
Mike Smith 744c4cd02f Store the current workspace's name instead of the whole Workspace object. 
This ensures that the most up-to-date data is reloaded from the database
when you ask for it, instead of returning cached results.

git-svn-id: file:///home/svn/framework3/trunk@7963 4d416f70-5f16-0410-b530-b9f4589650da
 2009-12-23 20:37:30 +00:00
HD Moore dde54bf99c Allow minrank to be specified via -R 
git-svn-id: file:///home/svn/framework3/trunk@7952 4d416f70-5f16-0410-b530-b9f4589650da
 2009-12-23 03:53:16 +00:00
James Lee 89695b40fe add ability to specify columns for db_{hosts,services} output 
git-svn-id: file:///home/svn/framework3/trunk@7948 4d416f70-5f16-0410-b530-b9f4589650da
 2009-12-22 22:20:58 +00:00
James Lee 4f92d9f431 Revamp the event system and add some ui hooks. Sessions are still ghetto -- we get interact events (in a lame way) but no input or output events yet. see 619 
git-svn-id: file:///home/svn/framework3/trunk@7947 4d416f70-5f16-0410-b530-b9f4589650da
 2009-12-22 18:52:48 +00:00
Mike Smith d3e8132532 Fix (ruby 1.8.7) issue where data appeared under the wrong column. 
git-svn-id: file:///home/svn/framework3/trunk@7944 4d416f70-5f16-0410-b530-b9f4589650da
 2009-12-22 02:48:54 +00:00
Mike Smith 1f7b184fe5 Use SQL to filter/sort the hosts & services records, instead of ruby. 
git-svn-id: file:///home/svn/framework3/trunk@7930 4d416f70-5f16-0410-b530-b9f4589650da
 2009-12-21 16:46:11 +00:00
James Lee fc1e0b88fb change db_hosts and db_services output to be more thorough, see 619 
git-svn-id: file:///home/svn/framework3/trunk@7912 4d416f70-5f16-0410-b530-b9f4589650da
 2009-12-18 01:14:05 +00:00
James Lee c4c0fd2b55 deal with broken Date.parse in 1.8.6 and older by just not printing the last updated date. fixes 693 
git-svn-id: file:///home/svn/framework3/trunk@7897 4d416f70-5f16-0410-b530-b9f4589650da
 2009-12-17 03:17:37 +00:00
James Lee b6c497467e add a message about requiring libmysqlclient-dev, fixes 535 
git-svn-id: file:///home/svn/framework3/trunk@7866 4d416f70-5f16-0410-b530-b9f4589650da
 2009-12-14 23:40:21 +00:00
Mike Smith f9ffc8b8bc Add db_workspace command & other db refactoring. 
* Added "workspaces" table and associated ActiveRecord class.
 * Moved ActiveRecord models from db_objects.rb into separate files.
 * Do the DB migration check every time you connect (was previously done
   during db_create).
 * Use :dependent => :destroy associations so that we don't have to
   manually delete the dependent objects.

git-svn-id: file:///home/svn/framework3/trunk@7861 4d416f70-5f16-0410-b530-b9f4589650da
 2009-12-14 22:52:34 +00:00
HD Moore 4311c20ee1 Warn the user when nessusv2 is specified (only v1 supported). See #690 
git-svn-id: file:///home/svn/framework3/trunk@7857 4d416f70-5f16-0410-b530-b9f4589650da
 2009-12-14 22:00:54 +00:00
James Lee a03e3bf823 adds support for regular shell sessions when running commands with 'sessions -c'. Commands are run sequentially, so will take forever on large numbers of sessions. 
git-svn-id: file:///home/svn/framework3/trunk@7855 4d416f70-5f16-0410-b530-b9f4589650da
 2009-12-14 21:17:49 +00:00
HD Moore 1029ecd7f8 Cleanup wmap, add the missing database tables back, rename to have a wmap_prefix 
git-svn-id: file:///home/svn/framework3/trunk@7837 4d416f70-5f16-0410-b530-b9f4589650da
 2009-12-13 05:24:48 +00:00
James Lee 23a63991b2 add -c option to sessions command to allow running a shell command on running meterpreter sesions; see #663 
git-svn-id: file:///home/svn/framework3/trunk@7831 4d416f70-5f16-0410-b530-b9f4589650da
 2009-12-12 00:49:48 +00:00
Joshua Drake 004c2864f4 This adds an option to the sessions command (-s). Using it allows running a script for each open meterpreter session, see #663 
git-svn-id: file:///home/svn/framework3/trunk@7830 4d416f70-5f16-0410-b530-b9f4589650da
 2009-12-11 23:19:19 +00:00
HD Moore eac301484c Forgot to update the timeout() wrapper class for refernces 
git-svn-id: file:///home/svn/framework3/trunk@7829 4d416f70-5f16-0410-b530-b9f4589650da
 2009-12-11 21:46:44 +00:00
HD Moore 0bc4ba6211 Major overhaul to how db_autopwn works, should be substantially faster and less error prone 
git-svn-id: file:///home/svn/framework3/trunk@7824 4d416f70-5f16-0410-b530-b9f4589650da
 2009-12-11 20:21:18 +00:00
HD Moore e2a5cb0ebe Pass the password argument in db_create 
git-svn-id: file:///home/svn/framework3/trunk@7823 4d416f70-5f16-0410-b530-b9f4589650da
 2009-12-11 18:54:19 +00:00
HD Moore afa5b46674 Default the minrank for autopwn, otherwise this prevents usage from being shown when no args are present. Also breaks -t -p when no rank is specified 
git-svn-id: file:///home/svn/framework3/trunk@7798 4d416f70-5f16-0410-b530-b9f4589650da
 2009-12-10 15:12:59 +00:00
James Lee 8d25dc00bc bail if MinimumRank is invalid 
git-svn-id: file:///home/svn/framework3/trunk@7787 4d416f70-5f16-0410-b530-b9f4589650da
 2009-12-09 23:07:58 +00:00
James Lee 084a10ded5 remove a debug print and deal with minrank being absent 
git-svn-id: file:///home/svn/framework3/trunk@7786 4d416f70-5f16-0410-b530-b9f4589650da
 2009-12-09 22:42:06 +00:00
HD Moore 898c8655ff Default rank to manual for the search command 
git-svn-id: file:///home/svn/framework3/trunk@7773 4d416f70-5f16-0410-b530-b9f4589650da
 2009-12-09 13:57:46 +00:00
James Lee 961e70fc34 add -f flag to exploit command to force running despite a conflicting MinimumRank value. fixes 628 
git-svn-id: file:///home/svn/framework3/trunk@7770 4d416f70-5f16-0410-b530-b9f4589650da
 2009-12-09 02:49:27 +00:00
James Lee 6989949720 adds a global option, MinimumRank, which db_autopwn now checks to prevent running exploits below a certain rank. fixes #625, see #628 
git-svn-id: file:///home/svn/framework3/trunk@7767 4d416f70-5f16-0410-b530-b9f4589650da
 2009-12-09 01:54:20 +00:00
James Lee 47fdec6ab3 add ability to search by minimum rank, fixes 627 
git-svn-id: file:///home/svn/framework3/trunk@7747 4d416f70-5f16-0410-b530-b9f4589650da
 2009-12-07 23:15:13 +00:00
Mike Smith 61b556a0d1 Initialize the database schema using ActiveRecord migrations 
git-svn-id: file:///home/svn/framework3/trunk@7739 4d416f70-5f16-0410-b530-b9f4589650da
 2009-12-07 17:03:27 +00:00
HD Moore facebbc791 allow module search to continue even if one module fails to load 
git-svn-id: file:///home/svn/framework3/trunk@7689 4d416f70-5f16-0410-b530-b9f4589650da
 2009-12-04 01:00:48 +00:00
HD Moore b1b7ef0350 Improves the NeXpose plugin, adds the ability to do discovery outside of NeXpose and then scan the results using the database as input (-d). 
git-svn-id: file:///home/svn/framework3/trunk@7681 4d416f70-5f16-0410-b530-b9f4589650da
 2009-12-03 15:26:30 +00:00
Patrick Webster a4fc468700 Handles exception where exec is a directory, or permission is denied. 
git-svn-id: file:///home/svn/framework3/trunk@7678 4d416f70-5f16-0410-b530-b9f4589650da
 2009-12-03 08:17:14 +00:00
HD Moore fc983ef7e3 Many bug fixes to db_autopwn, cross-referencing of OS-level vulnerabilities, small bug fixes to HTTP client API 
git-svn-id: file:///home/svn/framework3/trunk@7676 4d416f70-5f16-0410-b530-b9f4589650da
 2009-12-03 01:36:17 +00:00
James Lee 626d085dd4 expand ryan linn's idea of more verbose job info to include start time, see #586 
git-svn-id: file:///home/svn/framework3/trunk@7668 4d416f70-5f16-0410-b530-b9f4589650da
 2009-12-02 03:32:48 +00:00
James Lee e427bd5f81 spaces to tabs 
git-svn-id: file:///home/svn/framework3/trunk@7666 4d416f70-5f16-0410-b530-b9f4589650da
 2009-12-01 23:15:07 +00:00
James Lee 0da80965d6 more info about a job, thanks Ryan Linn for the patch; fixes #586 
git-svn-id: file:///home/svn/framework3/trunk@7665 4d416f70-5f16-0410-b530-b9f4589650da
 2009-12-01 23:11:12 +00:00
James Lee e73842251e add a kill command and clean up tabbing for jobs 
git-svn-id: file:///home/svn/framework3/trunk@7659 4d416f70-5f16-0410-b530-b9f4589650da
 2009-12-01 18:24:11 +00:00
James Lee d6a732d619 move histfile reading into rex 
git-svn-id: file:///home/svn/framework3/trunk@7625 4d416f70-5f16-0410-b530-b9f4589650da
 2009-11-26 06:03:05 +00:00
James Lee fd61df4e9e add full support for persistent history, works in msfweb as well. fixes #523 
git-svn-id: file:///home/svn/framework3/trunk@7621 4d416f70-5f16-0410-b530-b9f4589650da
 2009-11-26 02:18:02 +00:00
James Lee 1b4aa0380b read in a history file. beginnings of persistent history. see #523 
git-svn-id: file:///home/svn/framework3/trunk@7620 4d416f70-5f16-0410-b530-b9f4589650da
 2009-11-26 01:01:27 +00:00
HD Moore f3006f78c9 Fix up handling of service-less vulnerabilities 
git-svn-id: file:///home/svn/framework3/trunk@7612 4d416f70-5f16-0410-b530-b9f4589650da
 2009-11-25 18:03:25 +00:00
et 252cdcfb92 Removing unnecesary reporting methods 
git-svn-id: file:///home/svn/framework3/trunk@7606 4d416f70-5f16-0410-b530-b9f4589650da
 2009-11-25 06:11:52 +00:00
et 5b81d85447 Replaced reporting to use notes 
git-svn-id: file:///home/svn/framework3/trunk@7605 4d416f70-5f16-0410-b530-b9f4589650da
 2009-11-25 06:08:28 +00:00
HD Moore 49b6111dbc Correctly print vulnerability references when there is no associated service 
git-svn-id: file:///home/svn/framework3/trunk@7600 4d416f70-5f16-0410-b530-b9f4589650da
 2009-11-25 01:44:55 +00:00
et e354c8dbcc Multiple headers handling bug fixes 
git-svn-id: file:///home/svn/framework3/trunk@7588 4d416f70-5f16-0410-b530-b9f4589650da
 2009-11-24 05:27:11 +00:00
et a3d4e1c44a Added command to launch msfproxy from console 
git-svn-id: file:///home/svn/framework3/trunk@7584 4d416f70-5f16-0410-b530-b9f4589650da
 2009-11-23 03:38:05 +00:00
James Lee 14a0040b8a move nmap xml parsing into Rex::Parser; add a test to make sure it works 
git-svn-id: file:///home/svn/framework3/trunk@7566 4d416f70-5f16-0410-b530-b9f4589650da
 2009-11-18 06:15:45 +00:00
Joshua Drake d8b9e030e3 really fixed, test case: "db_create/db_nmap -P" 
git-svn-id: file:///home/svn/framework3/trunk@7543 4d416f70-5f16-0410-b530-b9f4589650da
 2009-11-16 19:13:33 +00:00
Joshua Drake 6d18c6dd53 bugfix for NMAP failure, test case: "db_nmap -P" 
git-svn-id: file:///home/svn/framework3/trunk@7542 4d416f70-5f16-0410-b530-b9f4589650da
 2009-11-16 19:06:42 +00:00
HD Moore 3f811a801e Fixes #509. Fix the last shadowed var issue, the rest dont seem significant 
git-svn-id: file:///home/svn/framework3/trunk@7537 4d416f70-5f16-0410-b530-b9f4589650da
 2009-11-16 18:34:08 +00:00
HD Moore ba5da501bf Log the exploit name when the module raises an exception, helps track down bugs during automation 
git-svn-id: file:///home/svn/framework3/trunk@7529 4d416f70-5f16-0410-b530-b9f4589650da
 2009-11-16 15:08:58 +00:00
HD Moore 291aad8cc1 Fixes #516 and fixes #515. This patch makes database support a little more user-friendly. The db commands now accept -h and --help, the db_drivers command will indicate how to install support for a given database, the db_create/db_destroy commands will indicate what tools are required to use them, and the postgres driver will now roperly handle sameuser authentication over a unix domain socket with postgres-pr 
git-svn-id: file:///home/svn/framework3/trunk@7516 4d416f70-5f16-0410-b530-b9f4589650da
 2009-11-14 21:41:38 +00:00
James Lee d3d406f405 more unitialized goodness 
git-svn-id: file:///home/svn/framework3/trunk@7501 4d416f70-5f16-0410-b530-b9f4589650da
 2009-11-13 23:53:17 +00:00
HD Moore eabfff5aca Adds the last updated date to the output 
git-svn-id: file:///home/svn/framework3/trunk@7497 4d416f70-5f16-0410-b530-b9f4589650da
 2009-11-13 22:50:12 +00:00
James Lee 80ee6157ed fix a few warnings 
git-svn-id: file:///home/svn/framework3/trunk@7492 4d416f70-5f16-0410-b530-b9f4589650da
 2009-11-13 20:28:36 +00:00
HD Moore 8c65a0f48c Handle interrupts without showing a backtrace 
git-svn-id: file:///home/svn/framework3/trunk@7473 4d416f70-5f16-0410-b530-b9f4589650da
 2009-11-12 05:56:52 +00:00
James Lee 62470e47a7 Skip closed/filtered ports when db_autopwning 
git-svn-id: file:///home/svn/framework3/trunk@7462 4d416f70-5f16-0410-b530-b9f4589650da
 2009-11-11 00:58:08 +00:00
James Lee c7967e00d7 handle both 'open' and 'up' for port state in db_services 
git-svn-id: file:///home/svn/framework3/trunk@7460 4d416f70-5f16-0410-b530-b9f4589650da
 2009-11-11 00:29:44 +00:00
James Lee 029d0bae47 save the port state regardless of whether we know the name 
git-svn-id: file:///home/svn/framework3/trunk@7459 4d416f70-5f16-0410-b530-b9f4589650da
 2009-11-11 00:22:03 +00:00
James Lee 73a0ef8b64 actually save port state 
git-svn-id: file:///home/svn/framework3/trunk@7458 4d416f70-5f16-0410-b530-b9f4589650da
 2009-11-11 00:16:52 +00:00
James Lee 3dfaf32bc8 trying out bold colors 
git-svn-id: file:///home/svn/framework3/trunk@7450 4d416f70-5f16-0410-b530-b9f4589650da
 2009-11-10 16:49:26 +00:00
James Lee 2cbb32550c fix meterp sessions getting initialized improperly, fix msf> prompt in exploit context after color cmd 
git-svn-id: file:///home/svn/framework3/trunk@7449 4d416f70-5f16-0410-b530-b9f4589650da
 2009-11-10 16:10:39 +00:00
James Lee 3628a3d3c6 fix sessions breaking right away when interacting. command dispatcher still appears to be hosed 
git-svn-id: file:///home/svn/framework3/trunk@7446 4d416f70-5f16-0410-b530-b9f4589650da
 2009-11-10 15:55:42 +00:00
HD Moore 3db9bbfaae See #493. Initialize the prompt 
git-svn-id: file:///home/svn/framework3/trunk@7445 4d416f70-5f16-0410-b530-b9f4589650da
 2009-11-10 15:33:14 +00:00
HD Moore 69dbb7b4b0 Address some of #493 
git-svn-id: file:///home/svn/framework3/trunk@7444 4d416f70-5f16-0410-b530-b9f4589650da
 2009-11-10 15:26:40 +00:00
James Lee daf58b6deb get rid of the single-character escapes so we're less likely to see accidental color substitutions 
git-svn-id: file:///home/svn/framework3/trunk@7443 4d416f70-5f16-0410-b530-b9f4589650da
 2009-11-10 07:12:56 +00:00
James Lee fd4e4154cd add a new 'color' command that lets the user force color on or off. 
git-svn-id: file:///home/svn/framework3/trunk@7442 4d416f70-5f16-0410-b530-b9f4589650da
 2009-11-10 06:58:01 +00:00
James Lee a8d9da0d3d initial color support. will add ability to change colors from console soon. see #344 
git-svn-id: file:///home/svn/framework3/trunk@7440 4d416f70-5f16-0410-b530-b9f4589650da
 2009-11-10 03:27:48 +00:00
HD Moore 2bec0701a7 Fixes a crash on startup when no svn directories are present 
git-svn-id: file:///home/svn/framework3/trunk@7438 4d416f70-5f16-0410-b530-b9f4589650da
 2009-11-10 03:05:12 +00:00
HD Moore acea0f87fb Correct the formatting of the old age warning. Obviously nobody would have seen this for another 5 days :) 
git-svn-id: file:///home/svn/framework3/trunk@7436 4d416f70-5f16-0410-b530-b9f4589650da
 2009-11-09 23:45:21 +00:00
Joshua Drake c372c68f48 fix whitespace 
git-svn-id: file:///home/svn/framework3/trunk@7423 4d416f70-5f16-0410-b530-b9f4589650da
 2009-11-09 06:19:59 +00:00
HD Moore 3853073731 Fixes #489. Change this a bit to be proper syntax 
git-svn-id: file:///home/svn/framework3/trunk@7422 4d416f70-5f16-0410-b530-b9f4589650da
 2009-11-09 06:16:29 +00:00
HD Moore 5581f5a73b Parse SVN information and warns folks with out of date installations 
git-svn-id: file:///home/svn/framework3/trunk@7415 4d416f70-5f16-0410-b530-b9f4589650da
 2009-11-09 01:50:44 +00:00
HD Moore 176e999f08 Merge patches from Ryan Linn. Fixes #438 
git-svn-id: file:///home/svn/framework3/trunk@7413 4d416f70-5f16-0410-b530-b9f4589650da
 2009-11-09 00:33:40 +00:00
et 7b832b9d3e Wmap checking for vulnerabilities and launching exploits 
git-svn-id: file:///home/svn/framework3/trunk@7399 4d416f70-5f16-0410-b530-b9f4589650da
 2009-11-07 21:55:33 +00:00
HD Moore 0fe06c614f Fixes #473. Import Sussaro's patch (wee!) 
git-svn-id: file:///home/svn/framework3/trunk@7395 4d416f70-5f16-0410-b530-b9f4589650da
 2009-11-06 21:08:34 +00:00
HD Moore 948e1ba5e9 Dont repeat the stdout 
git-svn-id: file:///home/svn/framework3/trunk@7386 4d416f70-5f16-0410-b530-b9f4589650da
 2009-11-06 20:15:12 +00:00
HD Moore 0cc3db65be This works but stdout needs to be hidden 
git-svn-id: file:///home/svn/framework3/trunk@7385 4d416f70-5f16-0410-b530-b9f4589650da
 2009-11-06 17:43:13 +00:00
HD Moore dc2c355703 Use nmap without the absolute path... Cygwin is annoying. 
git-svn-id: file:///home/svn/framework3/trunk@7384 4d416f70-5f16-0410-b530-b9f4589650da
 2009-11-06 17:32:13 +00:00
HD Moore f985349a26 Place all arguments in quotes 
git-svn-id: file:///home/svn/framework3/trunk@7383 4d416f70-5f16-0410-b530-b9f4589650da
 2009-11-06 17:30:25 +00:00
HD Moore bf0e856c1f Trying a different approach - buffing output to a file and using system to overcome bugs in IO.popen on Cygwin 
git-svn-id: file:///home/svn/framework3/trunk@7382 4d416f70-5f16-0410-b530-b9f4589650da
 2009-11-06 17:27:28 +00:00
HD Moore 55b5b828f2 Use the relative path to nmap 
git-svn-id: file:///home/svn/framework3/trunk@7381 4d416f70-5f16-0410-b530-b9f4589650da
 2009-11-06 17:15:26 +00:00
HD Moore 1c51182b39 One more shot 
git-svn-id: file:///home/svn/framework3/trunk@7380 4d416f70-5f16-0410-b530-b9f4589650da
 2009-11-06 17:12:19 +00:00
HD Moore 5de9a090a9 Another attempt at correct path translation 
git-svn-id: file:///home/svn/framework3/trunk@7379 4d416f70-5f16-0410-b530-b9f4589650da
 2009-11-06 17:09:31 +00:00
James Lee adf5b531eb make sure the address type is IP (not mac). fixes #476 
git-svn-id: file:///home/svn/framework3/trunk@7378 4d416f70-5f16-0410-b530-b9f4589650da
 2009-11-06 16:44:02 +00:00
HD Moore 0604fbfd71 Workaround broken cygpath behavior with the cygwin path contains 8.3 names 
git-svn-id: file:///home/svn/framework3/trunk@7377 4d416f70-5f16-0410-b530-b9f4589650da
 2009-11-06 16:43:14 +00:00
HD Moore 43edce7db8 Correct implementation (any instance of cygdrive in the path indicates a file outside the environment) 
git-svn-id: file:///home/svn/framework3/trunk@7376 4d416f70-5f16-0410-b530-b9f4589650da
 2009-11-06 16:03:40 +00:00
HD Moore 4fde76e8f6 Expand to a windows path if the exe is outside of the cygwin installation 
git-svn-id: file:///home/svn/framework3/trunk@7375 4d416f70-5f16-0410-b530-b9f4589650da
 2009-11-06 16:01:24 +00:00
James Lee e3e2d01fd2 parse nmap xml with a stream parser instead of a tree parser. fixes #251, i hope 
git-svn-id: file:///home/svn/framework3/trunk@7368 4d416f70-5f16-0410-b530-b9f4589650da
 2009-11-05 20:26:28 +00:00
HD Moore 176996fe61 Fixes #452. Solves a number of crashes caused by Regexp.new() on 1.9 without an explicit language specified 
git-svn-id: file:///home/svn/framework3/trunk@7320 4d416f70-5f16-0410-b530-b9f4589650da
 2009-11-02 17:09:13 +00:00
et 20be000d47 Wmap able to load exploits and check for vulnerabilities. Next step exploit if vulnerable 
git-svn-id: file:///home/svn/framework3/trunk@7302 4d416f70-5f16-0410-b530-b9f4589650da
 2009-10-29 03:16:27 +00:00
HD Moore 3cf4329335 Updates the autopwn matching algorithm to use multiple ports and service names 
git-svn-id: file:///home/svn/framework3/trunk@7298 4d416f70-5f16-0410-b530-b9f4589650da
 2009-10-28 18:04:50 +00:00
et 7a24a5495e Fix #414 globaly defined datastore values are now rewriten before RHOSTS, RPORT, SSL are set. Support of hostnames instead of ips. Minor version changes 
git-svn-id: file:///home/svn/framework3/trunk@7262 4d416f70-5f16-0410-b530-b9f4589650da
 2009-10-25 22:20:59 +00:00
et dc415c76ca Fixes #364. Added error message detection and signatures 
git-svn-id: file:///home/svn/framework3/trunk@7187 4d416f70-5f16-0410-b530-b9f4589650da
 2009-10-18 19:46:30 +00:00
HD Moore 4d4c0905ef Slightly improved error handling for auxiliary and exploit modules. Improved brute forcing mode for mssql_login. Serious errors (broken code, etc) are bubbled up in auxiliary scanners now. Fixes #384 by reading wordlists one line at a time and not buffering 
git-svn-id: file:///home/svn/framework3/trunk@7185 4d416f70-5f16-0410-b530-b9f4589650da
 2009-10-18 18:03:02 +00:00
HD Moore d0b07c0c3f Fixes #353. If the problem persists, make sure 'cygpath' is installed, it sounds like the root cause is 3.3-dev being run inside of an existing cygwin environment. 
git-svn-id: file:///home/svn/framework3/trunk@7176 4d416f70-5f16-0410-b530-b9f4589650da
 2009-10-17 06:41:37 +00:00
kris e0f885d50c Let db_autopwn -I/-X work with a single addr 
git-svn-id: file:///home/svn/framework3/trunk@7126 4d416f70-5f16-0410-b530-b9f4589650da
 2009-10-04 20:20:43 +00:00
kris 47d8e02389 Specify that db_autopwn -b is default 
git-svn-id: file:///home/svn/framework3/trunk@7125 4d416f70-5f16-0410-b530-b9f4589650da
 2009-10-04 19:48:48 +00:00
kris 50f2f90646 db_autopwn -I/-X fix for Ruby 1.9 (calling each() on a string). Now commas 
are allowed in the host specs in general.


git-svn-id: file:///home/svn/framework3/trunk@7124 4d416f70-5f16-0410-b530-b9f4589650da
 2009-10-04 19:43:06 +00:00
HD Moore 06818ae2bf Handle cases where a scanned host has no ports open 
git-svn-id: file:///home/svn/framework3/trunk@7122 4d416f70-5f16-0410-b530-b9f4589650da
 2009-10-03 20:05:36 +00:00
HD Moore 35fcf8c2b2 Swap around rbreadline - load it by default, but also allow the old readline with the -L (--real-readline) parameter to msfconsole. This also fixes absolute path handling for msfconsole command passthrough 
git-svn-id: file:///home/svn/framework3/trunk@7115 4d416f70-5f16-0410-b530-b9f4589650da
 2009-10-02 14:17:03 +00:00
kris 8efeb58285 add simple sessions -K to kill all. useful at least when i'm testing. 
git-svn-id: file:///home/svn/framework3/trunk@7100 4d416f70-5f16-0410-b530-b9f4589650da
 2009-09-30 23:00:15 +00:00
et debf126d32 Save wmap reports to a file 
git-svn-id: file:///home/svn/framework3/trunk@7096 4d416f70-5f16-0410-b530-b9f4589650da
 2009-09-30 04:20:06 +00:00
kris 41157e97fe make run -a functional 
git-svn-id: file:///home/svn/framework3/trunk@7068 4d416f70-5f16-0410-b530-b9f4589650da
 2009-09-26 22:34:48 +00:00
HD Moore f3708fb933 Fixes #278. Handle cases where a reload fails and indicate why 
git-svn-id: file:///home/svn/framework3/trunk@7046 4d416f70-5f16-0410-b530-b9f4589650da
 2009-09-20 20:22:45 +00:00
HD Moore 1d21e41156 Fix references searching from the console. Fixes #304 
git-svn-id: file:///home/svn/framework3/trunk@7043 4d416f70-5f16-0410-b530-b9f4589650da
 2009-09-20 19:40:00 +00:00
kris 29134be27a Fixes #336. Don't add 'NSS-<id>' to ref list when importing Nessus nbe/xml to 
database (report/patch by erwinpdev).

This NSS- stuff was in the original nbe code before things were copied and
reworked for the xml handling.  I'm not sure why it was there; the NSS id is
already available in the database (name).

Note that ref lists generated here can be empty now, which I think is fine.



git-svn-id: file:///home/svn/framework3/trunk@7040 4d416f70-5f16-0410-b530-b9f4589650da
 2009-09-18 17:33:46 +00:00
HD Moore b5da2c72f2 Fixes #333. Adds core and api version checks to all module loads. To specify a minimum version, add the following constant to the top of the module (outside of the class definition): 
RequiredVersions = [3.3, 1.0] # MSF 3.3+ API 1.0+


git-svn-id: file:///home/svn/framework3/trunk@7037 4d416f70-5f16-0410-b530-b9f4589650da
 2009-09-15 13:50:32 +00:00
HD Moore 0c584bae10 Match against the fullname not just the refname for -m regex filters in db_autopwn 
git-svn-id: file:///home/svn/framework3/trunk@7029 4d416f70-5f16-0410-b530-b9f4589650da
 2009-09-11 15:32:23 +00:00
kris da61141a79 Fixes #281, pt2. This time fixing unrelated whitespace changes from the 
original patch.  I (lazily) kept it because 'svn diff -x -b' showed no
difference and it was formatted fine in vi.  This is obviously not a good
way of assessing bad whitespace formatting :)


git-svn-id: file:///home/svn/framework3/trunk@7007 4d416f70-5f16-0410-b530-b9f4589650da
 2009-09-05 23:57:42 +00:00
kris 53775ed59b Fixes #281. Add .nessus db support via db_import_nessus_xml 
Based on work by mephux and erwinp.  I started with the latter's patch and
reworked it to avoid all of duplication from the .nbe stuff.


git-svn-id: file:///home/svn/framework3/trunk@7005 4d416f70-5f16-0410-b530-b9f4589650da
 2009-09-05 04:29:53 +00:00
HD Moore 64ff8b5181 Add missing -oX argument 
git-svn-id: file:///home/svn/framework3/trunk@7004 4d416f70-5f16-0410-b530-b9f4589650da
 2009-09-04 15:14:19 +00:00
HD Moore e7b200bc23 Expand cygwin to win32 path for db_nmap on windows inside of cygwin 
git-svn-id: file:///home/svn/framework3/trunk@7002 4d416f70-5f16-0410-b530-b9f4589650da
 2009-09-04 15:04:06 +00:00
James Lee bd2da7c12a revert overzealous commit 
git-svn-id: file:///home/svn/framework3/trunk@6961 4d416f70-5f16-0410-b530-b9f4589650da
 2009-08-18 04:53:35 +00:00
James Lee 08d50e0a5b fix a bug in colorization where %c gets replaced before %cya; wouldn't have been a problem until colorization gets put back in 
git-svn-id: file:///home/svn/framework3/trunk@6960 4d416f70-5f16-0410-b530-b9f4589650da
 2009-08-18 04:49:16 +00:00
HD Moore 4bcf42ae3c Apply a patch from Brett Blackham for loading plugins from the user's .msf3 directory as well as the system one 
git-svn-id: file:///home/svn/framework3/trunk@6933 4d416f70-5f16-0410-b530-b9f4589650da
 2009-08-01 14:07:05 +00:00
HD Moore 55ae0e10d8 Make a stink about missing openssl support in the console driver 
git-svn-id: file:///home/svn/framework3/trunk@6887 4d416f70-5f16-0410-b530-b9f4589650da
 2009-07-23 13:28:47 +00:00
HD Moore 238f8d798f Let vulns refer to hosts w/o a service, add a mac and address6 field to the hosts table. 
git-svn-id: file:///home/svn/framework3/trunk@6866 4d416f70-5f16-0410-b530-b9f4589650da
 2009-07-22 13:25:33 +00:00
HD Moore d981332b89 Better search behavior for console and msfweb 
git-svn-id: file:///home/svn/framework3/trunk@6706 4d416f70-5f16-0410-b530-b9f4589650da
 2009-06-24 01:31:16 +00:00
HD Moore 68888c469f Indicate why database support is not enabled 
git-svn-id: file:///home/svn/framework3/trunk@6623 4d416f70-5f16-0410-b530-b9f4589650da
 2009-06-03 16:28:28 +00:00
et 7c16f5b5c9 Added wmap sql command to access db directly from wmap. XML reporting. 
git-svn-id: file:///home/svn/framework3/trunk@6587 4d416f70-5f16-0410-b530-b9f4589650da
 2009-05-28 03:26:27 +00:00
HD Moore 304944d792 db_del_port from jabra 
git-svn-id: file:///home/svn/framework3/trunk@6498 4d416f70-5f16-0410-b530-b9f4589650da
 2009-04-26 14:53:37 +00:00
James Lee a8863ce330 possible fix to make postgres work again 
git-svn-id: file:///home/svn/framework3/trunk@6478 4d416f70-5f16-0410-b530-b9f4589650da
 2009-04-12 07:09:03 +00:00
kris 17ad98e8e3 Add 'Msf' to 'Context' in the connect command's socket for db_tracker 
git-svn-id: file:///home/svn/framework3/trunk@6476 4d416f70-5f16-0410-b530-b9f4589650da
 2009-04-11 12:07:50 +00:00
kris 162a835212 Keep the back command from removing the database backend stuff since it's 
been moved to metasploit core



git-svn-id: file:///home/svn/framework3/trunk@6474 4d416f70-5f16-0410-b530-b9f4589650da
 2009-04-10 23:56:28 +00:00
kris 1253e7a044 Catch ENOENT for db_destroy for sqlite3 so no backtrace is printed. I decided 
to give a little error message for trying to destroy a nonexistent db still.


git-svn-id: file:///home/svn/framework3/trunk@6468 4d416f70-5f16-0410-b530-b9f4589650da
 2009-04-08 03:30:18 +00:00
kris b5a8c86241 use print_error 
git-svn-id: file:///home/svn/framework3/trunk@6467 4d416f70-5f16-0410-b530-b9f4589650da
 2009-04-08 03:11:12 +00:00
kris 6b28b786ac watch out for RuntimeError in loadpath 
git-svn-id: file:///home/svn/framework3/trunk@6466 4d416f70-5f16-0410-b530-b9f4589650da
 2009-04-08 03:04:29 +00:00
James Lee 8fd36fecf5 make plugin load failure a bit more graceful 
git-svn-id: file:///home/svn/framework3/trunk@6460 4d416f70-5f16-0410-b530-b9f4589650da
 2009-04-07 05:59:38 +00:00
HD Moore 1073b04eb7 Remove sqlite2 support, force load sqlite3 gem 
git-svn-id: file:///home/svn/framework3/trunk@6425 4d416f70-5f16-0410-b530-b9f4589650da
 2009-03-29 03:40:25 +00:00
kris 62a1d3037d just a whitespace fix 
git-svn-id: file:///home/svn/framework3/trunk@6419 4d416f70-5f16-0410-b530-b9f4589650da
 2009-03-28 23:04:28 +00:00
HD Moore 191289450e Meterpreter is now the default payload for windows autopwn targets 
git-svn-id: file:///home/svn/framework3/trunk@6418 4d416f70-5f16-0410-b530-b9f4589650da
 2009-03-28 21:51:35 +00:00
HD Moore 709362ff53 This patch moves all database interaction into the metasploit core. Usage is about the same, except instead of loading a plugin, you call db_driver <driver_name> 
git-svn-id: file:///home/svn/framework3/trunk@6417 4d416f70-5f16-0410-b530-b9f4589650da
 2009-03-28 21:42:30 +00:00
kris ea1336d2f3 use more apt print methods for search messages 
git-svn-id: file:///home/svn/framework3/trunk@6344 4d416f70-5f16-0410-b530-b9f4589650da
 2009-03-15 16:05:06 +00:00
kris b1edecb728 Fix "route remove" by guarding against constant NameError/backtrace 
git-svn-id: file:///home/svn/framework3/trunk@6330 4d416f70-5f16-0410-b530-b9f4589650da
 2009-03-10 16:47:53 +00:00
kris b12a3d993e update version command description and comment 
git-svn-id: file:///home/svn/framework3/trunk@6329 4d416f70-5f16-0410-b530-b9f4589650da
 2009-03-10 16:25:00 +00:00
James Lee 96c8f6127c Replace += with << for Strings in a bunch of places. 
git-svn-id: file:///home/svn/framework3/trunk@6318 4d416f70-5f16-0410-b530-b9f4589650da
 2009-03-08 07:55:47 +00:00
HD Moore 90c3586ac3 Fix error handling for the save command 
git-svn-id: file:///home/svn/framework3/trunk@6317 4d416f70-5f16-0410-b530-b9f4589650da
 2009-03-08 07:41:28 +00:00
kris e316610f5d remove unused vars 
git-svn-id: file:///home/svn/framework3/trunk@6285 4d416f70-5f16-0410-b530-b9f4589650da
 2009-03-03 23:50:53 +00:00
kris 05b5cd695b add -z to connect command to just try the connection, then return (useful for 
seeing if a host is reachable or not with certain settings)


git-svn-id: file:///home/svn/framework3/trunk@6236 4d416f70-5f16-0410-b530-b9f4589650da
 2009-02-19 14:24:07 +00:00
James Lee 08fbd064d1 make the help command a little more helpful 
git-svn-id: file:///home/svn/framework3/trunk@6230 4d416f70-5f16-0410-b530-b9f4589650da
 2009-02-17 04:53:06 +00:00
James Lee 8039bf729c tab completion for loadpath 
git-svn-id: file:///home/svn/framework3/trunk@6229 4d416f70-5f16-0410-b530-b9f4589650da
 2009-02-15 21:52:10 +00:00
James Lee fd962ca307 type fix (route -> sessions) 
git-svn-id: file:///home/svn/framework3/trunk@6226 4d416f70-5f16-0410-b530-b9f4589650da
 2009-02-15 05:12:28 +00:00
kris cd9ad0f08d Don't join/split args on spaces in load command as that breaks things like 
using quotes to have multi-word tokens; shellwords takes care of this stuff


git-svn-id: file:///home/svn/framework3/trunk@6222 4d416f70-5f16-0410-b530-b9f4589650da
 2009-02-15 02:48:25 +00:00
kris 13cc54cbe5 Add -P source port option to connect 
git-svn-id: file:///home/svn/framework3/trunk@6184 4d416f70-5f16-0410-b530-b9f4589650da
 2009-01-26 03:06:58 +00:00
kris 32868c4b0f adding db_import_amap_mlog for reading in from a thc-amap machine-readable log 
git-svn-id: file:///home/svn/framework3/trunk@6169 4d416f70-5f16-0410-b530-b9f4589650da
 2009-01-21 02:12:10 +00:00
kris 4a15116fe6 move a stray alias to underneath the original method 
git-svn-id: file:///home/svn/framework3/trunk@6168 4d416f70-5f16-0410-b530-b9f4589650da
 2009-01-20 02:15:19 +00:00
kris a595def093 watch out for an already closed socket in connect (meterpreter session, etc) 
git-svn-id: file:///home/svn/framework3/trunk@6161 4d416f70-5f16-0410-b530-b9f4589650da
 2009-01-18 01:21:42 +00:00
kris 17f4396d1d add args checking for connect 
git-svn-id: file:///home/svn/framework3/trunk@6160 4d416f70-5f16-0410-b530-b9f4589650da
 2009-01-18 00:00:26 +00:00
kris d53ac9648c typo: correct name in "sessions" help/usage 
git-svn-id: file:///home/svn/framework3/trunk@6153 4d416f70-5f16-0410-b530-b9f4589650da
 2009-01-14 21:31:24 +00:00
kris 1c6715ff3b Run multiple resource files from single command (was getting ArgumentError) 
git-svn-id: file:///home/svn/framework3/trunk@6102 4d416f70-5f16-0410-b530-b9f4589650da
 2009-01-09 20:29:50 +00:00
kris f6fd33a3eb add usage/help to resource command 
git-svn-id: file:///home/svn/framework3/trunk@6101 4d416f70-5f16-0410-b530-b9f4589650da
 2009-01-09 20:16:08 +00:00
kris 4b34d5a8b1 use print() for search usage 
git-svn-id: file:///home/svn/framework3/trunk@6100 4d416f70-5f16-0410-b530-b9f4589650da
 2009-01-09 19:58:22 +00:00
Patrick Webster 65bbf8c052 Alphabetically sort the tab completion module name output. 
git-svn-id: file:///home/svn/framework3/trunk@6098 4d416f70-5f16-0410-b530-b9f4589650da
 2009-01-09 07:36:58 +00:00
kris 41fbd5500e shorten regexes 
git-svn-id: file:///home/svn/framework3/trunk@6081 4d416f70-5f16-0410-b530-b9f4589650da
 2009-01-07 02:50:10 +00:00
kris f86ba09020 use print_status and print_error instead of print_line where applicable in 
connect's output for [*] and [-]


git-svn-id: file:///home/svn/framework3/trunk@6077 4d416f70-5f16-0410-b530-b9f4589650da
 2009-01-06 06:12:58 +00:00
James Lee 23177cbb0d fix unload tabs 
git-svn-id: file:///home/svn/framework3/trunk@6063 4d416f70-5f16-0410-b530-b9f4589650da
 2009-01-04 05:52:13 +00:00
kris bba174bc61 Add -C to 'connect' command to try to use CRLF for the EOL sequence, which is 
useful for talking to some stringent servers.  This currently just replaces
the final '[^\r]\n' from gets() with '\r\n', which works well while interacting


git-svn-id: file:///home/svn/framework3/trunk@6052 4d416f70-5f16-0410-b530-b9f4589650da
 2008-12-28 21:35:11 +00:00
kris ee9986a582 don't split connect's short usage info across lines 
git-svn-id: file:///home/svn/framework3/trunk@6051 4d416f70-5f16-0410-b530-b9f4589650da
 2008-12-28 20:41:44 +00:00
kris 8bc6051787 Add -w to 'connect' command for specifying connect timeout 
git-svn-id: file:///home/svn/framework3/trunk@6050 4d416f70-5f16-0410-b530-b9f4589650da
 2008-12-28 20:38:02 +00:00
kris 6b9ea78869 Add -S to 'connect' command for specifying source addr 
git-svn-id: file:///home/svn/framework3/trunk@6049 4d416f70-5f16-0410-b530-b9f4589650da
 2008-12-28 20:02:17 +00:00
kris 658727ff27 whoops, reverse extra part of last commit 
git-svn-id: file:///home/svn/framework3/trunk@6048 4d416f70-5f16-0410-b530-b9f4589650da
 2008-12-26 07:13:08 +00:00
kris b012696f1f just use boolean @@support_ipv6 instead of "yes"/"no" 
git-svn-id: file:///home/svn/framework3/trunk@6047 4d416f70-5f16-0410-b530-b9f4589650da
 2008-12-26 07:11:49 +00:00
kris 410d52626c Add -i option to 'connect' command to send contents of a file 
git-svn-id: file:///home/svn/framework3/trunk@6044 4d416f70-5f16-0410-b530-b9f4589650da
 2008-12-25 01:13:29 +00:00
kris 5944cfc13c improve some usage info for connect command 
git-svn-id: file:///home/svn/framework3/trunk@6040 4d416f70-5f16-0410-b530-b9f4589650da
 2008-12-23 17:47:05 +00:00
kris bbc9ad1f75 Adding netcat-like "connect" console command. It currently supports proxying, 
comm selection and SSL options.


git-svn-id: file:///home/svn/framework3/trunk@6039 4d416f70-5f16-0410-b530-b9f4589650da
 2008-12-23 07:43:22 +00:00
kris ff92efa219 Add db_del_host command 
git-svn-id: file:///home/svn/framework3/trunk@6038 4d416f70-5f16-0410-b530-b9f4589650da
 2008-12-22 03:19:39 +00:00
kris 0e8ce1cc46 Move my portspec parsing code from scanner/portscan/tcp to Rex as 
Socket.portspec_crack and use it to also replace the incomplete
parsing code used for db_autopwn


git-svn-id: file:///home/svn/framework3/trunk@6033 4d416f70-5f16-0410-b530-b9f4589650da
 2008-12-20 20:34:05 +00:00
kris 248f1e9fc3 Remove "#{xxx.to_s}" redundancies ('s/\(#{[^}]*\)\.to_s}/\1}/g') 
git-svn-id: file:///home/svn/framework3/trunk@6022 4d416f70-5f16-0410-b530-b9f4589650da
 2008-12-19 07:11:08 +00:00
James Lee 7f59e5ff15 make sessions behave like jobs when no options are given 
git-svn-id: file:///home/svn/framework3/trunk@6013 4d416f70-5f16-0410-b530-b9f4589650da
 2008-12-15 06:05:11 +00:00
et 6f83ec2cf8 Added global variable WMAP_EXCLUDE_FILE with regular expresion to define what not to scan. By default images are not tested. Thanks Martin Muench for comments. 
git-svn-id: file:///home/svn/framework3/trunk@6000 4d416f70-5f16-0410-b530-b9f4589650da
 2008-12-07 05:50:49 +00:00
kris 8eda1cccbf typo 
git-svn-id: file:///home/svn/framework3/trunk@5990 4d416f70-5f16-0410-b530-b9f4589650da
 2008-12-02 02:03:22 +00:00
et 6f8a1ab13a Fixed minor help presentation issue 
git-svn-id: file:///home/svn/framework3/trunk@5989 4d416f70-5f16-0410-b530-b9f4589650da
 2008-12-01 03:59:27 +00:00
et 8547688d7d Added wmap profiles capabilities to use as a method to run specific modules 
git-svn-id: file:///home/svn/framework3/trunk@5988 4d416f70-5f16-0410-b530-b9f4589650da
 2008-12-01 03:48:23 +00:00
et 3e19245054 Fixed handling of root website directory. Minor presentation fixes in test modules 
git-svn-id: file:///home/svn/framework3/trunk@5987 4d416f70-5f16-0410-b530-b9f4589650da
 2008-11-30 22:41:09 +00:00
et fb62ec351c Added wmap_targets -a add parameter as a quick way to create a new target 
git-svn-id: file:///home/svn/framework3/trunk@5985 4d416f70-5f16-0410-b530-b9f4589650da
 2008-11-30 06:35:43 +00:00
kris 80cc5e3bb6 Don't save "unknown" service names from Nmap or Nessus 
git-svn-id: file:///home/svn/framework3/trunk@5983 4d416f70-5f16-0410-b530-b9f4589650da
 2008-11-28 12:57:10 +00:00
kris 29919b1d84 Strip whitespace from saved service names from NBEs 
git-svn-id: file:///home/svn/framework3/trunk@5982 4d416f70-5f16-0410-b530-b9f4589650da
 2008-11-28 12:51:35 +00:00
kris cba228e8bf close NBE after import 
git-svn-id: file:///home/svn/framework3/trunk@5980 4d416f70-5f16-0410-b530-b9f4589650da
 2008-11-24 22:28:22 +00:00
HD Moore 6219b1873e Commit modified version of a patch from Marcell 'SkyOut' Dietl (Helith). This adds port inclusion, exclusion, and regex matching, as well as -q for 'quiet' mode (only status output, no module output) 
git-svn-id: file:///home/svn/framework3/trunk@5952 4d416f70-5f16-0410-b530-b9f4589650da
 2008-11-18 22:01:15 +00:00
HD Moore 05088e59f9 Close before deleting 
git-svn-id: file:///home/svn/framework3/trunk@5944 4d416f70-5f16-0410-b530-b9f4589650da
 2008-11-18 14:57:41 +00:00
HD Moore a7595fce6c Fixes #250. Solves an old bug with background jobs not working right, fixes the 'background modules dont work' bug as well. 
git-svn-id: file:///home/svn/framework3/trunk@5926 4d416f70-5f16-0410-b530-b9f4589650da
 2008-11-16 20:54:41 +00:00
et 0518511160 Fixed bug regarding website root directory 
git-svn-id: file:///home/svn/framework3/trunk@5904 4d416f70-5f16-0410-b530-b9f4589650da
 2008-11-13 02:22:35 +00:00
kris 7b002d4288 remove unused exception variables 
git-svn-id: file:///home/svn/framework3/trunk@5882 4d416f70-5f16-0410-b530-b9f4589650da
 2008-11-11 06:00:54 +00:00
et b4cbe4ff8d Multiple bug fixes. Fixed query modules now resolved to correct function. Corrected in proxy and wmap code handling of RHOSTS as hostnames are not in use. Fixed reporting as target port was not handled properly and modules modified to reflect new wmap_target methods. 
git-svn-id: file:///home/svn/framework3/trunk@5869 4d416f70-5f16-0410-b530-b9f4589650da
 2008-11-10 04:38:05 +00:00
HD Moore d1052fdaf1 Fixes #215. Reinitialize the input/output after a reload 
git-svn-id: file:///home/svn/framework3/trunk@5851 4d416f70-5f16-0410-b530-b9f4589650da
 2008-11-08 17:48:21 +00:00
HD Moore 5af9abd81d Fixes #194. Add nicer call stacks to auxiliary modules 
git-svn-id: file:///home/svn/framework3/trunk@5850 4d416f70-5f16-0410-b530-b9f4589650da
 2008-11-07 22:54:49 +00:00
kris c52f889082 Report hosts as alive through db_tracker and the db Nmap and Nessus commands 
git-svn-id: file:///home/svn/framework3/trunk@5819 4d416f70-5f16-0410-b530-b9f4589650da
 2008-10-31 18:39:53 +00:00
kris 025b7410a0 Remove spurious ] from db_services output for consistency with other db output 
git-svn-id: file:///home/svn/framework3/trunk@5799 4d416f70-5f16-0410-b530-b9f4589650da
 2008-10-29 13:10:22 +00:00
kris 3e8c5ecebc Fix db_add_host (undefined variable) 
git-svn-id: file:///home/svn/framework3/trunk@5795 4d416f70-5f16-0410-b530-b9f4589650da
 2008-10-27 22:47:09 +00:00
et 75be2e33ad Added module reporting and wmap_reports command 
git-svn-id: file:///home/svn/framework3/trunk@5789 4d416f70-5f16-0410-b530-b9f4589650da
 2008-10-27 02:22:30 +00:00
Ramon de C Valle f124597a56 Code cleanups 
git-svn-id: file:///home/svn/framework3/trunk@5773 4d416f70-5f16-0410-b530-b9f4589650da
 2008-10-19 21:03:39 +00:00
et 7e73ed8c15 first attempt of reporting implementation. 
git-svn-id: file:///home/svn/framework3/trunk@5771 4d416f70-5f16-0410-b530-b9f4589650da
 2008-10-19 20:32:14 +00:00
et c153d1fea0 Wmap database merged, new wmap_generic module, fix website tree display and docs. 
git-svn-id: file:///home/svn/framework3/trunk@5740 4d416f70-5f16-0410-b530-b9f4589650da
 2008-10-12 03:46:49 +00:00
HD Moore 0320809c18 Fix session interaction again 
git-svn-id: file:///home/svn/framework3/trunk@5734 4d416f70-5f16-0410-b530-b9f4589650da
 2008-10-10 05:01:49 +00:00
et fa3ce57fed Implemented Auxiliary::WMAPScanUniqueQuery. 
git-svn-id: file:///home/svn/framework3/trunk@5704 4d416f70-5f16-0410-b530-b9f4589650da
 2008-10-01 03:57:57 +00:00
HD Moore c9bb1bbcd0 Move th fd.unlink for the db_nmap command 
git-svn-id: file:///home/svn/framework3/trunk@5686 4d416f70-5f16-0410-b530-b9f4589650da
 2008-09-26 05:01:18 +00:00
HD Moore b001e4684d Import first version of WMAP from ET LoWNOISE 
git-svn-id: file:///home/svn/framework3/trunk@5675 4d416f70-5f16-0410-b530-b9f4589650da
 2008-09-22 22:32:20 +00:00
HD Moore 9b34f931d2 Fixes #240. Resets tab completion after irb 
git-svn-id: file:///home/svn/framework3/trunk@5653 4d416f70-5f16-0410-b530-b9f4589650da
 2008-09-05 22:10:18 +00:00
HD Moore f52f4d7b62 Add |)ruid's infos to author, fix an issue with auxiliary options checking. 
git-svn-id: file:///home/svn/framework3/trunk@5577 4d416f70-5f16-0410-b530-b9f4589650da
 2008-07-23 20:14:47 +00:00
James Lee 2d344e64df browser_autopwn now works with mozilla_compareto, mozilla_navigatorjava, and firefox_queryinterface; increased reliability of OS and browser detection 
git-svn-id: file:///home/svn/framework3/trunk@5563 4d416f70-5f16-0410-b530-b9f4589650da
 2008-07-22 07:28:05 +00:00
HD Moore 380aba15b0 Implements the readline workaround, tested with regular and meterpreter sessions 
git-svn-id: file:///home/svn/framework3/trunk@5544 4d416f70-5f16-0410-b530-b9f4589650da
 2008-06-27 20:51:36 +00:00
James Lee 487d7d0bec spaces -> tabs. =( 
git-svn-id: file:///home/svn/framework3/trunk@5536 4d416f70-5f16-0410-b530-b9f4589650da
 2008-06-22 20:01:41 +00:00
James Lee 4733e56c5a add 'resource' command, no tab completion yet because i'm lazy 
git-svn-id: file:///home/svn/framework3/trunk@5535 4d416f70-5f16-0410-b530-b9f4589650da
 2008-06-22 19:59:12 +00:00
James Lee 73dd9aa89f show the name of the module in the output of 'show options' and friends 
git-svn-id: file:///home/svn/framework3/trunk@5532 4d416f70-5f16-0410-b530-b9f4589650da
 2008-06-18 08:30:26 +00:00
James Lee e1a25c1383 payload generate now honors ENCODER instead of requiring -e 
git-svn-id: file:///home/svn/framework3/trunk@5508 4d416f70-5f16-0410-b530-b9f4589650da
 2008-05-19 23:56:17 +00:00
James Lee c0b39cc234 "set foo" prints the value of foo if it exists; really, that's it this time 
git-svn-id: file:///home/svn/framework3/trunk@5507 4d416f70-5f16-0410-b530-b9f4589650da
 2008-05-17 06:27:03 +00:00
James Lee 2db9dd6ab2 Reversing over greedy commit. =( 
git-svn-id: file:///home/svn/framework3/trunk@5506 4d416f70-5f16-0410-b530-b9f4589650da
 2008-05-17 06:17:41 +00:00
James Lee 93199c5610 "set foo" prints the value of foo if it exists 
git-svn-id: file:///home/svn/framework3/trunk@5505 4d416f70-5f16-0410-b530-b9f4589650da
 2008-05-17 05:29:32 +00:00
James Lee 8116b32e14 allow comments in resource files. 
git-svn-id: file:///home/svn/framework3/trunk@5498 4d416f70-5f16-0410-b530-b9f4589650da
 2008-04-26 18:28:41 +00:00
HD Moore 509fc09382 Lots of updates related to <secret project X>. 
git-svn-id: file:///home/svn/framework3/trunk@5424 4d416f70-5f16-0410-b530-b9f4589650da
 2008-03-02 04:46:13 +00:00
HD Moore 3685b7a133 Fixes #190. Check for missing path and handle all exceptions. 
git-svn-id: file:///home/svn/framework3/trunk@5403 4d416f70-5f16-0410-b530-b9f4589650da
 2008-02-09 07:50:20 +00:00
HD Moore 6677beb174 Merged revisions 5366-5377 via svnmerge from 
svn+ssh://metasploit.com/home/svn/framework3/branches/framework-3.1

........
  r5366 | hdm | 2008-01-26 20:30:53 -0600 (Sat, 26 Jan 2008) | 2 lines
  
  Update version information
........
  r5367 | hdm | 2008-01-26 21:10:57 -0600 (Sat, 26 Jan 2008) | 3 lines
  
  Updated for version 3.1
........
  r5369 | hdm | 2008-01-26 21:13:31 -0600 (Sat, 26 Jan 2008) | 3 lines
  
  Wipe the private directories from the branch. 
........
  r5371 | hdm | 2008-01-27 17:24:24 -0600 (Sun, 27 Jan 2008) | 5 lines
  
  Timeout options added for dcerpc connect and read times. Addition of novell netware as a supported target platform. Inclusion of the serverprotect exploit (still works on the latest version). Addition of the first remote netware kernel exploit that leads to a shell, addition of netware stager and shell, and first draft of the release notes for 3.1
........
  r5372 | hdm | 2008-01-27 17:30:08 -0600 (Sun, 27 Jan 2008) | 3 lines
  
  Formatting, indentation, fixed the static IP embedded in the request
........
  r5373 | hdm | 2008-01-27 20:02:48 -0600 (Sun, 27 Jan 2008) | 3 lines
  
  Correctly trap exploit errors in a way that works with all of the UIs
........
  r5374 | hdm | 2008-01-27 20:23:25 -0600 (Sun, 27 Jan 2008) | 3 lines
  
  More last-minute bug fixes
........
  r5375 | hdm | 2008-01-27 20:37:43 -0600 (Sun, 27 Jan 2008) | 3 lines
  
  Force multi-bind off in netware, correct label display in gtk gui labels
........
  r5376 | hdm | 2008-01-27 20:50:03 -0600 (Sun, 27 Jan 2008) | 3 lines
  
  More exception handling fun
........


git-svn-id: file:///home/svn/framework3/trunk@5378 4d416f70-5f16-0410-b530-b9f4589650da
 2008-01-28 03:06:31 +00:00
HD Moore e17f43b9d5 Prevent duplicate error messages from appearing 
git-svn-id: file:///home/svn/framework3/trunk@5359 4d416f70-5f16-0410-b530-b9f4589650da
 2008-01-26 22:46:49 +00:00
HD Moore d931374844 Add -f to generate. Add SMBUser/SMBPass options to psexec (regular vs advanced) 
git-svn-id: file:///home/svn/framework3/trunk@5354 4d416f70-5f16-0410-b530-b9f4589650da
 2008-01-25 23:24:06 +00:00
HD Moore 16b457067a Woops. Had to add the error printing code to the UI wrapper 
git-svn-id: file:///home/svn/framework3/trunk@5353 4d416f70-5f16-0410-b530-b9f4589650da
 2008-01-25 22:36:05 +00:00
HD Moore a9ca5d1ace More GUI work. Changed the location where module exceptions are reported 
git-svn-id: file:///home/svn/framework3/trunk@5335 4d416f70-5f16-0410-b530-b9f4589650da
 2008-01-24 05:29:35 +00:00
HD Moore 65bfaa269d fixes to the search command in msfconsole. an attempt at solving the rubyw/gtk/stderr issue on windows 
git-svn-id: file:///home/svn/framework3/trunk@5308 4d416f70-5f16-0410-b530-b9f4589650da
 2008-01-22 04:57:06 +00:00
HD Moore c376951b30 Sanitize text before inserting it into a text view 
git-svn-id: file:///home/svn/framework3/trunk@5304 4d416f70-5f16-0410-b530-b9f4589650da
 2008-01-21 02:10:27 +00:00
HD Moore 5e2f1ea7cc More tempfile nonsense 
git-svn-id: file:///home/svn/framework3/trunk@5247 4d416f70-5f16-0410-b530-b9f4589650da
 2007-12-31 08:27:24 +00:00
HD Moore d6e5b0a25d Fix use of Tempfile 
git-svn-id: file:///home/svn/framework3/trunk@5246 4d416f70-5f16-0410-b530-b9f4589650da
 2007-12-31 08:20:48 +00:00
HD Moore 5131e4b747 Change the default payload back to a working one 
git-svn-id: file:///home/svn/framework3/trunk@5245 4d416f70-5f16-0410-b530-b9f4589650da
 2007-12-31 05:01:10 +00:00
HD Moore dfdc7d6dad Fix db_nmap on windows 
git-svn-id: file:///home/svn/framework3/trunk@5244 4d416f70-5f16-0410-b530-b9f4589650da
 2007-12-31 04:58:44 +00:00
HD Moore b7dc7dfe65 print command line output 
git-svn-id: file:///home/svn/framework3/trunk@5243 4d416f70-5f16-0410-b530-b9f4589650da
 2007-12-31 04:53:35 +00:00