Fix rapid7#2504, edit command fixes I missed 3y ago

local_editor was never nil, so there was some dead code.

Author: wvu

features/commands/help.feature

@@ -46,7 +46,7 @@ Feature: Help command
           -------       -----------
           advanced      Displays advanced options for one or more modules
           back          Move back from the current context
-          edit          Edit the current module with $VISUAL or $EDITOR
+          edit          Edit the current module with the preferred editor
           info          Displays information about one or more modules
           loadpath      Searches for and loads modules from a path
           options       Displays global options or for one or more modules

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

@@ -27,7 +27,7 @@ class Modules
           def commands
             {
               "back"       => "Move back from the current context",
-              "edit"       => "Edit the current module with $VISUAL or $EDITOR",
+              "edit"       => "Edit the current module with the preferred editor",
               "advanced"   => "Displays advanced options for one or more modules",
               "info"       => "Displays information about one or more modules",
               "options"    => "Displays global options or for one or more modules",
@@ -61,39 +61,40 @@ def name
             "Module"
           end
 
-
           def local_editor
-            Rex::Compat.getenv('VISUAL') || Rex::Compat.getenv('EDITOR') || '/usr/bin/vim'
+            framework.datastore['LocalEditor'] || Rex::Compat.getenv('VISUAL') || Rex::Compat.getenv('EDITOR')
           end
 
           def cmd_edit_help
             msg = "Edit the currently active module"
-            msg = "#{msg} #{local_editor ? "with #{local_editor}" : "($VISUAL or $EDITOR must be set first)"}."
+            msg = "#{msg} #{local_editor ? "with #{local_editor}" : "(LocalEditor or $VISUAL/$EDITOR should be set first)"}."
             print_line "Usage: edit"
             print_line
             print_line msg
-            print_line "When done editing, you must reload the module with 'reload' or 'rexploit'."
+            print_line "When done editing, you must reload the module with 'reload' or 'rerun'."
             print_line
           end
 
           #
           # Edit the currently active module
           #
           def cmd_edit
-            unless local_editor
-              print_error "$VISUAL or $EDITOR must be set first. Try 'export EDITOR=/usr/bin/vim'"
-              return
-            end
             if active_module
-              path = active_module.file_path
-              print_status "Launching #{local_editor} #{path}"
-              system(local_editor,path)
+              editor = local_editor
+              path   = active_module.file_path
+
+              if editor.nil?
+                editor = 'vim'
+                print_warning("LocalEditor or $VISUAL/$EDITOR should be set. Falling back on #{editor}.")
+              end
+
+              print_status("Launching #{editor} #{path}")
+              system(editor, path)
             else
-              print_error "Nothing to edit -- try using a module first."
+              print_error('Nothing to edit -- try using a module first.')
             end
           end
 
-
           def cmd_advanced_help
             print_line 'Usage: advanced [mod1 mod2 ...]'
             print_line