choria-mcorpc-support 2.23.0 → 2.24.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 240757ac597e3d2cfe78d338c925b62b7e9ae384
-  data.tar.gz: d67ed99f4a98219aa82f9b193c3eafc6a7ed0668
+SHA256:
+  metadata.gz: 56d418c1be77553ab3139e83deb55a7e0c765e0772ef7774da3f4e3a8150757b
+  data.tar.gz: 1b4a31f0f2abf0e567c72549f0dc602b4a9e80021aa4f53528c24fbb2bca8ece
 SHA512:
-  metadata.gz: d513a4149861bd15a98250139e282b0681465d58f6a1e6503dd8b7e0323f22f7c9c5c80a4f502a52dca8322d9349946ccef538c219bf899144f988a731262144
-  data.tar.gz: eb5b2c1a2127999d93b49ae248e2f19ae95e30163c5b209eeb70c74ba2c5b6f10d6851172eb7656922e536c83f164d707526914bde8f5cc1303dfd2b62be1656
+  metadata.gz: 607d333a8a2e2b274686ffd68915cf3dafd133e515ea6441bdd13d5d5fe17f934a979990de3c8f3bc4046ba7c56fb0ace7da7a5991ab54f5ef564505680cb70e
+  data.tar.gz: 4673c0ff851b1f09fc0b480b8a7f1ae610e7f329ad444d6e41a88d76bd36724a843b3bdbad23cc47ff8570602383b629677dd51a2e465b4e37ae9afbd8fbd4fc

data/lib/mcollective.rb

@@ -15,6 +15,7 @@ require "mcollective/monkey_patches"
 require "mcollective/cache"
 require "mcollective/exceptions"
 require "systemu"
+require "open3"
 
 # == The Marionette Collective
 #
@@ -34,13 +35,12 @@ module MCollective
   require "mcollective/client"
   require "mcollective/config"
   require "mcollective/connector"
-  require "mcollective/data"
   require "mcollective/ddl"
   require "mcollective/discovery"
+  require "mcollective/discovery/delegate"
   require "mcollective/facts"
   require "mcollective/logger"
   require "mcollective/log"
-  require "mcollective/matcher"
   require "mcollective/message"
   require "mcollective/optionparser"
   require "mcollective/generators"
@@ -54,7 +54,7 @@ module MCollective
   require "mcollective/util"
   require "mcollective/validator"
 
-  VERSION = "2.23.0".freeze
+  VERSION = "2.24.1".freeze
 
   def self.version
     VERSION

data/lib/mcollective/agent/bolt_tasks.ddl

@@ -77,6 +77,15 @@ action "run_and_wait", :description => "Runs a Puppet Task that was previously d
         :default     => "{}",
         :maxlength   => 102400
 
+  input :run_as,
+        :prompt      => "Run As",
+        :description => "User to run the task as",
+        :type        => :string,
+        :validation  => ".+",
+        :optional    => true,
+        :default     => nil,
+        :maxlength   => 32
+
   output :task_id,
          :description => "The ID the task was created with",
          :display_as  => "Task ID",
@@ -165,6 +174,15 @@ action "run_no_wait", :description => "Runs a Puppet Task that was previously do
         :default     => "{}",
         :maxlength   => 102400
 
+  input :run_as,
+        :prompt      => "Run As",
+        :description => "User to run the task as",
+        :type        => :string,
+        :validation  => ".+",
+        :optional    => true,
+        :default     => nil,
+        :maxlength   => 32
+
   output :task_id,
          :description => "The ID the task was created with",
          :display_as  => "Task ID",

data/lib/mcollective/agent/bolt_tasks.json

@@ -101,6 +101,15 @@
           "optional": false,
           "validation": "^.+$",
           "maxlength": 102400
+        },
+        "run_as": {
+          "prompt": "Run As",
+          "description": "User to run the task as",
+          "type": "string",
+          "default": null,
+          "optional": true,
+          "validation": ".+",
+          "maxlength": 32
         }
       },
       "output": {
@@ -233,6 +242,15 @@
           "optional": true,
           "validation": "^.+$",
           "maxlength": 102400
+        },
+        "run_as": {
+          "prompt": "Run As",
+          "description": "User to run the task as",
+          "type": "string",
+          "default": null,
+          "optional": true,
+          "validation": ".+",
+          "maxlength": 32
         }
       },
       "output": {

data/lib/mcollective/agent/bolt_tasks.rb

@@ -37,7 +37,8 @@ module MCollective
           "task" => request[:task],
           "input_method" => request[:input_method],
           "input" => request[:input],
-          "files" => JSON.parse(request[:files])
+          "files" => JSON.parse(request[:files]),
+          "run_as" => request[:run_as]
         }
 
         unless tasks.cached?(task["files"])
@@ -77,7 +78,8 @@ module MCollective
           "task" => request[:task],
           "input_method" => request[:input_method],
           "input" => request[:input],
-          "files" => JSON.parse(request[:files])
+          "files" => JSON.parse(request[:files]),
+          "run_as" => request[:run_as]
         }
 
         status = tasks.run_task_command(reply[:task_id], task, false, request.caller)

data/lib/mcollective/agent/rpcutil.ddl

@@ -65,9 +65,9 @@ action "get_fact", :description => "Retrieve a single fact from the fact store"
            :prompt      => "The name of the fact",
            :description => "The fact to retrieve",
            :type        => :string,
-           :validation  => '^[\w\-\.]+$',
+           :validation  => '.+',
            :optional    => false,
-           :maxlength   => 256
+           :maxlength   => 512
 
      output :fact,
             :description => "The name of the fact being returned",

data/lib/mcollective/agent/rpcutil.json

@@ -216,8 +216,8 @@
           "type": "string",
           "default": null,
           "optional": false,
-          "validation": "^[\\w\\-\\.]+$",
-          "maxlength": 256
+          "validation": ".+",
+          "maxlength": 512
         }
       },
       "output": {

data/lib/mcollective/application/choria.rb

@@ -8,37 +8,18 @@ module MCollective
 
   The ACTION can be one of the following:
 
-     request_cert - requests a certificate from the Puppet CA
      show_config  - shows the active configuration parameters
 
-  The environment is chosen using --environment and the concurrent
-  runs may be limited using --batch.
-
-  The batching works a bit different than typical, it will only batch
-  based on a sorted list of certificate names, this means the batches
-  will always run in predictable order.
       USAGE
 
       exclude_argument_sections "common", "filter", "rpc"
 
-      option :ca,
-             :arguments => ["--ca SERVER"],
-             :description => "Address of your Puppet CA",
-             :type => String
-
-      option :certname,
-             :arguments => ["--certname CERTNAME"],
-             :description => "Override the default certificate name",
-             :type => String
-
       def post_option_parser(configuration)
         if ARGV.length >= 1
           configuration[:command] = ARGV.shift
         else
           abort("Please specify a command, valid commands are: %s" % valid_commands.join(", "))
         end
-
-        ENV["MCOLLECTIVE_CERTNAME"] = configuration[:certname] if configuration[:certname]
       end
 
       # Validates the configuration
@@ -48,10 +29,6 @@ module MCollective
         Util.loadclass("MCollective::Util::Choria")
 
         abort("Unknown command %s, valid commands are: %s" % [configuration[:command], valid_commands.join(", ")]) unless valid_commands.include?(configuration[:command])
-
-        if !choria.has_client_public_cert? && !["request_cert", "show_config"].include?(configuration[:command])
-          abort("A certificate is needed from the Puppet CA for `%s`, please use the `request_cert` command" % choria.certname)
-        end
       end
 
       def main
@@ -66,45 +43,8 @@ module MCollective
       #
       # @return [void]
       def request_cert_command
-        disconnect
-
-        raise(Util::Choria::UserError, "Cannot only request certificates in Puppet security mode") unless choria.puppet_security?
-
-        raise(Util::Choria::UserError, "Already have a certificate '%s', cannot request a new one" % choria.client_public_cert) if choria.has_client_public_cert?
-
-        choria.ca = configuration[:ca] if configuration[:ca]
-
-        certname = choria.client_public_cert
-
-        choria.make_ssl_dirs
-        choria.fetch_ca
-
-        if choria.waiting_for_cert?
-          puts("Certificate %s has already been requested, attempting to retrieve it" % certname)
-        else
-          puts("Requesting certificate for '%s'" % certname)
-          choria.request_cert
-        end
-
-        puts("Waiting up to 240 seconds for it to be signed")
-        puts
-
-        puts("Key fingerprint: %s" % choria.csr_fingerprint)
-        puts
-
-        24.times do |time|
-          print "Attempting to download certificate %s: %d / 24\r" % [certname, time]
-
-          break if choria.attempt_fetch_cert
-
-          sleep 10
-        end
-
-        unless choria.has_client_public_cert?
-          raise(Util::Choria::UserError, "Could not fetch the certificate after 240 seconds, please ensure it gets signed and rerun this command")
-        end
-
-        puts("Certificate %s has been stored in %s" % [certname, choria.ssl_dir])
+        puts("Please use 'choria enroll' to enroll in the security subsystem")
+        raise(Util::Choria::Abort, "1")
       end
 
       def show_config_command # rubocop:disable Metrics/MethodLength
@@ -174,7 +114,7 @@ module MCollective
         if valid_ssl
           puts "     Valid SSL Setup: %s" % [Util.colorize(:green, "yes")]
         else
-          puts "     Valid SSL Setup: %s try running 'mco choria request_cert'" % [Util.colorize(:red, "no")]
+          puts "     Valid SSL Setup: %s try running 'choria enroll'" % [Util.colorize(:red, "no")]
         end
 
         puts "   Security Provider: %s" % [choria.security_provider]

data/lib/mcollective/application/facts.rb

@@ -1,71 +1,6 @@
 class MCollective::Application::Facts < MCollective::Application # rubocop:disable Style/ClassAndModuleChildren
   description "Reports on usage for a specific fact"
 
-  def post_option_parser(configuration)
-    configuration[:fact] = ARGV.shift unless ARGV.empty?
-  end
-
-  def validate_configuration(configuration)
-    raise "Please specify a fact to report for" unless configuration.include?(:fact)
-  end
-
-  def show_single_fact_report(fact, facts, verbose=false)
-    puts("Report for fact: #{fact}\n\n")
-
-    facts = stringify_facts_hash(facts)
-
-    field_size = MCollective::Util.field_size(facts.keys)
-    facts.keys.sort.each do |k|
-      printf("        %-#{field_size}s found %d times\n", k, facts[k].size)
-
-      next unless verbose
-
-      puts
-
-      facts[k].sort.each do |f|
-        puts("            #{f}")
-      end
-
-      puts
-    end
-  end
-
-  def stringify_facts_hash(facts)
-    res = Hash.new([])
-    facts.each { |k, v| res[k.to_s] += v }
-    res
-  end
-
-  def main
-    rpcutil = rpcclient("rpcutil")
-    rpcutil.progress = false
-
-    facts = {}
-
-    rpcutil.get_fact(:fact => configuration[:fact]) do |resp|
-      begin
-        value = resp[:body][:data][:value].to_s
-
-        if resp[:body][:data].include?(:value)
-          if facts.include?(value)
-            facts[value] << resp[:senderid]
-          else
-            facts[value] = [resp[:senderid]]
-          end
-        end
-      rescue Exception => e # rubocop:disable Lint/RescueException
-        warn "Could not parse facts for #{resp[:senderid]}: #{e.class}: #{e}"
-      end
-    end
-
-    if facts.empty?
-      puts "No values found for fact #{configuration[:fact]}\n"
-    else
-      show_single_fact_report(configuration[:fact], facts, options[:verbose])
-    end
-
-    printrpcstats
-
-    halt rpcutil.stats
-  end
+  external(:command => "choria", :args => ["facts"])
+  external_help(:command => "choria", :args => ["facts", "--help"])
 end

data/lib/mcollective/application/federation.rb

@@ -217,9 +217,7 @@ The ACTION can be one of the following:
 
         abort("Unknown command %s, valid commands are: %s" % [configuration[:command], valid_commands.join(", ")]) unless valid_commands.include?(configuration[:command])
 
-        if !choria.has_client_public_cert? && !["request_cert", "show_config"].include?(configuration[:command])
-          abort("A certificate is needed from the Puppet CA for `%s`, please use the `request_cert` command" % choria.certname)
-        end
+        abort("A certificate is needed from the Puppet CA for `%s`, please use the `choria enroll` command" % choria.certname) unless choria.has_client_public_cert?
       end
 
       def main

data/lib/mcollective/application/find.rb

@@ -16,7 +16,7 @@ class MCollective::Application::Find < MCollective::Application # rubocop:disabl
 
     nodes.each {|c| puts c}
 
-    warn "\nDiscovered %s nodes in %.2f seconds using the %s discovery plugin" % [nodes.size, discoverytime, mc.client.discoverer.discovery_method] if options[:verbose]
+    warn "\nDiscovered %s nodes in %.2f seconds using the %s discovery plugin" % [nodes.size, discoverytime, mc.client.options[:discovery_method]] if options[:verbose]
 
     !nodes.empty? ? exit(0) : exit(1)
   end

data/lib/mcollective/application/ping.rb

@@ -1,8 +1,36 @@
 module MCollective
   class Application::Ping < Application # rubocop:disable Style/ClassAndModuleChildren
-    description "Ping all nodes"
+    description "Low level network connectivity test"
 
-    external(:command => "choria", :args => ["ping"])
-    external_help(:command => "choria", :args => ["ping", "--help"])
+    def main
+      # If the user did not override the default timeout include the discovery timeout
+      if options[:timeout] == 5
+        discovery_timeout = options[:disctimeout] || Config.instance.discovery_timeout || 0
+        options[:timeout] = options[:timeout] + discovery_timeout
+      end
+      client = MCollective::Client.new(options)
+
+      start = Time.now.to_f
+      times = []
+
+      client.req("ping", "discovery") do |resp|
+        times << (Time.now.to_f - start) * 1000
+
+        puts "%-40s time=%.2f ms" % [resp[:senderid], times.last]
+      end
+
+      puts("\n\n---- ping statistics ----")
+
+      if !times.empty?
+        sum = times.inject(0) {|acc, i| acc + i}
+        avg = sum / times.length.to_f
+
+        puts "%d replies max: %.2f min: %.2f avg: %.2f" % [times.size, times.max, times.min, avg]
+      else
+        puts("No responses received")
+      end
+
+      halt client.stats
+    end
   end
 end

data/lib/mcollective/application/plugin.rb

@@ -9,7 +9,6 @@ mco plugin package [options] <directory>
        mco plugin doc <plugin>
        mco plugin doc <type/plugin>
        mco plugin generate agent <pluginname> [actions=val,val]
-       mco plugin generate data <pluginname> [outputs=val,val]
 
           info : Display plugin information including package details.
        package : Create all available plugin packages.
@@ -116,11 +115,6 @@ mco plugin package [options] <directory>
            :arguments => ["--actions [ACTIONS]"],
            :type => Array
 
-    option :outputs,
-           :description => "Outputs to be generated for an Data Plugin",
-           :arguments => ["--outputs [OUTPUTS]"],
-           :type => Array
-
     option :keep_artifacts,
            :description => "Don't remove artifacts after building packages",
            :arguments => ["--keep-artifacts"],
@@ -167,7 +161,7 @@ mco plugin package [options] <directory>
 
     # Generate a plugin skeleton
     def generate_command
-      raise "undefined plugin type. cannot generate plugin. valid types are 'agent' and 'data'" if configuration["target"] == "."
+      raise "undefined plugin type. cannot generate plugin. valid types are 'agent'" if configuration["target"] == "."
 
       unless configuration[:pluginname]
         puts "No plugin name specified. Using 'new_plugin'"
@@ -181,12 +175,6 @@ mco plugin package [options] <directory>
         Generators::AgentGenerator.new(configuration[:pluginname], configuration[:actions], configuration[:pluginname],
                                        configuration[:description], configuration[:author], configuration[:license],
                                        configuration[:version], configuration[:url], configuration[:timeout])
-      when "data"
-        raise "data plugin must have at least one output" unless configuration[:outputs]
-
-        Generators::DataGenerator.new(configuration[:pluginname], configuration[:outputs], configuration[:pluginname],
-                                      configuration[:description], configuration[:author], configuration[:license],
-                                      configuration[:version], configuration[:url], configuration[:timeout])
       else
         raise "invalid plugin type. cannot generate plugin '#{configuration[:target]}'"
       end
@@ -228,7 +216,6 @@ mco plugin package [options] <directory>
         ["Agents", :agent],
         ["Aggregate", :aggregate],
         ["Connectors", :connector],
-        ["Data Queries", :data],
         ["Discovery Methods", :discovery],
         ["Validator Plugins", :validator]
       ]
@@ -345,7 +332,7 @@ mco plugin package [options] <directory>
     # Return the name of the type of plugin as a string
     def identify_plugin
       plugintype = Dir.glob(File.join(configuration[:target], "*")).select do |file|
-        File.directory?(file) && file.match(/(connector|facts|registration|security|audit|pluginpackager|data|discovery|validator)/)
+        File.directory?(file) && file.match(/(connector|facts|registration|security|audit|pluginpackager|discovery|validator)/)
       end
 
       raise "more than one plugin type detected in directory" if plugintype.size > 1