phrocker commented on a change in pull request #489: MINIFICPP-740: Add ability to run NiFi processors from Java and Python URL: https://github.com/apache/nifi-minifi-cpp/pull/489#discussion_r260432003
########## File path: libminifi/include/core/VariableRegistry.h ########## @@ -0,0 +1,105 @@ +/** + * + * 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. + */ +#ifndef LIBMINIFI_INCLUDE_CORE_VARIABLEREGISTRY_H_ +#define LIBMINIFI_INCLUDE_CORE_VARIABLEREGISTRY_H_ + +#include <map> +#include "properties/Configure.h" +#include "utils/StringUtils.h" +namespace org { +namespace apache { +namespace nifi { +namespace minifi { +namespace core { + +/** + * Defines a base variable registry for minifi agents. + */ +class VariableRegistry { + public: + explicit VariableRegistry(const std::shared_ptr<minifi::Configure> &configuration) + : configuration_(configuration) { + if (configuration_ != nullptr) { + loadVariableRegistry(); + } + } + + virtual ~VariableRegistry() { + + } + + bool getConfigurationProperty(const std::string &property, std::string &value) const { + auto prop = variable_registry_.find(property); + if (prop != variable_registry_.end()) { + value = prop->second; + return true; + } + return false; + } + + private: + + protected: + + void loadVariableRegistry() { + std::string registry_values; + + auto options = configuration_->getConfiguredKeys(); + std::string white_list_opt = "minifi.variable.registry.whitelist", white_list; + std::string black_list_opt = "minifi.variable.registry.blacklist", black_list; + + // only allow those in the white liset + if (configuration_->get(white_list_opt, white_list)) { + options = utils::StringUtils::split(white_list, ","); + } + + for (const auto &opt : options) { + if (opt.find("password") != std::string::npos) + options.erase(std::remove(options.begin(), options.end(), opt), options.end()); + } + + // even if a white list is configured, remove the black listed fields Review comment: The comment does this a disservice but white listed fields allow selection only, blacklisted fields allow removal of fields from registry. 2 options, either it's an error condition to have both or we just remove blacklisted fields i the white list is specified. that was my preference for COOP. ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: [email protected] With regards, Apache Git Services
