From issues-return-102412-archive-asf-public=cust-asf.ponee.io@nifi.apache.org Tue Sep 1 12:42:57 2020 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mailroute1-lw-us.apache.org (mailroute1-lw-us.apache.org [207.244.88.153]) by mx-eu-01.ponee.io (Postfix) with ESMTPS id 56F4C180660 for ; Tue, 1 Sep 2020 14:42:57 +0200 (CEST) Received: from mail.apache.org (localhost [127.0.0.1]) by mailroute1-lw-us.apache.org (ASF Mail Server at mailroute1-lw-us.apache.org) with SMTP id 7E358127F08 for ; Tue, 1 Sep 2020 12:42:56 +0000 (UTC) Received: (qmail 71459 invoked by uid 500); 1 Sep 2020 12:42:56 -0000 Mailing-List: contact issues-help@nifi.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@nifi.apache.org Delivered-To: mailing list issues@nifi.apache.org Received: (qmail 71450 invoked by uid 99); 1 Sep 2020 12:42:56 -0000 Received: from ec2-52-202-80-70.compute-1.amazonaws.com (HELO gitbox.apache.org) (52.202.80.70) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 01 Sep 2020 12:42:56 +0000 From: =?utf-8?q?GitBox?= To: issues@nifi.apache.org Subject: =?utf-8?q?=5BGitHub=5D_=5Bnifi-minifi-cpp=5D_fgerlits_commented_on_a_change_?= =?utf-8?q?in_pull_request_=23886=3A_MINIFICPP-1323_Encrypt_sensitive_proper?= =?utf-8?q?ties?= Message-ID: <159896417620.32230.7044727519694461294.asfpy@gitbox.apache.org> Date: Tue, 01 Sep 2020 12:42:56 -0000 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit In-Reply-To: References: fgerlits commented on a change in pull request #886: URL: https://github.com/apache/nifi-minifi-cpp/pull/886#discussion_r481107749 ########## File path: encrypt-config/ConfigFile.cpp ########## @@ -0,0 +1,195 @@ +/** + * 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 "ConfigFile.h" + +#include + +#include "utils/StringUtils.h" + +namespace { +const std::array DEFAULT_SENSITIVE_PROPERTIES{"nifi.security.client.pass.phrase", + "nifi.rest.api.password"}; +const char* ADDITIONAL_SENSITIVE_PROPS_PROPERTY_NAME = "nifi.sensitive.props.additional.keys"; +} // namespace + +namespace org { +namespace apache { +namespace nifi { +namespace minifi { +namespace encrypt_config { + +ConfigLine::ConfigLine(std::string line) : line_(line) { + line = utils::StringUtils::trim(line); + if (line.empty() || line[0] == '#') { return; } + + size_t index_of_first_equals_sign = line.find('='); + if (index_of_first_equals_sign == std::string::npos) { return; } + + std::string key = utils::StringUtils::trim(line.substr(0, index_of_first_equals_sign)); + if (key.empty()) { return; } + + key_ = key; + value_ = utils::StringUtils::trim(line.substr(index_of_first_equals_sign + 1)); +} + +ConfigLine::ConfigLine(const std::string& key, const std::string& value) + : line_{key + "=" + value}, key_{key}, value_{value} { +} + +void ConfigLine::updateValue(const std::string& value) { + auto pos = line_.find('='); + if (pos != std::string::npos) { + line_.replace(pos + 1, std::string::npos, value); + value_ = value; + } else { + throw std::invalid_argument{"Cannot update value in config line: it does not contain an = sign!"}; + } +} + +ConfigFile::ConfigFile(const std::string& file_path) { + std::ifstream file{file_path}; + std::string line; + while (std::getline(file, line)) { + config_lines_.push_back(ConfigLine{line}); + } +} + +ConfigFile::Lines::const_iterator ConfigFile::findKey(const std::string& key) const { + return std::find_if(config_lines_.begin(), config_lines_.end(), [&key](const ConfigLine& config_line) { + return config_line.key_ == key; + }); +} + +ConfigFile::Lines::iterator ConfigFile::findKey(const std::string& key) { + return std::find_if(config_lines_.begin(), config_lines_.end(), [&key](const ConfigLine& config_line) { + return config_line.key_ == key; + }); +} + +utils::optional ConfigFile::getValue(const std::string& key) const { + auto it = findKey(key); + if (it != config_lines_.end()) { + return it->value_; + } else { + return utils::nullopt; + } +} + +void ConfigFile::update(const std::string& key, const std::string& value) { + const auto it = findKey(key); Review comment: Yeah, it's a const variable of non-const iterator type -- I find that confusing, too. :) I have removed the `const`. ---------------------------------------------------------------- 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: users@infra.apache.org