Merge remote-tracking branch 'upstream/staging/electro-release' into staging/electro-release

Author: limhoff-r7

lib/metasploit/framework/command.rb

@@ -2,21 +2,25 @@
 # Gems
 #
 
-# have to be exact so minimum is loaded prior to parsing arguments which could influence loading.
+# have to be exact so minimum is loaded prior to parsing arguments which could
+# influence loading.
 require 'active_support/dependencies/autoload'
 
-# @note Must use the nested declaration of the {Metasploit::Framework::Command} namespace because commands need to be
-# able to be required directly without any other part of metasploit-framework besides config/boot so that the commands
-# can parse arguments, setup RAILS_ENV, and load config/application.rb correctly.
+# @note Must use the nested declaration of the
+# {Metasploit::Framework::Command} namespace because commands need to be able
+# to be required directly without any other part of metasploit-framework
+# besides config/boot so that the commands can parse arguments, setup
+# RAILS_ENV, and load config/application.rb correctly.
 module Metasploit
   module Framework
     module Command
-      # Namespace for commands for metasploit-framework.  There are corresponding classes in the
-      # {Metasploit::Framework::ParsedOptions} namespace, which handle for parsing the options for each command.
+      # Namespace for commands for metasploit-framework.  There are
+      # corresponding classes in the {Metasploit::Framework::ParsedOptions}
+      # namespace, which handle for parsing the options for each command.
       extend ActiveSupport::Autoload
 
       autoload :Base
       autoload :Console
     end
   end
-end
+end

lib/metasploit/framework/command/base.rb

@@ -34,11 +34,13 @@ class Metasploit::Framework::Command::Base
   # Class Methods
   #
 
-  # @note {require_environment!} should be called to load `config/application.rb` to so that the RAILS_ENV can be set
-  #   from the command line options in `ARGV` prior to `Rails.env` being set.
+  # @note {require_environment!} should be called to load
+  #   `config/application.rb` to so that the RAILS_ENV can be set from the
+  #   command line options in `ARGV` prior to `Rails.env` being set.
   # @note After returning, `Rails.application` will be defined and configured.
   #
-  # Parses `ARGV` for command line arguments to configure the `Rails.application`.
+  # Parses `ARGV` for command line arguments to configure the
+  # `Rails.application`.
   #
   # @return (see parsed_options)
   def self.require_environment!
@@ -50,8 +52,9 @@ def self.require_environment!
     # @see https://github.com/rails/rails/blob/v3.2.17/railties/lib/rails/commands.rb#L39-L40
     require Pathname.new(__FILE__).parent.parent.parent.parent.parent.join('config', 'application')
 
-    # have to configure before requiring environment because config/environment.rb calls initialize! and the initializers
-    # will use the configuration from the parsed options.
+    # have to configure before requiring environment because
+    # config/environment.rb calls initialize! and the initializers will use
+    # the configuration from the parsed options.
     parsed_options.configure(Rails.application)
 
     # support disabling the database
@@ -104,4 +107,4 @@ def initialize(attributes={})
   def start
     raise NotImplementedError
   end
-end
+end

lib/metasploit/framework/parsed_options.rb

@@ -4,15 +4,18 @@
 
 require 'active_support/dependencies/autoload'
 
-# # @note Must use the nested declaration of the {Metasploit::Framework::ParsedOptions} namespace because commands,
-# which use parsed options, need to be able to be required directly without any other part of metasploit-framework
-# besides config/boot so that the commands can parse arguments, setup RAILS_ENV, and load config/application.rb
-# correctly.
+# @note Must use the nested declaration of the
+#   {Metasploit::Framework::ParsedOptions} namespace because commands, which
+#   use parsed options, need to be able to be required directly without any
+#   other part of metasploit-framework besides config/boot so that the
+#   commands can parse arguments, setup RAILS_ENV, and load
+#   config/application.rb correctly.
 module Metasploit
   module Framework
-    # Namespace for parsed options for {Metasploit::Framework::Command commands}.  The names of `Class`es in this
-    # namespace correspond to the name of the `Class` in the {Metasploit::Framework::Command} namespace for which this
-    # namespace's `Class` parses options.
+    # Namespace for parsed options for {Metasploit::Framework::Command
+    # commands}.  The names of `Class`es in this namespace correspond to the
+    # name of the `Class` in the {Metasploit::Framework::Command} namespace
+    # for which this namespace's `Class` parses options.
     module ParsedOptions
       extend ActiveSupport::Autoload
 

lib/metasploit/framework/parsed_options/base.rb

@@ -17,14 +17,15 @@
 require 'metasploit/framework/parsed_options'
 require 'msf/base/config'
 
-# Options parsed from the command line that can be used to change the `Metasploit::Framework::Application.config` and
-# `Rails.env`
+# Options parsed from the command line that can be used to change the
+# `Metasploit::Framework::Application.config` and `Rails.env`
 class Metasploit::Framework::ParsedOptions::Base
   #
   # CONSTANTS
   #
 
-  # msfconsole boots in production mode instead of the normal rails default of development.
+  # msfconsole boots in production mode instead of the normal rails default of
+  # development.
   DEFAULT_ENVIRONMENT = 'production'
 
   #
@@ -179,4 +180,4 @@ def option_parser
       end
     }
   end
-end
+end

lib/metasploit/framework/parsed_options/console.rb

@@ -70,4 +70,4 @@ def option_parser
 
     @option_parser
   end
-end
+end

lib/msf/ui/console/command_dispatcher/db.rb

@@ -690,6 +690,8 @@ def cmd_creds_help
     print_line "  creds add-ntlm alice 5cfe4c82d9ab8c66590f5b47cd6690f1:978a2e2e1dec9804c6b936f254727f9a"
     print_line "  # Add a user with a blank password and a domain"
     print_line "  creds add-password bob '' contosso"
+    print_line "  # Add a user with an SSH key"
+    print_line "  creds add-ssh-key root /root/.ssh/id_rsa"
     print_line
   end