adamdebreceni commented on a change in pull request #1138: URL: https://github.com/apache/nifi-minifi-cpp/pull/1138#discussion_r705060665
########## File path: libminifi/test/unit/FilePatternTests.cpp ########## @@ -0,0 +1,253 @@ +/** + * 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. + */ + +#define CUSTOM_EXTENSION_INIT + +#include <filesystem> + +#include "../TestBase.h" +#include "utils/file/FilePattern.h" +#include "range/v3/view/transform.hpp" +#include "range/v3/view/map.hpp" +#include "range/v3/view/join.hpp" +#include "range/v3/view/cache1.hpp" +#include "range/v3/view/c_str.hpp" +#include "range/v3/range/conversion.hpp" +#include "range/v3/range.hpp" + +struct FilePatternTestAccessor { + using FilePatternSegment = fileutils::FilePattern::FilePatternSegment; +}; + +using FilePatternSegment = FilePatternTestAccessor::FilePatternSegment; +using FilePattern = fileutils::FilePattern; + +#define REQUIRE_INCLUDE(val) REQUIRE((val == FilePatternSegment::MatchResult::INCLUDE)) +#define REQUIRE_EXCLUDE(val) REQUIRE((val == FilePatternSegment::MatchResult::EXCLUDE)) +#define REQUIRE_NOT_MATCHING(val) REQUIRE((val == FilePatternSegment::MatchResult::NOT_MATCHING)) + +#ifdef WIN32 +static std::filesystem::path root{"C:\\"}; +#else +static std::filesystem::path root{"/"}; +#endif + +TEST_CASE("Invalid paths") { + REQUIRE_THROWS(FilePatternSegment("")); + REQUIRE_THROWS(FilePatternSegment(".")); + REQUIRE_THROWS(FilePatternSegment("..")); + REQUIRE_THROWS(FilePatternSegment("!")); + REQUIRE_THROWS(FilePatternSegment("!.")); + REQUIRE_THROWS(FilePatternSegment("!..")); + // parent accessor after wildcard + FilePatternSegment("./../file.txt"); // sanity check + REQUIRE_THROWS(FilePatternSegment("./*/../file.txt")); +} + +TEST_CASE("FilePattern reports error in correct subpattern") { + std::vector<std::pair<std::string, std::string>> invalid_subpattern{ Review comment: changed ########## File path: libminifi/src/core/extension/ExtensionManager.cpp ########## @@ -0,0 +1,136 @@ +/** + * 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/extension/ExtensionManager.h" +#include "core/logging/LoggerConfiguration.h" +#include "utils/file/FileUtils.h" +#include "core/extension/Executable.h" +#include "utils/file/FilePattern.h" +#include "core/extension/DynamicLibrary.h" + +namespace org { +namespace apache { +namespace nifi { +namespace minifi { +namespace core { +namespace extension { + +namespace { + +struct LibraryDescriptor { + std::string name; + std::filesystem::path dir; + std::string filename; + + bool verify(const std::shared_ptr<logging::Logger>& /*logger*/) const { + // TODO(adebreceni): check signature + return true; + } + + std::filesystem::path getFullPath() const { + return dir / filename; + } Review comment: added -- 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: issues-unsubscr...@nifi.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
