Moduletrace/datasquirel
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Updates

Browse Source
This commit is contained in:
Benjamin Toby
2025-01-14 00:01:02 +01:00
parent 8f00f333aa
commit d586de0639
90 changed files with 533 additions and 960 deletions
Download Patch File Download Diff File Expand all files Collapse all files
dist/package-shared/shell/mariadb-users/handleGrants.d.ts
Vendored
+3 -3
View File
@@ -4,9 +4,9 @@ export interface GrantType {
privileges: string[];
}
type Param = {
username: string;
host: string;
grants: GrantType[];
username?: string;
host?: string;
grants?: GrantType[];
userId: string;
};
/**
dist/package-shared/shell/mariadb-users/refreshUsersAndGrants.d.ts
Vendored
+2 -2
View File
@@ -1,11 +1,11 @@
type Param = {
userId?: number | string;
mariadbUserHost?: string;
mariadbUser?: string;
mariadbUsername?: string;
sqlUserID?: string | number;
};
/**
* # Refresh Mariadb User Grants
*/
export default function refreshUsersAndGrants({ userId, mariadbUserHost, mariadbUser, sqlUserID, }: Param): Promise<void>;
export default function refreshUsersAndGrants({ userId, mariadbUserHost, mariadbUsername, sqlUserID, }: Param): Promise<void>;
export {};
dist/package-shared/shell/mariadb-users/refreshUsersAndGrants.js
Vendored
+40 -38
View File
@@ -26,26 +26,25 @@ const defaultMariadbUserHost = process.env.DSQL_DB_HOST || "127.0.0.1";
* # Refresh Mariadb User Grants
*/
function refreshUsersAndGrants(_a) {
return __awaiter(this, arguments, void 0, function* ({ userId, mariadbUserHost, mariadbUser, sqlUserID, }) {
return __awaiter(this, arguments, void 0, function* ({ userId, mariadbUserHost, mariadbUsername, sqlUserID, }) {
var _b, _c, _d, _e;
/**
* @description Users
* @type {*[] | null}
*/ // @ts-ignore
const users = yield (0, dbHandler_1.default)({
query: `SELECT * FROM users`,
});
if (!(users === null || users === void 0 ? void 0 : users[0])) {
process.exit();
const mariadbUsers = (yield (0, dbHandler_1.default)({
query: `SELECT * FROM mariadb_users`,
}));
if (!(mariadbUsers === null || mariadbUsers === void 0 ? void 0 : mariadbUsers[0])) {
return;
}
for (let i = 0; i < users.length; i++) {
const user = users[i];
if (!user)
const isRootUser = userId
? userId == Number(process.env.DSQL_SU_USER_ID)
: false;
for (let i = 0; i < mariadbUsers.length; i++) {
const mariadbUser = mariadbUsers[i];
if (!mariadbUser)
continue;
if (userId && user.id != userId)
if (userId && mariadbUser.user_id != userId)
continue;
try {
const { mariadb_user, mariadb_host, mariadb_pass, id } = user;
const { mariadb_user, mariadb_host, mariadb_pass, user_id } = mariadbUser;
const existingUser = yield (0, noDatabaseDbHandler_1.default)(`SELECT * FROM mysql.user WHERE User = '${mariadb_user}' AND Host = '${mariadb_host}'`);
const existingMariaDBUserArray = userId && sqlUserID
? yield (0, dbHandler_1.default)({
@@ -53,9 +52,6 @@ function refreshUsersAndGrants(_a) {
values: [sqlUserID, userId],
})
: null;
/**
* @type {import("../../types").MYSQL_mariadb_users_table_def | undefined}
*/
const activeMariadbUserObject = Array.isArray(existingMariaDBUserArray)
? existingMariaDBUserArray === null || existingMariaDBUserArray === void 0 ? void 0 : existingMariaDBUserArray[0]
: undefined;
@@ -66,7 +62,9 @@ function refreshUsersAndGrants(_a) {
: false;
const isUserExisting = Boolean((_c = existingUser === null || existingUser === void 0 ? void 0 : existingUser[0]) === null || _c === void 0 ? void 0 : _c.User);
const isThisPrimaryHost = Boolean(mariadbUserHost == defaultMariadbUserHost);
const dslUsername = `dsql_user_${id}`;
const dslUsername = isRootUser
? mariadbUsername
: `dsql_user_${user_id}`;
const dsqlPassword = (activeMariadbUserObject === null || activeMariadbUserObject === void 0 ? void 0 : activeMariadbUserObject.password)
? activeMariadbUserObject.password
: isUserExisting
@@ -91,20 +89,23 @@ function refreshUsersAndGrants(_a) {
!sqlUserID &&
!isPrimary &&
!mariadbUserHost &&
!mariadbUser) {
!mariadbUsername) {
const createNewUser = yield (0, noDatabaseDbHandler_1.default)(`CREATE USER IF NOT EXISTS '${dslUsername}'@'${defaultMariadbUserHost}' IDENTIFIED BY '${dsqlPassword}'`);
console.log("createNewUser", createNewUser);
console.log(`User ${user.id}: ${user.first_name} ${user.last_name} SQL credentials successfully updated.`);
console.log(`User ${mariadbUser.id}: ${mariadbUser.first_name} ${mariadbUser.last_name} SQL credentials successfully updated.`);
const updateUser = yield (0, dbHandler_1.default)({
query: `UPDATE users SET mariadb_user = ?, mariadb_host = ?, mariadb_pass = ? WHERE id = ?`,
values: [
dslUsername,
defaultMariadbUserHost,
encryptedPassword,
user.id,
mariadbUser.id,
],
});
}
else if (!isUserExisting && mariadbUserHost) {
const createNewUser = yield (0, noDatabaseDbHandler_1.default)(`CREATE USER IF NOT EXISTS '${dslUsername}'@'${mariadbUserHost}' IDENTIFIED BY '${dsqlPassword}'`);
}
if (isPrimary) {
const finalHost = mariadbUserHost
? mariadbUserHost
@@ -115,7 +116,7 @@ function refreshUsersAndGrants(_a) {
dslUsername,
finalHost,
encryptedPassword,
user.id,
mariadbUser.id,
],
});
}
@@ -127,7 +128,7 @@ function refreshUsersAndGrants(_a) {
*/
const existingMariadbPrimaryUser = yield (0, dbHandler_1.default)({
query: `SELECT * FROM mariadb_users WHERE user_id = ? AND \`primary\` = 1`,
values: [id],
values: [user_id],
});
const isPrimaryUserExisting = Boolean(Array.isArray(existingMariadbPrimaryUser) &&
((_d = existingMariadbPrimaryUser === null || existingMariadbPrimaryUser === void 0 ? void 0 : existingMariadbPrimaryUser[0]) === null || _d === void 0 ? void 0 : _d.user_id));
@@ -142,7 +143,7 @@ function refreshUsersAndGrants(_a) {
const insertPrimaryMariadbUser = yield (0, dbHandler_1.default)({
query: `INSERT INTO mariadb_users (user_id, username, password, \`primary\`, grants) VALUES (?, ?, ?, ?, ?)`,
values: [
id,
user_id,
dslUsername,
encryptedPassword,
"1",
@@ -153,36 +154,37 @@ function refreshUsersAndGrants(_a) {
//////////////////////////////////////////////
const existingExtraMariadbUsers = yield (0, dbHandler_1.default)({
query: `SELECT * FROM mariadb_users WHERE user_id = ? AND \`primary\` != '1'`,
values: [id],
values: [user_id],
});
if (Array.isArray(existingExtraMariadbUsers)) {
for (let i = 0; i < existingExtraMariadbUsers.length; i++) {
const mariadbUser = existingExtraMariadbUsers[i];
const { user_id, username, host, password, primary, grants, } = mariadbUser;
if (mariadbUser && username != mariadbUser)
const _mariadbUser = existingExtraMariadbUsers[i];
if (_mariadbUser &&
_mariadbUser.username != mariadbUsername)
continue;
if (mariadbUserHost && host != mariadbUserHost)
if (mariadbUserHost && _mariadbUser.host != mariadbUserHost)
continue;
const decrptedPassword = (0, decrypt_1.default)({
encryptedString: password,
encryptedString: _mariadbUser.password || "",
encryptionKey: process.env.DSQL_ENCRYPTION_PASSWORD,
encryptionSalt: process.env.DSQL_ENCRYPTION_SALT,
});
const existingExtraMariadbUser = yield (0, noDatabaseDbHandler_1.default)(`SELECT * FROM mysql.user WHERE User = '${username}' AND Host = '${host}'`);
const existingExtraMariadbUser = yield (0, noDatabaseDbHandler_1.default)(`SELECT * FROM mysql.user WHERE User='${_mariadbUser.username}' AND Host='${_mariadbUser.host}'`);
const isExtraMariadbUserExisting = Boolean((_e = existingExtraMariadbUser === null || existingExtraMariadbUser === void 0 ? void 0 : existingExtraMariadbUser[0]) === null || _e === void 0 ? void 0 : _e.User);
if (!isExtraMariadbUserExisting) {
yield (0, noDatabaseDbHandler_1.default)(`CREATE USER IF NOT EXISTS '${username}'@'${host}' IDENTIFIED BY '${decrptedPassword}'`);
yield (0, noDatabaseDbHandler_1.default)(`CREATE USER IF NOT EXISTS '${_mariadbUser.username}'@'${_mariadbUser.host}' IDENTIFIED BY '${decrptedPassword}'`);
}
const isGrantHandled = yield (0, handleGrants_1.default)({
username,
host,
grants: grants && typeof grants == "string"
? JSON.parse(grants)
username: _mariadbUser.username,
host: _mariadbUser.host,
grants: _mariadbUser.grants &&
typeof _mariadbUser.grants == "string"
? JSON.parse(_mariadbUser.grants)
: [],
userId: String(userId),
});
if (!isGrantHandled) {
console.log(`Error in handling grants for user ${username}@${host}`);
console.log(`Error in handling grants for user ${_mariadbUser.username}@${_mariadbUser.host}`);
}
}
}