Generate key pair from hex string seed in bindings (hyperledger-iroha…

…#1043) Signed-off-by: Moonraker <[email protected]>
itorK · Mar 30, 2018 · a85ee73 · a85ee73
1 parent 977c205
commit a85ee73
Show file tree

Hide file tree

Showing 4 changed files with 63 additions and 1 deletion.
diff --git a/shared_model/bindings/model_crypto.cpp b/shared_model/bindings/model_crypto.cpp
@@ -26,8 +26,13 @@ namespace shared_model {
     }
 
     crypto::Keypair ModelCrypto::generateKeypair(const std::string &seed) {
+      auto byte_string = iroha::hexstringToBytestring(seed);
+      if (not byte_string.has_value())
+      {
+        throw std::runtime_error("invalid seed");
+      }
       return crypto::CryptoProviderEd25519Sha3::generateKeypair(
-          crypto::Seed(seed));
+          crypto::Seed(*byte_string));
     }
 
     crypto::Keypair ModelCrypto::convertFromExisting(

diff --git a/shared_model/bindings/model_crypto.hpp b/shared_model/bindings/model_crypto.hpp
@@ -37,6 +37,7 @@ namespace shared_model {
 
       /**
        * Generates new keypair (ed25519) based on user-provided seed
+       * the seed should be 32 byte hex-encoded string
        * @return generated keypair
        */
       crypto::Keypair generateKeypair(const std::string &seed);

diff --git a/test/module/shared_model/bindings/CMakeLists.txt b/test/module/shared_model/bindings/CMakeLists.txt
@@ -15,10 +15,19 @@
 addtest(model_query_builder_test
     model_query_builder_test.cpp
     )
+
 target_link_libraries(model_query_builder_test
     bindings
     )
 
+addtest(model_crypto_test
+    model_crypto_test.cpp
+    )
+
+target_link_libraries(model_crypto_test
+    bindings
+    )
+
 if (SWIG_PYTHON OR SWIG_JAVA)
   get_property(SWIG_BUILD_DIR GLOBAL PROPERTY SWIG_BUILD_DIR)
 endif()

diff --git a/test/module/shared_model/bindings/model_crypto_test.cpp b/test/module/shared_model/bindings/model_crypto_test.cpp
@@ -0,0 +1,47 @@
+/**
+ * Copyright Soramitsu Co., Ltd. 2018 All Rights Reserved.
+ * http://soramitsu.co.jp
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "bindings/model_crypto.hpp"
+
+#include <gtest/gtest.h>
+
+/**
+ * @given ModelCrypto module
+ * @when Receive 32 byte hex string
+ * @then assertion is not thrown on keypair generation
+ */
+TEST(ModelCryptoTest, GenerateKeypair) {
+  ASSERT_NO_THROW(shared_model::bindings::ModelCrypto().generateKeypair(
+      std::string(64, 'a')););
+  ASSERT_NO_THROW(shared_model::bindings::ModelCrypto().generateKeypair(
+      std::string(64, 'A')););
+}
+/**
+ * @given ModelCrypto module
+ * @when Receive invalid hex byte string
+ * @then assertion is thrown
+ */
+TEST(ModelCryptoTest, GenerateKeypairInvalidSeed) {
+  ASSERT_THROW(shared_model::bindings::ModelCrypto().generateKeypair(
+      std::string(64, 'g'));, std::runtime_error);
+  ASSERT_THROW(shared_model::bindings::ModelCrypto().generateKeypair(
+      std::string(63, 'a'));, std::runtime_error);
+  ASSERT_THROW(shared_model::bindings::ModelCrypto().generateKeypair(
+      std::string(65, 'a'));, std::runtime_error);
+  ASSERT_THROW(shared_model::bindings::ModelCrypto().generateKeypair(
+      std::string(32, 'a'));, std::invalid_argument);
+}