bitwarden/directory-connector
1
0
Fork 0
mirror of https://github.com/bitwarden/directory-connector synced 2025-12-15 07:43:27 +00:00
Code Issues Releases Wiki Activity

Add options for giving passwords and secrets as file contents or in an environment variable (#82)

Browse Source
This commit is contained in:
Pasi Niemi
2021-01-04 18:53:11 +02:00
committed by GitHub
parent 77043d8d66
commit 55722d3c04
2 changed files with 22 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/commands/config.command.ts
View File

@@ -19,6 +19,8 @@ import { SyncConfiguration } from '../models/syncConfiguration';
import { ConnectorUtils } from '../utils'; import { ConnectorUtils } from '../utils';
import { NodeUtils } from 'jslib/misc/nodeUtils';
export class ConfigCommand { export class ConfigCommand {
private directory: DirectoryType; private directory: DirectoryType;
private ldap = new LdapConfiguration(); private ldap = new LdapConfiguration();
@@ -33,6 +35,13 @@ export class ConfigCommand {
async run(setting: string, value: string, cmd: program.Command): Promise<Response> { async run(setting: string, value: string, cmd: program.Command): Promise<Response> {
setting = setting.toLowerCase(); setting = setting.toLowerCase();
if (value == null || value === '') {
if (cmd.secretfile) {
value = await NodeUtils.readFirstLine(cmd.secretfile);
} else if (cmd.secretenv && process.env[cmd.secretenv]) {
value = process.env[cmd.secretenv];
}
}
try { try {
switch (setting) { switch (setting) {
case 'server': case 'server':

19
src/program.ts
View File

@@ -87,6 +87,8 @@ export class Program extends BaseProgram {
.option('--method <method>', 'Two-step login method.') .option('--method <method>', 'Two-step login method.')
.option('--code <code>', 'Two-step login code.') .option('--code <code>', 'Two-step login code.')
.option('--sso', 'Log in with Single-Sign On.') .option('--sso', 'Log in with Single-Sign On.')
.option('--passwordenv <variable-name>', 'Read password from the named environment variable.')
.option('--passwordfile <filename>', 'Read password from first line of the named file.')
.on('--help', () => { .on('--help', () => {
writeLn('\n Notes:'); writeLn('\n Notes:');
writeLn(''); writeLn('');
@@ -94,10 +96,12 @@ export class Program extends BaseProgram {
writeLn(''); writeLn('');
writeLn(' Examples:'); writeLn(' Examples:');
writeLn(''); writeLn('');
writeLn(' bw login'); writeLn(' bwdc login');
writeLn(' bw login john@example.com myPassword321'); writeLn(' bwdc login john@example.com myPassword321');
writeLn(' bw login john@example.com myPassword321 --method 1 --code 249213'); writeLn(' bwdc login john@example.com myPassword321 --method 1 --code 249213');
writeLn(' bw login --sso'); writeLn(' bwdc login john@example.com --passwordfile passwd.txt --method 1 --code 249213');
writeLn(' bwdc login john@example.com --passwordenv MY_PASSWD --method 1 --code 249213');
writeLn(' bwdc login --sso');
writeLn('', true); writeLn('', true);
}) })
.action(async (email: string, password: string, cmd: program.Command) => { .action(async (email: string, password: string, cmd: program.Command) => {
@@ -115,7 +119,7 @@ export class Program extends BaseProgram {
.on('--help', () => { .on('--help', () => {
writeLn('\n Examples:'); writeLn('\n Examples:');
writeLn(''); writeLn('');
writeLn(' bw logout'); writeLn(' bwdc logout');
writeLn('', true); writeLn('', true);
}) })
.action(async (cmd) => { .action(async (cmd) => {
@@ -182,8 +186,10 @@ export class Program extends BaseProgram {
}); });
program program
.command('config <setting> <value>') .command('config <setting> [value]')
.description('Configure settings.') .description('Configure settings.')
.option('--secretenv <variable-name>', 'Read secret from the named environment variable.')
.option('--secretfile <filename>', 'Read secret from first line of the named file.')
.on('--help', () => { .on('--help', () => {
writeLn('\n Settings:'); writeLn('\n Settings:');
writeLn(''); writeLn('');
@@ -201,6 +207,7 @@ export class Program extends BaseProgram {
writeLn(' bwdc config server bitwarden.com'); writeLn(' bwdc config server bitwarden.com');
writeLn(' bwdc config directory 1'); writeLn(' bwdc config directory 1');
writeLn(' bwdc config ldap.password <password>'); writeLn(' bwdc config ldap.password <password>');
writeLn(' bwdc config ldap.password --secretenv LDAP_PWD');
writeLn(' bwdc config azure.key <key>'); writeLn(' bwdc config azure.key <key>');
writeLn(' bwdc config gsuite.key <key>'); writeLn(' bwdc config gsuite.key <key>');
writeLn(' bwdc config okta.token <token>'); writeLn(' bwdc config okta.token <token>');