choria-mcorpc-support 2.26.3 → 2.26.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3afcdee832e60d663bb3b6191631a315dfa017297620227c73fec431acaec163
-  data.tar.gz: a643991b5feb3f8f19ab71c3ff66a4cef89dd1f0c1208882ef12fcddeec037d5
+  metadata.gz: 618794d9d7f198e7f4cc53e8367aaeddaa938fb6a6c7b2180c55fe14b767c68d
+  data.tar.gz: dbfc72f95e4ec3af2e8a7292bd7ec19ed5dd9d00d5d8b2d97f2ecafdd93e46a5
 SHA512:
-  metadata.gz: d85ba1e2515ef6282ac3c2d62c0612987d187f1539a30533c6c5da5389c60fd61aec7be8741934ecb3fcf717f681817e1cf606c9e8d38ec7a8699ea6a2a81dbc
-  data.tar.gz: cba939b5c47ead81430299df123f4e779cda4c1116e36ebef2e25bb420e21c761818a6045f8d97447b5b3fc82201edbf45ef72a2ef471b2b6f6344084f751421
+  metadata.gz: dcc0cc84a7f5c6a6a0a48ca454db2b68b658d353d0485dbfa71faa48c47d3a575d4505716bb8d53b4f735622910ae313c0caf14e2d770533bebcbc8dfc5638d8
+  data.tar.gz: 463adc38db69e4b905d8cdb46719eca031f1a4fe82c0c35ccc8098edc88725dd8aa7fe1e0d3c409d0b40c3467332ee8ed6c04c02831cd2c2a78cce686e74fc8e

data/lib/mcollective/agent/aaa_signer.ddl

@@ -1,12 +1,8 @@
---  Copyright (c) 2024, R.I. Pienaar and the Choria Project contributors
---
---  SPDX-License-Identifier: Apache-2.0
-
 metadata :name        => "aaa_signer",
          :description => "Request Signer for Choria AAA Service",
          :author      => "R.I.Pienaar <rip@devco.net>",
          :license     => "Apache-2.0",
-         :version     => "0.28.0",
+         :version     => "0.29.4",
          :url         => "https://github.com/choria-io/aaasvc",
          :provider    => "golang",
          :service     => true,

data/lib/mcollective/agent/aaa_signer.json

@@ -5,7 +5,7 @@
     "author": "R.I.Pienaar \u003crip@devco.net\u003e",
     "timeout": 10,
     "name": "aaa_signer",
-    "version": "0.28.0",
+    "version": "0.29.4",
     "url": "https://github.com/choria-io/aaasvc",
     "description": "Request Signer for Choria AAA Service",
     "provider": "golang",

data/lib/mcollective/agent/choria_provision.ddl

@@ -1,16 +1,8 @@
---  Copyright (c) 2024, R.I. Pienaar and the Choria Project contributors
---
---  SPDX-License-Identifier: Apache-2.0
-
---  Copyright (c) 2024, R.I. Pienaar and the Choria Project contributors
---
---  SPDX-License-Identifier: Apache-2.0
-
 metadata :name        => "choria_provision",
          :description => "Choria Provisioner",
          :author      => "R.I.Pienaar <rip@devco.net>",
          :license     => "Apache-2.0",
-         :version     => "0.28.0",
+         :version     => "0.29.4",
          :url         => "https://choria.io",
          :timeout     => 20
 

data/lib/mcollective/agent/choria_provision.json

@@ -5,7 +5,7 @@
     "description": "Choria Provisioner",
     "author": "R.I.Pienaar <rip@devco.net>",
     "license": "Apache-2.0",
-    "version": "0.28.0",
+    "version": "0.29.4",
     "url": "https://choria.io",
     "timeout": 20
   },

data/lib/mcollective/agent/choria_registry.ddl

@@ -1,12 +1,8 @@
---  Copyright (c) 2024, R.I. Pienaar and the Choria Project contributors
---
---  SPDX-License-Identifier: Apache-2.0
-
 metadata :name        => "choria_registry",
          :description => "Choria Registry Service",
          :author      => "rip@devco.net <rip@devco.net>",
          :license     => "Apache-2.0",
-         :version     => "0.28.0",
+         :version     => "0.29.4",
          :url         => "https://choria.io",
          :provider    => "golang",
          :service     => true,

data/lib/mcollective/agent/choria_registry.json

@@ -5,7 +5,7 @@
     "author": "rip@devco.net \u003crip@devco.net\u003e",
     "timeout": 2,
     "name": "choria_registry",
-    "version": "0.28.0",
+    "version": "0.29.4",
     "url": "https://choria.io",
     "description": "Choria Registry Service",
     "provider": "golang",

data/lib/mcollective/agent/choria_util.ddl

@@ -1,12 +1,8 @@
---  Copyright (c) 2024, R.I. Pienaar and the Choria Project contributors
---
---  SPDX-License-Identifier: Apache-2.0
-
 metadata :name        => "choria_util",
          :description => "Choria Utilities",
          :author      => "R.I.Pienaar <rip@devco.net>",
          :license     => "Apache-2.0",
-         :version     => "0.28.0",
+         :version     => "0.29.4",
          :url         => "https://choria.io",
          :timeout     => 2
 

data/lib/mcollective/agent/choria_util.json

@@ -5,7 +5,7 @@
     "description": "Choria Utilities",
     "author": "R.I.Pienaar <rip@devco.net>",
     "license": "Apache-2.0",
-    "version": "0.28.0",
+    "version": "0.29.4",
     "url": "https://choria.io",
     "timeout": 2
   },

data/lib/mcollective/agent/rpcutil.ddl

@@ -1,12 +1,8 @@
---  Copyright (c) 2024, R.I. Pienaar and the Choria Project contributors
---
---  SPDX-License-Identifier: Apache-2.0
-
 metadata :name        => "rpcutil",
          :description => "Utility actions that expose information about the state of the running Server",
          :author      => "R.I.Pienaar <rip@devco.net>",
          :license     => "Apache-2.0",
-         :version     => "0.28.0",
+         :version     => "0.29.4",
          :url         => "https://choria.io/",
          :timeout     => 2
 

data/lib/mcollective/agent/rpcutil.json

@@ -5,7 +5,7 @@
     "description": "Utility actions that expose information about the state of the running Server",
     "author": "R.I.Pienaar <rip@devco.net>",
     "license": "Apache-2.0",
-    "version": "0.28.0",
+    "version": "0.29.4",
     "url": "https://choria.io/",
     "timeout": 2
   },

data/lib/mcollective/agent/scout.ddl

@@ -1,12 +1,8 @@
---  Copyright (c) 2024, R.I. Pienaar and the Choria Project contributors
---
---  SPDX-License-Identifier: Apache-2.0
-
 metadata :name        => "scout",
          :description => "Choria Scout Agent Management API",
          :author      => "R.I.Pienaar <rip@devco.net>",
          :license     => "Apache-2.0",
-         :version     => "0.28.0",
+         :version     => "0.29.4",
          :url         => "https://choria.io",
          :provider    => "golang",
          :timeout     => 5

data/lib/mcollective/agent/scout.json

@@ -5,7 +5,7 @@
     "author": "R.I.Pienaar <rip@devco.net>",
     "timeout": 5,
     "name": "scout",
-    "version": "0.28.0",
+    "version": "0.29.4",
     "url": "https://choria.io",
     "description": "Choria Scout Agent Management API",
     "provider": "golang"

data/lib/mcollective/client.rb

@@ -15,6 +15,7 @@ module MCollective
         @config.loadconfig(options[:config]) unless @config.configured
         @options = options
         @connection_timeout = options[:connection_timeout]
+        @config.federations = options[:federations] if options[:federations]
       else
         raise "Invalid parameter passed to Client constructor. Valid types are Hash or String"
       end

data/lib/mcollective/config.rb

@@ -3,7 +3,7 @@ module MCollective
   class Config
     include Singleton
 
-    attr_accessor :mode
+    attr_accessor :mode, :federations
 
     attr_reader :daemonize, :pluginconf, :configured, :logfile, :keeplogs, :max_log_size, :loglevel, :logfacility,
                 :identity, :connector, :securityprovider, :factsource, :registration, :registerinterval, :classesfile,
@@ -112,7 +112,7 @@ module MCollective
           when "default_batch_sleep_time"
             @default_batch_sleep_time = Float(val)
           else
-            # server config might now be choria config which will divirge from mcollective
+            # server config might now be choria config which will diverge from mcollective
             # in time, so we only raise this error when it looks like we aren't loading
             # a server config else we try our best to load as much as we can
             raise("Unknown config parameter '#{key}'") unless configfile =~ /server/
@@ -231,6 +231,7 @@ module MCollective
       @connection_timeout = nil
       @default_batch_size = 0
       @default_batch_sleep_time = 1
+      @federations = []
     end
 
     def libdir

data/lib/mcollective/ddl/base.rb

@@ -52,11 +52,11 @@ module MCollective
         unless template == "metadata-help.erb"
           metadata_template = Util.templatepath("metadata-help.erb")
           metadata_template = File.read(metadata_template)
-          metastring = ERB.new(metadata_template, 0, "%")
+          metastring = ERB.new(metadata_template, trim_mode: "%") # rubocop:disable Style/HashSyntax
           metastring = metastring.result(binding)
         end
 
-        erb = ERB.new(template, 0, "%")
+        erb = ERB.new(template, trim_mode: "%") # rubocop:disable Style/HashSyntax
         erb.result(binding)
       end
 

data/lib/mcollective/ddl/discoveryddl.rb

@@ -11,7 +11,7 @@ module MCollective
     #             :timeout     => 2
     #
     # discovery do
-    #     capabilities [:classes, :facts, :identity, :agents, :compound]
+    #     capabilities [:classes, :facts, :identity, :agents, :compound, :federations]
     # end
     class DiscoveryDDL < Base
       def discovery_interface
@@ -25,10 +25,10 @@ module MCollective
         raise "Discovery plugin capabilities can't be empty" if caps.empty?
 
         caps.each do |cap|
-          if [:classes, :facts, :identity, :agents, :compound].include?(cap)
+          if [:classes, :facts, :identity, :agents, :compound, :federations].include?(cap)
             @entities[:discovery][:capabilities] << cap
           else
-            raise "%s is not a valid capability, valid capabilities are :classes, :facts, :identity, :agents and :compound" % cap
+            raise "%s is not a valid capability, valid capabilities are :classes, :facts, :identity, :agents, :compound, and :federations" % cap
           end
         end
       end

data/lib/mcollective/discovery/delegate.rb

@@ -6,6 +6,8 @@ module MCollective
       end
 
       def self.discover(filter, timeout, limit, client)
+        @config = Config.instance
+
         raise("Cannot find the choria binary in your path") unless Util.command_in_path?("choria")
 
         cmd = [binary_name, "discover", "-j", "--silent"]
@@ -37,6 +39,8 @@ module MCollective
           cmd << "-S" << c.first["expr"]
         end
 
+        cmd << "--federations" << @config.federations.join(",") unless @config.federations.empty?
+
         client.options.fetch(:discovery_options, []).each do |opt|
           cmd << "--do" << opt
         end

data/lib/mcollective/discovery/external.ddl

@@ -7,7 +7,7 @@ metadata    :name        => "external",
             :timeout     => 2
 
 discovery do
-    capabilities [:classes, :facts, :identity, :agents, :compound]
+    capabilities [:classes, :facts, :identity, :agents, :compound, :federations]
 end
 
 

data/lib/mcollective/optionparser.rb

@@ -186,6 +186,10 @@ module MCollective
       @parser.on("--connection-timeout TIMEOUT", Integer, "Set the timeout for establishing a connection to the middleware") do |v|
         @options[:connection_timeout] = Integer(v)
       end
+
+      @parser.on("--federations FEDERATIONS", String, "Target federations") do |v|
+        @options[:federations] = String(v).split(",")
+      end
     end
 
     private

data/lib/mcollective/rpc.rb

@@ -171,7 +171,7 @@ module MCollective
     def self.const_missing(const_name)
       super unless const_name == :DDL
 
-      Log.warn("MCollective::RPC::DDL is deprecatd, please use MCollective::DDL instead")
+      Log.warn("MCollective::RPC::DDL is deprecated, please use MCollective::DDL instead")
       MCollective::DDL
     end
   end

data/lib/mcollective/ssl.rb

@@ -176,6 +176,8 @@ module MCollective
       signature = base64_decode(signature) if base64
 
       @public_key.verify(OpenSSL::Digest.new("SHA1"), signature, string)
+    rescue
+      false
     end
 
     # base 64 encode a string

data/lib/mcollective/util/choria.rb

@@ -97,7 +97,9 @@ module MCollective
       #
       # @return [Array<String>]
       def federation_collectives
-        if override_networks = env_fetch("CHORIA_FED_COLLECTIVE", nil)
+        if !@config.federations.empty?
+          @config.federations
+        elsif (override_networks = env_fetch("CHORIA_FED_COLLECTIVE", nil))
           override_networks.split(",").map(&:strip).reject(&:empty?)
         else
           get_option("choria.federation.collectives", "").split(",").map(&:strip).reject(&:empty?)

data/lib/mcollective/util/playbook/nodes/mcollective_nodes.rb

@@ -9,6 +9,7 @@ module MCollective
             @facts = []
             @classes = []
             @identity = []
+            @federations = []
             @compound = nil
           end
 
@@ -64,6 +65,17 @@ module MCollective
           # @param data [Hash] input data matching nodes.json schema
           # @return [McollectiveNodes]
           def from_hash(data)
+            @config = Config.instance
+
+            # Allow specifying federations at playbook execution time
+            if data["federations"]
+              if data["federations"].instance_of?(String)
+                @config.federations = [data["federations"]]
+              else
+                @config.federations = data["federations"]
+              end
+            end
+
             @discovery_method = data.fetch("discovery_method", "mc")
             @agents = data.fetch("agents", ["rpcutil"])
             @facts = data.fetch("facts", [])

data/lib/mcollective/util/playbook/tasks/slack_task.rb

@@ -73,15 +73,21 @@ module MCollective
 
           def run
             https = choria.https(:target => "slack.com", :port => 443)
-            path = "/api/chat.postMessage?token=%s&username=%s&channel=%s&icon_url=%s&attachments=%s" % [
-              CGI.escape(@token),
-              CGI.escape(@username),
-              CGI.escape(@channel),
-              CGI.escape(@icon),
-              CGI.escape(attachments.to_json)
-            ]
+            path = "/api/chat.postMessage"
+            headers = {
+              "Content-type" => "application/json; charset=utf-8",
+              "Authorization" => "Bearer %s" % @token
+            }
+            params = {
+              "username" => @username,
+              "channel" => @channel,
+              "icon_url" => @icon,
+              "attachments" => attachments
+            }
+            post = choria.http_post(path, headers)
+            post.body = params.to_json
 
-            resp, data = https.request(choria.http_get(path))
+            resp, data = https.request(post)
             data = JSON.parse(data || resp.body)
 
             if resp.code == "200" && data["ok"]

data/lib/mcollective/util/tasks_support.rb

@@ -218,7 +218,7 @@ module MCollective
       def create_request_spooldir(requestid, task)
         dir = request_spooldir(requestid)
 
-        FileUtils.mkdir_p(dir, :mode => 0o0750)
+        FileUtils.mkdir_p(dir, mode: 0o0750) # rubocop:disable Style/HashSyntax
 
         populate_spooldir(dir, task)
 
@@ -235,7 +235,7 @@ module MCollective
 
           spool_filename = File.join(spooldir, "files", filename)
 
-          FileUtils.mkdir_p(File.dirname(spool_filename), :mode => 0o0750)
+          FileUtils.mkdir_p(File.dirname(spool_filename), mode: 0o0750) # rubocop:disable Style/HashSyntax
           FileUtils.cp(task_file_name(file), spool_filename)
         end
       end
@@ -718,7 +718,7 @@ module MCollective
         http_get(path, "Accept" => "application/octet-stream") do |resp|
           raise("Failed to request task content %s: %s: %s" % [path, resp.code, resp.body]) unless resp.code == "200"
 
-          FileUtils.mkdir_p(cache_dir, :mode => 0o0750)
+          FileUtils.mkdir_p(cache_dir, mode: 0o0750) # rubocop:disable Style/HashSyntax
           FileUtils.rm_rf(file_name) if File.directory?(file_name)
 
           task_file = Tempfile.new("tasks_%s" % file["filename"])

data/lib/mcollective/util.rb

@@ -216,7 +216,8 @@ module MCollective
         :collective => nil,
         :discovery_method => nil,
         :discovery_options => Config.instance.default_discovery_options,
-        :filter => empty_filter
+        :filter => empty_filter,
+        :federations => Config.instance.federations
       }
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: choria-mcorpc-support
 version: !ruby/object:Gem::Version
-  version: 2.26.3
+  version: 2.26.5
 platform: ruby
 authors:
 - R.I.Pienaar
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-02-03 00:00:00.000000000 Z
+date: 2024-12-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: systemu
@@ -231,7 +231,7 @@ homepage: https://choria.io/
 licenses:
 - Apache-2.0
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -246,9 +246,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6.2
-signing_key: 
+rubygems_version: 3.2.33
+signing_key:
 specification_version: 4
 summary: Support libraries the Choria Server
 test_files: []