szaszm commented on a change in pull request #914: URL: https://github.com/apache/nifi-minifi-cpp/pull/914#discussion_r499687851
########## File path: libminifi/src/Decryptor.cpp ########## @@ -0,0 +1,54 @@ +/** + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You 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 "properties/Decryptor.h" + +#include "properties/Properties.h" +#include "utils/OptionalUtils.h" +#include "utils/StringUtils.h" + +namespace { + +#ifdef WIN32 +constexpr const char* DEFAULT_NIFI_BOOTSTRAP_FILE = "\\conf\\bootstrap.conf"; +#else +constexpr const char* DEFAULT_NIFI_BOOTSTRAP_FILE = "./conf/bootstrap.conf"; +#endif // WIN32 + +constexpr const char* CONFIG_ENCRYPTION_KEY_PROPERTY_NAME = "nifi.bootstrap.sensitive.key"; + +} // namespace + +namespace org { +namespace apache { +namespace nifi { +namespace minifi { + +utils::optional<minifi::Decryptor> Decryptor::create(const std::string& minifi_home) { + minifi::Properties bootstrap_conf; + bootstrap_conf.setHome(minifi_home); + bootstrap_conf.loadConfigureFile(DEFAULT_NIFI_BOOTSTRAP_FILE); + return bootstrap_conf.getString(CONFIG_ENCRYPTION_KEY_PROPERTY_NAME) + | utils::map([](const std::string& encryption_key_hex) { return utils::StringUtils::from_hex(encryption_key_hex); }) + | utils::map([](const std::string& encryption_key) { return utils::crypto::stringToBytes(encryption_key); }) Review comment: Sadly overloaded functions (like `from_hex`) and constructor calls (like `Decryptor`) are not [`Callable`](https://en.cppreference.com/w/cpp/named_req/Callable), but function pointers are, so this line can be simplified: ```suggestion | utils::map(&utils::crypto::stringToBytes) ``` ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
