Commit Graph

4629 Commits (14cf0deb2986ad3a05ea4899258822527c746c85)

Author SHA1 Message Date
HD Moore 2ea46552ad Apply a fix that was already in reverse_https
git-svn-id: file:///home/svn/framework3/trunk@13205 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-18 14:17:19 +00:00
HD Moore 16840ebfa5 Add profiles table
git-svn-id: file:///home/svn/framework3/trunk@13202 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-17 21:39:21 +00:00
Chao Mu d23a5f6092 "The GetFileSecurityA and GetFileSecurityW functions have a "RequestedInformation" that is defined as a PBLOB and should be a DWORD." - Keith Faber. Thank you Keith! see #4364
git-svn-id: file:///home/svn/framework3/trunk@13201 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-17 17:48:09 +00:00
HD Moore cccbdf9fab This patch allows meterpreter to work with file paths and user names that are not of the US-ASCII character set.
git-svn-id: file:///home/svn/framework3/trunk@13200 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-17 17:32:52 +00:00
Chao Mu 1e1d7c534d "This is the first update to the Railgun Advapi32.dll Definitions. It adds some of the Windows CryptoAPI function calls." - David Maloney. see #4746
git-svn-id: file:///home/svn/framework3/trunk@13199 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-17 17:17:48 +00:00
Chao Mu 572a5a5b8b Added method "functions" to DLLWrapper that grabs the DLL's "functions" so that people can continue to test for function existence via .functions['blah'], evne though I hate this, I want to be backwards compatible. This will be deprecated eventually
git-svn-id: file:///home/svn/framework3/trunk@13198 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-17 15:15:26 +00:00
HD Moore 1bb9470e59 Adds the ability to set the cookies, authentication, and arbitrary headers
git-svn-id: file:///home/svn/framework3/trunk@13195 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-16 13:29:28 +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
James Lee c412a836ed add VERBOSE option to all modules and vprint_* methods to use it
git-svn-id: file:///home/svn/framework3/trunk@13183 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-15 15:33:35 +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
Chao Mu 59015b2cbf Closes Redmine issue 3073 (Railgun DLL cache/definition loader needs a rewrite). Major overhaul of how railgun handles DLLs and requests to them. def_*.rb files are now formed differently, this may break your code if you made changes to railgun/def/def_* or railgun.rb, see http://blog.minorcrash.com/2011/07/new-way-to-add-dlls-to-railgun.html
git-svn-id: file:///home/svn/framework3/trunk@13181 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-15 00:18:01 +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
James Lee c64efb676b don't raise RequestErrors that kill a whole module when we can't open a file
git-svn-id: file:///home/svn/framework3/trunk@13178 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-14 21:59:35 +00:00
James Lee c32ac59580 explicitly return the resultant session
git-svn-id: file:///home/svn/framework3/trunk@13172 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-14 19:42:03 +00:00
HD Moore 9b2e03e18b Handle newlines (or lack of them) cleaner
git-svn-id: file:///home/svn/framework3/trunk@13170 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-14 15:11:17 +00:00
Matt Weeks d1cfa7560f Update DHCP server for correctness, reliability, simplicity.
Actually keep track of which clients get which IP, only give PXE options to PXE clients, and provide more control over serving to PXE and/or normal clients.



git-svn-id: file:///home/svn/framework3/trunk@13165 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-14 02:34:25 +00:00
Matt Weeks bcfbcfec30 Because Program Files (x86) has spaces in it.
git-svn-id: file:///home/svn/framework3/trunk@13163 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-13 21:54:22 +00:00
Tod Beardsley b9c5835b5e Touching up the ssh key login module to be smarter about duplicate user names, not be so chatty in its messaging to the console, deal with whitespace, and avoid storing duplicate keys when we don't need to.
git-svn-id: file:///home/svn/framework3/trunk@13162 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-13 20:51:18 +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
Joshua Drake ee6cbb7c87 See #4868, reverts r13103
git-svn-id: file:///home/svn/framework3/trunk@13158 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-12 23:07:51 +00:00
Tod Beardsley dc84ee6aab More fixups for ssh_login_pubkey and special handlers for long strings of keys.
git-svn-id: file:///home/svn/framework3/trunk@13156 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-12 20:58:25 +00:00
Tod Beardsley 4c80d9a427 updates r13154 don't be case insensitive since it's a custom format and would like to preserve case on KEY=
git-svn-id: file:///home/svn/framework3/trunk@13155 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-12 16:36:28 +00:00
Tod Beardsley 7abb2980a6 Adds a mechanism to compare stored SSH keys by key id.
git-svn-id: file:///home/svn/framework3/trunk@13154 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-12 16:33:54 +00:00
Wei Chen 687aaf5c71 Apply egghunter patch (by corelanc0d3r) for DEP bypass size calculation improvement.
Please see #4909


git-svn-id: file:///home/svn/framework3/trunk@13153 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-12 01:06:15 +00:00
Jonathan Cran 24d2b48f64 Initial commit of an esx/esxi driver for the lab plugin (thanks to kernelsmith). Also updated documentation in lib/lab/README.
git-svn-id: file:///home/svn/framework3/trunk@13151 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-11 05:52:51 +00:00
HD Moore 90ced404b3 Updates to the jtr code, supports ruby 1.8.7 now, fixes #4908
git-svn-id: file:///home/svn/framework3/trunk@13149 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-11 01:07:46 +00:00
Wei Chen e55d2289cd I totally missed this: x64 linux payloads in msfencode should still remain in 64-bit format, not 32.
git-svn-id: file:///home/svn/framework3/trunk@13140 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-10 06:40:03 +00:00
HD Moore cd6678188e Allow :service to be passed in
git-svn-id: file:///home/svn/framework3/trunk@13139 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-09 06:58:55 +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
HD Moore 7754f0d8f2 This commit adds a basic "analyzer" module for creds
git-svn-id: file:///home/svn/framework3/trunk@13136 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-09 02:14:24 +00:00
Wei Chen dfc7f39e1c Modified how function to_linux_x64_elf() loads a template file
git-svn-id: file:///home/svn/framework3/trunk@13129 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-08 19:24:22 +00:00
Joshua Drake d6de23de27 Fixes #4868: allow 125 response during send_cmd_data
git-svn-id: file:///home/svn/framework3/trunk@13127 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-08 04:22:47 +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 7f743a5c1b make meterpreter's File.basename() honor both kinds of directory seperators, use the remote basename as the dest when dest is implicit
git-svn-id: file:///home/svn/framework3/trunk@13124 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-08 00:08:42 +00:00
Wei Chen 946074feb9 Add a waitFor() function to make sure chmod is finished running. Thx Juan.
git-svn-id: file:///home/svn/framework3/trunk@13119 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-07 19:40:34 +00:00
Tod Beardsley fb9e0a72e0 Deal with a workspace namespace race in starting the UI.
git-svn-id: file:///home/svn/framework3/trunk@13116 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-07 13:33:07 +00:00
James Lee 1f349ff542 Don't close the session for irrelevant exceptions. The shell might still be dead for some other reason, but this will prevent closing it unnecessarily
git-svn-id: file:///home/svn/framework3/trunk@13107 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-06 20:34:52 +00:00
James Lee b49c451cd7 derp, this is a string
git-svn-id: file:///home/svn/framework3/trunk@13104 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-06 00:19:29 +00:00
Joshua Drake b42df7cd20 close instead of shutdown
git-svn-id: file:///home/svn/framework3/trunk@13103 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-05 17:22:19 +00:00
James Lee d876b8d297 if the command we're running has spaces and we got no options for it, split it up correctly using Shellwords, fixes issues with running commands on java meterp
git-svn-id: file:///home/svn/framework3/trunk@13102 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-05 17:17:27 +00:00
HD Moore e6968c202a A couple bug fixes to enable cmd_interact and a new module for the VSFTPD backdoor
git-svn-id: file:///home/svn/framework3/trunk@13093 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-04 20:09:32 +00:00
James Lee 47a551468b add a Post.create method that makes testing post module stuff in IRB a lot easier. try this from a meterpreter irb prompt: pry Msf::Module::Post.create(client)
git-svn-id: file:///home/svn/framework3/trunk@13087 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-02 00:39:16 +00:00
James Lee d68e855bb6 don't try to chomp nil when the command failed (happens when a session dies)
git-svn-id: file:///home/svn/framework3/trunk@13085 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-01 23:46:54 +00:00
James Lee a301170cc2 special-case java and php to check for compatibility against the underlying platform.
git-svn-id: file:///home/svn/framework3/trunk@13084 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-01 23:41:49 +00:00
James Lee 9c8605813e don't wait for the session to send back a response after telling it to die
git-svn-id: file:///home/svn/framework3/trunk@13083 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-01 23:29:00 +00:00
James Lee 56de119a0f add a few opera fingerprints gathered from http://www.giac.org/paper/gwapt/1353/client-fingerprinting-analysis-browser-scripting-environment/115300
git-svn-id: file:///home/svn/framework3/trunk@13082 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-01 23:20:31 +00:00
Tod Beardsley 238d256ecb Works around a race condition that sometimes triggers when running multiple AuthBrute modules concurrently.
git-svn-id: file:///home/svn/framework3/trunk@13078 4d416f70-5f16-0410-b530-b9f4589650da
2011-06-30 19:24:14 +00:00
Tod Beardsley 0818a856b6 Some fixups for some new AuthBrute hotness.
git-svn-id: file:///home/svn/framework3/trunk@13075 4d416f70-5f16-0410-b530-b9f4589650da
2011-06-30 06:52:52 +00:00
HD Moore 17145d07b6 Add some new tables
git-svn-id: file:///home/svn/framework3/trunk@13074 4d416f70-5f16-0410-b530-b9f4589650da
2011-06-30 06:49:04 +00:00
HD Moore 7d9f36d4b9 Adds support for the new regloadkey/regunloadkey operations.
git-svn-id: file:///home/svn/framework3/trunk@13072 4d416f70-5f16-0410-b530-b9f4589650da
2011-06-30 05:35:18 +00:00
James Lee 5f5c024193 supress a useless exception (trying to close a closed stream)
git-svn-id: file:///home/svn/framework3/trunk@13071 4d416f70-5f16-0410-b530-b9f4589650da
2011-06-30 05:12:07 +00:00
James Lee e321d01cd4 actually do what the comment says it does instead of trying to read a bunch of times with a tiny timeout. fixes some issues with shell commands on meterpreter sessions
git-svn-id: file:///home/svn/framework3/trunk@13070 4d416f70-5f16-0410-b530-b9f4589650da
2011-06-30 05:05:02 +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 92bb531af5 New bins, new functions, more info soon
git-svn-id: file:///home/svn/framework3/trunk@13059 4d416f70-5f16-0410-b530-b9f4589650da
2011-06-29 06:12:03 +00:00
Matt Weeks 078d5d7790 Enable rwx exec thread method to generate jump offset off end. (for multipayload)
git-svn-id: file:///home/svn/framework3/trunk@13056 4d416f70-5f16-0410-b530-b9f4589650da
2011-06-29 01:13:12 +00:00
HD Moore a98602ed8d Shut down properly through session.kill
git-svn-id: file:///home/svn/framework3/trunk@13055 4d416f70-5f16-0410-b530-b9f4589650da
2011-06-28 21:38:24 +00:00
HD Moore a03b030465 Typo
git-svn-id: file:///home/svn/framework3/trunk@13054 4d416f70-5f16-0410-b530-b9f4589650da
2011-06-28 21:35:27 +00:00
HD Moore 9220506ba2 Merge in recent meterpreter work. These are not the commits you are looking for (more info on what all this is later this week).
git-svn-id: file:///home/svn/framework3/trunk@13053 4d416f70-5f16-0410-b530-b9f4589650da
2011-06-28 21:26:43 +00:00
HD Moore 175df6e52d Add framework.db.listeners
git-svn-id: file:///home/svn/framework3/trunk@13047 4d416f70-5f16-0410-b530-b9f4589650da
2011-06-28 16:01:21 +00:00
HD Moore 5bbf27bf5b Woops, this may not have a prompt accessor, find another way
git-svn-id: file:///home/svn/framework3/trunk@13029 4d416f70-5f16-0410-b530-b9f4589650da
2011-06-25 20:33: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
HD Moore e4eb2a4af0 Add a new table for managing background listeners
git-svn-id: file:///home/svn/framework3/trunk@13024 4d416f70-5f16-0410-b530-b9f4589650da
2011-06-25 06:57:47 +00:00
Joshua Drake 415777c25b fix missing initialization
git-svn-id: file:///home/svn/framework3/trunk@13023 4d416f70-5f16-0410-b530-b9f4589650da
2011-06-25 04:57:01 +00:00
HD Moore 73137c8dc1 Implement some future proofing
git-svn-id: file:///home/svn/framework3/trunk@13020 4d416f70-5f16-0410-b530-b9f4589650da
2011-06-25 01:40:16 +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 df5974c25d And now back to your regularly scheduled development version
git-svn-id: file:///home/svn/framework3/trunk@13016 4d416f70-5f16-0410-b530-b9f4589650da
2011-06-23 19:39:16 +00:00
HD Moore 25a2d846e2 Add the settings column
git-svn-id: file:///home/svn/framework3/trunk@13011 4d416f70-5f16-0410-b530-b9f4589650da
2011-06-23 07:04:20 +00:00
Jonathan Cran ef19406645 don't try to launch the gui w/ the workstation driver
git-svn-id: file:///home/svn/framework3/trunk@13010 4d416f70-5f16-0410-b530-b9f4589650da
2011-06-23 04:27:09 +00:00
James Lee 7ef6be45c4 fix some wacky inheritance problems with Msf::Module#inspect
git-svn-id: file:///home/svn/framework3/trunk@13006 4d416f70-5f16-0410-b530-b9f4589650da
2011-06-22 22:18:55 +00:00
Tod Beardsley 824022fde3 Adds a more universal print_error message for :abort in auth_brute.rb
git-svn-id: file:///home/svn/framework3/trunk@13005 4d416f70-5f16-0410-b530-b9f4589650da
2011-06-22 20:53:51 +00:00
Tod Beardsley 7a0e2ba59e Adds more verbose debugging output when the RPC service hits a raisable condition. Namely, tells the consumer what actually triggered the raise in the case of a missing or invalid request method, missing API group, or missing API group method.
git-svn-id: file:///home/svn/framework3/trunk@13004 4d416f70-5f16-0410-b530-b9f4589650da
2011-06-22 17:53:17 +00:00
HD Moore 40b9b2467b Remove the downgrade until we figure out the cause, getting different results for the same OS/SP/configuration
git-svn-id: file:///home/svn/framework3/trunk@12991 4d416f70-5f16-0410-b530-b9f4589650da
2011-06-21 01:12:17 +00:00
Carlos Perez 68e3691411 Change Post Mixin for Windows platform in its own separate class and minor fixes on modules and scripts
git-svn-id: file:///home/svn/framework3/trunk@12990 4d416f70-5f16-0410-b530-b9f4589650da
2011-06-21 00:38:04 +00:00
HD Moore c42ea1f896 Re-enable the workaround for now, see #4785
git-svn-id: file:///home/svn/framework3/trunk@12989 4d416f70-5f16-0410-b530-b9f4589650da
2011-06-20 23:38:30 +00:00
Carlos Perez ff7f68b470 Change Post Mixin for Solaris platform in its own separate class
git-svn-id: file:///home/svn/framework3/trunk@12988 4d416f70-5f16-0410-b530-b9f4589650da
2011-06-20 23:33:59 +00:00
HD Moore ab615c1225 Reference the ticket in this comment: See #4785
git-svn-id: file:///home/svn/framework3/trunk@12987 4d416f70-5f16-0410-b530-b9f4589650da
2011-06-20 23:32:29 +00:00
Carlos Perez 7a1c8d7bb2 Change Post Mixin for OSX platform in its own separate class
git-svn-id: file:///home/svn/framework3/trunk@12986 4d416f70-5f16-0410-b530-b9f4589650da
2011-06-20 23:29:57 +00:00
Carlos Perez 5d3bb04ac0 Change Post Mixin for Linux platform in its own separate class
git-svn-id: file:///home/svn/framework3/trunk@12985 4d416f70-5f16-0410-b530-b9f4589650da
2011-06-20 23:27:57 +00:00
HD Moore 346018c321 Disable NTLMv2 Session for Windows 2000 servers
git-svn-id: file:///home/svn/framework3/trunk@12984 4d416f70-5f16-0410-b530-b9f4589650da
2011-06-20 22:54:13 +00:00
HD Moore 846172fa1a Split options based on shellwords, pass as a hash, this prevents commas in option values from breaking things and allows quotes to be used
git-svn-id: file:///home/svn/framework3/trunk@12983 4d416f70-5f16-0410-b530-b9f4589650da
2011-06-20 20:54:46 +00:00
James Lee 28d182b2fa 3.7.2 release
git-svn-id: file:///home/svn/framework3/trunk@12982 4d416f70-5f16-0410-b530-b9f4589650da
2011-06-20 19:48:54 +00:00
HD Moore 3831e49455 See #4506 for Macro handling
git-svn-id: file:///home/svn/framework3/trunk@12977 4d416f70-5f16-0410-b530-b9f4589650da
2011-06-20 07:23:16 +00:00
HD Moore 47523c5925 Add RHEL detection from the .el[2-6] match
git-svn-id: file:///home/svn/framework3/trunk@12973 4d416f70-5f16-0410-b530-b9f4589650da
2011-06-18 18:12:59 +00:00
HD Moore 04bf281c12 Bug fix for the ndmp stack
git-svn-id: file:///home/svn/framework3/trunk@12971 4d416f70-5f16-0410-b530-b9f4589650da
2011-06-18 16:35:40 +00:00
Tod Beardsley 6827495d17 Adds a # of passwords per username limiter to authbrute.
git-svn-id: file:///home/svn/framework3/trunk@12970 4d416f70-5f16-0410-b530-b9f4589650da
2011-06-18 04:14:06 +00:00
Tod Beardsley db1619d035 Rejiggers the max credentials limiter a little, and adds a max time limiter per service.
git-svn-id: file:///home/svn/framework3/trunk@12967 4d416f70-5f16-0410-b530-b9f4589650da
2011-06-17 22:40:25 +00:00
James Lee e30252df02 add support for the new xml format of .svn/entries
git-svn-id: file:///home/svn/framework3/trunk@12966 4d416f70-5f16-0410-b530-b9f4589650da
2011-06-17 20:54:42 +00:00
HD Moore b80d364a64 Adds support for <audit> as well as <audits>. Fixes #4744
git-svn-id: file:///home/svn/framework3/trunk@12965 4d416f70-5f16-0410-b530-b9f4589650da
2011-06-17 20:08:27 +00:00
Tod Beardsley cc04901610 Updating import comment docs.
git-svn-id: file:///home/svn/framework3/trunk@12963 4d416f70-5f16-0410-b530-b9f4589650da
2011-06-17 14:46:54 +00:00
Tod Beardsley 70f185f76e Whitespace adjustments on auth_brute.
git-svn-id: file:///home/svn/framework3/trunk@12960 4d416f70-5f16-0410-b530-b9f4589650da
2011-06-16 22:33:08 +00:00
Tod Beardsley ab37580056 Refactored the AuthBrute mixin some to make the each_user_pass function a little cleaner and easier to maintain.
And maintain it I shall! Added in a standardized print_brute method to normalize the AuthBrute output to always include host, port, proto, and number of guesses over number remaining.

Also adds support for a MaxGuessesPerService datastore option for AuthBrute modules.

Currently, only ssh_login supports the new stuff, but now it's just a conversion matter. Will get to that in a bit.




git-svn-id: file:///home/svn/framework3/trunk@12958 4d416f70-5f16-0410-b530-b9f4589650da
2011-06-16 22:08:45 +00:00
James Lee 8e5311cb61 File.read is not binary safe. replace it with File.open in a few places where it matters.
git-svn-id: file:///home/svn/framework3/trunk@12957 4d416f70-5f16-0410-b530-b9f4589650da
2011-06-16 22:02:00 +00:00
HD Moore 11779785d4 Fix typo
git-svn-id: file:///home/svn/framework3/trunk@12955 4d416f70-5f16-0410-b530-b9f4589650da
2011-06-16 17:33:13 +00:00
Tod Beardsley c12939e582 Syncing PacketFu with upstream.
git-svn-id: file:///home/svn/framework3/trunk@12952 4d416f70-5f16-0410-b530-b9f4589650da
2011-06-16 13:58:33 +00:00
HD Moore 092817d449 Finally merging Cachedump into the SVN tree. Thanks to everyone who helped and again for their patience
git-svn-id: file:///home/svn/framework3/trunk@12946 4d416f70-5f16-0410-b530-b9f4589650da
2011-06-15 01:06:22 +00:00
HD Moore ee20ed3dc6 This adds support for direct import of ASPL files from IP360 (stored in the user's config directory) and fixes an issue with the report_host() processing Host objects. Fixes #4619
git-svn-id: file:///home/svn/framework3/trunk@12945 4d416f70-5f16-0410-b530-b9f4589650da
2011-06-15 00:51:51 +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
Carlos Perez cc04b538af use the proper id command
git-svn-id: file:///home/svn/framework3/trunk@12942 4d416f70-5f16-0410-b530-b9f4589650da
2011-06-14 20:39:37 +00:00
Joshua Drake cb98e40725 Add support for ignoring non-executable Mach-O binary segments
git-svn-id: file:///home/svn/framework3/trunk@12940 4d416f70-5f16-0410-b530-b9f4589650da
2011-06-14 15:23:32 +00:00
Carlos Perez d99df297d8 Added Amazon Linux the version used with EC2 AMI
git-svn-id: file:///home/svn/framework3/trunk@12933 4d416f70-5f16-0410-b530-b9f4589650da
2011-06-13 01:37:04 +00:00
HD Moore 7f3e2d182d Fix Axis2 to inherit from the correct class, prevent a stack trace when a non-Remote exploit has the cleanup method called.
git-svn-id: file:///home/svn/framework3/trunk@12928 4d416f70-5f16-0410-b530-b9f4589650da
2011-06-12 18:32:27 +00:00
Tod Beardsley e3c0cc3b8f Syncing Metasploit's PacketFu with upstream: https://github.com/todb/packetfu
git-svn-id: file:///home/svn/framework3/trunk@12926 4d416f70-5f16-0410-b530-b9f4589650da
2011-06-12 02:24:30 +00:00
HD Moore db413592e9 This commit adds support for the -r (remote machine name) parameter to the reg command and extends the api to support a remote machine name. Closes #1894
git-svn-id: file:///home/svn/framework3/trunk@12924 4d416f70-5f16-0410-b530-b9f4589650da
2011-06-12 00:01:29 +00:00
HD Moore 6dd65e56f2 All changes look good, merging
git-svn-id: file:///home/svn/framework3/trunk@12921 4d416f70-5f16-0410-b530-b9f4589650da
2011-06-11 23:17:42 +00:00
HD Moore c3307c80be Fixes #1733 by merging in Danilo Nascimento's patch. Thanks!
git-svn-id: file:///home/svn/framework3/trunk@12919 4d416f70-5f16-0410-b530-b9f4589650da
2011-06-11 23:01:11 +00:00
Joshua Drake a8d177ec35 Revert r12910, conflict-o oops-o
git-svn-id: file:///home/svn/framework3/trunk@12911 4d416f70-5f16-0410-b530-b9f4589650da
2011-06-11 18:53:39 +00:00
Joshua Drake 3ac9854e88 Fixes #4703: Change an assignment in the loop to append instead
git-svn-id: file:///home/svn/framework3/trunk@12910 4d416f70-5f16-0410-b530-b9f4589650da
2011-06-11 18:50:33 +00:00
David Rude 54f9ea7c0d code clean ups, fixes a bug in gadget collection, adds gadget grouping
git-svn-id: file:///home/svn/framework3/trunk@12909 4d416f70-5f16-0410-b530-b9f4589650da
2011-06-11 18:38:02 +00:00
Tod Beardsley 3fde9c6f1f Reworking how imported crendentials work.
git-svn-id: file:///home/svn/framework3/trunk@12908 4d416f70-5f16-0410-b530-b9f4589650da
2011-06-11 02:40:02 +00:00
David Rude 8eaf46eca0 Add support to disable color
git-svn-id: file:///home/svn/framework3/trunk@12906 4d416f70-5f16-0410-b530-b9f4589650da
2011-06-10 18:13:34 +00:00
David Rude a0c2321efc Add msfrop, a tool for collecting and ROP gadgets, features include export and import in CSV format, powerful regex searching
git-svn-id: file:///home/svn/framework3/trunk@12904 4d416f70-5f16-0410-b530-b9f4589650da
2011-06-10 12:54:01 +00:00
Carlos Perez 30caa5b60c remove hard coding of path for id command
git-svn-id: file:///home/svn/framework3/trunk@12902 4d416f70-5f16-0410-b530-b9f4589650da
2011-06-10 11:14:57 +00:00
Carlos Perez 9a2f23bd61 bad indents
git-svn-id: file:///home/svn/framework3/trunk@12897 4d416f70-5f16-0410-b530-b9f4589650da
2011-06-10 03:27:09 +00:00
Carlos Perez 2263e51cd2 Initial Solaris mixin
git-svn-id: file:///home/svn/framework3/trunk@12895 4d416f70-5f16-0410-b530-b9f4589650da
2011-06-10 03:07:54 +00:00
HD Moore 1664a4b5e8 Sync with upstream, add compatibility to rc4 algorithms (solaris support)
git-svn-id: file:///home/svn/framework3/trunk@12894 4d416f70-5f16-0410-b530-b9f4589650da
2011-06-10 02:02:18 +00:00
David Rude 05fe96cf37 Reworked how the Fileformat mixin works for exploits, a single filename will use a default path, users can set a full path as well if they want to place the files somewhere else instead of using OUTPUTPATH
git-svn-id: file:///home/svn/framework3/trunk@12889 4d416f70-5f16-0410-b530-b9f4589650da
2011-06-09 14:21:52 +00:00
Carlos Perez dc7ba642b0 Added Oracle Linux and Arch Linux support and change the call to standardize it with other mixins
git-svn-id: file:///home/svn/framework3/trunk@12887 4d416f70-5f16-0410-b530-b9f4589650da
2011-06-09 12:50:36 +00:00
James Lee 9d99b9de22 fix a logic error that results in sockets closing instead of resending data, really fixes #4642; also fixes a nil error when read() failed, makes logs actually useful
git-svn-id: file:///home/svn/framework3/trunk@12885 4d416f70-5f16-0410-b530-b9f4589650da
2011-06-08 21:36:34 +00:00
HD Moore c2d6ad8c35 Correct the host vs hostname entity
git-svn-id: file:///home/svn/framework3/trunk@12884 4d416f70-5f16-0410-b530-b9f4589650da
2011-06-08 19:31:41 +00:00
HD Moore 4a0cecbc29 Add the still unused macros table to the database
git-svn-id: file:///home/svn/framework3/trunk@12879 4d416f70-5f16-0410-b530-b9f4589650da
2011-06-07 00:20:19 +00:00
HD Moore 5d93f2ed31 Apply bugfix from David King
git-svn-id: file:///home/svn/framework3/trunk@12878 4d416f70-5f16-0410-b530-b9f4589650da
2011-06-06 23:55:52 +00:00
James Lee 96b568d65b add a tool for list all modules by rank, fixes #4333, fixes #4334, thanks David Maloney!
git-svn-id: file:///home/svn/framework3/trunk@12876 4d416f70-5f16-0410-b530-b9f4589650da
2011-06-06 22:47:55 +00:00
Tod Beardsley bd79b31c80 Future-proofing the credential ptype. Don't assume anything not smb_hash|ssh_key is plaintext.
git-svn-id: file:///home/svn/framework3/trunk@12875 4d416f70-5f16-0410-b530-b9f4589650da
2011-06-06 21:36:58 +00:00
Jonathan Cran b04623616f typo, thanks kernelsmith
git-svn-id: file:///home/svn/framework3/trunk@12870 4d416f70-5f16-0410-b530-b9f4589650da
2011-06-06 19:29:15 +00:00
HD Moore 5cce5e5095 Show the raw response data in the error message
git-svn-id: file:///home/svn/framework3/trunk@12866 4d416f70-5f16-0410-b530-b9f4589650da
2011-06-06 14:22:53 +00:00
David Rude 62826d3ff8 fix a bug in msfpescan and msfbinscan when handling disassembly
git-svn-id: file:///home/svn/framework3/trunk@12863 4d416f70-5f16-0410-b530-b9f4589650da
2011-06-05 21:50:29 +00:00
Jonathan Cran 6ebf4781bc handle a couple of error cases, improve the way commands run on multiple vms
git-svn-id: file:///home/svn/framework3/trunk@12856 4d416f70-5f16-0410-b530-b9f4589650da
2011-06-05 06:57:24 +00:00
Jonathan Cran 65cdcd67cc switch the workstation driver's run_command to write a script on the vm, like remote_workstation
git-svn-id: file:///home/svn/framework3/trunk@12853 4d416f70-5f16-0410-b530-b9f4589650da
2011-06-04 05:57:09 +00:00
Jonathan Cran b9fde0751f "wrap exceptions"
git-svn-id: file:///home/svn/framework3/trunk@12852 4d416f70-5f16-0410-b530-b9f4589650da
2011-06-04 03:34:37 +00:00
Jonathan Cran edece92f91 handle blank usernames / passwords
git-svn-id: file:///home/svn/framework3/trunk@12851 4d416f70-5f16-0410-b530-b9f4589650da
2011-06-04 03:11:49 +00:00
Tod Beardsley 7b4c7d44db Adds a Burp Session XML parser and importer. Also includes fix to Rex's HTTP header parser to ensure that it uses only unencoded regexes.
git-svn-id: file:///home/svn/framework3/trunk@12846 4d416f70-5f16-0410-b530-b9f4589650da
2011-06-03 21:17:57 +00:00
James Lee 89a12add6f always break strings into at least two pieces when splitting. Add better docs.
git-svn-id: file:///home/svn/framework3/trunk@12843 4d416f70-5f16-0410-b530-b9f4589650da
2011-06-03 17:52:34 +00:00
Carlos Perez a0292f7722 added name to authors list
git-svn-id: file:///home/svn/framework3/trunk@12841 4d416f70-5f16-0410-b530-b9f4589650da
2011-06-03 12:26:26 +00:00
James Lee bee19278d7 add a new javascript obfuscation engine using rkelly for parsing. use it in browser_autopwn and ms10_018_ie_behaviors. see #1003
git-svn-id: file:///home/svn/framework3/trunk@12839 4d416f70-5f16-0410-b530-b9f4589650da
2011-06-03 00:36:26 +00:00
James Lee 92d3c5e5e2 allow setting the property name. note that properties must be a bareword or string literal, not an expression
git-svn-id: file:///home/svn/framework3/trunk@12837 4d416f70-5f16-0410-b530-b9f4589650da
2011-06-03 00:16:50 +00:00
James Lee 0281b8c334 missed a file, see r12815
git-svn-id: file:///home/svn/framework3/trunk@12836 4d416f70-5f16-0410-b530-b9f4589650da
2011-06-03 00:15:08 +00:00
HD Moore fdd00e024d Show the real message
git-svn-id: file:///home/svn/framework3/trunk@12834 4d416f70-5f16-0410-b530-b9f4589650da
2011-06-03 00:08:58 +00:00
Carlos Perez 4499aa543d fix formating, replace spaces for tabs
git-svn-id: file:///home/svn/framework3/trunk@12833 4d416f70-5f16-0410-b530-b9f4589650da
2011-06-02 23:17:52 +00:00
amaloteaux a25ce9055e typo :)
git-svn-id: file:///home/svn/framework3/trunk@12832 4d416f70-5f16-0410-b530-b9f4589650da
2011-06-02 23:00:46 +00:00
Carlos Perez d62c65b11a typo
git-svn-id: file:///home/svn/framework3/trunk@12829 4d416f70-5f16-0410-b530-b9f4589650da
2011-06-02 22:26:13 +00:00
Carlos Perez e1c8e9032b Added calls to enumerate users and groups to linux post mixin
git-svn-id: file:///home/svn/framework3/trunk@12828 4d416f70-5f16-0410-b530-b9f4589650da
2011-06-02 22:21:28 +00:00
Carlos Perez 46cb4954b5 OSX Post mixin lib
git-svn-id: file:///home/svn/framework3/trunk@12827 4d416f70-5f16-0410-b530-b9f4589650da
2011-06-02 22:20:36 +00:00
Tod Beardsley 110f4df649 Adding a webapp vulnscanner parser for Appscan
git-svn-id: file:///home/svn/framework3/trunk@12826 4d416f70-5f16-0410-b530-b9f4589650da
2011-06-02 22:16:08 +00:00
Tod Beardsley f03ffaf13d Fixing a stack trace when the imported site cannot be resolved.
git-svn-id: file:///home/svn/framework3/trunk@12825 4d416f70-5f16-0410-b530-b9f4589650da
2011-06-02 22:12:50 +00:00
amaloteaux f1b8bbd436 arp poisoning : auto detect SMAC through new pcaprub code and avoid spoofing local host
git-svn-id: file:///home/svn/framework3/trunk@12822 4d416f70-5f16-0410-b530-b9f4589650da
2011-06-02 21:12:21 +00:00
HD Moore d326423b74 Skip another way that qualys indicates an invalid hostname
git-svn-id: file:///home/svn/framework3/trunk@12820 4d416f70-5f16-0410-b530-b9f4589650da
2011-06-02 20:56:42 +00:00
HD Moore 8249ce243f Show invalid requests (useful for debugging)
git-svn-id: file:///home/svn/framework3/trunk@12819 4d416f70-5f16-0410-b530-b9f4589650da
2011-06-02 20:56:02 +00:00
HD Moore d1ef28df1d Add payload_type
git-svn-id: file:///home/svn/framework3/trunk@12818 4d416f70-5f16-0410-b530-b9f4589650da
2011-06-02 20:55:46 +00:00
Jonathan Cran f86c3d8c0b fixup the extra space pointed out by kernelsmith. should really fixup #4613.
git-svn-id: file:///home/svn/framework3/trunk@12817 4d416f70-5f16-0410-b530-b9f4589650da
2011-06-02 19:28:39 +00:00
James Lee 7458abc8b3 add rkelly, a javascript parsing library. this version fixes several bugs in the abandoned gem, see https://github.com/tenderlove/rkelly/pull/6
git-svn-id: file:///home/svn/framework3/trunk@12815 4d416f70-5f16-0410-b530-b9f4589650da
2011-06-02 06:31:34 +00:00
Tod Beardsley 0a7f6b8528 Adds support for importing Acunetix webvuln XML reports.
git-svn-id: file:///home/svn/framework3/trunk@12813 4d416f70-5f16-0410-b530-b9f4589650da
2011-06-02 06:17:38 +00:00
HD Moore afa11f51a4 Fix up check for IPv6 constant, some minor grammar typos
git-svn-id: file:///home/svn/framework3/trunk@12811 4d416f70-5f16-0410-b530-b9f4589650da
2011-06-02 00:29:28 +00:00
Carlos Perez ddcc9407dd Linux initial post libraries
git-svn-id: file:///home/svn/framework3/trunk@12805 4d416f70-5f16-0410-b530-b9f4589650da
2011-06-01 22:48:55 +00:00
Tod Beardsley c0d88caf95 Fix the references for MS Bulletins when importing from qualys sources.
git-svn-id: file:///home/svn/framework3/trunk@12804 4d416f70-5f16-0410-b530-b9f4589650da
2011-06-01 20:14:25 +00:00
HD Moore d9355e4c32 Fix find_module vs _find_module
git-svn-id: file:///home/svn/framework3/trunk@12803 4d416f70-5f16-0410-b530-b9f4589650da
2011-06-01 20:06:17 +00:00
David Rude 1a466da015 Handle PE dissassemly the proper way, fixes a bug when handling regex searches
git-svn-id: file:///home/svn/framework3/trunk@12802 4d416f70-5f16-0410-b530-b9f4589650da
2011-06-01 19:53:08 +00:00
Tod Beardsley d3f19d8777 Moving the character and cdata readers to the nokogiri mixin. They've all been the same so far.
git-svn-id: file:///home/svn/framework3/trunk@12800 4d416f70-5f16-0410-b530-b9f4589650da
2011-06-01 17:37:54 +00:00
amaloteaux 40f06cd3e1 pcaprub : -add several native function to get all the informations about the network intefaces, original code is a python c extension called netifaces
-add also some initial wrappers into capture mixin
-Fixes #4376


git-svn-id: file:///home/svn/framework3/trunk@12799 4d416f70-5f16-0410-b530-b9f4589650da
2011-06-01 17:22:48 +00:00
Tod Beardsley 8600bc5bef Foundstone registers a fingerprint instead of directly setting os_name. Also updates the Windows version regex for mbsa. Also adds a fall-through fingerprint parser (which foundstone uses).
git-svn-id: file:///home/svn/framework3/trunk@12798 4d416f70-5f16-0410-b530-b9f4589650da
2011-06-01 16:31:27 +00:00
Tod Beardsley 43b78a6b8f Adds an import note for MBSA and Foundstone.
git-svn-id: file:///home/svn/framework3/trunk@12792 4d416f70-5f16-0410-b530-b9f4589650da
2011-06-01 02:21:10 +00:00
Mario Ceballos 2e0d399262 fixes some warnings.
git-svn-id: file:///home/svn/framework3/trunk@12791 4d416f70-5f16-0410-b530-b9f4589650da
2011-06-01 01:14:47 +00:00
Tod Beardsley 23e3d4274d Adds a parser for MBSA XML files.
git-svn-id: file:///home/svn/framework3/trunk@12790 4d416f70-5f16-0410-b530-b9f4589650da
2011-06-01 00:01:46 +00:00
Tod Beardsley c94577448e Cleans up service name normalization.
git-svn-id: file:///home/svn/framework3/trunk@12787 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-31 19:27:22 +00:00
Tod Beardsley 90bbacd75e Fixes #4620, attribute hashes are passed through a sanitizer now.
git-svn-id: file:///home/svn/framework3/trunk@12786 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-31 19:01:54 +00:00
HD Moore f75a907f4b Provide a more reasonable to_s value for wrapped exceptions
git-svn-id: file:///home/svn/framework3/trunk@12785 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-31 17:23:13 +00:00
Tod Beardsley a5e6b78d12 Cleanup on the yield warning for Retina imports.
git-svn-id: file:///home/svn/framework3/trunk@12783 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-31 16:30:07 +00:00
Tod Beardsley 8132409497 For older Nessus formatted reports, prefer the plugin name over the plugin id when importing vulnerabilities.
git-svn-id: file:///home/svn/framework3/trunk@12782 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-31 16:22:42 +00:00
Jonathan Cran e78d43691d fixup the output, better autonaming of vms when build_from_running or build_from_dir is used
git-svn-id: file:///home/svn/framework3/trunk@12781 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-31 15:51:22 +00:00
Tod Beardsley f420b9c9e9 Adding an importer for Foundstone/Mcafee Network Inventory reports.
git-svn-id: file:///home/svn/framework3/trunk@12780 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-31 15:24:42 +00:00
Carlos Perez e5a4dad237 Forgot to add handling for paths with spaced for when reading paths with spaces on post read_file command on nix sessions
git-svn-id: file:///home/svn/framework3/trunk@12777 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-30 22:16:19 +00:00
Carlos Perez 520760a899 File Post commands will execute the appropriate command and handle the different formats of issuing the commands depending on the OS for when executing against shell sessions.
git-svn-id: file:///home/svn/framework3/trunk@12776 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-30 22:14:11 +00:00
Carlos Perez ec3e1efbc8 Expanded cmd_exec to work also on shell sessions and handle command time out.
git-svn-id: file:///home/svn/framework3/trunk@12775 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-30 22:11:43 +00:00
Jonathan Cran 283e83bc5e fixes #4612 and a few other issues w/ lab commands
git-svn-id: file:///home/svn/framework3/trunk@12771 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-30 19:11:13 +00:00
HD Moore f33cc502f0 More RPC cleanup work, just about done
git-svn-id: file:///home/svn/framework3/trunk@12769 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-30 05:29:22 +00:00
HD Moore 3e0f3639ef This adds a quick windows/loadlibrary payload for folks who have a need for such things. The library path can be a UNC location and works fine over WebDAV...
git-svn-id: file:///home/svn/framework3/trunk@12765 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-30 03:44:59 +00:00
Carlos Perez 0dbe55c2ad Fix use of wrong nix command writing data to a file
git-svn-id: file:///home/svn/framework3/trunk@12764 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-30 00:15:04 +00:00
HD Moore 68c4b34ab6 More RPC cleanup
git-svn-id: file:///home/svn/framework3/trunk@12763 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-29 20:30:56 +00:00
Tod Beardsley e85a350257 Fixes #4605 -- only try to yield if we have a block to yield to.
git-svn-id: file:///home/svn/framework3/trunk@12762 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-29 03:00:13 +00:00
Tod Beardsley cf002b6b68 Updating PacketFu to track latest.
git-svn-id: file:///home/svn/framework3/trunk@12761 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-28 17:54:49 +00:00
HD Moore 556cd5affe Expand the core API to add threads, module paths, set/unsetd, and save
git-svn-id: file:///home/svn/framework3/trunk@12760 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-28 17:00:21 +00:00
HD Moore c1996206f2 Remove the temporary msgpack client/server, this is replaced by v10/client.rb and v10/service.rb respectively
git-svn-id: file:///home/svn/framework3/trunk@12759 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-28 16:22:20 +00:00
HD Moore 3a4b5a02fb Force strings to be binary in Meterpreter requests, wrap server-side errors with a client-side wrapper
git-svn-id: file:///home/svn/framework3/trunk@12758 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-28 05:55:51 +00:00
HD Moore a78a58b9d0 More RPC cleanup work
git-svn-id: file:///home/svn/framework3/trunk@12757 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-28 05:17:34 +00:00
HD Moore f126805ea1 Cleanup SSL key passing to match egypt's changes (cert + key in the same PEM). Add token management functions
git-svn-id: file:///home/svn/framework3/trunk@12756 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-28 04:01:15 +00:00
HD Moore cab5d26181 Add the database table for api keys
git-svn-id: file:///home/svn/framework3/trunk@12755 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-28 03:41:37 +00:00
HD Moore f7243d9245 Remove base64 encoding
git-svn-id: file:///home/svn/framework3/trunk@12754 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-28 03:29:15 +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
amaloteaux 911a219e56 db_import nmap: add ms06-035, ms07-029 in the parser too
git-svn-id: file:///home/svn/framework3/trunk@12750 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-27 23:34:12 +00:00
James Lee 00a8533a52 add a display field for the message body's From: field
git-svn-id: file:///home/svn/framework3/trunk@12749 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-27 20:59:36 +00:00
Tod Beardsley 1ecdb15017 It helps to actually require the parser if I'm going to go to all the trouble of writing it.
git-svn-id: file:///home/svn/framework3/trunk@12748 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-27 19:53:40 +00:00
amaloteaux c6c7d84c3e db_import : parse nmap script output and report ms08-67 vuln if found
git-svn-id: file:///home/svn/framework3/trunk@12745 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-27 18:51:09 +00:00
Tod Beardsley b6f79ec070 Updating nmap's nokogiri state tracker as well.
git-svn-id: file:///home/svn/framework3/trunk@12744 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-27 18:15:49 +00:00
David Rude e1180f5aac Fix a stack trace when handling Qualys imports with unknown fingerprints
git-svn-id: file:///home/svn/framework3/trunk@12743 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-27 18:11:46 +00:00
Tod Beardsley 19f50d9b1d Updates the nokogiri streaming document state machine to something a little more grown up.
git-svn-id: file:///home/svn/framework3/trunk@12742 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-27 17:53:56 +00:00
David Rude f92819e754 removed nasm calls inplace of metasm, cleaned up some formatting as well
git-svn-id: file:///home/svn/framework3/trunk@12741 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-27 17:34:31 +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
Tod Beardsley 3eabf41a67 Adds a Nokogiri parser for Nexpose vuln imports.
git-svn-id: file:///home/svn/framework3/trunk@12737 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-26 20:29:47 +00:00
James Lee 8acfef8770 add support for providing a list of CA certs for the signature
git-svn-id: file:///home/svn/framework3/trunk@12734 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-26 17:50:56 +00:00
Jonathan Cran 609ae839a1 remove debug line
git-svn-id: file:///home/svn/framework3/trunk@12729 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-26 02:31:28 +00:00
HD Moore 970b0a424a Remove autoloads, hits a conflict with rails
git-svn-id: file:///home/svn/framework3/trunk@12727 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-26 00:53:59 +00:00
Tod Beardsley 528e9e2b3a update from chlee
git-svn-id: file:///home/svn/framework3/trunk@12723 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-25 19:26:41 +00:00
Tod Beardsley 252830f3dd See #4471 - Moving off some common methods to a mixin.
git-svn-id: file:///home/svn/framework3/trunk@12720 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-25 18:48:23 +00:00
James Lee 11a1b5dcad fix the requires for java signing.
git-svn-id: file:///home/svn/framework3/trunk@12719 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-25 18:02:02 +00:00
James Lee 812bae9df9 add support for signing applets (or any other jar) with openssl. this removes the need for a dependency on RJB
git-svn-id: file:///home/svn/framework3/trunk@12718 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-25 16:45:20 +00:00
Jonathan Cran 971a77277e wrap the rest of the commands in quotes
git-svn-id: file:///home/svn/framework3/trunk@12713 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-25 07:30:22 +00:00
Jonathan Cran c979f3a43d fixup a few bugs w/ copying files
git-svn-id: file:///home/svn/framework3/trunk@12712 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-25 06:26:26 +00:00
HD Moore ecaeac1f6e Only override the server header if the caller didn't already provide one.
git-svn-id: file:///home/svn/framework3/trunk@12709 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-25 01:51:09 +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 e09d4fb771 Patch from chlee for the nexpose XML parser. Adds "potential" as a vulnerable marker (so imports them), adds import cases for description and solution as well.
git-svn-id: file:///home/svn/framework3/trunk@12707 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-25 00:24:20 +00:00
Tod Beardsley 38504b39a8 Warn the user if there's a truncated nmap file.
git-svn-id: file:///home/svn/framework3/trunk@12704 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-24 21:48:22 +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
HD Moore b27b7b53ae Fix bug introduced in last merge
git-svn-id: file:///home/svn/framework3/trunk@12701 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-24 17:29:14 +00:00
Jonathan Cran 563acc280b lots of fun changes to the lab plugin. added a basic TODO / README, added run_command support to remote_workstation, added support for dynagen (though it needs more testing), added a vixr controller and driver but the lack of snapshots is a little sad. see the README for more info on how to use it
git-svn-id: file:///home/svn/framework3/trunk@12700 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-24 15:56:32 +00:00
HD Moore 046e65fbce Remove old test cases
git-svn-id: file:///home/svn/framework3/trunk@12699 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-24 15:46:17 +00:00
James Lee ad2880ce67 merge chao-mu's patches for railgun testing, fixes #4015, thanks!
git-svn-id: file:///home/svn/framework3/trunk@12697 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-23 22:20:45 +00:00
HD Moore f4b8b56883 This patch from Chris Lee adds the following methods:
* asset_groups_listing
* asset_group_config
* site_scan_history
* site_device_scan_start

This patch also adds AdHoc report downloads and parsing
 


git-svn-id: file:///home/svn/framework3/trunk@12696 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-23 20:43:17 +00:00
James Lee 9311f5b198 add a unit test for ring buffer. all these tests pass on 1.8.7-p299, 1.9.1-p378, and 1.9.2-p180
git-svn-id: file:///home/svn/framework3/trunk@12694 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-23 19:15:00 +00:00
James Lee 1f72859874 set the session info when there is no database. fixes regression introduced by r12523
git-svn-id: file:///home/svn/framework3/trunk@12690 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-23 16:01:24 +00:00
Tod Beardsley 1efb6a1ff2 Updating PacketFu to 1.0.2
git-svn-id: file:///home/svn/framework3/trunk@12689 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-23 14:04:38 +00:00
HD Moore 4b2a37015c Make the HTTP Server header configurable
git-svn-id: file:///home/svn/framework3/trunk@12687 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-22 23:01:30 +00:00
HD Moore 7d320fc961 Bump the max read size and fix the agent option
git-svn-id: file:///home/svn/framework3/trunk@12686 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-22 22:55:16 +00:00
HD Moore a8c474d7d6 Add the versioned (1.0) RPC backend
git-svn-id: file:///home/svn/framework3/trunk@12679 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-22 03:50:14 +00:00
Carlos Perez 0d984cdd81 Added calls to write and append to files in binary format for post modules and scripts.
git-svn-id: file:///home/svn/framework3/trunk@12677 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-21 16:24:34 +00:00
Wei Chen 56b4a092d6 Added Linux x64 payloads. Modified exe.rb to support elf x64 payloads.
git-svn-id: file:///home/svn/framework3/trunk@12676 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-20 23:51:19 +00:00
James Lee d1e2f274f9 add ability to use arbitrary certs with SSL server sockets.
git-svn-id: file:///home/svn/framework3/trunk@12675 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-20 23:12:35 +00:00
James Lee 9003622af3 fix a typo in the dtd url, thanks tebo for noticing
git-svn-id: file:///home/svn/framework3/trunk@12674 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-20 16:52:51 +00:00
Tod Beardsley edd3041c9e Fixes #4561 - ensures that the declared interface is preferred over LHOST, and makes it possible to specify a device to capture_sendto().
Also makes should_arp?() logic a little easier to follow using an if instead of an unless.




git-svn-id: file:///home/svn/framework3/trunk@12673 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-20 15:27:13 +00:00
Tod Beardsley 520aa7d01c Fixes #4558. Since the arp spoofer is the only module that actually uses lookupaddrs, don't require every other pcaprub module to check for it.
git-svn-id: file:///home/svn/framework3/trunk@12672 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-20 14:26:24 +00:00
James Lee 25d7c5a6df make the constant match what os normalization is doing
git-svn-id: file:///home/svn/framework3/trunk@12664 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-19 16:54:33 +00:00
Tod Beardsley c95080d83d See #4430, committing upstream fixes to packetfu to enable app parsing. This will change very soon, but at least get the two repo's synced up.
git-svn-id: file:///home/svn/framework3/trunk@12662 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-19 13:00:35 +00:00
Tod Beardsley 76ebc59f29 Somehow missed this performance checkin for the 2000 ips check.
git-svn-id: file:///home/svn/framework3/trunk@12661 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-19 12:57:14 +00:00
James Lee 81eb15148f add a new fingerprint for unpatched ie7 on vista
git-svn-id: file:///home/svn/framework3/trunk@12660 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-19 00:57:30 +00:00
James Lee 0f9e7f640e add a new fingerprint for latest ie8 on win7
git-svn-id: file:///home/svn/framework3/trunk@12659 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-18 22:42:46 +00:00
Matt Weeks 23ee4b3aa8 Display additional version info in about box.
git-svn-id: file:///home/svn/framework3/trunk@12658 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-18 21:43:52 +00:00
Tod Beardsley 60dcac616e Renames some nessus-imported vulnerabilities to drop the NSS identifier and just stick with the plugin name (if available). Also drops junk NSS-0 vulnerabilities.
git-svn-id: file:///home/svn/framework3/trunk@12653 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-17 22:18:43 +00:00
James Lee e823a885bc avoid nil.downcase for old egghunter usage
git-svn-id: file:///home/svn/framework3/trunk@12652 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-17 21:55:48 +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
James Lee c5f79f1176 make parsing a little easier for obfuscation
git-svn-id: file:///home/svn/framework3/trunk@12650 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-17 20:35:18 +00:00
James Lee 7c2455b704 un-revert the last of r12600's overzealousness. see #4378 and r12569
git-svn-id: file:///home/svn/framework3/trunk@12649 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-17 17:40:48 +00:00
Tod Beardsley f542bdbb84 Fixes r12634, should be a regex not a not-equal. Using unless instead of if to avoid negative matching.
git-svn-id: file:///home/svn/framework3/trunk@12648 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-17 17:37:04 +00:00
James Lee 5091a0fbfa un-revert another piece of r12600's overzealousness. see r12574
git-svn-id: file:///home/svn/framework3/trunk@12647 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-17 17:16:47 +00:00
James Lee d43d542316 re-add elf template support which was inadvertantly reverted in r12600, see #4384
git-svn-id: file:///home/svn/framework3/trunk@12646 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-17 17:10:55 +00:00
Carlos Perez 0441b0c68c Typo that broke scripts in users home folder
git-svn-id: file:///home/svn/framework3/trunk@12645 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-17 17:03:06 +00:00
HD Moore 9bbee65ebb Back to regularly scheduled development
git-svn-id: file:///home/svn/framework3/trunk@12644 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-17 14:03:05 +00:00
James Lee ad12dffe29 move help_to_s down into CommandDispatcher so each dispatcher will know how to print its own help. see #564
git-svn-id: file:///home/svn/framework3/trunk@12640 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-16 23:03:31 +00:00
Wei Chen db1684395f Added VirtualProtect feature for egghunter
git-svn-id: file:///home/svn/framework3/trunk@12637 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-16 19:00:56 +00:00
Tod Beardsley 5f3e451e4d Fixes #4441. I believe this will solve the empty element problem for the nmap parser, but I'm having trouble reproducing it. Basically it wraps tag_start in a begin/rescue, and will ignore bad calls to nil objects (and nil objects only).
git-svn-id: file:///home/svn/framework3/trunk@12634 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-16 13:49:35 +00:00
HD Moore 68ca98b225 Add the missing debug accessor
git-svn-id: file:///home/svn/framework3/trunk@12627 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-16 02:12:59 +00:00
HD Moore 9f2ac9ae9f Gracefully handle a failed socket write due to disconnect
git-svn-id: file:///home/svn/framework3/trunk@12626 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-16 02:00:47 +00:00
HD Moore e0ffab0e6c Move all db.import* calls to the same db.import backend call (as they should have been). Fix method casing to be ruby standard
git-svn-id: file:///home/svn/framework3/trunk@12625 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-16 00:51:26 +00:00
HD Moore 9d765d4d25 Change protected for private, add debug flag to MessagePack (with debug.methods call)
git-svn-id: file:///home/svn/framework3/trunk@12624 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-15 23:51:53 +00:00
Tod Beardsley 056cde292f Deprecate the exploited_host table. Vulns that indicate a successful exploit without opening a session should set the :exploited_at timestamp.
git-svn-id: file:///home/svn/framework3/trunk@12623 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-15 22:19:00 +00:00
HD Moore 26fe5f2c9f Detailed logging when something goes wonky
git-svn-id: file:///home/svn/framework3/trunk@12622 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-15 19:25:09 +00:00
HD Moore a6da350581 Treat timestamps as integers in all RPC calls. This fixes a inconsistency between methods (string vs DateTime object) and standardizing on Unix time stamps results in wider RPC transport support
git-svn-id: file:///home/svn/framework3/trunk@12621 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-15 18:24:52 +00:00
HD Moore aadee8460d Minor tweak helps syntax highlighters
git-svn-id: file:///home/svn/framework3/trunk@12620 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-15 18:23:40 +00:00
HD Moore c5c4c929b8 Clarify that partial is handled in HTTP
git-svn-id: file:///home/svn/framework3/trunk@12619 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-15 18:23:14 +00:00
HD Moore 80f71b441e This adds a basic RPC server that operates over HTTP and uses MessagePack. The client/server wrappers are still being finalized. MessagePack libraries are avavailable for all major languages ( http://msgpack.org/ ) and this implementation is ridiculous fast and binary safe, relative to XMLRPC.
git-svn-id: file:///home/svn/framework3/trunk@12616 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-14 18:38:44 +00:00
HD Moore aa98667a77 Two performance fixes for HTTP Servers. The first reduces latency from 0.25s to near-zero for back-to-back connections by using the Queue class as a notify system. The second switches the slow socket.get for the much faster socket.read
git-svn-id: file:///home/svn/framework3/trunk@12615 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-14 18:34:06 +00:00
Tod Beardsley 03549f0b15 Nessus imported vulns should reference themselves as a NSS- identifier.
git-svn-id: file:///home/svn/framework3/trunk@12610 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-13 17:00:03 +00:00
Tod Beardsley 7f21eb8406 Allows for nessus imports to grab the plugin name as well as the plugin ID.
git-svn-id: file:///home/svn/framework3/trunk@12609 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-13 16:29:07 +00:00
James Lee 369a2e898e mark version for minor release
git-svn-id: file:///home/svn/framework3/trunk@12608 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-13 16:14:05 +00:00
HD Moore 4500d09c2f Bubble up errors from socket.get_once() and trigger an EOFError when read() returns nil
git-svn-id: file:///home/svn/framework3/trunk@12607 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-13 06:37:15 +00:00
HD Moore c7439f5ba1 Remove the leftover autoloads
git-svn-id: file:///home/svn/framework3/trunk@12603 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-12 20:20:08 +00:00
HD Moore 1904e446b2 Change this back to cooincide with autoload revert
git-svn-id: file:///home/svn/framework3/trunk@12602 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-12 20:11:43 +00:00
HD Moore ecb726fb2c Rolling two changes through again (stomped on by the autoload revert)
git-svn-id: file:///home/svn/framework3/trunk@12601 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-12 20:08:33 +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
HD Moore 95d802754b Rework to avoid a warning
git-svn-id: file:///home/svn/framework3/trunk@12598 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-12 19:26:11 +00:00
Joshua Drake 3122c500a6 See #4371, add a missing autoload for :Script
git-svn-id: file:///home/svn/framework3/trunk@12597 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-12 19:12:00 +00:00
Joshua Drake fd4e6db85d Fixes 4373, Migrates lib/msf to use autoload instead of require (first try)
git-svn-id: file:///home/svn/framework3/trunk@12596 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-12 19:07:35 +00:00
Joshua Drake 7600f9110e remove some more unecessary requires
git-svn-id: file:///home/svn/framework3/trunk@12595 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-12 18:33:49 +00:00
HD Moore 664bbf7c3c Remove the requires now that autoload has been fixed
git-svn-id: file:///home/svn/framework3/trunk@12593 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-12 15:09:27 +00:00
Joshua Drake 025c68244b See #4371, fix uninitialized constant Rex::Exploitation::Egghunter
git-svn-id: file:///home/svn/framework3/trunk@12592 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-12 15:03:20 +00:00
HD Moore 78a2558142 Apply patch from chao-mu, fixes #4414
git-svn-id: file:///home/svn/framework3/trunk@12591 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-12 14:59:44 +00:00
HD Moore c9566da399 Add missing requires and autoload to make browser exploits work again.
git-svn-id: file:///home/svn/framework3/trunk@12590 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-12 05:23:32 +00:00
Joshua Drake 8bd4f463a6 See #4371, add autoload for PeParsey
git-svn-id: file:///home/svn/framework3/trunk@12589 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-12 01:26:58 +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
James Lee d0614a4be7 fix a few requires in rex in preparation of removing unneeded requires from msf
git-svn-id: file:///home/svn/framework3/trunk@12587 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-11 23:28:12 +00:00
James Lee 7837e64b85 remove cruft leftover from the dawn of time
git-svn-id: file:///home/svn/framework3/trunk@12586 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-11 22:55:25 +00:00
HD Moore a95186df6a Revert previous patch and handle via override instead
git-svn-id: file:///home/svn/framework3/trunk@12585 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-11 22:18:16 +00:00
HD Moore ea2da5f9ce Applies a patch to fix autoload + active_support conflicts: https://rails.lighthouseapp.com/projects/8994-ruby-on-rails/tickets/2283-unnecessary-exception-raised-in-asdependenciesload_missing_constant
git-svn-id: file:///home/svn/framework3/trunk@12583 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-11 17:39:40 +00:00
Tod Beardsley 3e6d526eca Fixes #4391. Sorry! Ruby incompatability on method defs where if you set one option, you need to set them all (doesn't affect current 1.9 Rubies).
git-svn-id: file:///home/svn/framework3/trunk@12580 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-10 21:27:17 +00:00
James Lee 69d09113b5 use Metasm to parse elf templates and set appropriate header flags for marking .text as rwx, fixes #4384
git-svn-id: file:///home/svn/framework3/trunk@12579 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-10 21:06:19 +00:00
Joshua Drake cd5dbe7d58 See #4371, fix rex/file autoloads
git-svn-id: file:///home/svn/framework3/trunk@12577 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-10 20:15:16 +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
Joshua Drake cdeb44747f huh? missing something important heh
git-svn-id: file:///home/svn/framework3/trunk@12574 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-10 18:33:38 +00:00
Joshua Drake af45f0166f re-unbreak omelet code
git-svn-id: file:///home/svn/framework3/trunk@12572 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-09 22:42:41 +00:00
David Rude 2de7f9eb30 fixes a stack trace in converting a char to hex in ruby 1.9.x
git-svn-id: file:///home/svn/framework3/trunk@12571 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-09 20:48:40 +00:00
James Lee 2e1d25dad7 store some state so we can associate scripts with the right port/host. fixes #4378
git-svn-id: file:///home/svn/framework3/trunk@12569 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-09 18:10:56 +00:00
Tod Beardsley ce90282884 See #4378 -- this should limit the nmap parser to script tags that are associated only with ports. egyp7 may have a better way with dealing with this though, so not calling it fixed yet.
git-svn-id: file:///home/svn/framework3/trunk@12568 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-09 17:24:43 +00:00
amaloteaux cb72073cd8 pcaprub: add a respond_to? in the capture mixin to ensure latest version
git-svn-id: file:///home/svn/framework3/trunk@12565 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-08 04:43:24 +00:00
amaloteaux 5d8db916d7 pcap_replay: small fix on th delay
git-svn-id: file:///home/svn/framework3/trunk@12563 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-08 01:44:09 +00:00
Matt Weeks 490471e129 Include necessary require.
git-svn-id: file:///home/svn/framework3/trunk@12558 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-07 02:16:09 +00:00
Joshua Drake cd4c38333d See #4371, Fixes logging error with LogLevel set in config
git-svn-id: file:///home/svn/framework3/trunk@12556 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-06 19:10:02 +00:00
Joshua Drake a2cf5c01b9 See #4371, oops, forgot to commit rex.rb!
git-svn-id: file:///home/svn/framework3/trunk@12555 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-06 18:55:41 +00:00
Joshua Drake 05f107f466 Fixes #4371, Converts many uses of require to autoload
git-svn-id: file:///home/svn/framework3/trunk@12554 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-06 18:47:10 +00:00
Joshua Drake 57b530ccf6 fix up test require path
git-svn-id: file:///home/svn/framework3/trunk@12553 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-06 18:41:38 +00:00
Joshua Drake d638586d1f fix up test require path
git-svn-id: file:///home/svn/framework3/trunk@12552 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-06 18:39:19 +00:00