Merge ceeb35d into 011e15d

ydb-platform · Feb 19, 2024 · 52a7ac1 · 52a7ac1
2 parents 011e15d + ceeb35d
commit 52a7ac1
Showing 1 changed file with 8 additions and 4 deletions.
diff --git a/ydb/core/mon/mon.cpp b/ydb/core/mon/mon.cpp
@@ -6,15 +6,19 @@
 namespace NActors {
 
 using namespace NMonitoring;
+using namespace NKikimr;
 
 namespace {
 
 const std::vector<NKikimr::TEvTicketParser::TEvAuthorizeTicket::TEntry>& GetEntries(const TString& ticket) {
     if (ticket.StartsWith("Bearer")) {
-        static std::vector<NKikimr::TEvTicketParser::TEvAuthorizeTicket::TEntry> entries = {
-            {NKikimr::TEvTicketParser::TEvAuthorizeTicket::ToPermissions({"ydb.developerApi.get", "ydb.developerApi.update"}), {{"gizmo_id", "gizmo"}}}
-        };
-        return entries;
+        if (AppData()->AuthConfig.GetUseAccessService()
+            && (AppData()->DomainsConfig.GetSecurityConfig().ViewerAllowedSIDsSize() > 0 || AppData()->DomainsConfig.GetSecurityConfig().MonitoringAllowedSIDsSize() > 0)) {
+            static std::vector<NKikimr::TEvTicketParser::TEvAuthorizeTicket::TEntry> entries = {
+                {NKikimr::TEvTicketParser::TEvAuthorizeTicket::ToPermissions({"ydb.developerApi.get", "ydb.developerApi.update"}), {{"gizmo_id", "gizmo"}}}
+            };
+            return entries;
+        }
     }
     static std::vector<NKikimr::TEvTicketParser::TEvAuthorizeTicket::TEntry> emptyEntries = {};
     return emptyEntries;