Support storing image encryption keys in Vault

src/test/test_cluster_client.cpp

@@ -55,7 +55,7 @@ int *test_write(cluster_client_t *cli, uint64_t offset, uint64_t len, uint8_t c,
 {
     printf("Post write %jx+%jx\n", offset, len);
     int *r = new int;
-    *r = instant ? -2 : -1;
+    *r = instant ? -1001 : -1000;
     cluster_op_t *op = new cluster_op_t();
     op->opcode = OSD_OP_WRITE;
     op->inode = 0x1000000000001;
@@ -65,10 +65,11 @@ int *test_write(cluster_client_t *cli, uint64_t offset, uint64_t len, uint8_t c,
     memset(op->iov.buf[0].iov_base, c, len);
     op->callback = [r, cb](cluster_op_t *op)
     {
-        if (*r == -1)
+        if (*r == -1000)
             printf("Error: Not allowed to complete yet\n");
-        assert(*r != -1);
-        *r = op->retval == op->len ? 1 : 0;
+        assert(*r != -1000);
+        assert(op->retval == op->len || op->retval < 0);
+        *r = op->retval == op->len ? 1 : op->retval;
         free(op->iov.buf[0].iov_base);
         printf("Done write %jx+%jx r=%d\n", op->offset, op->len, op->retval);
         delete op;
@@ -90,14 +91,14 @@ int *test_sync(cluster_client_t *cli)
 {
     printf("Post sync\n");
     int *r = new int;
-    *r = -1;
+    *r = -1000;
     cluster_op_t *op = new cluster_op_t();
     op->opcode = OSD_OP_SYNC;
     op->callback = [r](cluster_op_t *op)
     {
-        if (*r == -1)
+        if (*r == -1000)
             printf("Error: Not allowed to complete yet\n");
-        assert(*r != -1);
+        assert(*r != -1000);
         *r = op->retval == 0 ? 1 : 0;
         printf("Done sync r=%d\n", op->retval);
         delete op;
@@ -110,7 +111,7 @@ void can_complete(int *r)
 {
     // Allow the operation to proceed so the test verifies
     // that it doesn't complete earlier than expected
-    *r = -2;
+    *r = -1001;
 }
 
 void check_completed(int *r)
@@ -723,6 +724,67 @@ void test_msgr_decrypt_chain()
 }
 #endif
 
+void test_vault()
+{
+    json11::Json::object config;
+    config["vault_url"] = "http://vault";
+    timerfd_manager_t *tfd = new timerfd_manager_t([](int fd, bool wr, std::function<void(int, int)> callback){});
+    cluster_client_t *cli = new cluster_client_t(NULL, tfd, config);
+
+    configure_single_pg_pool(cli);
+    pretend_connected(cli, 1);
+    cli->st_cli.parse_state((etcd_kv_t){
+        .key = "/config/inode/1/1",
+        .value = json11::Json::object {
+            { "name", "testimg" },
+            { "size", (uint64_t)10*1024*1024*1024 },
+            { "enc_key", "vault:key1" },
+        },
+    });
+
+    // No key -> fetch successfully -> complete op
+
+    int *r1 = test_write(cli, 0, 4096, 0x55);
+    check_op_count(cli, 1, 0);
+
+    assert(cli->vault_key_load_queue == std::vector<std::string>{"vault:key1"});
+    cli->vault_key_load_queue.clear();
+
+    cli->vault_parse_secret("vault:key1", "", json11::Json::object{
+        {"data", json11::Json::object {
+            {"key", "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"}
+        }}
+    });
+
+    can_complete(r1);
+    check_op_count(cli, 1, 1);
+    pretend_op_completed(cli, find_op(cli, 1, OSD_OP_WRITE, 0, 4096), 0);
+    check_completed(r1);
+
+    // No key -> error -> EPERM
+
+    cli->vault_keys.clear();
+    cli->inode_cache.clear();
+    cli->inode_cache_children.clear();
+
+    r1 = test_write(cli, 0, 4096, 0x55);
+    check_op_count(cli, 1, 0);
+
+    assert(cli->vault_key_load_queue == std::vector<std::string>{"vault:key1"});
+    cli->vault_key_load_queue.clear();
+
+    can_complete(r1);
+    cli->vault_parse_secret("vault:key1", "HTTP 403 Forbidden", json11::Json());
+    check_op_count(cli, 1, 0);
+    assert(*r1 == -EPERM);
+    delete r1;
+
+    // Free client
+    delete cli;
+    delete tfd;
+    printf("[ok] basic vault key fetch test\n");
+}
+
 int main(int narg, char *args[])
 {
     test1();
@@ -733,5 +795,6 @@ int main(int narg, char *args[])
     test_msgr_encrypt();
     test_msgr_decrypt_chain();
 #endif
+    test_vault();
     return 0;
 }