storage: Full support for Stratis V2 pools

They can have multiple passphrases and keyservers per pool.

This needs the "r8" API revision, and this commit changes Cockpit to
use r8 in preference to r6 in general.  We should only use a single
Stratis API revision in a given session and this also makes it trivial
to drop support for r6 when the time comes.

Author: mvollmer

pkg/storaged/client.js

@@ -728,31 +728,13 @@ function update_indices() {
     }
 
     client.blocks_stratis_stopped_pool = { };
-    client.stratis_stopped_pool_key_description = { };
-    client.stratis_stopped_pool_clevis_info = { };
     for (const uuid in client.stratis_manager.StoppedPools) {
         const devs = client.stratis_manager.StoppedPools[uuid].devs.v;
         for (const d of devs) {
             block = client.slashdevs_block[d.devnode];
             if (block)
                 client.blocks_stratis_stopped_pool[block.path] = uuid;
         }
-        const kinfo = client.stratis_manager.StoppedPools[uuid].key_description;
-        if (kinfo &&
-            kinfo.t == "(bv)" &&
-            kinfo.v[0] &&
-            kinfo.v[1].t == "(bs)" &&
-            kinfo.v[1].v[0]) {
-            client.stratis_stopped_pool_key_description[uuid] = kinfo.v[1].v[1];
-        }
-        const cinfo = client.stratis_manager.StoppedPools[uuid].clevis_info;
-        if (cinfo &&
-            cinfo.t == "(bv)" &&
-            cinfo.v[0] &&
-            cinfo.v[1].t == "(b(ss))" &&
-            cinfo.v[1].v[0]) {
-            client.stratis_stopped_pool_clevis_info[uuid] = cinfo.v[1].v[1];
-        }
     }
 
     client.stratis_pool_stats = { };
@@ -1432,7 +1414,7 @@ client.stratis_start = () => {
 // not allowed.  If we need to bump it, it should be bumped here for all
 // of them at the same time.
 //
-const stratis3_interface_revisions = [6];
+const stratis3_interface_revisions = [8, 6];
 
 async function stratis3_start() {
     const stratis = cockpit.dbus("org.storage.stratis3", { superuser: "try" });

pkg/storaged/stratis/create-dialog.jsx

@@ -28,6 +28,23 @@ import { validate_url, get_tang_adv } from "../crypto/tang.jsx";
 
 const _ = cockpit.gettext;
 
+function manager_create_pool(name, devs, key_desc, clevis_info) {
+    if (client.stratis_interface_revision < 8) {
+        return client.stratis_manager.CreatePool(name,
+                                                 devs,
+                                                 key_desc ? [true, key_desc] : [false, ""],
+                                                 clevis_info ? [true, clevis_info] : [false, ["", ""]]);
+    } else {
+        return client.stratis_manager.CreatePool(name,
+                                                 devs,
+                                                 key_desc ? [[[false, 0], key_desc]] : [],
+                                                 clevis_info ? [[[false, 0], clevis_info[0], clevis_info[1]]] : [],
+                                                 [false, 0], // journal_size
+                                                 [false, ""], // tag_spec
+                                                 [false, false]); // allocate_superblock
+    }
+}
+
 export function create_stratis_pool() {
     function find_pool(name) {
         for (const p in client.stratis_pools) {
@@ -124,10 +141,7 @@ export function create_stratis_pool() {
                         let clevis_info = null;
                         if (adv)
                             clevis_info = ["tang", JSON.stringify({ url: vals.tang_url, adv })];
-                        return client.stratis_manager.CreatePool(vals.name,
-                                                                 devs,
-                                                                 key_desc ? [true, key_desc] : [false, ""],
-                                                                 clevis_info ? [true, clevis_info] : [false, ["", ""]])
+                        return manager_create_pool(vals.name, devs, key_desc, clevis_info)
                                 .then(std_reply)
                                 .then(result => {
                                     if (vals.overprov && !vals.overprov.on && result[0]) {