Implement JSON (de)serialization for PublicKey

haenoe · Apr 2, 2024 · 27a16f4 · 27a16f4
1 parent 5859930
commit 27a16f4
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 10 deletions.
diff --git a/src/libfetchers/fetchers.cc b/src/libfetchers/fetchers.cc
@@ -395,3 +395,22 @@ std::string publicKeys_to_string(const std::vector<PublicKey>& publicKeys)
 }
 
 }
+
+namespace nlohmann {
+
+nix::fetchers::PublicKey adl_serializer<nix::fetchers::PublicKey>::from_json(const json & json)
+{
+    auto & object = getObject(json);
+    auto & type = getString(optionalValueAt(object, "type").value_or("ssh-ed25519"));
+    auto & key = getString(valueAt(object, "key"));
+
+    return nix::fetchers::PublicKey { type, key };
+}
+
+void adl_serializer<nix::fetchers::PublicKey>::to_json(json & json, nix::fetchers::PublicKey t)
+{
+    json["type"] = t.type;
+    json["key"] = t.key;
+}
+
+}
diff --git a/src/libfetchers/fetchers.hh b/src/libfetchers/fetchers.hh
@@ -9,6 +9,7 @@
 
 #include <memory>
 #include <nlohmann/json_fwd.hpp>
+#include "json-impls.hh"
 
 namespace nix { class Store; class StorePath; struct InputAccessor; }
 
@@ -213,8 +214,8 @@ struct PublicKey
     std::string type = "ssh-ed25519";
     std::string key;
 };
-NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE_WITH_DEFAULT(PublicKey, type, key)
-
 std::string publicKeys_to_string(const std::vector<PublicKey>&);
 
 }
+
+JSON_IMPL(nix::fetchers::PublicKey)
diff --git a/src/libfetchers/git.cc b/src/libfetchers/git.cc
@@ -147,14 +147,9 @@ std::vector<PublicKey> getPublicKeys(const Attrs & attrs)
 {
     std::vector<PublicKey> publicKeys;
     if (attrs.contains("publicKeys")) {
-        nlohmann::json publicKeysJson = nlohmann::json::parse(getStrAttr(attrs, "publicKeys"));
-        auto pubKeys = getArray(publicKeysJson);
-        publicKeys.clear();
-        for (auto jsonKey : pubKeys) {
-            auto keyObj = getObject(jsonKey);
-            auto type = getString(getNullable(keyObj, "type").value_or("ssh-ed25519"));
-            auto key = getString(valueAt(keyObj, "key"));
-            publicKeys.push_back({ type, key });
+        nlohmann::json publicKeysJson = getArray(nlohmann::json::parse(getStrAttr(attrs, "publicKeys")));
+        for (auto & jsonKey : publicKeysJson) {
+            publicKeys.push_back(jsonKey);
         }
     }
     if (attrs.contains("publicKey"))