dbgate-api-premium 6.1.4 → 6.1.5

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "dbgate-api-premium",
   "main": "src/index.js",
-  "version": "6.1.4",
+  "version": "6.1.5",
   "homepage": "https://dbgate.org/",
   "repository": {
     "type": "git",
@@ -29,10 +29,10 @@
     "compare-versions": "^3.6.0",
     "cors": "^2.8.5",
     "cross-env": "^6.0.3",
-    "dbgate-datalib": "^6.1.4",
+    "dbgate-datalib": "^6.1.5",
     "dbgate-query-splitter": "^4.11.3",
-    "dbgate-sqltree": "^6.1.4",
-    "dbgate-tools": "^6.1.4",
+    "dbgate-sqltree": "^6.1.5",
+    "dbgate-tools": "^6.1.5",
     "debug": "^4.3.4",
     "diff": "^5.0.0",
     "diff2html": "^3.4.13",
@@ -81,7 +81,7 @@
   "devDependencies": {
     "@types/fs-extra": "^9.0.11",
     "@types/lodash": "^4.14.149",
-    "dbgate-types": "^6.1.4",
+    "dbgate-types": "^6.1.5",
     "env-cmd": "^10.1.0",
     "jsdoc-to-markdown": "^9.0.5",
     "node-loader": "^1.0.2",

package/src/auth/authProvider.js

@@ -218,7 +218,7 @@ class LoginsProvider extends AuthProviderBase {
       };
     }
 
-    if (password == process.env[`LOGIN_PASSWORD_${login}`]) {
+    if (password && password == process.env[`LOGIN_PASSWORD_${login}`]) {
       return {
         accessToken: jwt.sign(
           {

package/src/auth/storageAuthProvider.js

@@ -3,12 +3,14 @@ const {
   getPredefinedPermissions,
   getLogger,
   getConnectionLabel,
+  runQueryFmt,
 } = require('dbgate-tools');
 const {
   storageSelectFmt,
   storageReadUserRolePermissions,
   storageReadUserPermissions,
   storageReadRolePermissions,
+  storageSqlCommandFmt,
 } = require('../controllers/storageDb');
 const { getTokenSecret, getTokenLifetime } = require('./authCommon');
 const { AuthProviderBase } = require('./authProvider');
@@ -143,10 +145,13 @@ class OauthProvider extends StorageProviderBase {
     const loginRows = await storageSelectFmt('select * from ~users where ~login = %v', login);
     const permissions = await loadPermissionsForUserId(loginRows[0]?.id ?? -1);
 
-    if (this.config.oauthOnlyDefinedLogins == 1) {
-      if (loginRows.length == 0) {
-        return { error: `Username ${login} not allowed to log in` };
-      }
+    if (this.config.oauthOnlyDefinedLogins == 1 && loginRows.length == 0) {
+      return { error: `Username ${login} not allowed to log in` };
+    }
+
+    if (this.config.oauthSaveNotDefinedLogins == 1 && loginRows.length == 0) {
+      const email = payload[this.config.oauthEmailField || 'email'] ?? null;
+      await storageSqlCommandFmt('insert into ~users (~login, ~email) values (%v, %v)', login, email);
     }
 
     let groups =

package/src/controllers/storage.js

@@ -17,7 +17,7 @@ const { hasPermission } = require('../utility/hasPermission');
 const { changeSetToSql, removeSchemaFromChangeSet } = require('dbgate-datalib');
 const storageModel = require('../storageModel');
 const { dumpSqlCommand } = require('dbgate-sqltree');
-const { runCommandOnDriver, getLogger } = require('dbgate-tools');
+const { runCommandOnDriver, getLogger, runQueryFmt } = require('dbgate-tools');
 const socket = require('../utility/socket');
 const { obtainRefreshedLicense } = require('../utility/authProxy');
 const { datadir } = require('../utility/directories');
@@ -31,11 +31,6 @@ function mapConnection(connnection) {
   };
 }
 
-async function runQueryFmt(driver, conn, query, ...args) {
-  const dmp = driver.createDumper();
-  dmp.put(query, ...args);
-  await driver.query(conn, dmp.s);
-}
 
 let refreshLicenseStarted = false;
 
@@ -140,7 +135,7 @@ module.exports = {
         displayName: 'Internal storage',
         defaultDatabase: process.env.STORAGE_DATABASE,
         singleDatabase: true,
-        ...getDbConnectionParams(),
+        ...await getDbConnectionParams(),
       };
     }
 

package/src/controllers/storageDb.js

@@ -4,8 +4,9 @@ const dbgateApi = require('../shell');
 const { getPredefinedPermissions, getLogger, extractErrorLogData } = require('dbgate-tools');
 const _ = require('lodash');
 const logger = getLogger('storageDb');
+const { extractConnectionSslParams } = require('../utility/connectUtility');
 
-function getDbConnectionParams() {
+async function getDbConnectionParams() {
   const server = process.env.STORAGE_SERVER;
   const port = process.env.STORAGE_PORT;
   const user = process.env.STORAGE_USER;
@@ -13,6 +14,18 @@ function getDbConnectionParams() {
   const database = process.env.STORAGE_DATABASE;
   const engine = process.env.STORAGE_ENGINE;
   const serviceName = process.env.STORAGE_SERVICE_NAME;
+  const socketPath = process.env.STORAGE_SOCKET_PATH;
+  const databaseUrl = process.env.STORAGE_DATABASE_URL;
+  const useDatabaseUrl = !!process.env.STORAGE_DATABASE_URL;
+  const authType = process.env.STORAGE_AUTH_TYPE;
+
+  const useSsl = process.env.STORAGE_USE_SSL;
+  const sslCaFile = process.env.STORAGE_SSL_CA_FILE;
+  const sslCertFile = process.env.STORAGE_SSL_CERT_FILE;
+  const sslCertFilePassword = process.env.STORAGE_SSL_CERT_FILE_PASSWORD;
+  const sslKeyFile = process.env.STORAGE_SSL_KEY_FILE;
+  const sslRejectUnauthorized = process.env.STORAGE_SSL_REJECT_UNAUTHORIZED;
+  const trustServerCertificate = process.env.STORAGE_SSL_TRUST_CERTIFICATE;
 
   if (!server || !user || !password || !database || !engine) {
     if (database) {
@@ -35,7 +48,30 @@ function getDbConnectionParams() {
     return null;
   }
 
-  return { server, port, user, password, database, engine, serviceName };
+  const res = {
+    server,
+    port,
+    user,
+    password,
+    database,
+    engine,
+    serviceName,
+    socketPath,
+    databaseUrl,
+    useDatabaseUrl,
+    authType,
+    useSsl,
+    sslCaFile,
+    sslCertFile,
+    sslCertFilePassword,
+    sslKeyFile,
+    sslRejectUnauthorized,
+    trustServerCertificate,
+  };
+  return {
+    ...res,
+    ssl: await extractConnectionSslParams(res),
+  };
 }
 
 let storageConnection = null;
@@ -47,7 +83,7 @@ async function getStorageConnectionCore() {
     return [storageConnection, storageDriver];
   }
 
-  const dbConnectionParams = getDbConnectionParams();
+  const dbConnectionParams = await getDbConnectionParams();
 
   if (!dbConnectionParams) {
     return [null, null];
@@ -125,6 +161,10 @@ async function storageSelectFmt(sql, ...params) {
   return resp.rows;
 }
 
+async function storageSqlCommandFmt(sql, ...params) {
+  await storageSelectFmt(sql, ...params);
+}
+
 async function storageReadUserRolePermissions(userId) {
   const resp = await storageSelectFmt(
     `
@@ -213,4 +253,5 @@ module.exports = {
   storageReadConfig,
   storageWriteConfig,
   getStorageConnectionError,
+  storageSqlCommandFmt,
 };

package/src/currentVersion.js

@@ -1,5 +1,5 @@
 
 module.exports = { 
-  version: '6.1.4',
-  buildTime: '2025-01-27T11:55:08.334Z'
+  version: '6.1.5',
+  buildTime: '2025-02-04T15:09:15.073Z'
 };

package/src/utility/checkLicense.js

@@ -9,6 +9,7 @@ const { setAuthProxyLicense } = require('./authProxy');
 const axios = require('axios');
 const crypto = require('crypto');
 const platformInfo = require('./platformInfo');
+const processArgs = require('./processArgs');
 
 const logger = getLogger('checkLicense');
 
@@ -107,6 +108,13 @@ async function getAwsMetadata() {
 }
 
 function checkLicenseKey(licenseKey) {
+  if (processArgs.runE2eTests) {
+    return {
+      status: 'ok',
+      type: 'premium',
+    };
+  }
+
   try {
     const decoded = jwt.verify(licenseKey, publicKey, {
       algorithms: ['RS256'],
@@ -176,6 +184,13 @@ function getAwsToken() {
 }
 
 async function checkLicense() {
+  if (processArgs.runE2eTests) {
+    return {
+      status: 'ok',
+      type: 'premium',
+    };
+  }
+
   if (process.env.DBGATE_LICENSE) {
     return checkLicenseKey(process.env.DBGATE_LICENSE);
   }