(#557) export connector and protocol security via choria_util

choria-legacy · Dec 19, 2018 · 1fb3dc3 · 1fb3dc3
1 parent 9f94035
commit 1fb3dc3
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 0 deletions.
diff --git 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
@@ -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]