Handle a couple more edge cases

I don't want to go any further down the rabbit hole.
2016-12-20 18:27:36 -06:00 · 2016-12-20 18:27:36 -06:00 · 11e3e1f3dd
parent 41605c533c
commit 11e3e1f3dd
1 changed files with 4 additions and 4 deletions
--- a/lib/msf/ui/console/command_dispatcher/modules.rb
+++ b/lib/msf/ui/console/command_dispatcher/modules.rb
@ -598,11 +598,11 @@ module Msf
            mod_name = args[0]

            # Ensure we have a reference name and not a path
-            if mod_name.start_with?('modules/')
-              mod_name.sub!(/^modules\//, '')
+            if mod_name.start_with?('modules/', '/')
+              mod_name.sub!(/^(?:modules)?\//, '')
            end
-            if mod_name.end_with?('.', '.rb')
-              mod_name.sub!(/\.(?:rb)?$/, '')
+            if mod_name.end_with?('.', '.r', '.rb')
+              mod_name.sub!(/\.(?:rb?)?$/, '')
            end

            begin