Merge branch 'development'

Author: rastating

.rubocop.yml

@@ -52,3 +52,9 @@ Lint/UnusedMethodArgument:
 Style/ClassVars:
   Enabled: false
   Description: 'There are genuine use cases for using class vars.'
+
+Metrics/BlockLength:
+  Enabled: true
+  Description: 'Some unit tests are going to be naturally long; no need to flag this up.'
+  Exclude:
+    - spec/**/*

.ruby-version

@@ -1 +1 @@
-2.4.1
+2.4.2

.travis.yml

@@ -1,7 +1,7 @@
 language: ruby
 rvm:
-  - 2.3.4
-  - 2.4.1
+  - 2.3.5
+  - 2.4.2
 before_install:
   - "echo 'gem: --no-ri --no-rdoc' > ~/.gemrc"
 script: bundle exec rspec

Gemfile

@@ -1,12 +1,14 @@
+# frozen_string_literal: true
+
 source 'https://rubygems.org'
 gem 'colorize', '>=0.8.1'
 gem 'mime-types', '>=3.1'
-gem 'nokogiri', '~>1.8.0'
+gem 'nokogiri', '~>1.8.1'
 gem 'require_all', '~>1.4'
-gem 'rubyzip', '~>1.2'
-gem 'slop', '~>4.5'
-gem 'typhoeus', '~>1.1.2'
+gem 'rubyzip', '~>1.2.1'
+gem 'slop', '~>4.6.0'
+gem 'typhoeus', '~>1.3.0'
 
 group :test do
-  gem 'rspec', '~>3.5'
+  gem 'rspec', '~>3.7'
 end

README.md

@@ -1 +1 @@
-1.7
+1.8

VERSION

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'date'
 require 'fileutils'
 require 'json'

env.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'json'
 require 'typhoeus'
 require 'fileutils'

github_updater.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Cli
   # Functionality for configuring auto-complete functionality in Readline lib.
   module AutoComplete

lib/cli/auto_complete.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'readline'
 
 require 'modules'

lib/cli/console.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Cli
   # A context which modules will be used in.
   class Context

lib/cli/context.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Cli
   # Methods for handling commands that provide the user with help info.
   module Help

lib/cli/help.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Cli
   # Methods for handling commands that interact with the currently loaded module.
   module LoadedModule

lib/cli/loaded_module.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Cli
   # Helper methods for outputing information about the currently loaded module.
   module ModuleInfo

lib/cli/module_info.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Cli
   # Methods for handling module loading and searching.
   module Modules

lib/cli/modules.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Cli
   # Methods for handling commands that interact with module options.
   module Options

lib/cli/options.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Cli
   # Methods for handling output to the screen.
   module Output

lib/cli/output.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # The root namespace.
 module Wpxf
   # The namespace for WordPress mixins and classes.
@@ -72,5 +74,7 @@ def self.change_stdout_sync(enabled)
 require 'wpxf/wordpress/stored_xss'
 require 'wpxf/wordpress/shell_upload'
 require 'wpxf/wordpress/file_download'
+require 'wpxf/wordpress/comments'
+require 'wpxf/wordpress/hash_dump'
 
 require 'wpxf/core/module'

lib/wpxf/core.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Wpxf
   # Represents a data file found in the data directory.
   class DataFile

lib/wpxf/core/data_file.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Wpxf
   # An event emitter that allows one or more subscribers.
   class EventEmitter

lib/wpxf/core/event_emitter.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Wpxf
   # The base class for all modules.
   class Module

lib/wpxf/core/module.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Wpxf
   # Provides functionality for authenticating modules with a WordPress target.
   module ModuleAuthentication

lib/wpxf/core/module_authentication.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Wpxf
   # Provides functionality for specifying module metadata.
   module ModuleInfo

lib/wpxf/core/module_info.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'wpxf/core/opts/option'
 require 'wpxf/core/opts/boolean_option'
 require 'wpxf/core/opts/enum_option'

lib/wpxf/core/options.rb

@@ -1,4 +1,6 @@
 
+# frozen_string_literal: true
+
 module Wpxf
   # A boolean option.
   class BooleanOption < Option

lib/wpxf/core/opts/boolean_option.rb

@@ -1,4 +1,6 @@
 
+# frozen_string_literal: true
+
 module Wpxf
   # An enum option.
   class EnumOption < Option

lib/wpxf/core/opts/enum_option.rb

@@ -1,4 +1,6 @@
 
+# frozen_string_literal: true
+
 module Wpxf
   # An integer option.
   class IntegerOption < Option

lib/wpxf/core/opts/integer_option.rb

@@ -1,4 +1,6 @@
 
+# frozen_string_literal: true
+
 module Wpxf
   # The base class for all module options.
   class Option

lib/wpxf/core/opts/option.rb

@@ -1,4 +1,6 @@
 
+# frozen_string_literal: true
+
 module Wpxf
   # A file system path option.
   class PathOption < Option

lib/wpxf/core/opts/path_option.rb

@@ -1,4 +1,6 @@
 
+# frozen_string_literal: true
+
 module Wpxf
   # A network port option.
   class PortOption < Option

lib/wpxf/core/opts/port_option.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Wpxf
   # A string option.
   class StringOption < Option

lib/wpxf/core/opts/string_option.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Wpxf
   # Provides methods for emitting events that should output information
   # to the user interface of the calling application.

lib/wpxf/core/output_emitters.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'base64'
 
 module Wpxf
@@ -124,7 +126,7 @@ def enqueue_command(cmd)
     private
 
     def raw_payload_with_random_var_names
-      payload = "#{php_preamble} #{raw}"
+      payload = "#{php_preamble} #{raw}".dup
       vars = generate_vars(obfuscated_variables)
       obfuscated_variables.each { |v| payload.gsub!("$#{v}", "$#{vars[v]}") }
       payload

lib/wpxf/core/payload.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Wpxf
   module Net
     # A Hash derivitive that provides cookie parsing functionality.

lib/wpxf/net/cookie_jar.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'uri'
 
 module Wpxf

lib/wpxf/net/http_client.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Wpxf
   module Net
     # Provides access to various HTTP based options.

lib/wpxf/net/http_options.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Wpxf
   module Net
     # A response from a request made by a HttpClient.

lib/wpxf/net/http_response.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'cgi'
 require 'socket'
 
@@ -45,7 +47,7 @@ def http_server_bind_port
   #  to send to the client. If a hash is returned, it should contain the keys:
   #  * +:body+ - the body text of the response.
   #  * +:type+ - the MIME type of the response.
-  #  * +:headers+ - a hash of header keys and values.
+  #  * +:headers+ - an array of header strings.
   def on_http_request(path, params, headers)
   end
 

lib/wpxf/net/http_server.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Wpxf
   module Net
     # Provides helper functions for interfacing with Typhoeus in a module.

lib/wpxf/net/typhoeus_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Wpxf
   module Net
     # Provides functionality for generating user agent strings.

lib/wpxf/net/user_agent.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'fileutils'
 
 module Wpxf

lib/wpxf/utility/body_builder.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Wpxf
   module Utility
     # A URL inflater for module references.

lib/wpxf/utility/reference_inflater.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'digest'
 
 module Wpxf
@@ -6,9 +8,12 @@ module Utility
     module Text
       # Generate a random numeric string.
       # @param length [Integer] the number of characters to include.
+      # @param allow_leading_zero [Boolean] if set to true, will allow a number starting with zero.
       # @return [String] a random numeric string.
-      def self.rand_numeric(length)
-        Array.new(length) { [*'0'..'9'].sample }.join
+      def self.rand_numeric(length, allow_leading_zero = false)
+        value = Array.new(length) { [*'0'..'9'].sample }.join
+        value[0] = [*'1'..'9'].sample unless allow_leading_zero
+        value
       end
 
       # Generate a random alphanumeric string.

lib/wpxf/utility/text.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Wpxf
   module Versioning
     # Provides functionality for generating random browser versions.

lib/wpxf/versioning/browser_versions.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Wpxf
   module Versioning
     # Provides functionality for generating random OS versions.