Merge pull request #534 from choria-io/533

(#533) do not require certificates when ssl is disabled

lib/mcollective/connector/nats.rb

@@ -79,7 +79,9 @@ def connect
 
         if $choria_unsafe_disable_nats_tls # rubocop:disable Style/GlobalVars
           Log.warn("Disabling TLS in NATS connector, this is not a production supported setup")
-          parameters.delete(:tls)
+        else
+          parameters[:tls] = {:context => choria.ssl_context}
+          choria.check_ssl_setup
         end
 
         servers = server_list
@@ -89,8 +91,6 @@ def connect
           parameters[:servers] = servers
         end
 
-        choria.check_ssl_setup
-
         connection.start(parameters)
 
         nil

lib/mcollective/security/choria.rb

@@ -49,13 +49,19 @@ def encoderequest(sender, msg, requestid, filter, target_agent, target_collectiv
         request["envelope"]["callerid"] = callerid
 
         serialized_request = serialize(request, default_serializer)
-
-        serialize(
+        secure_request = {
           "protocol" => "choria:secure:request:1",
           "message" => serialized_request,
-          "signature" => sign(serialized_request),
-          "pubcert" => File.read(client_public_cert).chomp
-        )
+          "signature" => "insecure",
+          "pubcert" => "insecure"
+        }
+
+        unless $choria_unsafe_disable_nats_tls # rubocop:disable Style/GlobalVars
+          secure_request["signature"] = sign(serialized_request)
+          secure_request["pubcert"] = File.read(client_public_cert).chomp
+        end
+
+        serialize(secure_request)
       end
 
       # Encodes a reply to a earlier received message