Land #2, OSX support tweaks and improvements to extension suffix handling.

Author: pbarry-r7

lib/msf/base/sessions/meterpreter.rb

@@ -647,6 +647,8 @@ def binary_suffix
         ["#{self.arch}.dll"]
       when 'linux' , 'aix' , 'hpux' , 'irix' , 'unix'
         ['bin', 'elf']
+      when 'osx'
+        ['elf']
       when 'android', 'java'
         ['jar']
       when 'php'

lib/rex/post/meterpreter/client_core.rb

@@ -249,15 +249,17 @@ def load_library(opts)
       # path of the local and target so that it gets loaded with a random
       # name
       if opts['Extension']
-        if client.binary_suffix.size > 1
+        if client.binary_suffix and client.binary_suffix.size > 1
           m = /(.*)\.(.*)/.match(library_path)
           suffix = $2
+        elsif client.binary_suffix.size == 1
+          suffix = client.binary_suffix[0]
         else
           suffix = client.binary_suffix
         end
 
         library_path = "ext#{rand(1000000)}.#{suffix}"
-        target_path  = library_path
+        target_path  = "/tmp/#{library_path}"
       end
     end
 
@@ -305,7 +307,9 @@ def use(mod, opts = { })
 
     modnameprovided = mod
     suffix = nil
-    if client.binary_suffix.size > 1
+    if not client.binary_suffix
+      suffix = ''
+    elsif client.binary_suffix.size > 1
       client.binary_suffix.each { |s|
         if (mod =~ /(.*)\.#{s}/ )
           mod = $1

lib/rex/post/meterpreter/ui/console/command_dispatcher/core.rb

@@ -1178,7 +1178,7 @@ def cmd_load(*args)
       md = m.downcase
       modulenameprovided = md
 
-      if client.binary_suffix.size > 1
+      if client.binary_suffix and client.binary_suffix.size > 1
         client.binary_suffix.each { |s|
           if (md =~ /(.*)\.#{s}/ )
             md = $1