szaszm commented on code in PR #1792: URL: https://github.com/apache/nifi-minifi-cpp/pull/1792#discussion_r1670605385
########## libminifi/src/core/ParameterTokenParser.cpp: ########## @@ -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. + */ +#include "core/ParameterTokenParser.h" + +#include <stdexcept> +#include "utils/RegexUtils.h" + +namespace org::apache::nifi::minifi::core { + +void ParameterTokenParser::parse() { + minifi::utils::Regex expr("[-a-zA-Z0-9_\\. ]+"); + ParseState state = ParseState::OutsideToken; + uint32_t token_start = 0; + uint32_t hashmark_length = 0; + for (uint32_t i = 0; i < input_.size(); ++i) { + if (input_[i] == '#') { + if (state == ParseState::OutsideToken) { + state = ParseState::InHashMark; + } + if (state != ParseState::InToken) { + ++hashmark_length; + } + } else if (input_[i] == '{') { + if (state == ParseState::InHashMark) { + token_start = i - hashmark_length; + state = ParseState::InToken; + } + } else if (input_[i] == '}') { + if (state == ParseState::InToken) { + state = ParseState::OutsideToken; + gsl_Assert(hashmark_length > 0); + if (hashmark_length % 2 == 0) { + tokens_.push_back(std::make_unique<EscapedToken>(token_start, i - token_start + 1, input_.substr(token_start + (hashmark_length / 2), i - token_start + 1 - (hashmark_length / 2)))); + } else { + auto token_name = input_.substr(token_start + hashmark_length + 1, i - token_start - hashmark_length - 1); + if (token_name.empty() || !minifi::utils::regexMatch(token_name, expr)) { + throw ParameterException("Invalid token name: '" + token_name + "'. " + "Only alpha-numeric characters (a-z, A-Z, 0-9), hyphens ( - ), underscores ( _ ), periods ( . ), and spaces are allowed in token name."); + } + tokens_.push_back(std::make_unique<ReplaceableToken>(token_name, (hashmark_length - 1) / 2, token_start, i - token_start + 1)); + token_start = 0; + } + } else { + state = ParseState::OutsideToken; + } + hashmark_length = 0; + } else { + if (state != ParseState::InToken) { + state = ParseState::OutsideToken; + hashmark_length = 0; + } + } + } +} + +std::string ParameterTokenParser::replaceParameters(ParameterContext* parameter_context, bool is_sensitive) const { + if (tokens_.empty()) { + return input_; + } + std::string result; + uint32_t last_end = 0; + for (const auto& token : tokens_) { + result.append(input_.substr(last_end, token->getStart() - last_end)); + if (token->getType() == ParameterToken::ParameterTokenType::Escaped) { + result.append(token->getValue().value()); + last_end = token->getStart() + token->getSize(); + continue; + } + + if (!parameter_context) { + throw ParameterException("Property references a parameter in its value, but no parameter context was provided."); + } Review Comment: I'd consider moving the check outside and making the `parameter_context` parameter not nullable (reference). -- 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]
