bin/remote: Include update URLs in list-gpg-keys

diff --git a/src/ostree/ot-dump.c b/src/ostree/ot-dump.c
index 1c0f04a9dd33cea34d765b4bc043151f416a4f3a..6db6dc8f1402702646b1be146a7a9c22e6050647 100644 (file)
--- a/src/ostree/ot-dump.c
+++ b/src/ostree/ot-dump.c
@@ -488,6 +488,13 @@ ot_dump_gpg_key (GVariant  *key,
                uid,
                revoked ? " (revoked)" : "",
                invalid ? " (invalid)" : "");
+
+      const char *advanced_url = NULL;
+      const char *direct_url = NULL;
+      (void) g_variant_lookup (uid_v, "advanced_url", "m&s", &advanced_url);
+      (void) g_variant_lookup (uid_v, "direct_url", "m&s", &direct_url);
+      g_print ("  Advanced update URL: %s\n", advanced_url ?: "");
+      g_print ("  Direct update URL: %s\n", direct_url ?: "");
     }
 
   GVariant *subkey = NULL;

diff --git a/tests/test-remote-list-gpg-keys.sh b/tests/test-remote-list-gpg-keys.sh
index 5ad6c9f2e1a8e25c8828b2a1424f074946e67993..81699f14ec24db0191c8edec9c528692492b9c0f 100755 (executable)
--- a/tests/test-remote-list-gpg-keys.sh
+++ b/tests/test-remote-list-gpg-keys.sh
@@ -67,6 +67,8 @@ cat > expected <<"EOF"
 Key: 5E65DE75AB1C501862D476347FCA23D8472CDAFA
   Created: Tue Sep 10 02:29:42 2013
   UID: Ostree Tester <test@test.com>
+  Advanced update URL: https://openpgpkey.test.com/.well-known/openpgpkey/test.com/hu/iffe93qcsgp4c8ncbb378rxjo6cn9q6u?l=test
+  Direct update URL: https://test.com/.well-known/openpgpkey/hu/iffe93qcsgp4c8ncbb378rxjo6cn9q6u?l=test
   Subkey: CC47B2DFB520AEF231180725DF20F58B408DEA49
     Created: Tue Sep 10 02:29:42 2013
 EOF
@@ -89,16 +91,22 @@ cat > expected <<"EOF"
 Key: 5E65DE75AB1C501862D476347FCA23D8472CDAFA
   Created: Tue Sep 10 02:29:42 2013
   UID: Ostree Tester <test@test.com>
+  Advanced update URL: https://openpgpkey.test.com/.well-known/openpgpkey/test.com/hu/iffe93qcsgp4c8ncbb378rxjo6cn9q6u?l=test
+  Direct update URL: https://test.com/.well-known/openpgpkey/hu/iffe93qcsgp4c8ncbb378rxjo6cn9q6u?l=test
   Subkey: CC47B2DFB520AEF231180725DF20F58B408DEA49
     Created: Tue Sep 10 02:29:42 2013
 Key: 7B3B1020D74479687FDB2273D8228CFECA950D41
   Created: Tue Mar 17 14:00:32 2015
   UID: Ostree Tester II <test2@test.com>
+  Advanced update URL: https://openpgpkey.test.com/.well-known/openpgpkey/test.com/hu/nnxwsxno46ap6hw7fgphp68j76egpfa9?l=test2
+  Direct update URL: https://test.com/.well-known/openpgpkey/hu/nnxwsxno46ap6hw7fgphp68j76egpfa9?l=test2
   Subkey: 1EFA95C06EB1EB91754575E004B69C2560D53993
     Created: Tue Mar 17 14:00:32 2015
 Key: 7D29CF060B8269CDF63BFBDD0D15FAE7DF444D67
   Created: Tue Mar 17 14:01:05 2015
   UID: Ostree Tester III <test3@test.com>
+  Advanced update URL: https://openpgpkey.test.com/.well-known/openpgpkey/test.com/hu/8494gyqhmrcs6gn38tn6kgjexet117cj?l=test3
+  Direct update URL: https://test.com/.well-known/openpgpkey/hu/8494gyqhmrcs6gn38tn6kgjexet117cj?l=test3
   Subkey: 0E45E48CBF7B360C0E04443E0C601A7402416340
     Created: Tue Mar 17 14:01:05 2015
 EOF