dbgate-api-premium 7.1.0 → 7.1.2

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "dbgate-api-premium",
   "main": "src/index.js",
-  "version": "7.1.0",
+  "version": "7.1.2",
   "homepage": "https://www.dbgate.io/",
   "repository": {
     "type": "git",
@@ -30,11 +30,11 @@
     "compare-versions": "^3.6.0",
     "cors": "^2.8.5",
     "cross-env": "^6.0.3",
-    "dbgate-datalib": "^7.1.0",
-    "dbgate-query-splitter": "^4.11.9",
-    "dbgate-rest": "^7.1.0",
-    "dbgate-sqltree": "^7.1.0",
-    "dbgate-tools": "^7.1.0",
+    "dbgate-datalib": "^7.1.2",
+    "dbgate-query-splitter": "^4.12.0",
+    "dbgate-rest": "^7.1.2",
+    "dbgate-sqltree": "^7.1.2",
+    "dbgate-tools": "^7.1.2",
     "debug": "^4.3.4",
     "diff": "^5.0.0",
     "diff2html": "^3.4.13",
@@ -88,7 +88,7 @@
   "devDependencies": {
     "@types/fs-extra": "^9.0.11",
     "@types/lodash": "^4.14.149",
-    "dbgate-types": "^7.1.0",
+    "dbgate-types": "^7.1.2",
     "env-cmd": "^10.1.0",
     "jsdoc-to-markdown": "^9.0.5",
     "node-loader": "^1.0.2",

package/src/auth/storageAuthProvider.js

@@ -14,6 +14,7 @@ const {
   loadSuperadminPermissions,
   readComplexUserRolePermissions,
   readComplexRolePermissions,
+  resolvePermissionConnectionIds,
   storageCheckRoleConnectionAccess,
   storageCheckUserRoleConnectionAccess,
 } = require('../controllers/storageDb');
@@ -61,12 +62,12 @@ class SuperadminAuthProvider extends AuthProviderBase {
 
   async getCurrentDatabasePermissions(req) {
     const databasePermissions = await readComplexRolePermissions(-3, 'role_databases');
-    return databasePermissions;
+    return resolvePermissionConnectionIds(databasePermissions);
   }
 
   async getCurrentTablePermissions(req) {
     const tablePermissions = await readComplexRolePermissions(-3, 'role_tables');
-    return tablePermissions;
+    return resolvePermissionConnectionIds(tablePermissions);
   }
 
   async getCurrentFilePermissions(req) {
@@ -104,13 +105,13 @@ class StorageProviderBase extends AuthProviderBase {
   async getCurrentDatabasePermissions(req) {
     const userId = this.getUserIdFromRequest(req);
     const databasePermissions = await readComplexUserRolePermissions(userId, 'user_databases', 'role_databases');
-    return databasePermissions;
+    return resolvePermissionConnectionIds(databasePermissions);
   }
 
   async getCurrentTablePermissions(req) {
     const userId = this.getUserIdFromRequest(req);
     const tablePermissions = await readComplexUserRolePermissions(userId, 'user_tables', 'role_tables');
-    return tablePermissions;
+    return resolvePermissionConnectionIds(tablePermissions);
   }
 
   async getCurrentFilePermissions(req) {
@@ -172,12 +173,12 @@ class AnonymousProvider extends StorageProviderBase {
 
   async getCurrentDatabasePermissions(req) {
     const databasePermissions = await readComplexRolePermissions(-1, 'role_databases');
-    return databasePermissions;
+    return resolvePermissionConnectionIds(databasePermissions);
   }
 
   async getCurrentTablePermissions(req) {
     const tablePermissions = await readComplexRolePermissions(-1, 'role_tables');
-    return tablePermissions;
+    return resolvePermissionConnectionIds(tablePermissions);
   }
 
   async getCurrentFilePermissions(req) {

package/src/controllers/connections.js

@@ -502,6 +502,9 @@ module.exports = {
         _id: '__model',
       };
     }
+    if (!conid) {
+      return null;
+    }
     await testConnectionPermission(conid, req);
     return this.getCore({ conid, mask: true });
   },

package/src/controllers/databaseConnections.js

@@ -15,6 +15,7 @@ const {
   getLogger,
   extractErrorLogData,
   filterStructureBySchema,
+  serializeJsTypesForJsonStringify,
 } = require('dbgate-tools');
 const { html, parse } = require('diff2html');
 const { handleProcessCommunication } = require('../utility/processComm');
@@ -224,12 +225,13 @@ module.exports = {
       this.close(conid, database, false);
     });
 
-    subprocess.send({
+    const connectMessage = serializeJsTypesForJsonStringify({
       msgtype: 'connect',
       connection: { ...connection, database },
       structure: lastClosed ? lastClosed.structure : null,
       globalSettings: await config.getSettings(),
     });
+    subprocess.send(connectMessage);
     return newOpened;
   },
 
@@ -239,7 +241,8 @@ module.exports = {
     const promise = new Promise((resolve, reject) => {
       this.requests[msgid] = [resolve, reject, additionalData];
       try {
-        conn.subprocess.send({ msgid, ...message });
+        const serializedMessage = serializeJsTypesForJsonStringify({ msgid, ...message });
+        conn.subprocess.send(serializedMessage);
       } catch (err) {
         logger.error(extractErrorLogData(err), 'DBGM-00115 Error sending request do process');
         this.close(conn.conid, conn.database);
@@ -473,6 +476,7 @@ module.exports = {
 
     const databasePermissions = await loadDatabasePermissionsFromRequest(req);
     const tablePermissions = await loadTablePermissionsFromRequest(req);
+    const databasePermissionRole = getDatabasePermissionRole(conid, database, databasePermissions);
     const fieldsAndRoles = [
       [changeSet.inserts, 'create_update_delete'],
       [changeSet.deletes, 'create_update_delete'],
@@ -487,7 +491,7 @@ module.exports = {
           operation.schemaName,
           operation.pureName,
           tablePermissions,
-          databasePermissions
+          databasePermissionRole
         );
         if (getTablePermissionRoleLevelIndex(role) < getTablePermissionRoleLevelIndex(requiredRole)) {
           throw new Error('DBGM-00262 Permission not granted');

package/src/controllers/serverConnections.js

@@ -171,7 +171,7 @@ module.exports = {
       const databasePermissions = await loadDatabasePermissionsFromRequest(req);
       const res = [];
       for (const db of opened?.databases ?? []) {
-        const databasePermissionRole = getDatabasePermissionRole(db.id, db.name, databasePermissions);
+        const databasePermissionRole = getDatabasePermissionRole(conid, db.name, databasePermissions);
         if (databasePermissionRole != 'deny') {
           res.push({
             ...db,

package/src/controllers/storageDb.js

@@ -247,6 +247,24 @@ async function readComplexRolePermissions(roleId, rolePermissionsTable) {
   return rolePermissionsResp;
 }
 
+async function resolvePermissionConnectionIds(permissionRows) {
+  if (!permissionRows || permissionRows.length === 0) return permissionRows;
+
+  const connectionIds = Array.from(new Set(permissionRows.filter(r => r.connection_id).map(r => r.connection_id)));
+  if (connectionIds.length === 0) return permissionRows;
+
+  const conidMap = {};
+  const rows = await storageSelectFmt('select ~id, ~conid from ~connections where ~id in (%,v)', connectionIds);
+  for (const row of rows ?? []) {
+    conidMap[row.id] = row.conid;
+  }
+
+  return permissionRows.map(r => ({
+    ...r,
+    connection_conid: r.connection_id ? conidMap[r.connection_id] ?? null : null,
+  }));
+}
+
 async function loadSuperadminPermissions() {
   const rolePermissions = await storageReadRolePermissions(-3);
   return [...getPredefinedPermissions('superadmin'), ...rolePermissions];
@@ -496,10 +514,12 @@ function getStorageConnectionError() {
 async function selectStorageIdentity(tableName) {
   const [conn, driver] = await getStorageConnection();
 
+  const tableDefinition = storageModel.tables?.find(t => t.pureName === tableName);
+
   const resp = await runQueryOnDriver(conn, driver, dmp =>
     dmp.selectScopeIdentity(
       // @ts-ignore
-      { pureName: tableName }
+      tableDefinition || { pureName: tableName }
     )
   );
 
@@ -1098,6 +1118,7 @@ module.exports = {
   storageSaveDetailPermissionsDiff,
   readComplexUserRolePermissions,
   readComplexRolePermissions,
+  resolvePermissionConnectionIds,
   storageCheckRoleConnectionAccess,
   storageCheckUserRoleConnectionAccess,
   storageCreateTeamFile,

package/src/currentVersion.js

@@ -1,5 +1,5 @@
 
 module.exports = { 
-  version: '7.1.0',
-  buildTime: '2026-02-24T14:21:05.674Z'
+  version: '7.1.2',
+  buildTime: '2026-03-02T14:55:41.639Z'
 };

package/src/utility/hasPermission.js

@@ -96,8 +96,9 @@ async function loadFilePermissionsFromRequest(req) {
 }
 
 function matchDatabasePermissionRow(conid, database, permissionRow) {
-  if (permissionRow.connection_id) {
-    if (conid != permissionRow.connection_id) {
+  const connectionIdentifier = permissionRow.connection_conid ?? permissionRow.connection_id;
+  if (connectionIdentifier) {
+    if (conid != connectionIdentifier) {
       return false;
     }
   }