Updates
This commit is contained in:
+50
-67
@@ -1,74 +1,57 @@
|
||||
"use strict";
|
||||
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
||||
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
||||
return new (P || (P = Promise))(function (resolve, reject) {
|
||||
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
||||
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
||||
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
||||
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
||||
});
|
||||
};
|
||||
var __importDefault = (this && this.__importDefault) || function (mod) {
|
||||
return (mod && mod.__esModule) ? mod : { "default": mod };
|
||||
};
|
||||
Object.defineProperty(exports, "__esModule", { value: true });
|
||||
exports.default = handleGrants;
|
||||
const noDatabaseDbHandler_1 = __importDefault(require("../utils/noDatabaseDbHandler"));
|
||||
import noDatabaseDbHandler from "../utils/noDatabaseDbHandler";
|
||||
/**
|
||||
* # Handle Grants for Users
|
||||
*/
|
||||
function handleGrants(_a) {
|
||||
return __awaiter(this, arguments, void 0, function* ({ username, host, grants, userId, }) {
|
||||
var _b;
|
||||
let success = false;
|
||||
console.log(`Handling Grants for User =>`, username, host);
|
||||
if (!username) {
|
||||
console.log(`No username provided.`);
|
||||
return success;
|
||||
}
|
||||
if (!host) {
|
||||
console.log(`No Host provided. \x1b[35m\`--host\`\x1b[0m flag is required`);
|
||||
return success;
|
||||
}
|
||||
if (!grants) {
|
||||
console.log(`No grants Array provided.`);
|
||||
return success;
|
||||
}
|
||||
try {
|
||||
const existingUser = yield (0, noDatabaseDbHandler_1.default)(`SELECT * FROM mysql.user WHERE User = '${username}' AND Host = '${host}'`);
|
||||
const isUserExisting = Boolean((_b = existingUser === null || existingUser === void 0 ? void 0 : existingUser[0]) === null || _b === void 0 ? void 0 : _b.User);
|
||||
if (isUserExisting) {
|
||||
const userGrants = yield (0, noDatabaseDbHandler_1.default)(`SHOW GRANTS FOR '${username}'@'${host}'`);
|
||||
for (let i = 0; i < userGrants.length; i++) {
|
||||
const grantObject = userGrants[i];
|
||||
const grant = grantObject === null || grantObject === void 0 ? void 0 : grantObject[Object.keys(grantObject)[0]];
|
||||
if (grant === null || grant === void 0 ? void 0 : grant.match(/GRANT .* PRIVILEGES ON .* TO/)) {
|
||||
const revokeGrantText = grant
|
||||
.replace(/GRANT/, "REVOKE")
|
||||
.replace(/ TO /, " FROM ");
|
||||
const revokePrivilege = yield (0, noDatabaseDbHandler_1.default)(revokeGrantText);
|
||||
}
|
||||
}
|
||||
const grantsArray = grants;
|
||||
for (let i = 0; i < grantsArray.length; i++) {
|
||||
const grantObject = grantsArray[i];
|
||||
const { database, table, privileges } = grantObject;
|
||||
const tableText = table == "*" ? "*" : `\`${table}\``;
|
||||
const databaseText = database == "*"
|
||||
? `\`${process.env.DSQL_USER_DB_PREFIX}${userId}_%\``
|
||||
: `\`${database}\``;
|
||||
const privilegesText = privileges.includes("ALL")
|
||||
? "ALL PRIVILEGES"
|
||||
: privileges.join(", ");
|
||||
const grantText = `GRANT ${privilegesText} ON ${databaseText}.${tableText} TO '${username}'@'${host}'`;
|
||||
const grantPriviledge = yield (0, noDatabaseDbHandler_1.default)(grantText);
|
||||
export default async function handleGrants({ username, host, grants, userId, }) {
|
||||
var _a;
|
||||
let success = false;
|
||||
console.log(`Handling Grants for User =>`, username, host);
|
||||
if (!username) {
|
||||
console.log(`No username provided.`);
|
||||
return success;
|
||||
}
|
||||
if (!host) {
|
||||
console.log(`No Host provided. \x1b[35m\`--host\`\x1b[0m flag is required`);
|
||||
return success;
|
||||
}
|
||||
if (!grants) {
|
||||
console.log(`No grants Array provided.`);
|
||||
return success;
|
||||
}
|
||||
try {
|
||||
const existingUser = await noDatabaseDbHandler(`SELECT * FROM mysql.user WHERE User = '${username}' AND Host = '${host}'`);
|
||||
const isUserExisting = Boolean((_a = existingUser === null || existingUser === void 0 ? void 0 : existingUser[0]) === null || _a === void 0 ? void 0 : _a.User);
|
||||
if (isUserExisting) {
|
||||
const userGrants = await noDatabaseDbHandler(`SHOW GRANTS FOR '${username}'@'${host}'`);
|
||||
for (let i = 0; i < userGrants.length; i++) {
|
||||
const grantObject = userGrants[i];
|
||||
const grant = grantObject === null || grantObject === void 0 ? void 0 : grantObject[Object.keys(grantObject)[0]];
|
||||
if (grant === null || grant === void 0 ? void 0 : grant.match(/GRANT .* PRIVILEGES ON .* TO/)) {
|
||||
const revokeGrantText = grant
|
||||
.replace(/GRANT/, "REVOKE")
|
||||
.replace(/ TO /, " FROM ");
|
||||
const revokePrivilege = await noDatabaseDbHandler(revokeGrantText);
|
||||
}
|
||||
}
|
||||
success = true;
|
||||
const grantsArray = grants;
|
||||
for (let i = 0; i < grantsArray.length; i++) {
|
||||
const grantObject = grantsArray[i];
|
||||
const { database, table, privileges } = grantObject;
|
||||
const tableText = table == "*" ? "*" : `\`${table}\``;
|
||||
const databaseText = database == "*"
|
||||
? `\`${process.env.DSQL_USER_DB_PREFIX}${userId}_%\``
|
||||
: `\`${database}\``;
|
||||
const privilegesText = privileges.includes("ALL")
|
||||
? "ALL PRIVILEGES"
|
||||
: privileges.join(", ");
|
||||
const grantText = `GRANT ${privilegesText} ON ${databaseText}.${tableText} TO '${username}'@'${host}'`;
|
||||
const grantPriviledge = await noDatabaseDbHandler(grantText);
|
||||
}
|
||||
}
|
||||
catch ( /** @type {any} */error) {
|
||||
console.log(`Error in adding SQL user =>`, error.message);
|
||||
}
|
||||
return success;
|
||||
});
|
||||
success = true;
|
||||
}
|
||||
catch ( /** @type {any} */error) {
|
||||
console.log(`Error in adding SQL user =>`, error.message);
|
||||
}
|
||||
return success;
|
||||
}
|
||||
|
||||
@@ -1,11 +0,0 @@
|
||||
type Param = {
|
||||
userId?: number | string;
|
||||
mariadbUserHost?: string;
|
||||
mariadbUsername?: string;
|
||||
sqlUserID?: string | number;
|
||||
};
|
||||
/**
|
||||
* # Refresh Mariadb User Grants
|
||||
*/
|
||||
export default function refreshUsersAndGrants({ userId, mariadbUserHost, mariadbUsername, sqlUserID, }: Param): Promise<void>;
|
||||
export {};
|
||||
@@ -1,110 +0,0 @@
|
||||
"use strict";
|
||||
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
||||
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
||||
return new (P || (P = Promise))(function (resolve, reject) {
|
||||
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
||||
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
||||
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
||||
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
||||
});
|
||||
};
|
||||
var __importDefault = (this && this.__importDefault) || function (mod) {
|
||||
return (mod && mod.__esModule) ? mod : { "default": mod };
|
||||
};
|
||||
Object.defineProperty(exports, "__esModule", { value: true });
|
||||
exports.default = refreshUsersAndGrants;
|
||||
const generate_password_1 = __importDefault(require("generate-password"));
|
||||
const noDatabaseDbHandler_1 = __importDefault(require("../utils/noDatabaseDbHandler"));
|
||||
const dbHandler_1 = __importDefault(require("../utils/dbHandler"));
|
||||
const handleGrants_1 = __importDefault(require("./handleGrants"));
|
||||
const encrypt_1 = __importDefault(require("../../functions/dsql/encrypt"));
|
||||
const decrypt_1 = __importDefault(require("../../functions/dsql/decrypt"));
|
||||
/**
|
||||
* # Refresh Mariadb User Grants
|
||||
*/
|
||||
function refreshUsersAndGrants(_a) {
|
||||
return __awaiter(this, arguments, void 0, function* ({ userId, mariadbUserHost, mariadbUsername, sqlUserID, }) {
|
||||
var _b, _c, _d;
|
||||
const mariadbUsers = (yield (0, dbHandler_1.default)({
|
||||
query: `SELECT * FROM mariadb_users`,
|
||||
}));
|
||||
if (!(mariadbUsers === null || mariadbUsers === void 0 ? void 0 : mariadbUsers[0])) {
|
||||
return;
|
||||
}
|
||||
const isRootUser = userId
|
||||
? userId == Number(process.env.DSQL_SU_USER_ID)
|
||||
: false;
|
||||
const isWildcardHost = mariadbUserHost == "%";
|
||||
if (isWildcardHost && !isRootUser) {
|
||||
return;
|
||||
}
|
||||
for (let i = 0; i < mariadbUsers.length; i++) {
|
||||
const mariadbUser = mariadbUsers[i];
|
||||
if (!mariadbUser)
|
||||
continue;
|
||||
if (userId && mariadbUser.user_id != userId)
|
||||
continue;
|
||||
if (sqlUserID && mariadbUser.id != sqlUserID)
|
||||
continue;
|
||||
try {
|
||||
const { username, password, host, user_id } = mariadbUser;
|
||||
const existingUser = yield (0, noDatabaseDbHandler_1.default)(`SELECT * FROM mysql.user WHERE User = '${username}' AND Host = '${host}'`);
|
||||
const isUserExisting = Boolean((_b = existingUser === null || existingUser === void 0 ? void 0 : existingUser[0]) === null || _b === void 0 ? void 0 : _b.User);
|
||||
const isPrimary = ((_c = String(mariadbUser.primary)) === null || _c === void 0 ? void 0 : _c.match(/1/))
|
||||
? true
|
||||
: false;
|
||||
const dsqlPassword = (mariadbUser === null || mariadbUser === void 0 ? void 0 : mariadbUser.password)
|
||||
? (0, decrypt_1.default)({ encryptedString: mariadbUser.password })
|
||||
: isUserExisting && password
|
||||
? (0, decrypt_1.default)({ encryptedString: password })
|
||||
: generate_password_1.default.generate({
|
||||
length: 16,
|
||||
numbers: true,
|
||||
symbols: true,
|
||||
uppercase: true,
|
||||
exclude: "*#.'`\"",
|
||||
});
|
||||
const encryptedPassword = (mariadbUser === null || mariadbUser === void 0 ? void 0 : mariadbUser.password)
|
||||
? mariadbUser.password
|
||||
: isUserExisting
|
||||
? password
|
||||
: (0, encrypt_1.default)({ data: dsqlPassword });
|
||||
if (!isUserExisting) {
|
||||
if (isWildcardHost) {
|
||||
const _existingUsers = (yield (0, noDatabaseDbHandler_1.default)(`SELECT * FROM mysql.user WHERE user='${mariadbUsername}'`));
|
||||
for (let i = 0; i < _existingUsers.length; i++) {
|
||||
const exUsr = _existingUsers[i];
|
||||
yield (0, noDatabaseDbHandler_1.default)(`DROP USER '${exUsr.User}'@'${exUsr.Host}'`);
|
||||
}
|
||||
}
|
||||
const createNewUser = yield (0, noDatabaseDbHandler_1.default)(`CREATE USER IF NOT EXISTS '${mariadbUsername}'@'${mariadbUserHost}' IDENTIFIED BY '${dsqlPassword}'`);
|
||||
}
|
||||
if (isPrimary) {
|
||||
const updateUser = yield (0, dbHandler_1.default)({
|
||||
query: `UPDATE users SET mariadb_user = ?, mariadb_host = ?, mariadb_pass = ? WHERE id = ?`,
|
||||
values: [
|
||||
mariadbUsername,
|
||||
mariadbUserHost,
|
||||
encryptedPassword,
|
||||
user_id,
|
||||
],
|
||||
});
|
||||
}
|
||||
const isGrantHandled = yield (0, handleGrants_1.default)({
|
||||
username: mariadbUser.username,
|
||||
host: mariadbUser.host,
|
||||
grants: mariadbUser.grants && typeof mariadbUser.grants == "string"
|
||||
? JSON.parse(mariadbUser.grants)
|
||||
: [],
|
||||
userId: String(user_id),
|
||||
});
|
||||
if (!isGrantHandled) {
|
||||
console.log(`Error in handling grants for user ${mariadbUser.username}@${mariadbUser.host}`);
|
||||
}
|
||||
}
|
||||
catch (error) {
|
||||
(_d = global.ERROR_CALLBACK) === null || _d === void 0 ? void 0 : _d.call(global, `Error Refreshing MariaDB Users and Grants`, error);
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
+49
-64
@@ -1,71 +1,56 @@
|
||||
"use strict";
|
||||
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
||||
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
||||
return new (P || (P = Promise))(function (resolve, reject) {
|
||||
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
||||
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
||||
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
||||
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
||||
});
|
||||
};
|
||||
var __importDefault = (this && this.__importDefault) || function (mod) {
|
||||
return (mod && mod.__esModule) ? mod : { "default": mod };
|
||||
};
|
||||
Object.defineProperty(exports, "__esModule", { value: true });
|
||||
require("dotenv").config({ path: "../../.env" });
|
||||
const generate_password_1 = __importDefault(require("generate-password"));
|
||||
const noDatabaseDbHandler_1 = __importDefault(require("../utils/noDatabaseDbHandler"));
|
||||
const dbHandler_1 = __importDefault(require("../utils/dbHandler"));
|
||||
const encrypt_1 = __importDefault(require("../../functions/dsql/encrypt"));
|
||||
import generator from "generate-password";
|
||||
import noDatabaseDbHandler from "../utils/noDatabaseDbHandler";
|
||||
import dbHandler from "../../functions/backend/dbHandler";
|
||||
import encrypt from "../../functions/dsql/encrypt";
|
||||
import grabSQLKeyName from "../../utils/grab-sql-key-name";
|
||||
/**
|
||||
* # Reset SQL Passwords
|
||||
*/
|
||||
function resetSQLCredentialsPasswords() {
|
||||
return __awaiter(this, void 0, void 0, function* () {
|
||||
var _a;
|
||||
const users = (yield (0, dbHandler_1.default)({
|
||||
query: `SELECT * FROM users`,
|
||||
}));
|
||||
if (!users) {
|
||||
process.exit();
|
||||
}
|
||||
for (let i = 0; i < users.length; i++) {
|
||||
const user = users[i];
|
||||
if (!user)
|
||||
continue;
|
||||
try {
|
||||
const maridbUsers = (yield (0, dbHandler_1.default)({
|
||||
query: `SELECT * FROM mysql.user WHERE User = 'dsql_user_${user.id}'`,
|
||||
}));
|
||||
for (let j = 0; j < maridbUsers.length; j++) {
|
||||
const { User, Host } = maridbUsers[j];
|
||||
const password = generate_password_1.default.generate({
|
||||
length: 16,
|
||||
numbers: true,
|
||||
symbols: true,
|
||||
uppercase: true,
|
||||
exclude: "*#.'`\"",
|
||||
});
|
||||
const encryptedPassword = (0, encrypt_1.default)({
|
||||
data: password,
|
||||
encryptionKey: process.env.DSQL_ENCRYPTION_PASSWORD,
|
||||
encryptionSalt: process.env.DSQL_ENCRYPTION_SALT,
|
||||
});
|
||||
yield (0, noDatabaseDbHandler_1.default)(`SET PASSWORD FOR '${User}'@'${Host}' = PASSWORD('${password}')`);
|
||||
if (user.mariadb_user == User && user.mariadb_host == Host) {
|
||||
const updateUser = yield (0, dbHandler_1.default)({
|
||||
query: `UPDATE users SET mariadb_pass = ? WHERE id = ?`,
|
||||
values: [encryptedPassword, user.id],
|
||||
});
|
||||
}
|
||||
console.log(`User ${user.id}: ${user.first_name} ${user.last_name} Password Updated successfully added.`);
|
||||
}
|
||||
}
|
||||
catch (error) {
|
||||
(_a = global.ERROR_CALLBACK) === null || _a === void 0 ? void 0 : _a.call(global, `Error Resetting MariaDB User Password`, error);
|
||||
}
|
||||
}
|
||||
async function resetSQLCredentialsPasswords() {
|
||||
var _a;
|
||||
const users = (await dbHandler({
|
||||
query: `SELECT * FROM users`,
|
||||
}));
|
||||
if (!users) {
|
||||
process.exit();
|
||||
});
|
||||
}
|
||||
for (let i = 0; i < users.length; i++) {
|
||||
const user = users[i];
|
||||
if (!user)
|
||||
continue;
|
||||
try {
|
||||
const maridbUsers = (await dbHandler({
|
||||
query: `SELECT * FROM mysql.user WHERE User = '${grabSQLKeyName({ type: "user", userId: user.id })}'`,
|
||||
}));
|
||||
for (let j = 0; j < maridbUsers.length; j++) {
|
||||
const { User, Host } = maridbUsers[j];
|
||||
const password = generator.generate({
|
||||
length: 16,
|
||||
numbers: true,
|
||||
symbols: true,
|
||||
uppercase: true,
|
||||
exclude: "*#.'`\"",
|
||||
});
|
||||
const encryptedPassword = encrypt({
|
||||
data: password,
|
||||
encryptionKey: process.env.DSQL_ENCRYPTION_PASSWORD,
|
||||
encryptionSalt: process.env.DSQL_ENCRYPTION_SALT,
|
||||
});
|
||||
await noDatabaseDbHandler(`SET PASSWORD FOR '${User}'@'${Host}' = PASSWORD('${password}')`);
|
||||
if (user.mariadb_user == User && user.mariadb_host == Host) {
|
||||
const updateUser = await dbHandler({
|
||||
query: `UPDATE users SET mariadb_pass = ? WHERE id = ?`,
|
||||
values: [encryptedPassword, user.id],
|
||||
});
|
||||
}
|
||||
console.log(`User ${user.id}: ${user.first_name} ${user.last_name} Password Updated successfully added.`);
|
||||
}
|
||||
}
|
||||
catch (error) {
|
||||
(_a = global.ERROR_CALLBACK) === null || _a === void 0 ? void 0 : _a.call(global, `Error Resetting MariaDB User Password`, error);
|
||||
}
|
||||
}
|
||||
process.exit();
|
||||
}
|
||||
resetSQLCredentialsPasswords();
|
||||
|
||||
+106
-121
@@ -1,136 +1,121 @@
|
||||
"use strict";
|
||||
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
||||
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
||||
return new (P || (P = Promise))(function (resolve, reject) {
|
||||
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
||||
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
||||
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
||||
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
||||
});
|
||||
};
|
||||
var __importDefault = (this && this.__importDefault) || function (mod) {
|
||||
return (mod && mod.__esModule) ? mod : { "default": mod };
|
||||
};
|
||||
Object.defineProperty(exports, "__esModule", { value: true });
|
||||
const path_1 = __importDefault(require("path"));
|
||||
import path from "path";
|
||||
require("dotenv").config({ path: "../../../.env" });
|
||||
const fs_1 = __importDefault(require("fs"));
|
||||
const child_process_1 = require("child_process");
|
||||
const ejson_1 = __importDefault(require("../../../utils/ejson"));
|
||||
const DB_HANDLER_1 = __importDefault(require("../../../utils/backend/global-db/DB_HANDLER"));
|
||||
const addDbEntry_1 = __importDefault(require("../../../functions/backend/db/addDbEntry"));
|
||||
const addMariadbUser_1 = __importDefault(require("../../../functions/backend/addMariadbUser"));
|
||||
const updateDbEntry_1 = __importDefault(require("../../../functions/backend/db/updateDbEntry"));
|
||||
const hashPassword_1 = __importDefault(require("../../../functions/dsql/hashPassword"));
|
||||
import fs from "fs";
|
||||
import { execSync } from "child_process";
|
||||
import EJSON from "../../../utils/ejson";
|
||||
import DB_HANDLER from "../../../utils/backend/global-db/DB_HANDLER";
|
||||
import addDbEntry from "../../../functions/backend/db/addDbEntry";
|
||||
import addMariadbUser from "../../../functions/backend/addMariadbUser";
|
||||
import updateDbEntry from "../../../functions/backend/db/updateDbEntry";
|
||||
import hashPassword from "../../../functions/dsql/hashPassword";
|
||||
import grabDirNames from "../../../utils/backend/names/grab-dir-names";
|
||||
const tmpDir = process.argv[process.argv.length - 1];
|
||||
/**
|
||||
* # Create New User
|
||||
*/
|
||||
function createUser() {
|
||||
return __awaiter(this, void 0, void 0, function* () {
|
||||
var _a;
|
||||
async function createUser() {
|
||||
var _a, _b;
|
||||
/**
|
||||
* Validate Form
|
||||
*
|
||||
* @description Check if request body is valid
|
||||
*/
|
||||
try {
|
||||
const isTmpDir = Boolean(tmpDir === null || tmpDir === void 0 ? void 0 : tmpDir.match(/\.json$/));
|
||||
const targetPath = isTmpDir
|
||||
? path.resolve(process.cwd(), tmpDir)
|
||||
: path.resolve(__dirname, "./new-user.json");
|
||||
const userObj = EJSON.parse(fs.readFileSync(targetPath, "utf-8"));
|
||||
if (typeof userObj !== "object" || Array.isArray(userObj))
|
||||
throw new Error("User Object Invalid!");
|
||||
const ROOT_DIR = path.resolve(__dirname, "../../../");
|
||||
/**
|
||||
* Validate Form
|
||||
*
|
||||
* @description Check if request body is valid
|
||||
*/
|
||||
try {
|
||||
const isTmpDir = Boolean(tmpDir === null || tmpDir === void 0 ? void 0 : tmpDir.match(/\.json$/));
|
||||
const targetPath = isTmpDir
|
||||
? path_1.default.resolve(process.cwd(), tmpDir)
|
||||
: path_1.default.resolve(__dirname, "./new-user.json");
|
||||
const userObj = ejson_1.default.parse(fs_1.default.readFileSync(targetPath, "utf-8"));
|
||||
if (typeof userObj !== "object" || Array.isArray(userObj))
|
||||
throw new Error("User Object Invalid!");
|
||||
const ROOT_DIR = path_1.default.resolve(__dirname, "../../../");
|
||||
/**
|
||||
* Validate Form
|
||||
*
|
||||
* @description Check if request body is valid
|
||||
*/
|
||||
const first_name = userObj.first_name;
|
||||
const last_name = userObj.last_name;
|
||||
const email = userObj.email;
|
||||
const password = userObj.password;
|
||||
const username = userObj.username;
|
||||
if (!(email === null || email === void 0 ? void 0 : email.match(/.*@.*\..*/)))
|
||||
return false;
|
||||
if (!(first_name === null || first_name === void 0 ? void 0 : first_name.match(/^[a-zA-Z]+$/)) ||
|
||||
!(last_name === null || last_name === void 0 ? void 0 : last_name.match(/^[a-zA-Z]+$/)))
|
||||
return false;
|
||||
if (password === null || password === void 0 ? void 0 : password.match(/ /))
|
||||
return false;
|
||||
if (username === null || username === void 0 ? void 0 : username.match(/ /))
|
||||
return false;
|
||||
let hashedPassword = (0, hashPassword_1.default)({
|
||||
encryptionKey: process.env.DSQL_ENCRYPTION_PASSWORD || "",
|
||||
password: password,
|
||||
});
|
||||
let existingUser = yield (0, DB_HANDLER_1.default)(`SELECT * FROM users WHERE email='${email}'`);
|
||||
if (existingUser === null || existingUser === void 0 ? void 0 : existingUser[0]) {
|
||||
console.log("User Exists");
|
||||
return false;
|
||||
}
|
||||
const newUser = yield (0, addDbEntry_1.default)({
|
||||
dbFullName: "datasquirel",
|
||||
tableName: "users",
|
||||
data: Object.assign(Object.assign({}, userObj), { password: hashedPassword }),
|
||||
});
|
||||
if (!(newUser === null || newUser === void 0 ? void 0 : newUser.insertId))
|
||||
return false;
|
||||
/**
|
||||
* Add a Mariadb User for this User
|
||||
*/
|
||||
yield (0, addMariadbUser_1.default)({ userId: newUser.insertId });
|
||||
const STATIC_ROOT = process.env.DSQL_STATIC_SERVER_DIR;
|
||||
if (!STATIC_ROOT) {
|
||||
console.log("Static File ENV not Found!");
|
||||
throw new Error("No Static Path");
|
||||
}
|
||||
/**
|
||||
* Create new user folder and file
|
||||
*
|
||||
* @description Create new user folder and file
|
||||
*/
|
||||
let newUserSchemaFolderPath = `${process.env.DSQL_USER_DB_SCHEMA_PATH}/user-${newUser.insertId}`;
|
||||
let newUserMediaFolderPath = path_1.default.join(STATIC_ROOT, `images/user-images/user-${newUser.insertId}`);
|
||||
fs_1.default.mkdirSync(newUserSchemaFolderPath, { recursive: true });
|
||||
fs_1.default.mkdirSync(newUserMediaFolderPath, { recursive: true });
|
||||
fs_1.default.writeFileSync(`${newUserSchemaFolderPath}/main.json`, JSON.stringify([]), "utf8");
|
||||
const imageBasePath = path_1.default.join(STATIC_ROOT, `images/user-images/user-${newUser.insertId}`);
|
||||
if (!fs_1.default.existsSync(imageBasePath)) {
|
||||
fs_1.default.mkdirSync(imageBasePath, { recursive: true });
|
||||
}
|
||||
let imagePath = path_1.default.join(STATIC_ROOT, `images/user-images/user-${newUser.insertId}/user-${newUser.insertId}-profile.jpg`);
|
||||
let imageThumbnailPath = path_1.default.join(STATIC_ROOT, `images/user-images/user-${newUser.insertId}/user-${newUser.insertId}-profile-thumbnail.jpg`);
|
||||
let prodImageUrl = imagePath.replace(STATIC_ROOT, process.env.DSQL_STATIC_HOST || "");
|
||||
let prodImageThumbnailUrl = imageThumbnailPath.replace(STATIC_ROOT, process.env.DSQL_STATIC_HOST || "");
|
||||
fs_1.default.copyFileSync(path_1.default.join(ROOT_DIR, "/public/images/user-preset.png"), imagePath);
|
||||
fs_1.default.copyFileSync(path_1.default.join(ROOT_DIR, "/public/images/user-preset-thumbnail.png"), imageThumbnailPath);
|
||||
(0, child_process_1.execSync)(`chmod 644 ${imagePath} ${imageThumbnailPath}`);
|
||||
const updateImages = yield (0, updateDbEntry_1.default)({
|
||||
dbFullName: "datasquirel",
|
||||
tableName: "users",
|
||||
identifierColumnName: "id",
|
||||
identifierValue: newUser.insertId,
|
||||
data: {
|
||||
image: prodImageUrl,
|
||||
image_thumbnail: prodImageThumbnailUrl,
|
||||
},
|
||||
});
|
||||
if (isTmpDir) {
|
||||
try {
|
||||
fs_1.default.unlinkSync(path_1.default.resolve(process.cwd(), tmpDir));
|
||||
}
|
||||
catch (error) { }
|
||||
}
|
||||
return true;
|
||||
}
|
||||
catch (error) {
|
||||
(_a = global.ERROR_CALLBACK) === null || _a === void 0 ? void 0 : _a.call(global, `Error Creating User`, error);
|
||||
const first_name = userObj.first_name;
|
||||
const last_name = userObj.last_name;
|
||||
const email = userObj.email;
|
||||
const password = userObj.password;
|
||||
const username = userObj.username;
|
||||
if (!(email === null || email === void 0 ? void 0 : email.match(/.*@.*\..*/)))
|
||||
return false;
|
||||
if (!(first_name === null || first_name === void 0 ? void 0 : first_name.match(/^[a-zA-Z]+$/)) ||
|
||||
!(last_name === null || last_name === void 0 ? void 0 : last_name.match(/^[a-zA-Z]+$/)))
|
||||
return false;
|
||||
if (password === null || password === void 0 ? void 0 : password.match(/ /))
|
||||
return false;
|
||||
if (username === null || username === void 0 ? void 0 : username.match(/ /))
|
||||
return false;
|
||||
let hashedPassword = hashPassword({
|
||||
encryptionKey: process.env.DSQL_ENCRYPTION_PASSWORD || "",
|
||||
password: password,
|
||||
});
|
||||
let existingUser = await DB_HANDLER(`SELECT * FROM users WHERE email='${email}'`);
|
||||
if (existingUser === null || existingUser === void 0 ? void 0 : existingUser[0]) {
|
||||
console.log("User Exists");
|
||||
return false;
|
||||
}
|
||||
});
|
||||
const newUser = await addDbEntry({
|
||||
dbFullName: "datasquirel",
|
||||
tableName: "users",
|
||||
data: Object.assign(Object.assign({}, userObj), { password: hashedPassword }),
|
||||
});
|
||||
if (!((_a = newUser === null || newUser === void 0 ? void 0 : newUser.payload) === null || _a === void 0 ? void 0 : _a.insertId))
|
||||
return false;
|
||||
/**
|
||||
* Add a Mariadb User for this User
|
||||
*/
|
||||
await addMariadbUser({ userId: newUser.payload.insertId });
|
||||
const { STATIC_ROOT } = grabDirNames();
|
||||
if (!STATIC_ROOT) {
|
||||
console.log("Static File ENV not Found!");
|
||||
throw new Error("No Static Path");
|
||||
}
|
||||
/**
|
||||
* Create new user folder and file
|
||||
*
|
||||
* @description Create new user folder and file
|
||||
*/
|
||||
let newUserSchemaFolderPath = `${process.env.DSQL_USER_DB_SCHEMA_PATH}/user-${newUser.payload.insertId}`;
|
||||
let newUserMediaFolderPath = path.join(STATIC_ROOT, `images/user-images/user-${newUser.payload.insertId}`);
|
||||
fs.mkdirSync(newUserSchemaFolderPath, { recursive: true });
|
||||
fs.mkdirSync(newUserMediaFolderPath, { recursive: true });
|
||||
fs.writeFileSync(`${newUserSchemaFolderPath}/main.json`, JSON.stringify([]), "utf8");
|
||||
const imageBasePath = path.join(STATIC_ROOT, `images/user-images/user-${newUser.payload.insertId}`);
|
||||
if (!fs.existsSync(imageBasePath)) {
|
||||
fs.mkdirSync(imageBasePath, { recursive: true });
|
||||
}
|
||||
let imagePath = path.join(STATIC_ROOT, `images/user-images/user-${newUser.payload.insertId}/user-${newUser.payload.insertId}-profile.jpg`);
|
||||
let imageThumbnailPath = path.join(STATIC_ROOT, `images/user-images/user-${newUser.payload.insertId}/user-${newUser.payload.insertId}-profile-thumbnail.jpg`);
|
||||
let prodImageUrl = imagePath.replace(STATIC_ROOT, process.env.DSQL_STATIC_HOST || "");
|
||||
let prodImageThumbnailUrl = imageThumbnailPath.replace(STATIC_ROOT, process.env.DSQL_STATIC_HOST || "");
|
||||
fs.copyFileSync(path.join(ROOT_DIR, "/public/images/user-preset.png"), imagePath);
|
||||
fs.copyFileSync(path.join(ROOT_DIR, "/public/images/user-preset-thumbnail.png"), imageThumbnailPath);
|
||||
execSync(`chmod 644 ${imagePath} ${imageThumbnailPath}`);
|
||||
const updateImages = await updateDbEntry({
|
||||
dbFullName: "datasquirel",
|
||||
tableName: "users",
|
||||
identifierColumnName: "id",
|
||||
identifierValue: newUser.payload.insertId,
|
||||
data: {
|
||||
image: prodImageUrl,
|
||||
image_thumbnail: prodImageThumbnailUrl,
|
||||
},
|
||||
});
|
||||
if (isTmpDir) {
|
||||
try {
|
||||
fs.unlinkSync(path.resolve(process.cwd(), tmpDir));
|
||||
}
|
||||
catch (error) { }
|
||||
}
|
||||
return true;
|
||||
}
|
||||
catch (error) {
|
||||
(_b = global.ERROR_CALLBACK) === null || _b === void 0 ? void 0 : _b.call(global, `Error Creating User`, error);
|
||||
return false;
|
||||
}
|
||||
}
|
||||
createUser().then((res) => {
|
||||
if (res) {
|
||||
|
||||
+48
-64
@@ -1,75 +1,59 @@
|
||||
"use strict";
|
||||
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
||||
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
||||
return new (P || (P = Promise))(function (resolve, reject) {
|
||||
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
||||
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
||||
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
||||
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
||||
});
|
||||
};
|
||||
var __importDefault = (this && this.__importDefault) || function (mod) {
|
||||
return (mod && mod.__esModule) ? mod : { "default": mod };
|
||||
};
|
||||
Object.defineProperty(exports, "__esModule", { value: true });
|
||||
const path_1 = __importDefault(require("path"));
|
||||
import path from "path";
|
||||
require("dotenv").config({ path: "../../../.env" });
|
||||
const fs_1 = __importDefault(require("fs"));
|
||||
const ejson_1 = __importDefault(require("../../../utils/ejson"));
|
||||
const hashPassword_1 = __importDefault(require("../../../functions/dsql/hashPassword"));
|
||||
const updateDbEntry_1 = __importDefault(require("../../../functions/backend/db/updateDbEntry"));
|
||||
import fs from "fs";
|
||||
import EJSON from "../../../utils/ejson";
|
||||
import hashPassword from "../../../functions/dsql/hashPassword";
|
||||
import updateDbEntry from "../../../functions/backend/db/updateDbEntry";
|
||||
const tmpDir = process.argv[process.argv.length - 1];
|
||||
/**
|
||||
* # Create New User
|
||||
*/
|
||||
function createUser() {
|
||||
return __awaiter(this, void 0, void 0, function* () {
|
||||
var _a;
|
||||
/**
|
||||
* Validate Form
|
||||
*
|
||||
* @description Check if request body is valid
|
||||
*/
|
||||
try {
|
||||
const isTmpDir = Boolean(tmpDir === null || tmpDir === void 0 ? void 0 : tmpDir.match(/\.json$/));
|
||||
const targetPath = isTmpDir
|
||||
? path_1.default.resolve(process.cwd(), tmpDir)
|
||||
: path_1.default.resolve(__dirname, "./update-user.json");
|
||||
const updateUserObj = ejson_1.default.parse(fs_1.default.readFileSync(targetPath, "utf-8"));
|
||||
if (typeof updateUserObj !== "object" || Array.isArray(updateUserObj))
|
||||
throw new Error("Update User Object Invalid!");
|
||||
let hashedPassword = updateUserObj.password
|
||||
? (0, hashPassword_1.default)({
|
||||
encryptionKey: process.env.DSQL_ENCRYPTION_PASSWORD || "",
|
||||
password: updateUserObj.password,
|
||||
})
|
||||
: undefined;
|
||||
let updatePayload = Object.assign({}, updateUserObj);
|
||||
if (hashedPassword) {
|
||||
updatePayload["password"] = hashedPassword;
|
||||
}
|
||||
const newUser = yield (0, updateDbEntry_1.default)({
|
||||
dbFullName: "datasquirel",
|
||||
tableName: "users",
|
||||
data: Object.assign(Object.assign({}, updatePayload), { id: undefined }),
|
||||
identifierColumnName: "id",
|
||||
identifierValue: updatePayload.id,
|
||||
});
|
||||
if (!(newUser === null || newUser === void 0 ? void 0 : newUser.affectedRows))
|
||||
return false;
|
||||
if (isTmpDir) {
|
||||
try {
|
||||
fs_1.default.unlinkSync(path_1.default.resolve(process.cwd(), tmpDir));
|
||||
}
|
||||
catch (error) { }
|
||||
}
|
||||
return true;
|
||||
async function createUser() {
|
||||
var _a;
|
||||
/**
|
||||
* Validate Form
|
||||
*
|
||||
* @description Check if request body is valid
|
||||
*/
|
||||
try {
|
||||
const isTmpDir = Boolean(tmpDir === null || tmpDir === void 0 ? void 0 : tmpDir.match(/\.json$/));
|
||||
const targetPath = isTmpDir
|
||||
? path.resolve(process.cwd(), tmpDir)
|
||||
: path.resolve(__dirname, "./update-user.json");
|
||||
const updateUserObj = EJSON.parse(fs.readFileSync(targetPath, "utf-8"));
|
||||
if (typeof updateUserObj !== "object" || Array.isArray(updateUserObj))
|
||||
throw new Error("Update User Object Invalid!");
|
||||
let hashedPassword = updateUserObj.password
|
||||
? hashPassword({
|
||||
encryptionKey: process.env.DSQL_ENCRYPTION_PASSWORD || "",
|
||||
password: updateUserObj.password,
|
||||
})
|
||||
: undefined;
|
||||
let updatePayload = Object.assign({}, updateUserObj);
|
||||
if (hashedPassword) {
|
||||
updatePayload["password"] = hashedPassword;
|
||||
}
|
||||
catch (error) {
|
||||
(_a = global.ERROR_CALLBACK) === null || _a === void 0 ? void 0 : _a.call(global, `Error Updating User`, error);
|
||||
const newUser = await updateDbEntry({
|
||||
dbFullName: "datasquirel",
|
||||
tableName: "users",
|
||||
data: Object.assign(Object.assign({}, updatePayload), { id: undefined }),
|
||||
identifierColumnName: "id",
|
||||
identifierValue: updatePayload.id,
|
||||
});
|
||||
if (!(newUser === null || newUser === void 0 ? void 0 : newUser.affectedRows))
|
||||
return false;
|
||||
if (isTmpDir) {
|
||||
try {
|
||||
fs.unlinkSync(path.resolve(process.cwd(), tmpDir));
|
||||
}
|
||||
catch (error) { }
|
||||
}
|
||||
});
|
||||
return true;
|
||||
}
|
||||
catch (error) {
|
||||
(_a = global.ERROR_CALLBACK) === null || _a === void 0 ? void 0 : _a.call(global, `Error Updating User`, error);
|
||||
return false;
|
||||
}
|
||||
}
|
||||
createUser().then((res) => {
|
||||
if (res) {
|
||||
|
||||
Reference in New Issue
Block a user