dotsec 4.0.0-alpha.15 → 4.0.0-alpha.17

package/CHANGELOG.md

@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [4.0.0-alpha.16](https://github.com/jpwesselink/dotsec/compare/v4.0.0-alpha.15...v4.0.0-alpha.16) (2023-05-22)
+
+**Note:** Version bump only for package dotsec
+
+
+
+
+
 # [4.0.0-alpha.14](https://github.com/jpwesselink/dotsec/compare/v4.0.0-alpha.13...v4.0.0-alpha.14) (2023-05-22)
 
 

package/dist/cli/index.js

@@ -7,9 +7,10 @@ var bundleRequire = require('bundle-require');
 var JoyCon = require('joycon');
 var fs2 = require('fs/promises');
 var prompts = require('prompts');
-var chalk = require('chalk');
+var chalk2 = require('chalk');
 require('cli-table');
 var dotenvExpand = require('dotenv-expand');
+var camelCase = require('camel-case');
 var child_process = require('child_process');
 var Ajv = require('ajv');
 var yargsParser = require('yargs-parser');
@@ -21,7 +22,7 @@ var path__default = /*#__PURE__*/_interopDefault(path);
 var JoyCon__default = /*#__PURE__*/_interopDefault(JoyCon);
 var fs2__default = /*#__PURE__*/_interopDefault(fs2);
 var prompts__default = /*#__PURE__*/_interopDefault(prompts);
-var chalk__default = /*#__PURE__*/_interopDefault(chalk);
+var chalk2__default = /*#__PURE__*/_interopDefault(chalk2);
 var Ajv__default = /*#__PURE__*/_interopDefault(Ajv);
 var yargsParser__default = /*#__PURE__*/_interopDefault(yargsParser);
 
@@ -89,6 +90,10 @@ var getMagicalConfig = async (filename) => {
           defaults: {
             ...data?.defaults,
             ...defaultConfig.defaults,
+            output: {
+              ...data?.defaults?.output,
+              ...defaultConfig.defaults?.output
+            },
             plugins: {
               ...data?.defaults?.plugins,
               ...defaultConfig.defaults?.plugins
@@ -112,6 +117,10 @@ var getMagicalConfig = async (filename) => {
           defaults: {
             ...data?.defaults,
             ...defaultConfig.defaults,
+            output: {
+              ...data?.defaults?.output,
+              ...defaultConfig.defaults?.output
+            },
             plugins: {
               ...data?.defaults?.plugins,
               ...defaultConfig.defaults?.plugins
@@ -316,7 +325,29 @@ if (undefined) {
     `);
   });
 }
-var strong = (str) => chalk__default.default.yellow.bold(str);
+var strong = (str) => chalk2__default.default.yellow.bold(str);
+
+// src/types/colors.ts
+var backgroundColors = [
+  "black",
+  "red",
+  "green",
+  "yellow",
+  "blue",
+  "magenta",
+  "cyan",
+  "white",
+  "black-bright",
+  "gray",
+  "grey",
+  "red-bright",
+  "green-bright",
+  "yellow-bright",
+  "blue-bright",
+  "magenta-bright",
+  "cyan-bright",
+  "white-bright"
+];
 
 // src/cli/options/sharedOptions.ts
 var envFileOption = {
@@ -347,6 +378,28 @@ var usingNoEncryptionEngineOption = {
   choices: ["env"],
   env: "DOTSEC_USING"
 };
+var showRedactedOption = {
+  flags: "--show-redacted",
+  description: 'Wether to show redacted values."',
+  env: "DOTSEC_SHOW_REDACTED"
+};
+var showOutputPrefixOption = {
+  flags: "--show-output-prefix",
+  description: "Show output prefix",
+  env: "DOTSEC_SHOW_OUTPUT_PREFIX"
+};
+var showOutputBackgroundColorOption = {
+  flags: "--show-output-background-color",
+  description: "Show output background color",
+  env: "DOTSEC_SHOW_OUTPUT_BACKGROUND_COLOR"
+};
+var outputBackgroundColorOption = {
+  flags: "--output-background-color <outputBackgroundColor>",
+  description: "Background color of the output.",
+  env: "DOTSEC_OUTPUT_BACKGROUND_COLOR",
+  choices: backgroundColors,
+  defaultValue: "red-bright"
+};
 var yesOption = {
   option: ["--yes", "Skip confirmation prompts"]
 };
@@ -549,7 +602,11 @@ var runCommandDefaults = {
       configFile: configFileOption,
       envFile: envFileOption,
       yes: yesOption,
-      engine: engineOption
+      engine: engineOption,
+      showRedacted: showRedactedOption,
+      outputBackgroundColor: outputBackgroundColorOption,
+      hideOutputBackgroundColor: showOutputBackgroundColorOption,
+      hideOutputPrefix: showOutputPrefixOption
     },
     requiredOptions: {
       using: usingNoEncryptionEngineOption
@@ -582,7 +639,11 @@ $ DOTSEC_USING=env npx dotsec run node -e "console.log(process.env)"
       configFile: configFileOption,
       envFile: envFileOption,
       secFile: secFileOption,
-      yes: yesOption
+      yes: yesOption,
+      showRedacted: showRedactedOption,
+      outputBackgroundColor: outputBackgroundColorOption,
+      hideOutputBackgroundColor: showOutputBackgroundColorOption,
+      hideOutputPrefix: showOutputPrefixOption
     },
     requiredOptions: {
       using: usingOption
@@ -1109,7 +1170,16 @@ var addRunProgam = (program2, options) => {
   const subProgram = program2.command("run <command...>").allowUnknownOption(true).enablePositionalOptions().passThroughOptions().showHelpAfterError(true).action(
     async (commands, _options, command) => {
       try {
-        const { envFile, using, secFile, engine } = command.optsWithGlobals();
+        const {
+          envFile,
+          using,
+          secFile,
+          engine,
+          showRedacted,
+          outputBackgroundColor,
+          showOutputBackgroundColor,
+          showOutputPrefix
+        } = command.optsWithGlobals();
         let envContents;
         if (using === "env" || hasDecryptEngine === false) {
           if (!envFile) {
@@ -1138,11 +1208,17 @@ var addRunProgam = (program2, options) => {
               return [key, _options[key]];
             })
           );
-          const dotSecContents = fs3__default.default.readFileSync(secFile, "utf8");
-          envContents = await pluginCliDecrypt.handler({
-            ciphertext: dotSecContents,
-            ...allOptionsValues
-          });
+          try {
+            const dotSecContents = fs3__default.default.readFileSync(secFile, "utf8");
+            envContents = await pluginCliDecrypt.handler({
+              ciphertext: dotSecContents,
+              ...allOptionsValues
+            });
+          } catch (e) {
+            console.error("Something bad happened while decrypting.");
+            console.error(`File: ${secFile}`);
+            throw e;
+          }
         }
         if (envContents) {
           const dotenvVars = parse(envContents).obj;
@@ -1156,18 +1232,75 @@ var addRunProgam = (program2, options) => {
             }
           });
           const [userCommand, ...userCommandArgs] = commands;
-          const spawn = child_process.spawnSync(userCommand, [...userCommandArgs], {
-            stdio: "inherit",
-            shell: false,
-            encoding: "utf-8",
-            env: {
-              ...expandedEnvVars.parsed,
-              ...process.env,
-              __DOTSEC_ENV__: JSON.stringify(Object.keys(dotenvVars))
+          const waiter = await new Promise((resolve) => {
+            const cprocess = child_process.spawn(userCommand, [...userCommandArgs], {
+              stdio: "pipe",
+              shell: false,
+              env: {
+                ...expandedEnvVars.parsed,
+                ...process.env,
+                __DOTSEC_ENV__: JSON.stringify(Object.keys(dotenvVars))
+              }
+            });
+            const expandedEnvVarsWithoutEnv = dotenvExpand.expand({
+              ignoreProcessEnv: true,
+              parsed: {
+                // add standard env variables
+                // add custom env variables, either from .env or .sec, (or empty object if none)
+                ...dotenvVars
+              }
+            });
+            cprocess.stdout.setEncoding("utf8");
+            let addBackgroundColor = showOutputBackgroundColor || dotsecConfig.defaults?.output?.showBackgroundColor ? chalk2__default.default.bgRedBright : (str) => str;
+            if (outputBackgroundColor && (showOutputBackgroundColor || dotsecConfig.defaults?.output?.showBackgroundColor)) {
+              if (!backgroundColors.includes(
+                outputBackgroundColor
+              )) {
+                throw new Error(
+                  `Invalid background color: ${outputBackgroundColor}`
+                );
+              }
+              const backgroundColorFnName = camelCase.camelCase(
+                `bg-${outputBackgroundColor}`
+              );
+              if (chalk2__default.default[backgroundColorFnName]) {
+                addBackgroundColor = chalk2__default.default[backgroundColorFnName];
+              } else {
+                console.warn(
+                  `Invalid background color: ${backgroundColorFnName}, using default: red`
+                );
+                addBackgroundColor = chalk2__default.default.bgRedBright;
+              }
             }
+            const prefix = showOutputPrefix || dotsecConfig?.defaults?.output?.showOutputPrefix ? "(dxotsec)  " : "";
+            cprocess.stdout.on("data", function(data) {
+              const lines = addBackgroundColor(
+                data.split(/\r?\n/).map((line) => `${prefix}${line}`).join("\n")
+              );
+              const redactedLines = showRedacted !== true ? Object.values(expandedEnvVarsWithoutEnv.parsed || {}).sort((a, b) => {
+                if (a.length > b.length) {
+                  return -1;
+                } else if (a.length < b.length) {
+                  return 1;
+                } else {
+                  return 0;
+                }
+              }).reduce((acc, value) => {
+                const redactedValue = value.replace(/./g, "*");
+                return acc.replace(value, redactedValue);
+              }, lines) : lines;
+              console.log(redactedLines);
+            });
+            cprocess.stderr.setEncoding("utf8");
+            cprocess.stderr.on("data", function(data) {
+              process.stderr.write(data.toString());
+            });
+            cprocess.on("exit", (code) => {
+              resolve(code);
+            });
           });
-          if (spawn.status !== 0) {
-            process.exit(spawn.status || 1);
+          if (waiter !== 0) {
+            process.exit(waiter || 1);
           }
         } else {
           throw new Error("No .env or .sec file provided");