Moduletrace/dsql-admin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Refactor SSL

Browse Source
This commit is contained in:
Benjamin Toby
2024-11-06 13:57:20 +01:00
parent eb341a7845
commit 83d261362f
316 changed files with 541 additions and 4615 deletions
Download Patch File Download Diff File Expand all files Collapse all files
dsql-app/shell/checkDb.js
+2 -17
View File
@@ -5,22 +5,9 @@
////////////////////////////////////////
require("dotenv").config({ path: "./../.env" });
const fs = require("fs");
const path = require("path");
// const mysql = require("mysql");
// const connection = mysql.createConnection({
// host: process.env.DSQL_DB_HOST,
// user: process.env.DSQL_DB_USERNAME,
// password: process.env.DSQL_DB_PASSWORD,
// database: process.env.DSQL_DB_NAME,
// charset: "utf8mb4",
// });
const grabDbSSL = require("../package-shared/utils/backend/grabDbSSL");
const mysql = require("serverless-mysql");
const SSL_DIR = "/app/ssl";
const connection = mysql({
config: {
host: process.env.DSQL_DB_HOST,
@@ -28,9 +15,7 @@ const connection = mysql({
password: process.env.DSQL_DB_PASSWORD,
database: process.env.DSQL_DB_NAME,
charset: "utf8mb4",
ssl: {
ca: fs.readFileSync(`${SSL_DIR}/ca-cert.pem`),
},
ssl: grabDbSSL(),
},
});
dsql-app/shell/test-external-server.js
+2 -8
View File
@@ -5,13 +5,9 @@
////////////////////////////////////////
require("dotenv").config({ path: "./.env" });
const fs = require("fs");
const path = require("path");
const grabDbSSL = require("../package-shared/utils/backend/grabDbSSL");
const mysql = require("serverless-mysql");
const SSL_DIR = "/app/ssl";
const connection = mysql({
config: {
host: process.env.DSQL_DB_HOST,
@@ -19,9 +15,7 @@ const connection = mysql({
password: process.env.DB_PASS,
// database: process.env.DSQL_DB_NAME,
charset: "utf8mb4",
ssl: {
ca: fs.readFileSync(`${SSL_DIR}/ca-cert.pem`),
},
ssl: grabDbSSL(),
},
});
dsql-app/shell/updateSSLUsers.js
+2 -28
View File
@@ -1,26 +1,9 @@
// @ts-check
////////////////////////////////////////
////////////////////////////////////////
////////////////////////////////////////
require("dotenv").config({ path: "./../.env" });
const fs = require("fs");
const path = require("path");
// const mysql = require("mysql");
// const connection = mysql.createConnection({
// host: process.env.DSQL_DB_HOST,
// user: process.env.DSQL_DB_USERNAME,
// password: process.env.DSQL_DB_PASSWORD,
// database: process.env.DSQL_DB_NAME,
// charset: "utf8mb4",
// });
const grabDbSSL = require("../package-shared/utils/backend/grabDbSSL");
const mysql = require("serverless-mysql");
const SSL_DIR = "/app/ssl";
const connection = mysql({
config: {
host: process.env.DSQL_DB_HOST,
@@ -28,19 +11,10 @@ const connection = mysql({
password: process.env.DSQL_DB_PASSWORD,
database: process.env.DSQL_DB_NAME,
charset: "utf8mb4",
ssl: {
ca: fs.readFileSync(`${SSL_DIR}/ca-cert.pem`),
},
ssl: grabDbSSL(),
},
});
//////////////////////////////////////////////////////////////////////////////////
//////////////////////////////////////////////////////////////////////////////////
//////////////////////////////////////////////////////////////////////////////////
//////////////////////////////////////////////////////////////////////////////////
//////////////////////////////////////////////////////////////////////////////////
//////////////////////////////////////////////////////////////////////////////////
/**
* # Main DB Handler Function
* @async
dsql-app/shell/utils/dbHandler.js
+3 -8
View File
@@ -8,8 +8,7 @@ const fs = require("fs");
const path = require("path");
const mysql = require("serverless-mysql");
const SSL_DIR = "/app/ssl";
const grabDbSSL = require("../../package-shared/utils/backend/grabDbSSL");
let connection = mysql({
config: {
@@ -18,9 +17,7 @@ let connection = mysql({
password: process.env.DSQL_DB_PASSWORD,
database: process.env.DSQL_DB_NAME,
charset: "utf8mb4",
ssl: {
ca: fs.readFileSync(`${SSL_DIR}/ca-cert.pem`),
},
ssl: grabDbSSL(),
},
});
@@ -58,9 +55,7 @@ module.exports = async function dbHandler({ query, values, database }) {
password: process.env.DSQL_DB_PASSWORD,
database: database,
charset: "utf8mb4",
ssl: {
ca: fs.readFileSync(`${SSL_DIR}/ca-cert.pem`),
},
ssl: grabDbSSL(),
},
});
}