feat: pk secrets env command

src/bin/secrets/CommandEnv.ts

@@ -7,15 +7,68 @@
 // import * as binUtils from '../utils';
 // import * as CLIErrors from '../errors';
 // import * as grpcErrors from '../../grpc/errors';
-
 // import CommandPolykey from '../CommandPolykey';
 // import * as binOptions from '../utils/options';
 
-// class CommandEnv extends CommandPolykey {
-//   constructor(...args: ConstructorParameters<typeof CommandPolykey>) {
-//     super(...args);
-//     this.name('env');
-//     this.description('Secrets Env');
+import type PolykeyClient from '../../PolykeyClient';
+import type * as agentPB from '../../proto/js/polykey/v1/agent/agent_pb';
+import CommandPolykey from '../CommandPolykey';
+import * as binUtils from '../utils';
+import * as binOptions from '../utils/options';
+import * as binProcessors from '../utils/processors';
+
+class CommandEnv extends CommandPolykey {
+  constructor(...args: ConstructorParameters<typeof CommandPolykey>) {
+    super(...args);
+    this.name('env');
+    this.description('Run a program with secrets injected into its environment');
+    this.option(
+      '-ie, --ignore-environment',
+      'Start with an empty environment',
+    );
+    this.option(
+      '-ee, --export-environment',
+      'Exports secrets into the shell',
+    );
+    this.argument(
+      '<[NAME=<vaultName>:<secretPath>]... <command> [arg]...>',
+      'List of secrets to inject and the command to run'
+    );
+    this.addOption(binOptions.nodeId);
+    this.addOption(binOptions.clientHost);
+    this.addOption(binOptions.clientPort);
+    this.action(async (args: Array<string>, options) => {
+      const secrets: Array<{
+        envName: string;
+        vaultName: string;
+        secretPath: string;
+      }> = [];
+      let argIndex = 0;
+      for (const arg of args) {
+        const secretMatches = arg.match(
+          /([A-Z]+)=([a-zA-Z0-9]+):([a-zA-Z0-9._\-\/\s]+)/
+        );
+        if (secretMatches != null) {
+          secrets.push({
+            envName: secretMatches[1],
+            vaultName: secretMatches[2],
+            secretPath: secretMatches[3],
+          });
+        } else {
+          break;
+        }
+        argIndex++;
+      }
+      console.log(secrets);
+      const commandArgs = args.slice(argIndex);
+      console.log(commandArgs);
+
+
+      // console.log(args);
+      // console.log(options);
+    });
+
+
 //     this.option(
 //       '--command <command>',
 //       'In the environment of the derivation, run the shell command cmd in an interactive shell (Use --run to use a non-interactive shell instead)',
@@ -24,17 +77,14 @@
 //       '--run <run>',
 //       'In the environment of the derivation, run the shell command cmd in a non-interactive shell, meaning (among other things) that if you hit Ctrl-C while the command is running, the shell exits (Use --command to use an interactive shell instead)',
 //     );
-//     this.arguments(
-//       "Secrets to inject into env, of the format '<vaultName>:<secretPath>[=<variableName>]', you can also control what the environment variable will be called using '[<variableName>]' (defaults to upper, snake case of the original secret name)",
-//     );
 //     this.addOption(binOptions.nodeId);
 //     this.addOption(binOptions.clientHost);
 //     this.addOption(binOptions.clientPort);
 //     this.action(async (options, command) => {
 
 //     });
-//   }
-// }
+  }
+}
 
 // export default CommandEnv;
 
@@ -176,4 +226,4 @@
 //   }
 // });
 
-// export default env;
+export default CommandEnv;

src/bin/secrets/CommandSecrets.ts

@@ -2,7 +2,7 @@ import CommandCreate from './CommandCreate';
 import CommandDelete from './CommandDelete';
 import CommandDir from './CommandDir';
 import CommandEdit from './CommandEdit';
-// Import CommandEnv from './CommandEnv';
+import CommandEnv from './CommandEnv';
 import CommandGet from './CommandGet';
 import CommandList from './CommandList';
 import CommandMkdir from './CommandMkdir';
@@ -20,7 +20,7 @@ class CommandSecrets extends CommandPolykey {
     this.addCommand(new CommandDelete(...args));
     this.addCommand(new CommandDir(...args));
     this.addCommand(new CommandEdit(...args));
-    // This.addCommand(new CommandEnv(...args));
+    this.addCommand(new CommandEnv(...args));
     this.addCommand(new CommandGet(...args));
     this.addCommand(new CommandList(...args));
     this.addCommand(new CommandMkdir(...args));

src/bin/utils/parsers.ts

@@ -78,18 +78,17 @@ function parseCoreCount(v: string): number | undefined {
   return parseInt(v);
 }
 
-function parseSecretPath(secretPath: string): [string, string, string?] {
+function parseSecretPath(secretAddress: string): [string, string] {
   // E.g. If 'vault1:a/b/c', ['vault1', 'a/b/c'] is returned
-  //      If 'vault1:a/b/c=VARIABLE', ['vault1, 'a/b/c', 'VARIABLE'] is returned
-  const secretPathRegex =
-    /^([\w-]+)(?::)([\w\-\\\/\.\$]+)(?:=)?([a-zA-Z_][\w]+)?$/;
-  if (!secretPathRegex.test(secretPath)) {
+  const secretAddressRegex = /^([a-zA-Z0-9-_]+):([\w\-\\\/\.\$]+)$/;
+  const matches = secretAddress.match(secretAddressRegex);
+  if (matches == null) {
     throw new commander.InvalidArgumentError(
-      `${secretPath} is not of the format <vaultName>:<directoryPath>`,
+      `${secretAddress} is not of the format <vaultName>:<secretPath>`,
     );
   }
-  const [, vaultName, directoryPath] = secretPath.match(secretPathRegex)!;
-  return [vaultName, directoryPath, undefined];
+  const [, vaultName, secretPath] = matches;
+  return [vaultName, secretPath];
 }
 
 export {