Merge pull request #42641 from Enmk/fix_profile_names_mismatch

Fixed exception when user tries to log in

src/Access/SettingsProfilesCache.cpp

@@ -139,8 +139,10 @@ void SettingsProfilesCache::mergeSettingsAndConstraintsFor(EnabledSettings & ena
     merged_settings.merge(enabled.params.settings_from_user);
 
     auto info = std::make_shared<SettingsProfilesInfo>(access_control);
-    info->profiles = enabled.params.settings_from_user.toProfileIDs();
+
+    info->profiles = merged_settings.toProfileIDs();
     substituteProfiles(merged_settings, info->profiles_with_implicit, info->names_of_profiles);
+
     info->settings = merged_settings.toSettingsChanges();
     info->constraints = merged_settings.toSettingsConstraints(access_control);
 

src/Access/SettingsProfilesInfo.cpp

@@ -1,11 +1,18 @@
 #include <Access/SettingsProfilesInfo.h>
+#include <Access/AccessControl.h>
 #include <Access/SettingsConstraintsAndProfileIDs.h>
 #include <base/removeDuplicates.h>
+#include <Common/Exception.h>
 
 
 namespace DB
 {
 
+namespace ErrorCodes
+{
+    extern const int LOGICAL_ERROR;
+}
+
 bool operator==(const SettingsProfilesInfo & lhs, const SettingsProfilesInfo & rhs)
 {
     if (lhs.settings != rhs.settings)
@@ -55,4 +62,26 @@ SettingsProfilesInfo::getConstraintsAndProfileIDs(const std::shared_ptr<const Se
     return res;
 }
 
+Strings SettingsProfilesInfo::getProfileNames() const
+{
+    Strings result;
+    result.reserve(profiles.size());
+    for (const auto & profile_id : profiles)
+    {
+        const auto p = names_of_profiles.find(profile_id);
+        if (p != names_of_profiles.end())
+            result.push_back(p->second);
+        else
+        {
+            if (const auto name = access_control.tryReadName(profile_id))
+                // We could've updated cache here, but it is a very rare case, so don't bother.
+                result.push_back(*name);
+            else
+                throw Exception(ErrorCodes::LOGICAL_ERROR, "Unable to get profile name for {}", toString(profile_id));
+        }
+    }
+
+    return result;
+}
+
 }

src/Access/SettingsProfilesInfo.h

@@ -36,15 +36,7 @@ struct SettingsProfilesInfo
     friend bool operator ==(const SettingsProfilesInfo & lhs, const SettingsProfilesInfo & rhs);
     friend bool operator !=(const SettingsProfilesInfo & lhs, const SettingsProfilesInfo & rhs) { return !(lhs == rhs); }
 
-    Strings getProfileNames() const
-    {
-        Strings result;
-        result.reserve(profiles.size());
-        for (const auto & profile_id : profiles)
-            result.push_back(names_of_profiles.at(profile_id));
-
-        return result;
-    }
+    Strings getProfileNames() const;
 
 private:
     const AccessControl & access_control;

tests/integration/test_settings_profile/test.py

@@ -550,7 +550,7 @@ def test_function_current_profiles():
             user="robin",
             params={"session_id": session_id},
         )
-        == "['P1','P2']\t['P1','P2']\t['default','P3','P4','P5','P1','P2']\n"
+        == "['P1','P2']\t['default','P3','P5','P1','P2']\t['default','P3','P4','P5','P1','P2']\n"
     )
 
     instance.http_query(