fgerlits commented on code in PR #1716: URL: https://github.com/apache/nifi-minifi-cpp/pull/1716#discussion_r1455414745
########## libminifi/src/core/json/JsonFlowSerializer.cpp: ########## @@ -0,0 +1,82 @@ +/** + * 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 "core/json/JsonFlowSerializer.h" + +#include "rapidjson/prettywriter.h" +#include "utils/crypto/property_encryption/PropertyEncryptionUtils.h" + +#ifdef WIN32 +#pragma push_macro("GetObject") +#undef GetObject // windows.h #defines GetObject = GetObjectA or GetObjectW, which conflicts with rapidjson +#endif + +namespace org::apache::nifi::minifi::core::json { + +void JsonFlowSerializer::encryptSensitiveProperties(rapidjson::Value &property_jsons, rapidjson::Document::AllocatorType &alloc, + const std::map<std::string, Property> &properties, const utils::crypto::EncryptionProvider &encryption_provider) const { + for (auto &property : property_jsons.GetObject()) { + std::string name{property.name.GetString()}; Review Comment: fixed in 52814c6cc538df8715d22ea213f6f5a355fc0118 ########## libminifi/src/core/json/JsonFlowSerializer.cpp: ########## @@ -0,0 +1,82 @@ +/** + * 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 "core/json/JsonFlowSerializer.h" + +#include "rapidjson/prettywriter.h" +#include "utils/crypto/property_encryption/PropertyEncryptionUtils.h" + +#ifdef WIN32 +#pragma push_macro("GetObject") +#undef GetObject // windows.h #defines GetObject = GetObjectA or GetObjectW, which conflicts with rapidjson +#endif + +namespace org::apache::nifi::minifi::core::json { + +void JsonFlowSerializer::encryptSensitiveProperties(rapidjson::Value &property_jsons, rapidjson::Document::AllocatorType &alloc, + const std::map<std::string, Property> &properties, const utils::crypto::EncryptionProvider &encryption_provider) const { + for (auto &property : property_jsons.GetObject()) { + std::string name{property.name.GetString()}; + if (!properties.contains(name)) { + logger_->log_warn("Property {} found in flow definition does not exist!", name); + continue; + } + if (properties.at(name).isSensitive()) { + auto &value = property.value; + std::string encrypted_value = utils::crypto::property_encryption::encrypt(value.GetString(), encryption_provider); Review Comment: fixed in 52814c6cc538df8715d22ea213f6f5a355fc0118 -- 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. To unsubscribe, e-mail: [email protected] For queries about this service, please contact Infrastructure at: [email protected]
