Merge branch 'master' into maint/vasil.pashov/include-what-you-use

man-group · Apr 18, 2024 · e917454 · e917454
2 parents e389647 + 2799e94
commit e917454
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 21 deletions.
diff --git a/cpp/CMakePresets.json b/cpp/CMakePresets.json
@@ -112,15 +112,6 @@
       "name": "linux-debug",
       "inherits": ["common_vcpkg", "linux"]
     },
-    {
-      "name": "linux-debug-clang",
-      "inherits": ["common_vcpkg", "linux"],
-      "cacheVariables": {
-        "CMAKE_C_COMPILER": "clang",
-        "CMAKE_CXX_COMPILER": "clang++",
-        "STATIC_LINK_STD_LIB": "OFF"
-      }
-    },
     {
       "name": "linux-conda-debug",
       "inherits":  ["common_conda", "linux"]
@@ -155,7 +146,6 @@
     {"name": "windows-cl-conda-debug",    "configurePreset": "windows-cl-conda-debug",    "targets": "arcticdb_ext" },
     {"name": "windows-cl-conda-release",  "configurePreset": "windows-cl-conda-release",  "targets": "arcticdb_ext" },
     {"name": "linux-debug",               "configurePreset": "linux-debug",               "targets": "arcticdb_ext" },
-    {"name": "linux-debug-clang",         "configurePreset": "linux-debug-clang",         "targets": "arcticdb_ext" },
     {"name": "linux-release",             "configurePreset": "linux-release",             "targets": "arcticdb_ext" },
     {"name": "linux-conda-debug",         "configurePreset": "linux-conda-debug",         "targets": "arcticdb_ext" },
     {"name": "linux-conda-release",       "configurePreset": "linux-conda-release",       "targets": "arcticdb_ext" },

diff --git a/cpp/arcticdb/storage/lmdb/lmdb_storage.cpp b/cpp/arcticdb/storage/lmdb/lmdb_storage.cpp
@@ -256,8 +256,11 @@ void LmdbStorage::do_iterate_type(KeyType key_type, const IterateTypeVisitor& vi
     }
 }
 
-bool LmdbStorage::do_is_path_valid(const std::string_view pathString) const {
+bool LmdbStorage::do_is_path_valid(const std::string_view pathString ARCTICDB_UNUSED) const {
 #ifdef _WIN32
+    // Note that \ and / are valid characters as they will create subdirectories which are expected to work.
+    // The filenames such as COM1, LPT1, AUX, CON etc. are reserved but not strictly disallowed by Windows as directory names.
+    // Therefore, paths with these names are allowed.
     std::string_view invalid_win32_chars = "<>:\"|?*";
     auto found = pathString.find_first_of(invalid_win32_chars);
     if (found != std::string::npos) {
@@ -267,8 +270,6 @@ bool LmdbStorage::do_is_path_valid(const std::string_view pathString) const {
     if (!pathString.empty() && (pathString.back() == '.' || std::isspace(pathString.back()))) {
         return false;
     }
-#else
-    (void) pathString; // suppress -Werror=unused-parameter
 #endif
     return true;
 }

diff --git a/cpp/arcticdb/util/name_validation.cpp b/cpp/arcticdb/util/name_validation.cpp
@@ -121,12 +121,11 @@ void verify_library_path_part(const std::string& library_part, char delim) {
 
 void verify_library_path_on_write(const Store* store, const StringId& library_path) {
     verify_name("library name", library_path, true, UNSUPPORTED_S3_CHARS);
-    if(!store->is_path_valid(library_path)) {
-        user_input::raise<ErrorCode::E_INVALID_CHAR_IN_NAME>(
-                "The library name contains unsupported chars. Library Name: {}",
-                library_path
-        );
-    }
+    user_input::check<ErrorCode::E_INVALID_CHAR_IN_NAME>(
+            store->is_path_valid(library_path),
+            "The library name contains unsupported chars. Library Name: {}",
+            library_path
+    );
 }
 
 }
diff --git a/python/arcticdb/adapters/azure_library_adapter.py b/python/arcticdb/adapters/azure_library_adapter.py
@@ -62,7 +62,8 @@ def __init__(self, uri: str, encoding_version: EncodingVersion, *args, **kwargs)
         super().__init__(uri, self._encoding_version)
 
     def __repr__(self):
-        return "azure(endpoint=%s, container=%s)" % (self._endpoint, self._container)
+        censored_endpoint = re.sub(r"AccountKey=.+?;", "AccountKey=...;", self._endpoint)
+        return "azure(endpoint=%s, container=%s)" % (censored_endpoint, self._container)
 
     @property
     def config_library(self):

diff --git a/python/tests/integration/arcticdb/test_arctic.py b/python/tests/integration/arcticdb/test_arctic.py
@@ -351,6 +351,12 @@ def test_delete_date_range(arctic_library):
     assert lib["symbol"].version == 1
 
 
+def test_azure_repr_body_censored(arctic_library):
+    ac_library_repr = repr(arctic_library)
+    if "AccountKey=" in ac_library_repr:
+        assert "AccountKey=..." in ac_library_repr.split(";")
+
+
 def _test_mongo_repr_body(mongo_storage: MongoDatabase):
     # The arctic_uri has the PrefixingLibraryAdapterDecorator logic in it, so use mongo_uri
     ac = Arctic(f"{mongo_storage.mongo_uri}/?maxPoolSize=10")

diff --git a/python/tests/integration/arcticdb/test_lmdb.py b/python/tests/integration/arcticdb/test_lmdb.py
@@ -103,7 +103,7 @@ def test_lmdb_malloc_trim(lmdb_storage):
     lib._nvs.trim()
 
 @pytest.mark.skipif(sys.platform != "win32", reason="Non Windows platforms have different file path name restrictions")
-@pytest.mark.parametrize("invalid_lib_name", ["lib?1", "lib:1", "lib|1", "lib.", "lib "])
+@pytest.mark.parametrize("invalid_lib_name", ["lib?1", "lib:1", "lib|1", "lib\"1", "lib.", "lib "])
 def test_invalid_lmdb_lib_name_windows(lmdb_storage, invalid_lib_name):
     ac = lmdb_storage.create_arctic()
     with pytest.raises(UserInputException) as e: