choria-mcorpc-support 2.22.1 → 2.23.0.pre

data/lib/mcollective/matcher/scanner.rb

@@ -11,33 +11,31 @@ module MCollective
       end
 
       # Scans the input string and identifies single language tokens
-      def get_token
-        if @token_index >= @arguments.size
-          return nil
-        end
+      def get_token # rubocop:disable Naming/AccessorMethodName
+        return nil if @token_index >= @arguments.size
 
         case @arguments[@token_index]
         when "("
-          return "(", "("
+          ["(", "("]
 
         when ")"
-          return ")", ")"
+          [")", ")"]
 
         when "n"
           if (@arguments[@token_index + 1] == "o") && (@arguments[@token_index + 2] == "t") && ((@arguments[@token_index + 3] == " ") || (@arguments[@token_index + 3] == "("))
             @token_index += 2
-            return "not", "not"
+            ["not", "not"]
           else
             gen_statement
           end
 
         when "!"
-          return "not", "not"
+          ["not", "not"]
 
         when "a"
           if (@arguments[@token_index + 1] == "n") && (@arguments[@token_index + 2] == "d") && ((@arguments[@token_index + 3] == " ") || (@arguments[@token_index + 3] == "("))
             @token_index += 2
-            return "and", "and"
+            ["and", "and"]
           else
             gen_statement
           end
@@ -45,13 +43,13 @@ module MCollective
         when "o"
           if (@arguments[@token_index + 1] == "r") && ((@arguments[@token_index + 2] == " ") || (@arguments[@token_index + 2] == "("))
             @token_index += 1
-            return "or", "or"
+            ["or", "or"]
           else
             gen_statement
           end
 
         when " "
-          return " ", " "
+          [" ", " "]
 
         else
           gen_statement
@@ -59,21 +57,24 @@ module MCollective
       end
 
       private
+
       # Helper generates a statement token
-      def gen_statement
+      def gen_statement # rubocop:disable Metrics/MethodLength
         func = false
         current_token_value = ""
         j = @token_index
         escaped = false
 
         begin
-          if (@arguments[j] == "/")
-            begin
+          case @arguments[j]
+          when "/"
+            loop do
               current_token_value << @arguments[j]
               j += 1
-            end until (j >= @arguments.size) || (@arguments[j] =~ /\s/)
-          elsif (@arguments[j] =~ /=|<|>/)
-            while !(@arguments[j] =~ /=|<|>/)
+              break if (j >= @arguments.size) || (@arguments[j] =~ /\s/)
+            end
+          when /=|<|>/
+            while @arguments[j] !~ /=|<|>/
               current_token_value << @arguments[j]
               j += 1
             end
@@ -82,27 +83,28 @@ module MCollective
             j += 1
 
             if @arguments[j] == "/"
-              begin
+              loop do
                 current_token_value << @arguments[j]
                 j += 1
                 if @arguments[j] == "/"
                   current_token_value << "/"
                   break
                 end
-              end until (j >= @arguments.size) || (@arguments[j] =~ /\//)
+                break if (j >= @arguments.size) || (@arguments[j] =~ /\//)
+              end
               while (j < @arguments.size) && ((@arguments[j] != " ") && (@arguments[j] != ")"))
                 current_token_value << @arguments[j]
                 j += 1
               end
             end
           else
-            begin
+            loop do
               # Identify and tokenize regular expressions by ignoring everything between /'s
-              if @arguments[j] == '/'
-                current_token_value << '/'
+              if @arguments[j] == "/"
+                current_token_value << "/"
                 j += 1
-                while(j < @arguments.size && @arguments[j] != '/')
-                  if  @arguments[j] == '\\'
+                while j < @arguments.size && @arguments[j] != "/"
+                  if @arguments[j] == '\\' # rubocop:disable Metrics/BlockNesting
                     # eat the escape char
                     current_token_value << @arguments[j]
                     j += 1
@@ -116,7 +118,8 @@ module MCollective
                 break
               end
 
-              if @arguments[j] == "("
+              case @arguments[j]
+              when "("
                 func = true
 
                 current_token_value << @arguments[j]
@@ -124,29 +127,29 @@ module MCollective
 
                 while j < @arguments.size
                   current_token_value << @arguments[j]
-                  if @arguments[j] == ')'
+                  if @arguments[j] == ")" # rubocop:disable Metrics/BlockNesting
                     j += 1
                     break
                   end
                   j += 1
                 end
-              elsif @arguments[j] == '"' || @arguments[j] == "'"
+              when '"', "'"
                 escaped = true
                 escaped_with = @arguments[j]
 
                 j += 1 # step over first " or '
                 @white_spaces += 1
                 # identified "..." or '...'
+                # rubocop:disable Metrics/BlockNesting
                 while j < @arguments.size
-                  if  @arguments[j] == '\\'
+                  case @arguments[j]
+                  when '\\'
                     # eat the escape char but don't add it to the token, or we
                     # end up with \\\"
                     j += 1
                     @white_spaces += 1
-                    unless j < @arguments.size
-                      break
-                    end
-                  elsif @arguments[j] == escaped_with
+                    break unless j < @arguments.size
+                  when escaped_with
                     j += 1
                     @white_spaces += 1
                     break
@@ -154,24 +157,22 @@ module MCollective
                   current_token_value << @arguments[j]
                   j += 1
                 end
+                # rubocop:enable Metrics/BlockNesting
               else
                 current_token_value << @arguments[j]
                 j += 1
               end
 
-              if(@arguments[j] == ' ')
-                break if(is_klass?(j) && !(@arguments[j-1] =~ /=|<|>/))
-              end
+              break if @arguments[j] == " " && (is_klass?(j) && @arguments[j - 1] !~ /=|<|>/)
 
-              if( (@arguments[j] == ' ') && (@seperation_counter < 2) && !(current_token_value.match(/^.+(=|<|>).+$/)) )
-                if((index = lookahead(j)))
-                  j = index
-                end
+              if (@arguments[j] == " ") && (@seperation_counter < 2) && !current_token_value.match(/^.+(=|<|>).+$/) && (index = lookahead(j))
+                j = index
               end
-            end until (j >= @arguments.size) || (@arguments[j] =~ /\s|\)/)
+              break if (j >= @arguments.size) || (@arguments[j] =~ /\s|\)/)
+            end
             @seperation_counter = 0
           end
-        rescue Exception => e
+        rescue Exception => e # rubocop:disable Lint/RescueException
           raise "An exception was raised while trying to tokenize '#{current_token_value} - #{e}'"
         end
 
@@ -180,61 +181,55 @@ module MCollective
 
         # bar(
         if current_token_value.match(/.+?\($/)
-          return "bad_token", [@token_index - current_token_value.size + 1, @token_index]
+          ["bad_token", [@token_index - current_token_value.size + 1, @token_index]]
         # /foo/=bar
         elsif current_token_value.match(/^\/.+?\/(<|>|=).+/)
-          return "bad_token", [@token_index - current_token_value.size + 1, @token_index]
+          ["bad_token", [@token_index - current_token_value.size + 1, @token_index]]
         elsif current_token_value.match(/^.+?\/(<|>|=).+/)
-          return "bad_token", [@token_index - current_token_value.size + 1, @token_index]
-        else
-          if func
-            if current_token_value.match(/^.+?\((\s*(')[^']*(')\s*(,\s*(')[^']*('))*)?\)(\.[a-zA-Z0-9_]+)?((!=|<=|>=|=|>|<).+)?$/) ||
-               current_token_value.match(/^.+?\((\s*(")[^"]*(")\s*(,\s*(")[^"]*("))*)?\)(\.[a-zA-Z0-9_]+)?((!=|<=|>=|=|>|<).+)?$/)
-              return "fstatement", current_token_value
-            else
-              return "bad_token", [@token_index - current_token_value.size + 1, @token_index]
-            end
+          ["bad_token", [@token_index - current_token_value.size + 1, @token_index]]
+        elsif func
+          if current_token_value.match(/^.+?\((\s*(')[^']*(')\s*(,\s*(')[^']*('))*)?\)(\.[a-zA-Z0-9_]+)?((!=|<=|>=|=|>|<).+)?$/) ||
+             current_token_value.match(/^.+?\((\s*(")[^"]*(")\s*(,\s*(")[^"]*("))*)?\)(\.[a-zA-Z0-9_]+)?((!=|<=|>=|=|>|<).+)?$/)
+            ["fstatement", current_token_value]
           else
-            if escaped
-              return "statement", current_token_value
-            end
-            slash_err = false
-            current_token_value.split('').each do |c|
-              if c == '/'
-                slash_err = !slash_err
-              end
-            end
-            return "bad_token", [@token_index - current_token_value.size + 1, @token_index] if slash_err
-            return "statement", current_token_value
+            ["bad_token", [@token_index - current_token_value.size + 1, @token_index]]
+          end
+        else
+          return "statement", current_token_value if escaped
+
+          slash_err = false
+          current_token_value.split("").each do |c|
+            slash_err = !slash_err if c == "/"
           end
+          return "bad_token", [@token_index - current_token_value.size + 1, @token_index] if slash_err
+
+          ["statement", current_token_value]
         end
       end
 
       # Deal with special puppet class statement
-      def is_klass?(j)
-        while(j < @arguments.size && @arguments[j] == ' ')
-          j += 1
-        end
+      def is_klass?(klass)
+        klass += 1 while klass < @arguments.size && @arguments[klass] == " "
 
-        if @arguments[j] =~ /=|<|>/
-          return false
+        if @arguments[klass] =~ /=|<|>/
+          false
         else
-          return true
+          true
         end
       end
 
       # Eat spaces while looking for the next comparison symbol
       def lookahead(index)
         index += 1
-        while(index <= @arguments.size)
+        while index <= @arguments.size
           @white_spaces += 1
-          unless(@arguments[index] =~ /\s/)
-            @seperation_counter +=1
+          unless @arguments[index] =~ /\s/
+            @seperation_counter += 1
             return index
           end
           index += 1
         end
-        return nil
+        nil
       end
     end
   end

data/lib/mcollective/message.rb

@@ -2,8 +2,7 @@ module MCollective
   # container for a message, its headers, agent, collective and other meta data
   class Message
     attr_reader :message, :request, :validated, :msgtime, :payload, :type, :expected_msgid, :reply_to
-    attr_accessor :headers, :agent, :collective, :filter
-    attr_accessor :requestid, :discovered_hosts, :options, :ttl
+    attr_accessor :headers, :agent, :collective, :filter, :requestid, :discovered_hosts, :options, :ttl
 
     VALIDTYPES = [:message, :request, :direct_request, :reply].freeze
 
@@ -79,9 +78,7 @@ module MCollective
       if type == :direct_request
         raise "Direct requests is not enabled using the direct_addressing config option" unless Config.instance.direct_addressing
 
-        unless @discovered_hosts && !@discovered_hosts.empty?
-          raise "Can only set type to :direct_request if discovered_hosts have been set"
-        end
+        raise "Can only set type to :direct_request if discovered_hosts have been set" unless @discovered_hosts && !@discovered_hosts.empty?
 
         # clear out the filter, custom discovery sources might interpret the filters
         # different than the remote mcollectived and in directed mode really the only
@@ -109,6 +106,7 @@ module MCollective
     # at us.
     def expected_msgid=(msgid)
       raise "Can only store the expected msgid for reply messages" unless @type == :reply
+
       @expected_msgid = msgid
     end
 
@@ -132,7 +130,7 @@ module MCollective
 
     def description
       cid = ""
-      cid += payload[:callerid] + "@" if payload.include?(:callerid)
+      cid += "#{payload[:callerid]}@" if payload.include?(:callerid)
       cid += payload[:senderid]
 
       "#{requestid} for agent '#{agent}' in collective '#{collective}' from #{cid}"
@@ -163,6 +161,7 @@ module MCollective
       compound_filter.each do |filter|
         filter.each do |statement|
           next unless statement["fstatement"]
+
           functionname = statement["fstatement"]["name"]
           pluginname = Data.pluginname(functionname)
           value = statement["fstatement"]["value"]
@@ -175,9 +174,7 @@ module MCollective
 
           Data.ddl_validate(ddl, statement["fstatement"]["params"])
 
-          unless value && Data.ddl_has_output?(ddl, value)
-            raise(DDLValidationError, "Data plugin '%s()' does not return a '%s' value" % [functionname, value])
-          end
+          raise(DDLValidationError, "Data plugin '%s()' does not return a '%s' value" % [functionname, value]) unless value && Data.ddl_has_output?(ddl, value)
         end
       end
     end
@@ -194,15 +191,15 @@ module MCollective
         else
           # We're in the client, log and carry on as best we can
 
-          # Note: mc_sender is unverified.  The verified identity is in the
+          # NOTE: mc_sender is unverified.  The verified identity is in the
           # payload we just failed to decode
           Log.warn("Failed to decode a message from '#{headers['mc_sender']}': #{e}")
           return
         end
       end
 
-      if type == :request
-        raise "callerid in request is not valid, surpressing reply to potentially forged request" unless PluginManager["security_plugin"].valid_callerid?(payload[:callerid])
+      if type == :request && !PluginManager["security_plugin"].valid_callerid?(payload[:callerid])
+        raise "callerid in request is not valid, surpressing reply to potentially forged request"
       end
 
       [:collective, :agent, :filter, :requestid, :ttl, :msgtime].each do |prop|
@@ -216,11 +213,7 @@ module MCollective
 
       msg_age = Time.now.utc.to_i - msgtime
 
-      if msg_age > ttl
-        PluginManager["global_stats"].ttlexpired
-        raise(MsgTTLExpired, "Message #{description} created at #{msgtime} is #{msg_age} seconds old, TTL is #{ttl}. Rejecting message.")
-      end
-
+      raise(MsgTTLExpired, "Message #{description} created at #{msgtime} is #{msg_age} seconds old, TTL is #{ttl}. Rejecting message.") if msg_age > ttl
       raise(NotTargettedAtUs, "Message #{description} does not pass filters. Ignoring message.") unless PluginManager["security_plugin"].validate_filter?(payload[:filter])
 
       @validated = true

data/lib/mcollective/monkey_patches.rb

@@ -67,8 +67,8 @@ class String
   unless method_defined?(:bytes)
     def bytes(&block)
       # This should not be necessary, really ...
-      require "enumerator"
       return to_enum(:each_byte) unless block_given?
+
       each_byte(&block)
     end
   end
@@ -141,9 +141,7 @@ class OpenSSL::SSL::SSLContext # rubocop:disable Style/ClassAndModuleChildren
   end
 
   # ruby 1.8.5 doesn't define this constant, but has it on by default
-  if defined?(OpenSSL::SSL::OP_DONT_INSERT_EMPTY_FRAGMENTS)
-    DEFAULT_PARAMS[:options] |= OpenSSL::SSL::OP_DONT_INSERT_EMPTY_FRAGMENTS
-  end
+  DEFAULT_PARAMS[:options] |= OpenSSL::SSL::OP_DONT_INSERT_EMPTY_FRAGMENTS if defined?(OpenSSL::SSL::OP_DONT_INSERT_EMPTY_FRAGMENTS)
 
   DEFAULT_PARAMS[:ciphers] << ":!SSLv2" if DEFAULT_PARAMS[:ciphers]
 

data/lib/mcollective/optionparser.rb

@@ -155,6 +155,7 @@ module MCollective
 
       @parser.on("--dm", "--disc-method METHOD", "Which discovery method to use") do |v|
         raise "Discovery method is already set by a competing option" if @options[:discovery_method] && @options[:discovery_method] != v
+
         @options[:discovery_method] = v
       end
 

data/lib/mcollective/pluginmanager.rb

@@ -91,7 +91,7 @@ module MCollective
 
     # use eval to create an instance of a class
     def self.create_instance(klass)
-      eval("#{klass}.new") # rubocop:disable Security/Eval
+      eval("#{klass}.new") # rubocop:disable Security/Eval, Style/EvalWithLocation
     rescue Exception => e # rubocop:disable Lint/RescueException
       raise("Could not create instance of plugin #{klass}: #{e}")
     end
@@ -146,9 +146,7 @@ module MCollective
       extension = ".#{extension}" unless extension =~ /^\./
 
       klasses = find(type, extension).map do |plugin|
-        if block_given?
-          next unless yield(plugin)
-        end
+        next if block_given? && !yield(plugin)
 
         "%s::%s::%s" % ["MCollective", type.capitalize, plugin.capitalize]
       end.compact
@@ -159,7 +157,7 @@ module MCollective
     # Loads a class from file by doing some simple search/replace
     # on class names and then doing a require.
     def self.loadclass(klass, squash_failures=false)
-      fname = klass.gsub("::", "/").downcase + ".rb"
+      fname = "#{klass.gsub('::', '/').downcase}.rb"
 
       Log.debug("Loading #{klass} from #{fname}")
 

data/lib/mcollective/pluginpackager.rb

@@ -84,9 +84,7 @@ module MCollective
 
     # Return the path to a plugin's core directories
     def self.get_plugin_path(target)
-      if File.exist?(File.join(target, "lib", "mcollective"))
-        return File.join(target, "lib", "mcollective")
-      end
+      return File.join(target, "lib", "mcollective") if File.exist?(File.join(target, "lib", "mcollective"))
 
       target
     end

data/lib/mcollective/pluginpackager/agent_definition.rb

@@ -2,8 +2,7 @@ module MCollective
   module PluginPackager
     # MCollective Agent Plugin package
     class AgentDefinition
-      attr_accessor :path, :packagedata, :metadata, :target_path, :vendor, :revision, :preinstall
-      attr_accessor :plugintype, :dependencies, :postinstall, :mcname, :mcversion
+      attr_accessor :path, :packagedata, :metadata, :target_path, :vendor, :revision, :preinstall, :plugintype, :dependencies, :postinstall, :mcname, :mcversion
 
       def initialize(configuration, mcdependency, plugintype)
         @plugintype = plugintype
@@ -53,9 +52,7 @@ module MCollective
         agent[:files] = (Dir.glob(File.join(agentdir, "**", "**")) - ddls)
         agent[:plugindependency] = {:name => "#{@mcname}-#{@metadata[:name]}-common", :version => @metadata[:version], :revision => @revision}
 
-        if @metadata[:provider] == "external"
-          agent[:executable_files] << File.join(agentdir, @agent_name)
-        end
+        agent[:executable_files] << File.join(agentdir, @agent_name) if @metadata[:provider] == "external"
 
         agent
       end
@@ -95,9 +92,7 @@ module MCollective
         end
 
         # We fail if there is no ddl file present
-        if common[:files].grep(/^.*\.ddl$/).empty?
-          raise "cannot create package - No ddl file found in #{File.join(@path, 'agent')}"
-        end
+        raise "cannot create package - No ddl file found in #{File.join(@path, 'agent')}" if common[:files].grep(/^.*\.ddl$/).empty?
 
         common[:files].uniq!