Merge pull request #18 from clee-r7/goliath_cleanup

Goliath Cleanup in preparation for merge to master

Author: clee-r7

Gemfile

@@ -3,10 +3,6 @@ source 'https://rubygems.org'
 #   spec.add_runtime_dependency '<name>', [<version requirements>]
 gemspec name: 'metasploit-framework'
 
-
-gem 'thin'
-gem 'sinatra'
-
 # separate from test as simplecov is not run on travis-ci
 group :coverage do
   # code coverage for tests

Gemfile.lock

@@ -62,8 +62,10 @@ PATH
       ruby_smb (= 0.0.18)
       rubyntlm
       rubyzip
+      sinatra
       sqlite3
       sshkey
+      thin
       tzinfo
       tzinfo-data
       windows_error
@@ -378,6 +380,7 @@ PLATFORMS
 DEPENDENCIES
   factory_girl_rails
   fivemat
+  google-protobuf (= 3.5.1)
   metasploit-aggregator
   metasploit-framework!
   octokit
@@ -387,8 +390,6 @@ DEPENDENCIES
   rspec-rails
   rspec-rerun
   simplecov
-  sinatra
-  thin
   timecop
   yard
 

documentation/modules/auxiliary/scanner/http/owa_login.md

@@ -44,11 +44,7 @@ class Metasploit::Framework::Command::Base
   #
   # @return (see parsed_options)
   def self.require_environment!
-    # TODO: Look into removing Rails.application (save ~20mb)
-    # return self.parsed_options if ( self.parsed_options.options.database.remote_process)
-
     parsed_options = self.parsed_options
-
     # RAILS_ENV must be set before requiring 'config/application.rb'
     parsed_options.environment!
     ARGV.replace(parsed_options.positional)
@@ -83,9 +79,7 @@ def self.parsed_options_class_name
 
   def self.start
     parsed_options = require_environment!
-    is_db_remote = false # parsed_options.options.database.remote_process
-    application = is_db_remote ? nil : Rails.application
-    new(application: application, parsed_options: parsed_options).start
+    new(application: Rails.application, parsed_options: parsed_options).start
   end
 
   #

lib/metasploit/framework/command/base.rb

@@ -12,28 +12,20 @@ def init_module_paths(opts={})
             return
           end
 
-          #is_remote_db = opts.delete(:is_remote_database)
           allowed_module_paths = []
-
-          #if (!is_remote_db)
-            extract_engine_module_paths(Rails.application).each do |path|
-              allowed_module_paths << path
-            end
-          #else
-          #  allowed_module_paths << "/home/chlee/rapid7/metasploit-framework/modules"
-          #end
+          extract_engine_module_paths(Rails.application).each do |path|
+            allowed_module_paths << path
+          end
 
           if Msf::Config.user_module_directory
             allowed_module_paths << Msf::Config.user_module_directory
           end
 
-          #unless (is_remote_db)
-            ::Rails::Engine.subclasses.map(&:instance).each do |engine|
-              extract_engine_module_paths(engine).each do |path|
-                allowed_module_paths << path
-              end
+          ::Rails::Engine.subclasses.map(&:instance).each do |engine|
+            extract_engine_module_paths(engine).each do |path|
+              allowed_module_paths << path
             end
-         # end
+          end
 
           # If additional module paths have been defined globally, then load them.
           # They should be separated by semi-colons.

lib/msf/base/simple/framework/module_paths.rb

@@ -94,7 +94,6 @@ class Msf::DBManager
   include Msf::DBManager::Web
   include Msf::DBManager::Workspace
 
-
   # Provides :framework and other accessors
   include Msf::Framework::Offspring
 

lib/msf/core/db_manager.rb

@@ -113,16 +113,14 @@ def initialize(framework)
 
           last_seen_timer = Time.now.utc
 
-          if framework.db.active
-            ::ActiveRecord::Base.connection_pool.with_connection do
-              values.each do |s|
-                # Update the database entry on a regular basis, marking alive threads
-                # as recently seen.  This notifies other framework instances that this
-                # session is being maintained.
-                if s.db_record
-                  s.db_record.last_seen = Time.now.utc
-                  s.db_record.save
-                end
+          ::ActiveRecord::Base.connection_pool.with_connection do
+            values.each do |s|
+              # Update the database entry on a regular basis, marking alive threads
+              # as recently seen.  This notifies other framework instances that this
+              # session is being maintained.
+              if s.db_record
+                s.db_record.last_seen = Time.now.utc
+                s.db_record.save
               end
             end
           end