CB-6206 show secured properties for a secret configuration

dbeaver · Feb 14, 2025 · 746d895 · 746d895
1 parent 4cdfa5b
commit 746d895
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/WebServiceUtils.java b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/WebServiceUtils.java
@@ -380,7 +380,8 @@ public static Set<String> getApplicableDriversIds() {
     public static WebPropertyInfo[] getObjectFilteredProperties(
         @NotNull WebSession session,
         @NotNull DBPObject object,
-        @Nullable WebPropertyFilter filter
+        @Nullable WebPropertyFilter filter,
+        boolean showProtected
     ) {
         PropertyCollector propertyCollector = new PropertyCollector(object, true);
         propertyCollector.setLocale(session.getLocale());
@@ -391,6 +392,7 @@ public static WebPropertyInfo[] getObjectFilteredProperties(
                 continue;
             }
             WebPropertyInfo webProperty = new WebPropertyInfo(session, prop, propertyCollector);
+            webProperty.setShowProtected(showProtected);
             if (filter != null) {
                 if (!CommonUtils.isEmpty(filter.getFeatures()) && !webProperty.hasAnyFeature(filter.getFeatures())) {
                     continue;

diff --git a/...les/io.cloudbeaver.server/src/io/cloudbeaver/service/navigator/WebDatabaseObjectInfo.java b/...les/io.cloudbeaver.server/src/io/cloudbeaver/service/navigator/WebDatabaseObjectInfo.java
@@ -33,7 +33,6 @@
 import org.jkiss.dbeaver.model.struct.rdb.DBSTable;
 
 import java.util.ArrayList;
-import java.util.Collection;
 import java.util.List;
 
 
@@ -98,7 +97,7 @@ public WebPropertyInfo[] filterProperties(@Nullable WebPropertyFilter filter) {
             filter = new WebPropertyFilter();
             filter.setFeatures(List.of(DBConstants.PROP_FEATURE_NAME));
         }
-        return WebServiceUtils.getObjectFilteredProperties(session, object, filter);
+        return WebServiceUtils.getObjectFilteredProperties(session, object, filter, false);
     }
 
     private boolean isDataSourceEditable(@NotNull DBPDataSourceContainer container) {