Merge pull request #185 from ripienaar/2_26_2

(misc) Release 2.26.2

CHANGELOG.md

@@ -1,5 +1,7 @@
 |Date      |Issue |Description                                                                                              |
 |----------|------|---------------------------------------------------------------------------------------------------------|
+|2023/03/22|      |Release 2.26.2                                                                                           |
+|2023/03/22|      |Update embedded DDL files                                                                                |
 |2022/11/07|      |Release 2.26.1                                                                                           |
 |2022/03/15|182   |Report failure with exit code in mco tasks                                                               |
 |2021/10/15|      |Release 2.26.0                                                                                           |

Gemfile

@@ -20,4 +20,5 @@ group :development, :test do
   gem "semantic_puppet"
   gem "webmock"
   gem "yard"
+  gem "google-protobuf", "3.17.3"
 end

lib/mcollective/agent/aaa_signer.ddl

@@ -2,7 +2,7 @@ metadata :name        => "aaa_signer",
          :description => "Request Signer for Choria AAA Service",
          :author      => "R.I.Pienaar <[email protected]>",
          :license     => "Apache-2.0",
-         :version     => "0.24.0",
+         :version     => "0.27.0",
          :url         => "https://github.com/choria-io/aaasvc",
          :provider    => "golang",
          :service     => true,
@@ -21,6 +21,15 @@ action "sign", :description => "Signs a RPC Request on behalf of a user" do
         :optional    => false
 
 
+  input :signature,
+        :prompt      => "Request Signature",
+        :description => "A signature produced using the ed25519 seed of the request, hex encoded",
+        :type        => :string,
+        :validation  => '.',
+        :maxlength   => 1024,
+        :optional    => false
+
+
   input :token,
         :prompt      => "JWT Token",
         :description => "The JWT token authenticating the user",

lib/mcollective/agent/aaa_signer.json

@@ -5,7 +5,7 @@
     "author": "R.I.Pienaar \u003c[email protected]\u003e",
     "timeout": 10,
     "name": "aaa_signer",
-    "version": "0.24.0",
+    "version": "0.27.0",
     "url": "https://github.com/choria-io/aaasvc",
     "description": "Request Signer for Choria AAA Service",
     "provider": "golang",
@@ -30,6 +30,14 @@
           "optional": false,
           "validation": ".",
           "maxlength": 10024
+        },
+        "signature": {
+          "prompt": "Request Signature",
+          "description": "A signature produced using the ed25519 seed of the request, hex encoded",
+          "type": "string",
+          "optional": false,
+          "validation": ".",
+          "maxlength": 1024
         }
       },
       "output": {

lib/mcollective/agent/choria_provision.ddl

@@ -2,7 +2,7 @@ metadata :name        => "choria_provision",
          :description => "Choria Provisioner",
          :author      => "R.I.Pienaar <[email protected]>",
          :license     => "Apache-2.0",
-         :version     => "0.24.0",
+         :version     => "0.27.0",
          :url         => "https://choria.io",
          :timeout     => 20
 
@@ -55,7 +55,7 @@ action "configure", :description => "Configure the Choria Server" do
 
   input :key,
         :prompt      => "PEM text block for the private key",
-        :description => "",
+        :description => "A RSA private key",
         :type        => :string,
         :validation  => '-----BEGIN RSA PRIVATE KEY-----',
         :maxlength   => 10240,
@@ -69,6 +69,15 @@ action "configure", :description => "Configure the Choria Server" do
         :optional    => true
 
 
+  input :server_jwt,
+        :prompt      => "Server JWT",
+        :description => "JWT file used to identify the server to the broker for ed25519 based authentication",
+        :type        => :string,
+        :validation  => '.',
+        :maxlength   => 2048,
+        :optional    => true
+
+
   input :ssldir,
         :prompt      => "SSL Dir",
         :description => "Directory for storing the certificate in",
@@ -96,6 +105,46 @@ action "configure", :description => "Configure the Choria Server" do
 
 end
 
+action "gen25519", :description => "Generates a new ED25519 keypair" do
+  display :always
+
+  input :nonce,
+        :prompt      => "Nonce",
+        :description => "Single use token to be signed by the private key being generated",
+        :type        => :string,
+        :validation  => '.',
+        :maxlength   => 64,
+        :optional    => false
+
+
+  input :token,
+        :prompt      => "Token",
+        :description => "Authentication token to pass to the server",
+        :type        => :string,
+        :validation  => '.',
+        :maxlength   => 128,
+        :optional    => false
+
+
+
+
+  output :directory,
+         :description => "The directory where server.key and server.pub is written to",
+         :type        => "string",
+         :display_as  => "Directory"
+
+  output :public_key,
+         :description => "The ED255519 public key hex encoded",
+         :type        => "string",
+         :display_as  => "Public Key"
+
+  output :signature,
+         :description => "The signature of the nonce made using the new private key, hex encoded",
+         :type        => "string",
+         :display_as  => "Signature"
+
+end
+
 action "gencsr", :description => "Request a CSR from the Choria Server" do
   display :always
 
@@ -159,7 +208,7 @@ action "gencsr", :description => "Request a CSR from the Choria Server" do
         :type        => :string,
         :validation  => '.',
         :maxlength   => 128,
-        :optional    => true
+        :optional    => false
 
 
 
@@ -181,33 +230,41 @@ action "gencsr", :description => "Request a CSR from the Choria Server" do
 
 end
 
-action "release_update", :description => "Performs an in-place binary update and restarts Choria" do
+action "jwt", :description => "Re-enable provision mode in a running Choria Server" do
   display :always
 
-  input :repository,
-        :prompt      => "Repository URL",
-        :description => "HTTP(S) server hosting the update repository",
+  input :token,
+        :prompt      => "Token",
+        :description => "Authentication token to pass to the server",
         :type        => :string,
-        :validation  => '^http(s*)://',
-        :maxlength   => 512,
+        :validation  => '.',
+        :maxlength   => 128,
         :optional    => false
 
 
+
+
+  output :ecdh_public,
+         :description => "The ECDH public key for calculating shared secrets",
+         :type        => "string",
+         :display_as  => "ECDH Public Key"
+
+  output :jwt,
+         :description => "The contents of the JWT token",
+         :type        => "string",
+         :display_as  => "JWT Token"
+
+end
+
+action "reprovision", :description => "Reenable provision mode in a running Choria Server" do
+  display :always
+
   input :token,
         :prompt      => "Token",
         :description => "Authentication token to pass to the server",
         :type        => :string,
         :validation  => '.',
         :maxlength   => 128,
-        :optional    => true
-
-
-  input :version,
-        :prompt      => "Version to update to",
-        :description => "Package version to update to",
-        :type        => :string,
-        :validation  => '.+',
-        :maxlength   => 32,
         :optional    => false
 
 
@@ -220,42 +277,62 @@ action "release_update", :description => "Performs an in-place binary update and
 
 end
 
-action "jwt", :description => "Re-enable provision mode in a running Choria Server" do
-  display :always
+action "restart", :description => "Restart the Choria Server" do
+  display :failed
+
+  input :splay,
+        :prompt      => "Splay time",
+        :description => "The configuration to apply to this node",
+        :type        => :number,
+        :optional    => true
+
 
   input :token,
         :prompt      => "Token",
         :description => "Authentication token to pass to the server",
         :type        => :string,
         :validation  => '.',
         :maxlength   => 128,
-        :optional    => true
-
+        :optional    => false
 
 
 
-  output :ecdh_public,
-         :description => "The ECDH public key for calculating shared secrets",
-         :type        => "string",
-         :display_as  => "ECDH Public Key"
 
-  output :jwt,
-         :description => "The contents of the JWT token",
+  output :message,
+         :description => "Status message from the Provisioner",
          :type        => "string",
-         :display_as  => "JWT Token"
+         :display_as  => "Message"
 
 end
 
-action "reprovision", :description => "Reenable provision mode in a running Choria Server" do
+action "release_update", :description => "Performs an in-place binary update and restarts Choria" do
   display :always
 
+  input :repository,
+        :prompt      => "Repository URL",
+        :description => "HTTP(S) server hosting the update repository",
+        :type        => :string,
+        :validation  => '^http(s*)://',
+        :maxlength   => 512,
+        :optional    => false
+
+
   input :token,
         :prompt      => "Token",
         :description => "Authentication token to pass to the server",
         :type        => :string,
         :validation  => '.',
         :maxlength   => 128,
-        :optional    => true
+        :optional    => false
+
+
+  input :version,
+        :prompt      => "Version to update to",
+        :description => "Package version to update to",
+        :type        => :string,
+        :validation  => '.+',
+        :maxlength   => 32,
+        :optional    => false
 
 
 
@@ -267,23 +344,16 @@ action "reprovision", :description => "Reenable provision mode in a running Chor
 
 end
 
-action "restart", :description => "Restart the Choria Server" do
+action "shutdown", :description => "Shut the Choria Server down cleanly" do
   display :failed
 
-  input :splay,
-        :prompt      => "Splay time",
-        :description => "The configuration to apply to this node",
-        :type        => :number,
-        :optional    => true
-
-
   input :token,
         :prompt      => "Token",
         :description => "Authentication token to pass to the server",
         :type        => :string,
         :validation  => '.',
         :maxlength   => 128,
-        :optional    => true
+        :optional    => false