CB-5584. Rename parameter

dbeaver · Nov 11, 2024 · 0f32f18 · 0f32f18
1 parent b41e951
commit 0f32f18
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 56 deletions.
diff --git a/server/bundles/io.cloudbeaver.server/plugin.xml b/server/bundles/io.cloudbeaver.server/plugin.xml
@@ -77,7 +77,7 @@
 
     <extension point="org.jkiss.dbeaver.settings">
         <propertyGroup id="log" label="Logger">
-            <property id="log.debug" label="Show all variables in log"
+            <property id="log.api.graphql.debug" label="Show all variables in log"
                       type="boolean" scopes="global"
                       description="Show in logs all variables in graphql endpoints"/>
         </propertyGroup>

diff --git a/...er/bundles/io.cloudbeaver.server/src/io/cloudbeaver/server/graphql/GraphQLLoggerUtil.java b/...er/bundles/io.cloudbeaver.server/src/io/cloudbeaver/server/graphql/GraphQLLoggerUtil.java
@@ -27,25 +27,30 @@
 
 public class GraphQLLoggerUtil {
 
-    private static final Set<String> PROHIBITED_VARIABLES = GraphQLProhibitedVariables.getAllProhibitedVariables();
+    private static final Set<String> PROHIBITED_VARIABLES =
+        Set.of("password", "config", "parameters", "settings", "licenseText", "credentials", "username");
 
     public static String getUserId(HttpServletRequest request) {
         String userId = null;
-        WebSession session = (WebSession) CBApplication.getInstance().getSessionManager().getSession(request.getSession().getId());
-        if (session != null) {
-            userId = session.getUserContext().getUserId();
-            if (userId == null && session.getUserContext().isAuthorizedInSecurityManager()) {
-                userId = "anonymous";
+        if (request.getSession() != null) {
+            WebSession session =
+                (WebSession) CBApplication.getInstance().getSessionManager().getSession(request.getSession().getId());
+            if (session != null) {
+                userId = session.getUserContext().getUserId();
+                if (userId == null && session.getUserContext().isAuthorizedInSecurityManager()) {
+                    userId = "anonymous";
+                }
             }
         }
         return userId;
+
     }
 
     public static String buildLoggerMessage(String sessionId, String userId, Map<String, Object> variables) {
         StringBuilder loggerMessage = new StringBuilder(" [user: ").append(userId)
             .append(", sessionId: ").append(sessionId).append("]");
 
-        if (CBPlatform.getInstance().getPreferenceStore().getBoolean("log.debug") && variables != null) {
+        if (CBPlatform.getInstance().getPreferenceStore().getBoolean("log.api.graphql.debug") && variables != null) {
             loggerMessage.append(" [variables] ");
             String parsedVariables = parseVarialbes(variables);
             if (CommonUtils.isNotEmpty(parsedVariables)) {

diff --git a/...s/io.cloudbeaver.server/src/io/cloudbeaver/server/graphql/GraphQLProhibitedVariables.java b/...s/io.cloudbeaver.server/src/io/cloudbeaver/server/graphql/GraphQLProhibitedVariables.java