Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
This switches the Metasploit Framework to a Rails 3 backend. If you run into new problems (especially around Active Record or your postgresql gem) you should try first updating your Ruby installation to 1.9.3 and use a more recent 'pg' gem. If that fails, we'd love to see your bug report (just drop all the detail you can into an issue on GitHub). In the meantime, you can checkout the rails2 branch, which was branched from master immediately before this cutover. Squashed commit of the following: commit 5802ec8 Author: HD Moore <[email protected]> Date: Sun Apr 15 23:30:12 2012 -0500 Enable MSF_BUNDLE_GEMS mode by default (set to N/F/0 to disable) commit 8102f98 Author: HD Moore <[email protected]> Date: Sun Apr 15 23:30:03 2012 -0500 Add a method to expand win32 file paths commit bda6479 Author: HD Moore <[email protected]> Date: Sun Apr 15 18:53:44 2012 -0500 Fix 1.8.x compatibility commit 101ce4e Author: HD Moore <[email protected]> Date: Sun Apr 15 18:40:59 2012 -0500 Use verbose instead of stringio commit 5db467f Author: HD Moore <[email protected]> Date: Sun Apr 15 18:30:06 2012 -0500 Hide the iconv warning, were stuck with it due to EBCDIC support commit 63b9cb2 Author: HD Moore <[email protected]> Date: Sun Apr 15 18:29:58 2012 -0500 Dont use GEM_HOME by default commit ca49271 Author: HD Moore <[email protected]> Date: Sun Apr 15 18:23:34 2012 -0500 Move Gemfile to root (there be dragons, lets find them) and catch failed bundler loads commit 34af040 Author: HD Moore <[email protected]> Date: Sun Apr 15 18:18:29 2012 -0500 Fallback to bundler when not running inside of a installer env commit ed1066a Author: HD Moore <[email protected]> Date: Sun Apr 15 16:26:55 2012 -0500 Remove a mess of gems that were not actually required commit 21290a7 Author: HD Moore <[email protected]> Date: Sun Apr 15 15:59:10 2012 -0500 Hack around a gem() call that is well-intentioned but an obstacle in this case commit 8e414a8 Author: Tod Beardsley <[email protected]> Date: Sun Apr 15 15:06:08 2012 -0500 Ruby, come on. Ducktype this. Please. Use interpolated strings to get the to_s behavior you don't get with just plussing. commit 0fa92c5 Author: HD Moore <[email protected]> Date: Sun Apr 15 15:05:42 2012 -0500 Add new eventmachine/thin gems commit 819d5e7 Author: HD Moore <[email protected]> Date: Sun Apr 15 15:01:18 2012 -0500 Purge (reimport in a second) commit ea6f3f6 Author: HD Moore <[email protected]> Date: Sun Apr 15 14:54:42 2012 -0500 Cleanup uncessary .so files (ext vs lib) commit d219330 Author: HD Moore <[email protected]> Date: Sun Apr 15 14:53:02 2012 -0500 PG gems built against the older installation environment commit d6e590c Author: HD Moore <[email protected]> Date: Sun Apr 15 14:06:35 2012 -0500 Rename to include the version commit a893de2 Author: HD Moore <[email protected]> Date: Sun Apr 15 13:56:47 2012 -0500 Detect older installation environments and load the arch-lib directories into the search path commit 6444bba Author: HD Moore <[email protected]> Date: Sun Apr 15 13:49:25 2012 -0500 Merge in windows gems commit 95efbcf Author: Tod Beardsley <[email protected]> Date: Sun Apr 15 13:49:33 2012 -0500 Report_vuln shouldn't use :include in finder find_or_create_by doesn't take :include as a param. commit c5f99eb Author: David Maloney <[email protected]> Date: Sun Apr 15 12:44:09 2012 -0500 One more msised Mdm namespace issue commit 2184e2b Author: David Maloney <[email protected]> Date: Sun Apr 15 12:33:41 2012 -0500 Fixes some mroe Mdm namespace confusion Fixes rapid7#6626 commit 10cee17 Author: HD Moore <[email protected]> Date: Sun Apr 15 03:40:44 2012 -0500 Add robots gem (required by webscan) commit 327e674 Author: HD Moore <[email protected]> Date: Sun Apr 15 03:39:05 2012 -0500 Fix missing error checks commit a5a2464 Author: HD Moore <[email protected]> Date: Sun Apr 15 01:15:37 2012 -0500 Reorder requires and add a method for injecting a new migration path commit 250a5fa Author: HD Moore <[email protected]> Date: Sun Apr 15 00:56:09 2012 -0500 Remove missing constant (use string) and add gemcache cleaner commit 37ad606 Merge: d47ee82 4be0361 Author: Tod Beardsley <[email protected]> Date: Sun Apr 15 00:40:16 2012 -0500 Merge branch 'master-clone' into rails3-clone commit d47ee82 Author: HD Moore <[email protected]> Date: Sun Apr 15 00:30:03 2012 -0500 cleanup leftovers from gems commit 6d883b5 Author: HD Moore <[email protected]> Date: Sun Apr 15 00:25:47 2012 -0500 MDM update with purged DBSave module commit 71e4f2d Author: HD Moore <[email protected]> Date: Sat Apr 14 23:19:37 2012 -0500 Add new mdm commit 651cd5a Author: HD Moore <[email protected]> Date: Sat Apr 14 23:19:13 2012 -0500 Update mdm commit 0191a8b Author: HD Moore <[email protected]> Date: Sat Apr 14 22:30:40 2012 -0500 This fixes numerous cases of missed Mdm:: prefixes on db objects commit a2a9bb3 Author: HD Moore <[email protected]> Date: Sat Apr 14 18:30:18 2012 -0500 Add eventmachine commit 301ddeb Author: HD Moore <[email protected]> Date: Sat Apr 14 18:18:12 2012 -0500 A nicer error for folks who need to upgrade pg commit fa6bde1 Author: HD Moore <[email protected]> Date: Sat Apr 14 17:54:55 2012 -0500 Remove bundler requirements commit 2e3ab9e Author: HD Moore <[email protected]> Date: Sat Apr 14 17:35:38 2012 -0500 Pull in eventmachine with actual .so's this time commit 901fb33 Author: HD Moore <[email protected]> Date: Sat Apr 14 17:19:12 2012 -0500 Update deps, still need to add eventmachine commit 6b0e170 Author: HD Moore <[email protected]> Date: Sat Apr 14 13:07:06 2012 -0500 Handle older installer environments and only allow binary gems when the environment specifically asks for it commit b98eb78 Author: HD Moore <[email protected]> Date: Sat Apr 14 04:05:13 2012 -0500 Bump version to -testing commit 6ac508c Author: HD Moore <[email protected]> Date: Sat Apr 14 02:25:09 2012 -0500 Remove msf3 subdir commit a27dac5 Author: HD Moore <[email protected]> Date: Sat Apr 14 02:24:39 2012 -0500 Remove the old busted external commit 5fb5a0f Author: HD Moore <[email protected]> Date: Sat Apr 14 02:03:10 2012 -0500 Add the gemcache loader commit 09e2d89 Author: HD Moore <[email protected]> Date: Sat Apr 14 02:02:23 2012 -0500 Purge gemfile/bundler configure in exchange for new gemcache setup commit 3cc0264 Author: Tod Beardsley <[email protected]> Date: Thu Apr 12 14:11:45 2012 -0500 Mode change on modicon_ladder.apx commit c18b3d5 Author: HD Moore <[email protected]> Date: Thu Apr 12 01:38:56 2012 -0500 The go faster button commit ca2a67d Merge: 674ee09 b8129f9 Author: Tod Beardsley <[email protected]> Date: Mon Apr 9 15:50:33 2012 -0500 Merge branch 'master-clone' into rails3-clone Picking up Packetfu upstream changes, all pretty minor commit 674ee09 Merge: e9513e5 a26e844 Author: Tod Beardsley <[email protected]> Date: Mon Apr 9 13:57:26 2012 -0500 Merge branch 'master-clone' into rails3-clone Conflicts: lib/msf/core/handler/reverse_http.rb lib/msf/core/handler/reverse_https.rb modules/auxiliary/scanner/discovery/udp_probe.rb modules/auxiliary/scanner/discovery/udp_sweep.rb Resolved conflicts with the reverse_http handlers and the udp probe / scanners byt favoring the more recent changes (which happened to be the intent anyway). The reverse_http and reverse_https changes were mine so I know what the intent was, and @dmaloney-r7 changed udp_probe and udp_sweep to use pcAnywhere_stat instead of merely pcAnywhere, so the intent is clear there as well. commit e9513e5 Author: David Maloney <[email protected]> Date: Fri Apr 6 18:21:46 2012 -0500 Some fixes to how services get reported to prevent issues with the web interface commit adeb44e Author: David Maloney <[email protected]> Date: Mon Apr 2 15:39:46 2012 -0500 Some corrections to pcAnywhere discovery modules to distinguish between the two services commit b139001 Author: HD Moore <[email protected]> Date: Sat Mar 31 12:03:21 2012 -0500 Enable additional migration-path parameters, use a temporary directory to bring the database online commit 526b4c5 Author: David Maloney <[email protected]> Date: Wed Mar 28 23:24:56 2012 -0500 A bunch of Mdsm fixes for .kind_of? calls, to make sure we ponit to the right place commit 2cf3143 Author: HD Moore <[email protected]> Date: Mon Mar 26 16:22:09 2012 -0500 Check for ruby 2.0 as well as 1.9 for encoding override commit 4d0f51b Author: HD Moore <[email protected]> Date: Mon Mar 26 15:36:04 2012 -0500 Remove debug statement commit f5d2335 Author: HD Moore <[email protected]> Date: Mon Mar 26 15:01:55 2012 -0500 Be explicit about the Mdm namespace commit bc8be22 Author: hdm <hdm@hypo.(none)> Date: Mon Mar 26 11:49:51 2012 -0500 Precalculate some uri strings in case the 1000-round generation fails commit 4254f41 Author: Trevor Rosen <[email protected]> Date: Sat Mar 24 14:03:44 2012 -0500 Removed some non-namespaced calls to Host commit c8190e1 Author: HD Moore <[email protected]> Date: Tue Mar 20 00:37:00 2012 -0500 Purge the rvmrc, this is causing major headaches commit 76df185 Author: HD Moore <[email protected]> Date: Tue Mar 20 00:31:52 2012 -0500 Switch .rvmrc to the shipping 1.9.3 version commit 7124971 Author: David Maloney <[email protected]> Date: Mon Mar 12 16:56:40 2012 -0500 Adds mixin for looking up Mime Types by extension commit b7ca835 Merge: a0b0c75 6b9a219 Author: Matt Buck <[email protected]> Date: Tue Mar 6 19:38:53 2012 -0600 Merge from develop. commit a0b0c75 Author: Trevor Rosen <[email protected]> Date: Tue Mar 6 11:08:59 2012 -0600 Somehow migration file is new? commit 84d2b3c Author: David Maloney <[email protected]> Date: Wed Feb 29 16:38:55 2012 -0600 Added ability to specify headers to redirects in http server commit e50d27c Author: HD Moore <[email protected]> Date: Sat Feb 4 04:44:50 2012 -0600 Tweak the event dispatcher to enable customer events without a category and trigger http request events from the main exploit mixin. Experimental commit 0e4fd20 Author: Matt Buck <[email protected]> Date: Thu Feb 2 22:09:05 2012 -0600 Change Msm -> Mdm in migrations. This is what was preventing migrations from finishing on first boot. commit c94a296 Author: Trevor Rosen <[email protected]> Date: Wed Feb 1 12:48:48 2012 -0600 Changed Gemfile to use new gem name commit 245c206 Author: Trevor Rosen <[email protected]> Date: Wed Feb 1 12:47:42 2012 -0600 Did find/replace for final namespace of Mdm commit 6ed9bf8 Author: Trevor Rosen <[email protected]> Date: Tue Jan 24 10:47:44 2012 -0600 Fix a bunch of namespace issues commit 2fe08d9 Author: Matt Buck <[email protected]> Date: Fri Jan 20 14:37:37 2012 -0600 Update Msm contstants in migrations for initial DB builds. commit 4cc6b8f Author: Matt Buck <[email protected]> Date: Fri Jan 20 14:37:25 2012 -0600 Update Gemfile.lock. commit 1cc655b Author: Trevor Rosen <[email protected]> Date: Thu Jan 19 11:48:29 2012 -0600 Errant Workspaces needed namespace commit 607a782 Author: Trevor Rosen <[email protected]> Date: Tue Jan 17 15:44:02 2012 -0600 Refactored all models to use the new namespace * Every model using DBManager::* namespace is now Msm namespace * Almost all of this in msf/base/core * Some in modules commit a690cd9 Author: Trevor Rosen <[email protected]> Date: Tue Jan 17 13:41:44 2012 -0600 Move bundler setup commit dae115c Author: Trevor Rosen <[email protected]> Date: Mon Jan 9 15:51:07 2012 -0600 Moved ActiveSupport dep to gem commit d32f8ed Author: Trevor Rosen <[email protected]> Date: Mon Jan 9 14:40:05 2012 -0600 Removed model require file commit d0c74cf Author: Trevor Rosen <[email protected]> Date: Tue Jan 3 16:06:10 2012 -0600 Update some more finds commit 4eb79ea Author: Trevor Rosen <[email protected]> Date: Tue Jan 3 14:21:15 2012 -0600 Yet another dumb commit commit a75febc Author: Trevor Rosen <[email protected]> Date: Thu Dec 29 19:20:51 2011 -0600 Fixing deletion commit dc139ff Author: Trevor Rosen <[email protected]> Date: Wed Dec 7 17:06:45 2011 -0600 Fixed erroneous commit commit 531c1e6 Author: Trevor Rosen <[email protected]> Date: Mon Nov 21 16:11:35 2011 -0600 Remove AR patch stuff; attempting to debug non-connection between MSF and Pro commit 4586112 Author: Trevor Rosen <[email protected]> Date: Fri Nov 18 16:17:27 2011 -0600 Drop ActiveRecord/ActiveSupport in preparation for upgrade
- Loading branch information
