Land rapid7#7649, update session_compatible? for changes from PR#7507

Fixing the ability to find compatible post scripts for sessions

Author: bwatters-r7

lib/msf/core/post_mixin.rb

@@ -160,34 +160,17 @@ def session_compatible?(sess_or_sid)
       return false unless self.module_info["SessionTypes"].include?(s.type)
     end
 
-    # Types are okay, now check the platform.  This is kind of a ghetto
-    # workaround for session platforms being ad-hoc and Platform being
-    # inflexible.
+    # Types are okay, now check the platform.
     if self.platform and self.platform.kind_of?(Msf::Module::PlatformList)
-      [
-        # Add as necessary
-        'win', 'linux', 'osx'
-      ].each do |name|
-        if self.platform =~ /#{name}/
-          p = Msf::Module::PlatformList.transform(name)
-          return false unless self.platform.supports? p
-        end
-      end
-    elsif self.platform and self.platform.kind_of?(Msf::Module::Platform)
-      p_klass = Msf::Module::Platform
-      case self.platform
-      when 'win'
-        return false unless self.platform.kind_of?(p_klass::Windows)
-      when 'osx'
-        return false unless self.platform.kind_of?(p_klass::OSX)
-      when 'linux'
-        return false unless self.platform.kind_of?(p_klass::Linux)
-      end
+      return false unless self.platform.supports?(Msf::Module::PlatformList.transform(s.base_platform))
     end
 
     # Check to make sure architectures match
     mod_arch = self.module_info['Arch']
+    unless mod_arch.nil?
     mod_arch = [mod_arch] unless mod_arch.kind_of?(Array)
+      return false unless mod_arch.include? s.base_arch
+    end
 
     # If we got here, we haven't found anything that definitely
     # disqualifies this session.  Assume that means we can use it.