Merge remote-tracking branch 'upstream/master' into beug/session

Conflicts:
	lib/msf/base/simple/post.rb

Author: wvu

lib/msf/core/post_mixin.rb

@@ -74,7 +74,7 @@ def session
     return @session if @session and not session_changed?
 
     if datastore["SESSION"]
-      @session = framework.sessions[datastore["SESSION"].to_i]
+      @session = framework.sessions.get(datastore["SESSION"].to_i)
     else
       @session = nil
     end

lib/msf/core/session_manager.rb

@@ -279,7 +279,17 @@ def deregister(session, reason='')
   # Returns the session associated with the supplied sid, if any.
   #
   def get(sid)
-    return self[sid.to_i]
+    session = nil
+    sid = sid.to_i
+
+    if sid > 0
+      session = self[sid]
+    elsif sid == -1
+      sid = self.keys.sort[-1]
+      session = self[sid]
+    end
+
+    session
   end
 
   #

modules/post/linux/gather/enum_system.rb

@@ -27,6 +27,7 @@ def initialize(info={})
             'Stephen Haywood <averagesecurityguy[at]gmail.com>', # get_cron and original enum_linux
             'sinn3r', # Testing and modification of original enum_linux
             'ohdae <bindshell[at]live.com>', # Combined separate mods, modifications and testing
+            'Roberto Espreto <robertoespreto[at]gmail.com>', # log files and setuid/setgid
           ],
         'Platform'      => [ 'linux' ],
         'SessionTypes'  => [ 'shell' ]
@@ -59,13 +60,17 @@ def run
     crons = get_crons(users, user)
     diskspace = execute("/bin/df -ahT")
     disks = (mount +"\n\/"+ diskspace)
+    logfiles = execute("find /var/log -type f -perm -4 2> /dev/null")
+    uidgid = execute("find / -xdev -type f -perm +6000 -perm -1 2> /dev/null")
 
     save("Linux version", distro)
     save("User accounts", users)
     save("Installed Packages", installed_pkg)
     save("Running Services", installed_svc)
     save("Cron jobs", crons)
     save("Disk info", disks)
+    save("Logfiles", logfiles)
+    save("Setuid/setgid files", uidgid)
 
   end