#93 - add last usage time to key meta data

roman-modelist-dev · roman-modelist-dev · commit 50226197e82a · 2019-01-11T12:53:45.000Z
diff --git a/keychain_lib/include/keychain_lib/key_file_parser.hpp b/keychain_lib/include/keychain_lib/key_file_parser.hpp
@@ -8,6 +8,8 @@
 #include <fc_light/reflect/reflect.hpp>
 #include <fc_light/variant.hpp>
 
+#include <fc_light/time.hpp>
+
 namespace keychain_app {
 
 namespace keyfile_format
@@ -52,6 +54,8 @@ struct keyfile_t
   std::string keyname;
   std::string description;
   std::string keychain_version;
+  fc_light::time_point creation_time;
+  fc_light::time_point usage_time;
   struct keyinfo_t
   {
     bool encrypted;
@@ -69,7 +73,7 @@ FC_LIGHT_REFLECT_ENUM(keychain_app::keyfile_format::file_type, (TYPE_UNKNOWN)(TY
 FC_LIGHT_REFLECT_ENUM(keychain_app::keyfile_format::curve_etype, (unknown)(secp256k1))
 FC_LIGHT_REFLECT(keychain_app::keyfile_format::encrypted_data, (cipher_type)(iv)(enc_data))
 FC_LIGHT_REFLECT(keychain_app::keyfile_format::keyfile_t::keyinfo_t, (encrypted)(curve_type)(priv_key_data)(public_key))
-FC_LIGHT_REFLECT(keychain_app::keyfile_format::keyfile_t, (filetype)(keyname)(description)(keychain_version)(keyinfo))
+FC_LIGHT_REFLECT(keychain_app::keyfile_format::keyfile_t, (filetype)(keyname)(description)(keychain_version)(creation_time)(usage_time)(keyinfo))
 
 
 #endif //KEYCHAINAPP_KEY_FILE_PARSER_HPP
diff --git a/keychain_lib/include/keychain_lib/keychain_commands.hpp b/keychain_lib/include/keychain_lib/keychain_commands.hpp
@@ -469,6 +469,9 @@ struct keychain_command<command_te::sign_hex> : keychain_command_base
                                  "Unknown blockchain_type, blockchain = ${type}", ("type", params.blockchain_type));
     }
   
+    auto& keyfile = keyfiles[params.keyname];
+    keyfile.usage_time = fc_light::time_point::now();
+    keyfiles.update(std::move(keyfile));
     json_response response(to_hex(signature.data(), signature.size()).c_str(), id);
     fc_light::variant res(response);
     return fc_light::json::to_string(res);
@@ -539,7 +542,10 @@ struct keychain_command<command_te::sign_hash> : keychain_command_base
         break;
       }
     }
-
+  
+    auto& keyfile = keyfiles[params.keyname];
+    keyfile.usage_time = fc_light::time_point::now();
+    keyfiles.update(std::move(keyfile));
     json_response response(to_hex(signature.data(), signature.size()).c_str(), id);
     fc_light::variant res(response);
     return fc_light::json::to_string(res);
@@ -616,6 +622,7 @@ struct keychain_command<command_te::create>: keychain_command_base
       keyfile.keyinfo.public_key = pb_hex;
       keyfile.keyname = keyname;
       keyfile.description = params.description;
+      keyfile.creation_time = fc_light::time_point::now();
       keyfile.keychain_version = version_info::short_version();
       keyfile.filetype = keyfile_format::TYPE_KEY;
       keyfile.keyinfo.curve_type = params.curve;
@@ -624,7 +631,6 @@ struct keychain_command<command_te::create>: keychain_command_base
         FC_LIGHT_THROW_EXCEPTION(fc_light::internal_error_exception, "Keyname (filename) is empty");
 
       keyfiles.insert(std::move(keyfile));
-      keyfiles.flush_keyfile(params.keyname);
       json_response response(keyname, id);
       return fc_light::json::to_string(fc_light::variant(response));
     }
diff --git a/keychain_lib/include/keychain_lib/keyfile_singleton.hpp b/keychain_lib/include/keychain_lib/keyfile_singleton.hpp
@@ -24,6 +24,7 @@ class keyfile_singleton
   static keyfile_singleton& instance();
   keyfile_format::keyfile_t& operator[](const std::string& key);
   void insert(keyfile_format::keyfile_t&& keyfile_data); //NOTE: keyfile_t (fc_light::variant) is not support move semantic
+  void update(keyfile_format::keyfile_t&& keyfile_data);
   bool is_exist(const std::string& key) const;
   void flush_keyfile(const std::string& key) const;
   void flush_all() const;
diff --git a/keychain_lib/src/keyfile_singleton.cpp b/keychain_lib/src/keyfile_singleton.cpp
@@ -45,6 +45,15 @@ void keyfile_singleton::insert(keyfile_format::keyfile_t&& keyfile_data)
   flush_keyfile(keyfile_data.keyname);
 }
 
+void keyfile_singleton::update(keyfile_format::keyfile_t&& keyfile_data)
+{
+  auto it = m_keydata_map.find(keyfile_data.keyname);
+  if(it == m_keydata_map.end())
+    FC_LIGHT_THROW_EXCEPTION(fc_light::key_not_found_exception, "Keyfile with name \"${key_}\" not found", ("key_", keyfile_data.keyname));
+  it->second = keyfile_data;
+  flush_keyfile(keyfile_data.keyname);
+}
+
 bool keyfile_singleton::is_exist(const std::string& key) const
 {
   auto it = m_keydata_map.find(key);
