Skip to content

Commit f92ebb3

Browse files
committed
fix: moved begin/rescue inside the update_session_info; added logging
1 parent 0659232 commit f92ebb3

File tree

2 files changed

+7
-5
lines changed

2 files changed

+7
-5
lines changed

lib/msf/base/sessions/meterpreter.rb

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -425,7 +425,11 @@ def load_priv
425425

426426
def update_session_info
427427
# sys.config.getuid, and fs.dir.getwd cache their results, so update them
428-
fs&.dir&.getwd
428+
begin
429+
fs&.dir&.getwd
430+
rescue Rex::Post::Meterpreter::RequestError => e
431+
elog('failed retrieving working directory', error: e)
432+
end
429433
username = self.sys.config.getuid
430434
sysinfo = self.sys.config.sysinfo
431435

lib/rex/post/meterpreter/ui/console/command_dispatcher/stdapi/sys.rb

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1224,10 +1224,8 @@ def cmd_drop_token(*args)
12241224
#
12251225
def cmd_sysinfo(*args)
12261226
info = client.sys.config.sysinfo(refresh: true)
1227-
begin
1228-
client.update_session_info
1229-
rescue
1230-
end
1227+
client.update_session_info
1228+
12311229
width = "Meterpreter".length
12321230
info.keys.each { |k| width = k.length if k.length > width and info[k] }
12331231

0 commit comments

Comments
 (0)