From 1fb3dc30344eacc8d51c447b377976cc9f93860b Mon Sep 17 00:00:00 2001 From: "R.I.Pienaar" Date: Wed, 19 Dec 2018 12:57:23 +0100 Subject: [PATCH] (#557) export connector and protocol security via choria_util --- lib/mcollective/agent/choria_util.ddl | 10 ++++++++++ lib/mcollective/agent/choria_util.rb | 2 ++ 2 files changed, 12 insertions(+) diff --git a/lib/mcollective/agent/choria_util.ddl b/lib/mcollective/agent/choria_util.ddl index 8564788..8d41c76 100644 --- a/lib/mcollective/agent/choria_util.ddl +++ b/lib/mcollective/agent/choria_util.ddl @@ -13,10 +13,18 @@ action "info", :description => "Choria related information from the running Daem :description => "Security Provider plugin", :display_as => "Security Provider" + output :secure_protocol, + :description => "If the protocol is running with PKI security enabled", + :display_as => "Protocol Secure" + output :connector, :description => "Connector plugin", :display_as => "Connector" + output :connector_tls, + :description => "If the connector is running with TLS security enabled", + :display_as => "Connector TLS" + output :path, :description => "Active OS PATH", :display_as => "Path" @@ -72,5 +80,7 @@ action "info", :description => "Choria related information from the running Daem aggregate summary(:connected_server) aggregate summary(:srv_domain) aggregate summary(:using_srv) + aggregate summary(:secure_protocol) + aggregate summary(:connector_tls) end end diff --git a/lib/mcollective/agent/choria_util.rb b/lib/mcollective/agent/choria_util.rb index 44ffefb..d70ec24 100644 --- a/lib/mcollective/agent/choria_util.rb +++ b/lib/mcollective/agent/choria_util.rb @@ -19,6 +19,8 @@ class Choria_util < RPC::Agent reply[:middleware_servers] = choria.middleware_servers.map {|s| s.join(":")} reply[:path] = ENV.fetch("PATH", "") reply[:choria_version] = "mcollective plugin %s" % Util::Choria::VERSION + reply[:secure_protocol] = !$choria_unsafe_disable_protocol_security + reply[:connector_tls] = !$choria_unsafe_disable_nats_tls if connector.connected? reply[:connected_server] = "%s://%s:%s" % [connector.connected_server.scheme, connector.connected_server.host, connector.connected_server.port]