This commit is contained in:
2024-11-16 16:16:47 -05:00
parent 17cdf7a4cf
commit e464c1d778
2 changed files with 139 additions and 163 deletions
+138 -162
View File
@@ -1,8 +1,8 @@
import { dynamicStringHandler } from "@jjHelpers/dynamicStringHandler"; import { dynamicStringHandler } from "@jjHelpers/dynamicStringHandler";
import { getJJConfigByKeyChain } from "@jjHelpers/jjConfigUtils" import { getJJConfigByKeyChain } from "@jjHelpers/jjConfigUtils";
import { makeJJlogger } from "@jjHelpers/jjLogger"; import { makeJJlogger } from "@jjHelpers/jjLogger";
import _ from 'lodash'; import _ from "lodash";
import fs from 'fs-extra'; import fs from "fs-extra";
import path from "path"; import path from "path";
import { generateHasDir, generateMD5, jjDecrypt, jjEncrypt } from "@jjHelpers/cryptoUtils"; import { generateHasDir, generateMD5, jjDecrypt, jjEncrypt } from "@jjHelpers/cryptoUtils";
import { saveFileIfItChanged } from "@jjHelpers/saveFileIfItChanged"; import { saveFileIfItChanged } from "@jjHelpers/saveFileIfItChanged";
@@ -11,248 +11,224 @@ import { subRepositoryClean, subRepositoryPull, subRepositoryPushChanges } from
import moment from "moment"; import moment from "moment";
const logger = makeJJlogger({ const logger = makeJJlogger({
filename: 'jj/cli/secrets.ts' filename: "jj/cli/secrets.ts",
}) });
export const getSecretFolder = () => { export const getSecretFolder = () => {
let secretsFolder = getJJConfigByKeyChain(`secretsFolder`) let secretsFolder = getJJConfigByKeyChain(`secretsFolder`);
secretsFolder = dynamicStringHandler(secretsFolder, "", process.env, false) secretsFolder = dynamicStringHandler(secretsFolder, "", process.env, false);
return secretsFolder return secretsFolder;
} };
export const getEncryptionKeyForEnv = (envKey) => { export const getEncryptionKeyForEnv = (envKey) => {
const secretsFolder = getSecretFolder() const secretsFolder = getSecretFolder();
if (!fs.existsSync(`${secretsFolder}/~~${envKey}`)) { if (!fs.existsSync(`${secretsFolder}/~~${envKey}`)) {
logger.error(`Encryption key for ${envKey} env not fond and nt exist `) logger.error(`Encryption key for ${envKey} env not fond and nt exist `);
process.exit(1) process.exit(1);
} }
const encryptionKey = fs.readFileSync(`${secretsFolder}/~~${envKey}`, 'utf8') const encryptionKey = fs.readFileSync(`${secretsFolder}/~~${envKey}`, "utf8");
return encryptionKey return encryptionKey;
} };
export const decryptFile = async (absFilePath) => { export const decryptFile = async (absFilePath) => {
if (!fs.existsSync(absFilePath)) { if (!fs.existsSync(absFilePath)) {
logger.error(`Secret ${absFilePath} is not exist`) logger.error(`Secret ${absFilePath} is not exist`);
} }
logger.log(`decrypt file-secret for ${absFilePath} start`) logger.log(`decrypt file-secret for ${absFilePath} start`);
const secretFileObjRaw = await fs.readFile(absFilePath, 'utf8') const secretFileObjRaw = await fs.readFile(absFilePath, "utf8");
const secretObj = JSON.parse(secretFileObjRaw) const secretObj = JSON.parse(secretFileObjRaw);
const envKey = path.basename(path.join(absFilePath, "..")) const envKey = path.basename(path.join(absFilePath, ".."));
const decryptedSecretObj = {} const decryptedSecretObj = {};
const encryptionKey = getEncryptionKeyForEnv(envKey) const encryptionKey = getEncryptionKeyForEnv(envKey);
Object.keys(secretObj).forEach((key) => { Object.keys(secretObj).forEach((key) => {
const plainValue = secretObj[key] const plainValue = secretObj[key];
if (plainValue.includes(`${envKey}--`)) { if (plainValue.includes(`${envKey}--`)) {
decryptedSecretObj[key] = jjDecrypt(plainValue.replace(`${envKey}--`, ""), encryptionKey) decryptedSecretObj[key] = jjDecrypt(plainValue.replace(`${envKey}--`, ""), encryptionKey);
return return;
} }
decryptedSecretObj[key] = plainValue decryptedSecretObj[key] = plainValue;
return return;
}) });
let shFormatDecrypt = "" let shFormatDecrypt = "";
Object.keys(decryptedSecretObj).forEach((key) => { Object.keys(decryptedSecretObj).forEach((key) => {
shFormatDecrypt += `export ${key}="${decryptedSecretObj[key]}"\n` shFormatDecrypt += `export ${key}="${decryptedSecretObj[key]}"\n`;
}) });
const absDirPath = path.dirname(absFilePath); const absDirPath = path.dirname(absFilePath);
const fileName = path.basename(absFilePath).replace('.json', ''); const fileName = path.basename(absFilePath).replace(".json", "");
if (!fs.existsSync(`${absDirPath}/~~decrypt`)) { if (!fs.existsSync(`${absDirPath}/~~decrypt`)) {
fs.mkdirSync(`${absDirPath}/~~decrypt`, { recursive: true }) fs.mkdirSync(`${absDirPath}/~~decrypt`, { recursive: true });
} }
const decryptedJsonFormat = `${absDirPath}/~~decrypt/${fileName}.json` const decryptedJsonFormat = `${absDirPath}/~~decrypt/${fileName}.json`;
fs.writeFileSync(decryptedJsonFormat, JSON.stringify(decryptedSecretObj, null, 4), 'utf-8'); fs.writeFileSync(decryptedJsonFormat, JSON.stringify(decryptedSecretObj, null, 4), "utf-8");
const decryptedShFormat = `${absDirPath}/~~decrypt/${fileName}.sh` const decryptedShFormat = `${absDirPath}/~~decrypt/${fileName}.sh`;
fs.writeFileSync(decryptedShFormat, shFormatDecrypt, 'utf-8'); fs.writeFileSync(decryptedShFormat, shFormatDecrypt, "utf-8");
logger.success(`decrypt file-secret for ${absFilePath} done`) logger.success(`decrypt file-secret for ${absFilePath} done`);
return decryptedSecretObj return decryptedSecretObj;
} };
export const setSecretFileFromFile = async ({
absFilePath,
secretKey,
secretAbsFilePath
}) => {
export const setSecretFileFromFile = async ({ absFilePath, secretKey, secretAbsFilePath }) => {
if (!fs.existsSync(secretAbsFilePath)) { if (!fs.existsSync(secretAbsFilePath)) {
logger.error(`Secret original ${secretAbsFilePath} is not exist`) logger.error(`Secret original ${secretAbsFilePath} is not exist`);
} }
const secretValue = fs.readFileSync(secretAbsFilePath, 'utf8') const secretValue = fs.readFileSync(secretAbsFilePath, "utf8");
return await setSecretFile({ return await setSecretFile({
absFilePath, absFilePath,
secretKey, secretKey,
secretValue secretValue,
}) });
} };
export const setSecretFile = async ({
absFilePath,
secretKey,
secretValue
}) => {
export const setSecretFile = async ({ absFilePath, secretKey, secretValue }) => {
if (!fs.existsSync(absFilePath)) { if (!fs.existsSync(absFilePath)) {
logger.error(`Secret ${absFilePath} is not exist`) logger.error(`Secret ${absFilePath} is not exist`);
} }
logger.log(`adding secret for ${absFilePath} with Key ${secretKey.toUpperCase()} start`) logger.log(`adding secret for ${absFilePath} with Key ${secretKey.toUpperCase()} start`);
const envKey = path.basename(path.join(absFilePath, "..")) const envKey = path.basename(path.join(absFilePath, ".."));
const secretFileObjRaw = await fs.readFile(absFilePath, 'utf8') const secretFileObjRaw = await fs.readFile(absFilePath, "utf8");
const secretObj = JSON.parse(secretFileObjRaw) const secretObj = JSON.parse(secretFileObjRaw);
const encryptionKey = getEncryptionKeyForEnv(envKey) const encryptionKey = getEncryptionKeyForEnv(envKey);
const encryptVal = jjEncrypt(secretValue, encryptionKey)
secretObj[secretKey.toUpperCase()] = `${envKey}--${encryptVal}`
saveFileIfItChanged(JSON.stringify(secretObj, null, 4), absFilePath)
logger.success(`adding secret for ${absFilePath} with Key ${secretKey.toUpperCase()} done`)
await decryptFile(absFilePath)
}
const encryptVal = jjEncrypt(secretValue, encryptionKey);
secretObj[secretKey.toUpperCase()] = `${envKey}--${encryptVal}`;
saveFileIfItChanged(JSON.stringify(secretObj, null, 4), absFilePath);
logger.success(`adding secret for ${absFilePath} with Key ${secretKey.toUpperCase()} done`);
await decryptFile(absFilePath);
};
export const commitSecretMeta = async () => { export const commitSecretMeta = async () => {
const metadataRepoFolderRelative = getJJConfigByKeyChain(`metadataRepo.path`);
const metadataRepoBranch = getJJConfigByKeyChain(`metadataRepo.branch`);
await subRepositoryClean(metadataRepoFolderRelative);
await subRepositoryPull(metadataRepoFolderRelative, metadataRepoBranch);
const metadataRepoFolderRelative = getJJConfigByKeyChain(`metadataRepo.path`) logger.log(`commitSecretMeta for ${process.env.JJ_CLI_SELECTED_COMMIT} start`);
const metadataRepoBranch = getJJConfigByKeyChain(`metadataRepo.branch`)
await subRepositoryClean(metadataRepoFolderRelative)
await subRepositoryPull(metadataRepoFolderRelative, metadataRepoBranch)
const environments = getJJConfigByKeyChain(`environments`);
logger.log(`commitSecretMeta for ${process.env.JJ_CLI_SELECTED_COMMIT} start`) const environmentsKeys = Object.keys(environments);
const environments = getJJConfigByKeyChain(`environments`) const metadataSecretPathBase = `${process.env.JJ_WORKSPACE_DIR}/${metadataRepoFolderRelative}/metadata/${process.env.JJ_CLI_SELECTED_COMMIT}`;
const metadataSecretPathBaseCommitSecrets = `${metadataSecretPathBase}/jj_secrets.yaml`;
const environmentsKeys = Object.keys(environments) if (!fs.existsSync(metadataSecretPathBaseCommitSecrets)) {
await fs.writeFile(metadataSecretPathBaseCommitSecrets, YAML.dump({}, {}), "utf8");
const metadataSecretPathBase = `${process.env.JJ_WORKSPACE_DIR}/${metadataRepoFolderRelative}/metadata/${process.env.JJ_CLI_SELECTED_COMMIT}`
const secretsBasePath = `${process.env.JJ_WORKSPACE_DIR}/${metadataRepoFolderRelative}/secretsHash`
const mainSecretMetaDataFilePath = `${process.env.JJ_WORKSPACE_DIR}/${metadataRepoFolderRelative}/secrets.yaml`
if (!fs.existsSync(mainSecretMetaDataFilePath)) {
await fs.writeFile(mainSecretMetaDataFilePath, YAML.dump({}, {}), "utf8")
} }
const mainSecretMetaDataObj = YAML.load(await fs.readFile(mainSecretMetaDataFilePath, "utf8")) || {} const metadataSecretPathBaseCommitSecretsObj = YAML.load(await fs.readFile(metadataSecretPathBaseCommitSecrets, "utf8")) || {};
const secretsBasePath = `${process.env.JJ_WORKSPACE_DIR}/${metadataRepoFolderRelative}/secretsHash`;
const mainSecretMetaDataFilePath = `${process.env.JJ_WORKSPACE_DIR}/${metadataRepoFolderRelative}/secrets.yaml`;
if (!fs.existsSync(mainSecretMetaDataFilePath)) {
await fs.writeFile(mainSecretMetaDataFilePath, YAML.dump({}, {}), "utf8");
}
const mainSecretMetaDataObj = YAML.load(await fs.readFile(mainSecretMetaDataFilePath, "utf8")) || {};
for (const environmentKey of environmentsKeys) { for (const environmentKey of environmentsKeys) {
const envMetadataFolder = `${metadataSecretPathBase}/${environmentKey}`;
const envMetadataFolder = `${metadataSecretPathBase}/${environmentKey}`
if (!fs.existsSync(envMetadataFolder)) { if (!fs.existsSync(envMetadataFolder)) {
fs.mkdirSync(envMetadataFolder, { recursive: true }) fs.mkdirSync(envMetadataFolder, { recursive: true });
} }
const secretsMetadataPath = `${envMetadataFolder}/jj_secrets.yaml` const secretsMetadataPath = `${envMetadataFolder}/jj_secrets.yaml`;
if (!fs.existsSync(secretsMetadataPath)) { if (!fs.existsSync(secretsMetadataPath)) {
await fs.writeFile(secretsMetadataPath, YAML.dump({}, {}), "utf8") await fs.writeFile(secretsMetadataPath, YAML.dump({}, {}), "utf8");
} }
const currentMetadataSecretsObj = YAML.load(await fs.readFile(secretsMetadataPath, "utf8")) || {} const currentMetadataSecretsObj = YAML.load(await fs.readFile(secretsMetadataPath, "utf8")) || {};
const secretsHashEnvPath = `${secretsBasePath}/${environmentKey}` const secretsHashEnvPath = `${secretsBasePath}/${environmentKey}`;
if (!fs.existsSync(secretsHashEnvPath)) { if (!fs.existsSync(secretsHashEnvPath)) {
fs.mkdirSync(secretsHashEnvPath, { recursive: true }) fs.mkdirSync(secretsHashEnvPath, { recursive: true });
} }
const currentSecretsEnvPath = `${process.env.JJ_WORKSPACE_DIR}/secrets/${environmentKey}` const currentSecretsEnvPath = `${process.env.JJ_WORKSPACE_DIR}/secrets/${environmentKey}`;
let jsonSourceFormatEncryptedSecrets = fs.readdirSync(currentSecretsEnvPath) let jsonSourceFormatEncryptedSecrets = fs.readdirSync(currentSecretsEnvPath);
jsonSourceFormatEncryptedSecrets = jsonSourceFormatEncryptedSecrets.filter((file) => file.includes(".json")) jsonSourceFormatEncryptedSecrets = jsonSourceFormatEncryptedSecrets.filter((file) => file.includes(".json"));
for (const jsonSourceFormatEncryptedSecret of jsonSourceFormatEncryptedSecrets) { for (const jsonSourceFormatEncryptedSecret of jsonSourceFormatEncryptedSecrets) {
const encryptedSecretFilePath = `${currentSecretsEnvPath}/${jsonSourceFormatEncryptedSecret}` const encryptedSecretFilePath = `${currentSecretsEnvPath}/${jsonSourceFormatEncryptedSecret}`;
const encryptedSecretFileHash = (await generateHasDir(encryptedSecretFilePath)).hash const encryptedSecretFileHash = (await generateHasDir(encryptedSecretFilePath)).hash;
const secretFileNameWithoutExtension = jsonSourceFormatEncryptedSecret.split(".json")[0] const secretFileNameWithoutExtension = jsonSourceFormatEncryptedSecret.split(".json")[0];
const secretHashFileNameWithoutExtension = `${secretFileNameWithoutExtension}__${encryptedSecretFileHash}` const secretHashFileNameWithoutExtension = `${secretFileNameWithoutExtension}__${encryptedSecretFileHash}`;
const secretHashFileName = `${secretHashFileNameWithoutExtension}.json` const secretHashFileName = `${secretHashFileNameWithoutExtension}.json`;
const secretsHashFile = `${secretsHashEnvPath}/${secretHashFileName}` const secretsHashFile = `${secretsHashEnvPath}/${secretHashFileName}`;
if (!fs.existsSync(secretsHashFile)) { if (!fs.existsSync(secretsHashFile)) {
fs.copyFileSync(encryptedSecretFilePath, secretsHashFile) fs.copyFileSync(encryptedSecretFilePath, secretsHashFile);
} }
_.set(currentMetadataSecretsObj, `secrets.${environmentKey}.${secretFileNameWithoutExtension}`, encryptedSecretFileHash) _.set(currentMetadataSecretsObj, `secrets.${environmentKey}.${secretFileNameWithoutExtension}`, encryptedSecretFileHash);
const currentSecretMdObj = _.get(mainSecretMetaDataObj, `['${secretFileNameWithoutExtension}']['${environmentKey}']['${encryptedSecretFileHash}']`, {}) const currentSecretMdObj = _.get(
_.set(
mainSecretMetaDataObj, mainSecretMetaDataObj,
`['${secretFileNameWithoutExtension}']['${environmentKey}']['${encryptedSecretFileHash}']`, `['${secretFileNameWithoutExtension}']['${environmentKey}']['${encryptedSecretFileHash}']`,
{ {}
...currentSecretMdObj, );
timeOfInitiate: currentSecretMdObj?.timeOfInitiate ? currentSecretMdObj?.timeOfInitiate : moment().toISOString(), _.set(mainSecretMetaDataObj, `['${secretFileNameWithoutExtension}']['${environmentKey}']['${encryptedSecretFileHash}']`, {
firstCommit: currentSecretMdObj?.firstCommit ? currentSecretMdObj?.firstCommit : process.env.JJ_CLI_SELECTED_COMMIT, ...currentSecretMdObj,
} timeOfInitiate: currentSecretMdObj?.timeOfInitiate ? currentSecretMdObj?.timeOfInitiate : moment().toISOString(),
) firstCommit: currentSecretMdObj?.firstCommit ? currentSecretMdObj?.firstCommit : process.env.JJ_CLI_SELECTED_COMMIT,
await fs.writeFile(secretsMetadataPath, YAML.dump(currentMetadataSecretsObj, {}), "utf8") });
await fs.writeFile(secretsMetadataPath, YAML.dump(currentMetadataSecretsObj, {}), "utf8");
_.merge(metadataSecretPathBaseCommitSecretsObj, currentMetadataSecretsObj);
} }
await fs.writeFile(mainSecretMetaDataFilePath, YAML.dump(mainSecretMetaDataObj, {}), "utf8");
} }
await fs.writeFile(mainSecretMetaDataFilePath, YAML.dump(mainSecretMetaDataObj, {}), "utf8") await fs.writeFile(metadataSecretPathBaseCommitSecrets, YAML.dump(metadataSecretPathBaseCommitSecretsObj, {}), "utf8");
await subRepositoryPushChanges(metadataRepoFolderRelative, metadataRepoBranch, `${process.env.JJ_CLI_SELECTED_COMMIT} ${process.env.JJ_GIT_USER_EMAIL} 'jj secrets commitSecretMeta'`) await subRepositoryPushChanges(
metadataRepoFolderRelative,
metadataRepoBranch,
`${process.env.JJ_CLI_SELECTED_COMMIT} ${process.env.JJ_GIT_USER_EMAIL} 'jj secrets commitSecretMeta'`
logger.success(`commitSecretMeta for ${process.env.JJ_CLI_SELECTED_COMMIT} done`) );
}
logger.success(`commitSecretMeta for ${process.env.JJ_CLI_SELECTED_COMMIT} done`);
};
export const secrets = async () => { export const secrets = async () => {
if (process.env.JJ_CLI_ARG_2 == "commitSecretMeta") {
if (process.env.JJ_CLI_ARG_2 == 'commitSecretMeta') { await commitSecretMeta();
process.exit(0);
await commitSecretMeta()
process.exit(0)
} }
const secretFilePath = process.env.JJ_CLI_ARG_3;
const secretFilePath = process.env.JJ_CLI_ARG_3 const absFilePath = path.resolve(process.cwd(), secretFilePath);
const envKey = path.basename(path.join(absFilePath, ".."));
const absFilePath = path.resolve(process.cwd(), secretFilePath) const secretKey = process.env.JJ_CLI_ARG_4;
const envKey = path.basename(path.join(absFilePath, "..")) const secretValue = process.env.JJ_CLI_ARG_5;
const secretKey = process.env.JJ_CLI_ARG_4 const environment = getJJConfigByKeyChain(`environments['${envKey}']`);
const secretValue = process.env.JJ_CLI_ARG_5
const environment = getJJConfigByKeyChain(`environments['${envKey}']`)
if (_.isEmpty(environment)) { if (_.isEmpty(environment)) {
logger.error(`environment is not exist`) logger.error(`environment is not exist`);
process.exit(1) process.exit(1);
} }
if (process.env.JJ_CLI_ARG_2 == "setSecret") {
if (process.env.JJ_CLI_ARG_2 == 'setSecret') {
await setSecretFile({ await setSecretFile({
absFilePath, absFilePath,
secretKey, secretKey,
secretValue secretValue,
}) });
process.exit(0);
process.exit(0)
} }
if (process.env.JJ_CLI_ARG_2 == 'decryptFile') { if (process.env.JJ_CLI_ARG_2 == "decryptFile") {
await decryptFile(absFilePath);
await decryptFile(absFilePath) process.exit(0);
process.exit(0)
} }
if (process.env.JJ_CLI_ARG_2 == 'setSecretFromFile') { if (process.env.JJ_CLI_ARG_2 == "setSecretFromFile") {
await setSecretFileFromFile({ await setSecretFileFromFile({
absFilePath, absFilePath,
secretKey, secretKey,
secretAbsFilePath: secretValue secretAbsFilePath: secretValue,
}) });
process.exit(0);
process.exit(0)
} }
};
} export default secrets;
export default secrets
+1 -1
View File
@@ -1,7 +1,7 @@
{ {
"name": "jj-command-line", "name": "jj-command-line",
"description": "jj cli", "description": "jj cli",
"version": "1.0.11", "version": "1.0.12",
"author": "Jason Jafari", "author": "Jason Jafari",
"bin": { "bin": {
"jj": "./jj.sh" "jj": "./jj.sh"