dbgate-api 5.3.0 → 5.3.1

package/env/portal/.env

@@ -1,6 +1,6 @@
 DEVMODE=1
 
-CONNECTIONS=mysql,postgres,mongo,mongo2,mysqlssh,sqlite,relational
+CONNECTIONS=mysql,postgres,postgres1,mongo,mongo2,mysqlssh,sqlite,relational
 
 LABEL_mysql=MySql localhost
 SERVER_mysql=localhost
@@ -12,10 +12,18 @@ ENGINE_mysql=mysql@dbgate-plugin-mysql
 LABEL_postgres=Postgres localhost
 SERVER_postgres=localhost
 USER_postgres=postgres
-PASSWORD_postgres=test
-PORT_postgres=5433
+PASSWORD_postgres=Pwd2020Db
+PORT_postgres=5432
 ENGINE_postgres=postgres@dbgate-plugin-postgres
 
+LABEL_postgres1=Postgres localhost test DB
+SERVER_postgres1=localhost
+USER_postgres1=postgres
+PASSWORD_postgres1=Pwd2020Db
+PORT_postgres1=5432
+ENGINE_postgres1=postgres@dbgate-plugin-postgres
+DATABASE_postgres1=test
+
 LABEL_mongo=Mongo URL
 URL_mongo=mongodb://localhost:27017
 ENGINE_mongo=mongo@dbgate-plugin-mongo

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "dbgate-api",
   "main": "src/index.js",
-  "version": "5.3.0",
+  "version": "5.3.1",
   "homepage": "https://dbgate.org/",
   "repository": {
     "type": "git",
@@ -26,10 +26,10 @@
     "compare-versions": "^3.6.0",
     "cors": "^2.8.5",
     "cross-env": "^6.0.3",
-    "dbgate-datalib": "^5.3.0",
+    "dbgate-datalib": "^5.3.1",
     "dbgate-query-splitter": "^4.10.1",
-    "dbgate-sqltree": "^5.3.0",
-    "dbgate-tools": "^5.3.0",
+    "dbgate-sqltree": "^5.3.1",
+    "dbgate-tools": "^5.3.1",
     "debug": "^4.3.4",
     "diff": "^5.0.0",
     "diff2html": "^3.4.13",
@@ -73,7 +73,7 @@
   "devDependencies": {
     "@types/fs-extra": "^9.0.11",
     "@types/lodash": "^4.14.149",
-    "dbgate-types": "^5.3.0",
+    "dbgate-types": "^5.3.1",
     "env-cmd": "^10.1.0",
     "node-loader": "^1.0.2",
     "nodemon": "^2.0.2",

package/src/controllers/sessions.js

@@ -149,7 +149,7 @@ module.exports = {
     const { sesid } = await this.create({ conid, database });
     const session = this.opened.find(x => x.sesid == sesid);
     session.killOnDone = true;
-    const jslid = uuidv1();
+    const jslid = crypto.randomUUID();
     session.loadingReader_jslid = jslid;
     const fileName = queryName && appFolder ? path.join(appdir(), appFolder, `${queryName}.query.sql`) : null;
 
@@ -169,7 +169,7 @@ module.exports = {
 
   startProfiler_meta: true,
   async startProfiler({ sesid }) {
-    const jslid = uuidv1();
+    const jslid = crypto.randomUUID();
     const session = this.opened.find(x => x.sesid == sesid);
     if (!session) {
       throw new Error('Invalid session');

package/src/controllers/uploads.js

@@ -12,6 +12,7 @@ const _ = require('lodash');
 const serverConnections = require('./serverConnections');
 const config = require('./config');
 const gistSecret = require('../gistSecret');
+const currentVersion = require('../currentVersion');
 
 module.exports = {
   upload_meta: {
@@ -59,7 +60,7 @@ module.exports = {
       const response = await axios.default.post(
         'https://api.github.com/gists',
         {
-          description: 'DbGate error report',
+          description: `DbGate ${currentVersion.version} error report`,
           public: false,
           files: {
             'logs.jsonl': {
@@ -93,6 +94,9 @@ module.exports = {
             'connections.json': {
               content: JSON.stringify(connections, null, 2),
             },
+            'version.json': {
+              content: JSON.stringify(currentVersion, null, 2),
+            },
           },
         },
         {

package/src/currentVersion.js

@@ -1,5 +1,5 @@
 
 module.exports = { 
-  version: '5.3.0',
-  buildTime: '2024-06-07T08:19:32.117Z'
+  version: '5.3.1',
+  buildTime: '2024-06-21T07:36:24.602Z'
 };

package/src/utility/JsonLinesDatastore.js

@@ -210,7 +210,7 @@ class JsonLinesDatastore {
   async getRows(offset, limit, filter, sort) {
     const res = [];
     if (sort && !this.sortedFiles[stableStringify(sort)]) {
-      const jslid = uuidv1();
+      const jslid = crypto.randomUUID();
       const sortedFile = path.join(jsldir(), `${jslid}.jsonl`);
       await JsonLinesDatastore.sortFile(this.file, sortedFile, sort);
       this.sortedFiles[stableStringify(sort)] = sortedFile;

package/src/utility/hasPermission.js

@@ -9,7 +9,8 @@ function hasPermission(tested, req) {
     return true;
   }
   const { user } = (req && req.auth) || {};
-  const key = user || '';
+  const { login } = (process.env.OAUTH_PERMISSIONS && req && req.user) || {};
+  const key = user || login || '';
   const logins = getLogins();
 
   if (!userPermissions[key]) {
@@ -39,7 +40,7 @@ function getLogins() {
       permissions: process.env.PERMISSIONS,
     });
   }
-  if (process.env.LOGINS || process.env.OAUTH_PERMISSIONS) {
+  if (process.env.LOGINS) {
     const logins = _.compact(process.env.LOGINS.split(',').map(x => x.trim()));
     for (const login of logins) {
       const password = process.env[`LOGIN_PASSWORD_${login}`];
@@ -51,13 +52,14 @@ function getLogins() {
           permissions,
         });
       }
-      if (process.env.OAUTH_PERMISSIONS) {
-        res.push({
-          login,
-          password: null,
-          permissions,
-        })
-      }
+    }
+  }
+  else if (process.env.OAUTH_PERMISSIONS) {
+    const login_permission_keys = Object.keys(process.env).filter((key) => _.startsWith(key, 'LOGIN_PERMISSIONS_'))
+    for (const permissions_key of login_permission_keys) {
+      const login = permissions_key.replace('LOGIN_PERMISSIONS_', '');
+      const permissions = process.env[permissions_key];
+      userPermissions[login] = compilePermissions(permissions);
     }
   }