rex 2.0.9 → 2.0.10

data/lib/rex/proto/dcerpc/svcctl/packet.rb

@@ -53,7 +53,7 @@ class Client
         end
       end
     rescue Rex::Proto::DCERPC::Exceptions::Fault => e
-      print_error("#{peer} - Error getting scm handle: #{e}")
+      print_error("Error getting scm handle: #{e}")
     end
 
     [scm_handle, scm_status]
@@ -124,7 +124,7 @@ class Client
         end
       end
     rescue Rex::Proto::DCERPC::Exceptions::Fault => e
-      print_error("#{peer} - Error creating service: #{e}")
+      print_error("Error creating service: #{e}")
     end
 
     return svc_handle, svc_status
@@ -149,7 +149,7 @@ class Client
       response = dcerpc_client.call(CHANGE_SERVICE_CONFIG2_W, stubdata) # ChangeServiceConfig2
       svc_status = error_code(response)
     rescue Rex::Proto::DCERPC::Exceptions::Fault => e
-      print_error("#{peer} - Error changing service description : #{e}")
+      print_error("Error changing service description : #{e}")
     end
 
     svc_status
@@ -169,7 +169,7 @@ class Client
         svc_status = error_code(response[20,4])
       end
     rescue Rex::Proto::DCERPC::Exceptions::Fault => e
-      print_error("#{peer} - Error closing service handle: #{e}")
+      print_error("Error closing service handle: #{e}")
     end
 
     svc_status
@@ -195,7 +195,7 @@ class Client
         end
       end
     rescue Rex::Proto::DCERPC::Exceptions::Fault => e
-      print_error("#{peer} - Error opening service handle: #{e}")
+      print_error("Error opening service handle: #{e}")
     end
 
     svc_handle
@@ -219,7 +219,7 @@ class Client
         svc_status = error_code(response)
       end
     rescue Rex::Proto::DCERPC::Exceptions::Fault => e
-      print_error("#{peer} - Error starting service: #{e}")
+      print_error("Error starting service: #{e}")
     end
 
     svc_status
@@ -249,7 +249,7 @@ class Client
        svc_status =  error_code(response[28,4])
       end
     rescue Rex::Proto::DCERPC::Exceptions::Fault => e
-      print_error("#{peer} - Error controlling service: #{e}")
+      print_error("Error controlling service: #{e}")
     end
 
     svc_status
@@ -268,7 +268,7 @@ class Client
         svc_status = error_code(response)
       end
     rescue Rex::Proto::DCERPC::Exceptions::Fault => e
-      print_error("#{peer} - Error deleting service: #{e}")
+      print_error("Error deleting service: #{e}")
     end
 
     svc_status
@@ -292,7 +292,7 @@ class Client
         ret = 2
       end
     rescue Rex::Proto::DCERPC::Exceptions::Fault => e
-      print_error("#{peer} - Error deleting service: #{e}")
+      print_error("Error deleting service: #{e}")
     end
 
     ret

data/lib/rex/proto/http/client_request.rb

@@ -391,8 +391,9 @@ class ClientRequest
 
   #
   # Return the content length header
+  #
   def set_content_len_header(clen)
-    return "" if opts['chunked_size'] > 0
+    return "" if clen == 0 || opts['chunked_size'] > 0 || (opts['headers'] && opts['headers']['Content-Length'])
     set_formatted_header("Content-Length", clen)
   end
 

data/lib/rex/proto/http/response.rb

@@ -108,7 +108,7 @@ class Response < Packet
   #
   # @return [Hash]
   def get_json_document
-    json = []
+    json = {}
 
     begin
       json = JSON.parse(self.body)

data/lib/rex/proto/kademlia/bootstrap_response.rb

@@ -51,14 +51,14 @@ module Kademlia
       bootstrap_peer_id = Rex::Proto::Kademlia.decode_peer_id(message.body.slice!(0, 16))
       bootstrap_tcp_port, bootstrap_version, num_peers = message.body.slice!(0, 5).unpack('vCv')
       # protocol says there are no peers and the body confirms this, so just return with no peers
-      if num_peers == 0 && message.body.blank?
+      if num_peers == 0 && message.body.to_s.empty?
         peers = []
       else
         peers_data = message.body
         # peers data is too long/short, abort
         return if peers_data.size % BOOTSTRAP_PEER_SIZE != 0
         peers = []
-        until peers_data.blank?
+        until peers_data.to_s.empty?
           peer_data = peers_data.slice!(0, BOOTSTRAP_PEER_SIZE)
           peer_id = Rex::Proto::Kademlia.decode_peer_id(peer_data.slice!(0, 16))
           ip, udp_port, tcp_port, version = peer_data.unpack('VvvC')

data/lib/rex/proto/ntp/modes.rb

@@ -92,6 +92,23 @@ module NTP
     end
   end
 
+  class NTPSymmetric < BitStruct
+    unsigned :li, 2,  default: 0
+    unsigned :version, 3,  default: 3
+    unsigned :mode, 3,  default: 0
+    unsigned :stratum, 8,  default: 0
+    unsigned :poll, 8,  default: 0
+    unsigned :precision, 8,  default: 0
+    unsigned :root_delay, 32,  default: 0
+    unsigned :root_dispersion, 32,  default: 0
+    unsigned :reference_id, 32,  default: 0
+    unsigned :reference_timestamp, 64,  default: 0
+    unsigned :origin_timestamp, 64,  default: 0
+    unsigned :receive_timestamp, 64,  default: 0
+    unsigned :transmit_timestamp, 64,  default: 0
+    rest :payload
+  end
+
   def self.ntp_control(version, operation, payload = nil)
     n = NTPControl.new
     n.version = version

data/lib/rex/text.rb

@@ -1477,6 +1477,18 @@ EOS
     "{#{parts.join('-')}}"
   end
 
+  #
+  # Generate a valid random 4 byte UTF-8 character
+  # valid codepoints for 4byte UTF-8 chars: U+010000 - U+10FFFF
+  #
+  # @example
+  #   Rex::Text.rand_4byte_utf8 # => "\u{108CF3}"
+  #
+  # @return [String]
+  def self.rand_4byte_utf8
+    [rand(0x10000..0x10ffff)].pack('U*')
+  end
+
   #
   # Creates a pattern that can be used for offset calculation purposes.  This
   # routine is capable of generating patterns using a supplied set and a

data/lib/rex/zip/blocks.rb

@@ -116,7 +116,7 @@ class CentralDir
   end
 
   def pack
-    if @entry.central_dir_name.blank?
+    if @entry.central_dir_name.to_s.empty?
       path = @entry.relative_path
     else
       path = @entry.central_dir_path

data/lib/rex/zip/entry.rb

@@ -76,7 +76,7 @@ class Entry
   end
 
   def central_dir_path
-    return nil if @central_dir_name.blank?
+    return nil if @central_dir_name.to_s.empty?
     get_relative_path(@central_dir_name)
   end
 

data/rex.gemspec

@@ -1,7 +1,7 @@
 # encoding: utf-8
 
 APP_NAME = "rex"
-VERSION  = "2.0.9"
+VERSION  = "2.0.10"
 
 Gem::Specification.new do |s|
   s.name                  = APP_NAME
@@ -17,4 +17,31 @@ Gem::Specification.new do |s|
   s.extra_rdoc_files      = ["README.markdown"]
   s.platform              = "ruby"
   s.required_ruby_version = ">= 2.1.5"
+
+  # Needed for Javascript obfuscation
+  s.add_runtime_dependency 'jsobfu', '~> 0.4.1'
+
+  # Needed for some admin modules (scrutinizer_add_user.rb)
+  s.add_runtime_dependency 'json'
+
+  # Metasm compiler/decompiler/assembler
+  s.add_runtime_dependency 'metasm', '~> 1.0.2'
+
+  # Needed by anemone crawler
+  s.add_runtime_dependency 'nokogiri'
+
+  # rb-readline doesn't work with Ruby Installer due to error with Fiddle:
+  #   NoMethodError undefined method `dlopen' for Fiddle:Module
+  unless Gem.win_platform?
+    # Command line editing, history, and tab completion in msfconsole
+    # Use the Rapid7 fork until the official gem catches up
+    s.add_runtime_dependency 'rb-readline-r7'
+  end
+
+  # Needed by anemone crawler
+  s.add_runtime_dependency 'robots'
+
+  # Needed so that disk size output isn't horrible
+  s.add_runtime_dependency 'filesize'
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rex
 version: !ruby/object:Gem::Version
-  version: 2.0.9
+  version: 2.0.10
 platform: ruby
 authors:
 - HD Moore
@@ -9,8 +9,106 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-22 00:00:00.000000000 Z
-dependencies: []
+date: 2016-03-07 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: jsobfu
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.4.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.4.1
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: metasm
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.0.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.0.2
+- !ruby/object:Gem::Dependency
+  name: nokogiri
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rb-readline-r7
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: robots
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: filesize
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Rex provides a variety of classes useful for security testing and exploit
   development.
 email:
@@ -174,9 +272,11 @@ files:
 - lib/rex/parser/apple_backup_manifestdb.rb
 - lib/rex/parser/appscan_nokogiri.rb
 - lib/rex/parser/arguments.rb
+- lib/rex/parser/burp_issue_nokogiri.rb
 - lib/rex/parser/burp_session_nokogiri.rb
 - lib/rex/parser/ci_nokogiri.rb
 - lib/rex/parser/foundstone_nokogiri.rb
+- lib/rex/parser/fs/bitlocker.rb
 - lib/rex/parser/fs/ntfs.rb
 - lib/rex/parser/fusionvm_nokogiri.rb
 - lib/rex/parser/group_policy_preferences.rb
@@ -394,6 +494,9 @@ files:
 - lib/rex/proto/acpp.rb
 - lib/rex/proto/acpp/client.rb
 - lib/rex/proto/acpp/message.rb
+- lib/rex/proto/adb.rb
+- lib/rex/proto/adb/client.rb
+- lib/rex/proto/adb/message.rb
 - lib/rex/proto/addp.rb
 - lib/rex/proto/dcerpc.rb
 - lib/rex/proto/dcerpc/client.rb