fix: addressing review comments

Author: dledda-r7

lib/msf/base/sessions/meterpreter.rb

@@ -180,7 +180,7 @@ def bootstrap(datastore = {}, handler = nil)
       print_warning('Meterpreter start up operations have been aborted. Use the session at your own risk.')
       return nil
     end
-    extensions = datastore['AutoLoadExtensions']&.split(';') || []
+    extensions = datastore['AutoLoadExtensions']&.delete(' ').split(',') || []
 
     # BEGIN: This should be removed on MSF 7
     # Unhook the process prior to loading stdapi to reduce logging/inspection by any AV/PSP (by default unhook is first, see meterpreter_options/windows.rb)
@@ -195,9 +195,13 @@ def bootstrap(datastore = {}, handler = nil)
     # TODO: abstract this a little, perhaps a "post load" function that removes
     # platform-specific stuff?
     extensions.each do |extension|
-      console.run_single("load #{extension}")
-      console.run_single('unhook_pe') if extension == 'unhook'
-      session.load_session_info if extension == 'stdapi' && datastore['AutoSystemInfo']
+      begin
+        console.run_single("load #{extension}")
+        console.run_single('unhook_pe') if extension == 'unhook'
+        session.load_session_info if extension == 'stdapi' && datastore['AutoSystemInfo']
+      rescue => e
+        print_warning("Failed loading extension #{extension}")
+      end
     end
     console.disable_output = original
 

lib/msf/base/sessions/meterpreter_options/android.rb

@@ -16,7 +16,7 @@ def initialize(info = {})
           [
             OptString.new(
               'AutoLoadExtensions',
-              [true, "Automatically load extensions on bootstrap, semicolon separated.", 'stdapi;android']
+              [true, "Automatically load extensions on bootstrap, semicolon separated.", 'stdapi,android']
             ),
           ],
           self.class

lib/msf/base/sessions/meterpreter_options/windows.rb

@@ -16,7 +16,7 @@ def initialize(info = {})
           [
             OptString.new(
               'AutoLoadExtensions',
-              [true, "Automatically load extensions on bootstrap, semicolon separated.", 'unhook;priv;stdapi']
+              [true, "Automatically load extensions on bootstrap, semicolon separated.", 'unhook,priv,stdapi']
             ),
             OptBool.new(
               'AutoUnhookProcess',

tools/modules/meterpreter_reverse.erb

@@ -8,7 +8,7 @@
 module MetasploitModule
 
   include Msf::Payload::Single
-  include Msf::Sessions::MeterpreterOptions::<%= platform.split('_').each { |s| s.capitalize! }.join %>
+  include Msf::Sessions::MeterpreterOptions::<%= platform.split('_').each { |s| s.casecmp?('osx') ? 'OSX' : s.capitalize! }.join %>
   include Msf::Sessions::MettleConfig
 
   def initialize(info = {})