check nodekey before start

Author: cleverfox

apps/tpnode/src/nodekey.erl

@@ -23,31 +23,36 @@ get_privs() ->
   end.
 
 get_priv() ->
-  {ok, K1}=application:get_env(tpnode, privkey),
-  case K1 of
-    <<_:32/binary>> -> K1;
-    <<_:48/binary>> -> K1;
-    <<_:64/binary>> -> K1;
-    _ -> 
-      Res=hex:parse(K1),
-      %32=size(Res),
-      application:set_env(tpnode, privkey, Res),
-      Res
+  case application:get_env(tpnode,privkey_dec) of
+    {ok, Bin} ->
+      Bin;
+    undefined ->
+      {ok, K1}=application:get_env(tpnode, privkey),
+      case K1 of
+        <<_:32/binary>> -> K1;
+        <<_:48/binary>> -> K1;
+        <<_:64/binary>> -> K1;
+        _ ->
+          Res=hex:parse(K1),
+          %32=size(Res),
+          application:set_env(tpnode, privkey_dec, Res),
+          Res
+      end
   end.
 
 get_pub() ->
   case application:get_env(tpnode, pubkey) of
     {ok, Bin} when is_binary(Bin) ->
       Bin;
-    _ -> 
+    _ ->
       Pub=tpecdsa:calc_pub(get_priv()),
       application:set_env(tpnode, pubkey, Pub),
       Pub
   end.
 
 node_id() ->
   case application:get_env(tpnode, nodeid) of
-    undefined -> 
+    undefined ->
       ID=node_id(get_pub()),
       application:set_env(tpnode, nodeid, ID),
       ID;
@@ -67,12 +72,12 @@ node_name(Default) ->
 node_name() ->
   try
     case application:get_env(tpnode, nodename) of
-      undefined -> 
+      undefined ->
         case chainsettings:is_our_node(get_pub()) of
           Name when is_binary(Name) ->
             application:set_env(tpnode, nodename, Name),
             Name;
-          _ -> 
+          _ ->
             node_id()
         end;
       {ok, Name} -> Name

apps/tpnode/src/tpnode.erl

@@ -33,7 +33,8 @@ reload() ->
                       application:set_env(tpnode, K, V)
               end, Config),
             logger_reconfig(),
-            application:unset_env(tpnode, pubkey);
+            application:unset_env(tpnode, pubkey),
+            application:unset_env(tpnode,privkey_dec);
         {error, Any} ->
             {error, Any}
     end.

apps/tpnode/src/tpnode_sup.erl

@@ -6,7 +6,7 @@
 -export([start_link/0]).
 
 %% Supervisor callbacks
--export([init/1]).
+-export([init/1, check_key/0]).
 
 %% Helper macro for declaring children of supervisor
 -define(CHILD(I, Type), {I, {I, start_link, []}, permanent, 5000, Type, [I]}).
@@ -22,6 +22,28 @@ start_link() ->
 %% Supervisor callbacks
 %% ===================================================================
 
+check_key() ->
+  try
+    Priv=nodekey:get_priv(),
+    case tpecdsa:keytype(Priv) of
+      {priv, ed25519} -> ok;
+      {priv, Type} ->
+        throw({keytype_not_supported,Type})
+    end,
+    Public=nodekey:get_pub(),
+    logger:notice("Starting up, pubkey is ~s",[hex:encode(Public)]),
+    ok
+  catch
+    error:{badmatch,undefined} ->
+      {error,"privkey does not specified"};
+    throw:Reason ->
+      {error,Reason};
+    Ec:Ee ->
+      logger:notice("Node key error ~p:~p",[Ec,Ee]),
+      {error,"privkey broken"}
+  end.
+
+
 init([repl_sup]) ->
   Sup={_SupFlags = {simple_one_for_one, 5, 10},
        [
@@ -32,6 +54,13 @@ init([repl_sup]) ->
 
 init([]) ->
     tpnode:reload(),
+
+    case check_key() of
+      ok -> ok;
+      {error, Reason} ->
+        throw(Reason)
+    end,
+
     MandatoryServices = [ api ],
     VMHost=case application:get_env(tpnode,vmaddr,undefined) of
              XHost when is_list(XHost) ->