Prefix time module with namespace resolution operator

adfoster-r7 · adfoster-r7 · commit af330874f57a · 2021-03-04T13:19:09.000Z
diff --git a/lib/rex/job.rb b/lib/rex/job.rb
@@ -27,7 +27,7 @@ def initialize(container, jid, name, ctx, run_proc, clean_proc)
   # Otherwise, the job is run inline.
   #
   def start(async = false)
-    self.start_time = Time.now
+    self.start_time = ::Time.now
     if (async)
       self.job_thread = Rex::ThreadFactory.spawn("JobID(#{jid})-#{name}", false) {
         # Deschedule our thread momentarily
diff --git a/lib/rex/logging/log_sink.rb b/lib/rex/logging/log_sink.rb
@@ -30,7 +30,7 @@ def log(sev, src, level, msg)
   # This method returns the current timestamp in MM/DD/YYYY HH:Mi:SS format.
   #
   def get_current_timestamp
-    return Time.now.strftime("%m/%d/%Y %H:%M:%S")
+    return ::Time.now.strftime("%m/%d/%Y %H:%M:%S")
   end
 
 end
diff --git a/lib/rex/parser/apple_backup_manifestdb.rb b/lib/rex/parser/apple_backup_manifestdb.rb
@@ -50,9 +50,9 @@ def parse_mbdb
       info[:unknown3]     = mbdb_read_int(4)
       info[:uid]          = mbdb_read_int(4)
       info[:gid]          = mbdb_read_int(4)
-      info[:mtime]        = Time.at(mbdb_read_int(4))
-      info[:atime]        = Time.at(mbdb_read_int(4))
-      info[:ctime]        = Time.at(mbdb_read_int(4))
+      info[:mtime]        = ::Time.at(mbdb_read_int(4))
+      info[:atime]        = ::Time.at(mbdb_read_int(4))
+      info[:ctime]        = ::Time.at(mbdb_read_int(4))
       info[:length]       = mbdb_read_int(8)
       info[:flag]         = mbdb_read_int(1)
       property_count      = mbdb_read_int(1)
diff --git a/lib/rex/post/file_stat.rb b/lib/rex/post/file_stat.rb
@@ -63,13 +63,13 @@ def blocks
     self.stathash['st_blocks']
   end
   def atime
-    Time.at(self.stathash['st_atime'])
+    ::Time.at(self.stathash['st_atime'])
   end
   def mtime
-    Time.at(self.stathash['st_mtime'])
+    ::Time.at(self.stathash['st_mtime'])
   end
   def ctime
-    Time.at(self.stathash['st_ctime'])
+    ::Time.at(self.stathash['st_ctime'])
   end
 
   def update(buf)
diff --git a/lib/rex/post/hwbridge/ui/console/command_dispatcher/core.rb b/lib/rex/post/hwbridge/ui/console/command_dispatcher/core.rb
@@ -220,7 +220,7 @@ def cmd_status(*args)
     print_status("HW Version: #{status['hw_version']}") if status.key? 'hw_version'
     print_status("Uptime: #{stats['uptime']} seconds") if stats.key? 'uptime'
     print_status("Packets Sent: #{stats['packet_stats']}") if stats.key? 'packet_stats'
-    print_status("Last packet Sent: #{Time.at(stats['last_request'])}") if stats.key? 'last_request'
+    print_status("Last packet Sent: #{::Time.at(stats['last_request'])}") if stats.key? 'last_request'
     print_status("Voltage: #{stats['voltage']}") if stats.key? 'voltage' and not stats['voltage'] == 'not supported'
   end
 
diff --git a/lib/rex/post/meterpreter/client.rb b/lib/rex/post/meterpreter/client.rb
@@ -125,7 +125,7 @@ def init_meterpreter(sock,opts={})
     self.target_id    = opts[:target_id]
     self.capabilities = opts[:capabilities] || {}
     self.commands     = []
-    self.last_checkin = Time.now
+    self.last_checkin = ::Time.now
 
     self.conn_id      = opts[:conn_id]
     self.url          = opts[:url]
diff --git a/lib/rex/post/meterpreter/extensions/android/android.rb b/lib/rex/post/meterpreter/extensions/android/android.rb
@@ -102,7 +102,7 @@ def interval_collect(opts)
 
       response.each(TLV_TYPE_COLLECT_RESULT_GROUP) do |g|
         timestamp = g.get_tlv_value(TLV_TYPE_COLLECT_RESULT_TIMESTAMP)
-        timestamp = Time.at(timestamp).to_datetime.strftime('%Y-%m-%d %H:%M:%S')
+        timestamp = ::Time.at(timestamp).to_datetime.strftime('%Y-%m-%d %H:%M:%S')
 
         g.each(TLV_TYPE_COLLECT_RESULT_WIFI) do |w|
           bssid = w.get_tlv_value(TLV_TYPE_COLLECT_RESULT_WIFI_BSSID)
@@ -129,7 +129,7 @@ def interval_collect(opts)
 
       response.each(TLV_TYPE_COLLECT_RESULT_GROUP) do |g|
         timestamp = g.get_tlv_value(TLV_TYPE_COLLECT_RESULT_TIMESTAMP)
-        timestamp = Time.at(timestamp).to_datetime.strftime('%Y-%m-%d %H:%M:%S')
+        timestamp = ::Time.at(timestamp).to_datetime.strftime('%Y-%m-%d %H:%M:%S')
 
         g.each(TLV_TYPE_COLLECT_RESULT_GEO) do |w|
           lat = w.get_tlv_value(TLV_TYPE_GEO_LAT)
@@ -145,7 +145,7 @@ def interval_collect(opts)
 
       response.each(TLV_TYPE_COLLECT_RESULT_GROUP) do |g|
         timestamp = g.get_tlv_value(TLV_TYPE_COLLECT_RESULT_TIMESTAMP)
-        timestamp = Time.at(timestamp).to_datetime.strftime('%Y-%m-%d %H:%M:%S')
+        timestamp = ::Time.at(timestamp).to_datetime.strftime('%Y-%m-%d %H:%M:%S')
 
         g.each(TLV_TYPE_COLLECT_RESULT_CELL) do |cell|
 
diff --git a/lib/rex/post/meterpreter/extensions/priv/fs.rb b/lib/rex/post/meterpreter/extensions/priv/fs.rb
@@ -36,10 +36,10 @@ def get_file_mace(file_path)
     # Return the hash of times associated with the MACE values
     begin
       return {
-        'Modified'       => Time.at(response.get_tlv_value(TLV_TYPE_FS_FILE_MODIFIED)),
-        'Accessed'       => Time.at(response.get_tlv_value(TLV_TYPE_FS_FILE_ACCESSED)),
-        'Created'        => Time.at(response.get_tlv_value(TLV_TYPE_FS_FILE_CREATED)),
-        'Entry Modified' => Time.at(response.get_tlv_value(TLV_TYPE_FS_FILE_EMODIFIED))
+        'Modified'       => ::Time.at(response.get_tlv_value(TLV_TYPE_FS_FILE_MODIFIED)),
+        'Accessed'       => ::Time.at(response.get_tlv_value(TLV_TYPE_FS_FILE_ACCESSED)),
+        'Created'        => ::Time.at(response.get_tlv_value(TLV_TYPE_FS_FILE_CREATED)),
+        'Entry Modified' => ::Time.at(response.get_tlv_value(TLV_TYPE_FS_FILE_EMODIFIED))
       }
     rescue RangeError
       raise RangeError, 'Invalid MACE values'
diff --git a/lib/rex/post/meterpreter/extensions/stdapi/sys/event_log_subsystem/event_record.rb b/lib/rex/post/meterpreter/extensions/stdapi/sys/event_log_subsystem/event_record.rb
@@ -27,8 +27,8 @@ class EventRecord
 
   def initialize(recnum, timegen, timewri, id, type, cat, strs, data)
     self.num       = recnum
-    self.generated = Time.at(timegen)
-    self.written   = Time.at(timewri)
+    self.generated = ::Time.at(timegen)
+    self.written   = ::Time.at(timewri)
     self.eventid   = id
     self.type      = type
     self.category  = cat
diff --git a/lib/rex/post/meterpreter/packet.rb b/lib/rex/post/meterpreter/packet.rb
@@ -481,7 +481,7 @@ def self.generate_command_id_map_c
 /*!
  * @file common_command_ids.h
  * @brief Declarations of command ID values
- * @description This file was generated #{Time.now.utc}. Do not modify directly.
+ * @description This file was generated #{::Time.now.utc}. Do not modify directly.
  */
 #ifndef _METERPRETER_SOURCE_COMMON_COMMAND_IDS_H
 #define _METERPRETER_SOURCE_COMMON_COMMAND_IDS_H
@@ -504,7 +504,7 @@ def self.generate_command_id_map_java
 /**
  * All supported Command Identifiers
  *
- * @author Genereated by a tool @ #{Time.now.utc}
+ * @author Genereated by a tool @ #{::Time.now.utc}
  */
 public interface CommandId {
 #{command_ids.join("\n")}
@@ -516,7 +516,7 @@ def self.generate_command_id_map_php_lib(lib, id_map)
   command_ids = id_map.map {|k, v| "define('COMMAND_ID_#{k.upcase}', #{v});"}
   %Q^
 # ---------------------------------------------------------------
-# --- THIS CONTENT WAS GENERATED BY A TOOL @ #{Time.now.utc}
+# --- THIS CONTENT WAS GENERATED BY A TOOL @ #{::Time.now.utc}
 # IDs for #{lib}
 #{command_ids.join("\n")}
 # ---------------------------------------------------------------
@@ -539,7 +539,7 @@ def self.generate_command_id_map_python
   command_ids = id_map.map {|k, v| "    (#{v}, '#{k.downcase}'),"}
   %Q^
 # ---------------------------------------------------------------
-# --- THIS CONTENT WAS GENERATED BY A TOOL @ #{Time.now.utc}
+# --- THIS CONTENT WAS GENERATED BY A TOOL @ #{::Time.now.utc}
 COMMAND_IDS = (
 #{command_ids.join("\n")}
 )
@@ -568,7 +568,7 @@ def self.generate_command_id_map_python_extension
   command_ids = id_map.map {|k, v| "COMMAND_ID_#{k.upcase} = #{v}"}
   %Q^
 # ---------------------------------------------------------------
-# --- THIS CONTENT WAS GENERATED BY A TOOL @ #{Time.now.utc}
+# --- THIS CONTENT WAS GENERATED BY A TOOL @ #{::Time.now.utc}
 
 #{command_ids.join("\n")}
 
@@ -597,7 +597,7 @@ def self.generate_command_id_map_csharp
   command_ids = id_map.map {|k, v| "#{k.split('_').map(&:capitalize).join} = #{v},"}
   %Q^
 /// <summary>
-// This content was generated by a tool @ #{Time.now.utc}
+// This content was generated by a tool @ #{::Time.now.utc}
 /// </summary>
 namespace MSF.Powershell.Meterpreter
 {
diff --git a/lib/rex/post/meterpreter/packet_dispatcher.rb b/lib/rex/post/meterpreter/packet_dispatcher.rb
@@ -102,7 +102,7 @@ def shutdown_passive_dispatcher
 
   def on_passive_request(cli, req)
     begin
-      self.last_checkin = Time.now
+      self.last_checkin = ::Time.now
       resp = send_queue.shift
       cli.send_response(resp)
     rescue => e
@@ -252,7 +252,7 @@ def send_packet_wait_response(packet, timeout)
   # @return [void]
   def keepalive
     if @ping_sent
-      if Time.now.to_i - last_checkin.to_i > PING_TIME*2
+      if ::Time.now.to_i - last_checkin.to_i > PING_TIME*2
         dlog("No response to ping, session #{self.sid} is dead", LEV_3)
         self.alive = false
       end
@@ -577,7 +577,7 @@ def dispatch_inbound_packet(packet)
     #STDERR.puts("RECV: #{packet.inspect}\n")
 
     # Update our last reply time
-    self.last_checkin = Time.now
+    self.last_checkin = ::Time.now
 
     pivot_session = self.find_pivot_session(packet.session_guid)
     pivot_session.pivoted_session.last_checkin = self.last_checkin if pivot_session
@@ -671,7 +671,7 @@ def on_passive_request(cli, req)
     resp['Content-Type'] = 'application/octet-stream'
     resp['Connection']   = 'close'
 
-    self.last_checkin = Time.now
+    self.last_checkin = ::Time.now
 
     if req.method == 'GET'
       rpkt = send_queue.shift
diff --git a/lib/rex/post/meterpreter/ui/console/command_dispatcher/android.rb b/lib/rex/post/meterpreter/ui/console/command_dispatcher/android.rb
@@ -107,7 +107,7 @@ def cmd_interval_collect(*args)
         header = "Captured #{opts[:type]} data"
 
         if result[:timestamp]
-          time = Time.at(result[:timestamp]).to_datetime
+          time = ::Time.at(result[:timestamp]).to_datetime
           header << " at #{time.strftime('%Y-%m-%d %H:%M:%S')}"
         end
 
@@ -188,7 +188,7 @@ def cmd_set_audio_mode(*args)
   end
 
   def cmd_dump_sms(*args)
-    path = "sms_dump_#{Time.new.strftime('%Y%m%d%H%M%S')}.txt"
+    path = "sms_dump_#{::Time.new.strftime('%Y%m%d%H%M%S')}.txt"
     dump_sms_opts = Rex::Parser::Arguments.new(
       '-h' => [ false, 'Help Banner' ],
       '-o' => [ true, 'Output path for sms list']
@@ -218,7 +218,7 @@ def cmd_dump_sms(*args)
         data << "[+] SMS messages dump\n"
         data << "=====================\n\n"
 
-        time = Time.new
+        time = ::Time.new
         data << "Date: #{time.inspect}\n"
         data << "OS: #{info['OS']}\n"
         data << "Remote IP: #{client.sock.peerhost}\n"
@@ -252,7 +252,7 @@ def cmd_dump_sms(*args)
           data << "Type\t: #{type}\n"
 
           time = a['date'].to_i / 1000
-          time = Time.at(time)
+          time = ::Time.at(time)
 
           data << "Date\t: #{time.strftime('%Y-%m-%d %H:%M:%S')}\n"
           data << "Address\t: #{a['address']}\n"
@@ -275,7 +275,7 @@ def cmd_dump_sms(*args)
   end
 
   def cmd_dump_contacts(*args)
-    path   = "contacts_dump_#{Time.new.strftime('%Y%m%d%H%M%S')}"
+    path   = "contacts_dump_#{::Time.new.strftime('%Y%m%d%H%M%S')}"
     format = :text
 
     dump_contacts_opts = Rex::Parser::Arguments.new(
@@ -324,7 +324,7 @@ def cmd_dump_contacts(*args)
           data << "[+] Contacts list dump\n"
           data << "======================\n\n"
 
-          time = Time.new
+          time = ::Time.new
           data << "Date: #{time.inspect}\n"
           data << "OS: #{info['OS']}\n"
           data << "Remote IP: #{client.sock.peerhost}\n"
@@ -421,7 +421,7 @@ def cmd_geolocate(*args)
   end
 
   def cmd_dump_calllog(*args)
-    path = "calllog_dump_#{Time.new.strftime('%Y%m%d%H%M%S')}.txt"
+    path = "calllog_dump_#{::Time.new.strftime('%Y%m%d%H%M%S')}.txt"
     dump_calllog_opts = Rex::Parser::Arguments.new(
       '-h' => [ false, 'Help Banner' ],
       '-o' => [ true, 'Output path for call log']
@@ -451,7 +451,7 @@ def cmd_dump_calllog(*args)
         data << "[+] Call log dump\n"
         data << "=================\n\n"
 
-        time = Time.new
+        time = ::Time.new
         data << "Date: #{time.inspect}\n"
         data << "OS: #{info['OS']}\n"
         data << "Remote IP: #{client.sock.peerhost}\n"
diff --git a/lib/rex/post/meterpreter/ui/console/command_dispatcher/core.rb b/lib/rex/post/meterpreter/ui/console/command_dispatcher/core.rb
@@ -681,7 +681,7 @@ def cmd_get_timeouts(*args)
 
   def print_timeouts(timeouts)
     if timeouts[:session_exp]
-      print_line("Session Expiry  : @ #{(Time.now + timeouts[:session_exp]).strftime('%Y-%m-%d %H:%M:%S')}")
+      print_line("Session Expiry  : @ #{(::Time.now + timeouts[:session_exp]).strftime('%Y-%m-%d %H:%M:%S')}")
     end
     if timeouts[:comm_timeout]
       print_line("Comm Timeout    : #{timeouts[:comm_timeout]} seconds")
diff --git a/lib/rex/post/meterpreter/ui/console/command_dispatcher/priv/timestomp.rb b/lib/rex/post/meterpreter/ui/console/command_dispatcher/priv/timestomp.rb
@@ -156,7 +156,7 @@ def str_to_time(str) # :nodoc:
       raise ArgumentError, "Invalid date format, expected MM/DD/YYYY HH24:MI:SS (got #{str})"
     end
 
-    Time.mktime(year, mon, day, hour, min, sec, 0)
+    ::Time.mktime(year, mon, day, hour, min, sec, 0)
   end
 end
 end
diff --git a/lib/rex/post/meterpreter/ui/console/command_dispatcher/stdapi/fs.rb b/lib/rex/post/meterpreter/ui/console/command_dispatcher/stdapi/fs.rb
@@ -459,7 +459,7 @@ def cmd_download(*args)
         opts['tries'] = true
         opts['tries_no'] = tries_no
       when "-t"
-        opts['timestamp'] = '_' + Time.now.iso8601
+        opts['timestamp'] = '_' + ::Time.now.iso8601
       when nil
         src_items << last if (last)
         last = val
diff --git a/lib/rex/post/meterpreter/ui/console/command_dispatcher/stdapi/stream.rb b/lib/rex/post/meterpreter/ui/console/command_dispatcher/stdapi/stream.rb
@@ -46,7 +46,7 @@ def stream_html_template(name, host, stream_path)
 </noscript>
 <pre>
 Target IP  : #{host}
-Start time : #{Time.now}
+Start time : #{::Time.now}
 Status     : <span id="status"></span>
 </pre>
 <br>
diff --git a/lib/rex/proto/dns/server.rb b/lib/rex/proto/dns/server.rb
@@ -29,7 +29,7 @@ def initialize
     # @return [Array] Records found
     def find(search, type = 'A')
       self.records.select do |record,expire|
-        record.type == type and (expire < 1 or expire > Time.now.to_i) and
+        record.type == type and (expire < 1 or expire > ::Time.now.to_i) and
         (
           record.name == '*' or
           record.name == search or record.name[0..-2] == search or
@@ -53,7 +53,7 @@ def cache_record(record)
       if record.is_a?(Dnsruby::RR) and
       (!record.respond_to?(:address) or Rex::Socket.is_ip_addr?(record.address.to_s)) and
       record.name.to_s.match(MATCH_HOSTNAME)
-        add(record, Time.now.to_i + record.ttl)
+        add(record, ::Time.now.to_i + record.ttl)
       else
         raise "Invalid record for cache entry - #{record.inspect}"
       end
@@ -81,7 +81,7 @@ def add_static(name, address, type = 'A', replace = false)
     # Prune cache entries
     #
     # @param before [Fixnum] Time in seconds before which records are evicted
-    def prune(before = Time.now.to_i)
+    def prune(before = ::Time.now.to_i)
       self.records.select do |rec, expire|
         expire > 0 and expire < before
       end.each {|rec, exp| delete(rec)}
diff --git a/lib/rex/proto/http/client.rb b/lib/rex/proto/http/client.rb
@@ -311,7 +311,7 @@ def basic_auth_header(username,password)
 
 
   def make_cnonce
-    Digest::MD5.hexdigest "%x" % (Time.now.to_i + rand(65535))
+    Digest::MD5.hexdigest "%x" % (::Time.now.to_i + rand(65535))
   end
 
   # Send a series of requests to complete Digest Authentication
diff --git a/lib/rex/proto/iax2/call.rb b/lib/rex/proto/iax2/call.rb
@@ -157,7 +157,7 @@ def hangup
   end
 
   def ring_time
-    (self.ring_finish || Time.now).to_i - self.ring_start.to_i
+    (self.ring_finish || ::Time.now).to_i - self.ring_start.to_i
   end
 
   def timestamp
diff --git a/lib/rex/proto/iax2/client.rb b/lib/rex/proto/iax2/client.rb
@@ -114,7 +114,7 @@ def allocate_call_id
 
   def dprint(msg)
     return if not self.debugging
-    $stderr.puts "[#{Time.now.to_s}] #{msg}"
+    $stderr.puts "[#{::Time.now.to_s}] #{msg}"
   end
 
   def send_data(call, data, inc_seq = true )
diff --git a/lib/rex/proto/ntlm/crypt.rb b/lib/rex/proto/ntlm/crypt.rb
@@ -184,7 +184,7 @@ def self.ntlmv2_response(arg, opt = {})
       cc = opt[:client_challenge] || rand(CONST::MAX64)
       cc = BASE::pack_int64le(cc) if cc.is_a?(::Integer)
 
-      ts = opt[:timestamp] || Time.now.to_i
+      ts = opt[:timestamp] || ::Time.now.to_i
 
       # Convert the unix timestamp to windows format
       #   epoch -> milsec from Jan 1, 1601
diff --git a/lib/rex/proto/ntlm/utils.rb b/lib/rex/proto/ntlm/utils.rb
@@ -432,7 +432,7 @@ def self.make_ntlmv2_clientchallenge(win_domain, win_name, dns_domain, dns_name,
       client_challenge ||= Rex::Text.rand_text(8)
       # We have to set the timestamps here to the one in the challenge message from server if present
       # If we don't do that, recent server like Seven/2008 will send a STATUS_INVALID_PARAMETER error packet
-      timestamp = chall_MsvAvTimestamp != '' ? chall_MsvAvTimestamp : self.time_unix_to_smb(Time.now.to_i).reverse.pack("VV")
+      timestamp = chall_MsvAvTimestamp != '' ? chall_MsvAvTimestamp : self.time_unix_to_smb(::Time.now.to_i).reverse.pack("VV")
       # Make those values unicode as requested
       win_domain = Rex::Text.to_unicode(win_domain)
       win_name = Rex::Text.to_unicode(win_name)
diff --git a/lib/rex/proto/smb/client.rb b/lib/rex/proto/smb/client.rb
diff --git a/lib/rex/proto/smb/utils.rb b/lib/rex/proto/smb/utils.rb
diff --git a/lib/rex/thread_factory.rb b/lib/rex/thread_factory.rb
diff --git a/lib/rex/ui/text/shell.rb b/lib/rex/ui/text/shell.rb

Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ def initialize(container, jid, name, ctx, run_proc, clean_proc)`
`27`	`27`	`# Otherwise, the job is run inline.`
`28`	`28`	`#`
`29`	`29`	`def start(async = false)`
`30`		`- self.start_time = Time.now`
	`30`	`+ self.start_time = ::Time.now`
`31`	`31`	`if (async)`
`32`	`32`	`self.job_thread = Rex::ThreadFactory.spawn("JobID(#{jid})-#{name}", false) {`
`33`	`33`	`# Deschedule our thread momentarily`
Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ def log(sev, src, level, msg)`
`30`	`30`	`# This method returns the current timestamp in MM/DD/YYYY HH:Mi:SS format.`
`31`	`31`	`#`
`32`	`32`	`def get_current_timestamp`
`33`		`- return Time.now.strftime("%m/%d/%Y %H:%M:%S")`
	`33`	`+ return ::Time.now.strftime("%m/%d/%Y %H:%M:%S")`
`34`	`34`	`end`
`35`	`35`
`36`	`36`	`end`