Skip to content

fix(connection-secrets): hide ssh tunnel password #2799

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 17, 2022
Merged

fix(connection-secrets): hide ssh tunnel password #2799

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions packages/data-service/src/connection-secrets.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@ describe('connection secrets', function () {
const newConnectionInfo = mergeSecrets(originalConnectionInfo, {
awsSessionToken: 'sessionToken',
password: 'userPassword',
sshTunnelPassword: 'password',
sshTunnelPassphrase: 'passphrase',
tlsCertificateKeyFilePassword: 'tlsCertPassword',
proxyPassword: 'bar',
Expand All @@ -81,6 +82,7 @@ describe('connection secrets', function () {
sshTunnel: {
host: 'localhost',
username: 'user',
password: 'password',
port: 22,
identityKeyPassphrase: 'passphrase',
},
Expand Down Expand Up @@ -141,6 +143,7 @@ describe('connection secrets', function () {
sshTunnel: {
host: 'localhost',
username: 'user',
password: 'password',
port: 22,
identityKeyPassphrase: 'passphrase',
},
Expand All @@ -166,6 +169,7 @@ describe('connection secrets', function () {
expect(secrets).to.be.deep.equal({
awsSessionToken: 'sessionToken',
password: 'userPassword',
sshTunnelPassword: 'password',
sshTunnelPassphrase: 'passphrase',
tlsCertificateKeyFilePassword: 'tlsCertPassword',
proxyPassword: 'bar',
Expand Down
10 changes: 10 additions & 0 deletions packages/data-service/src/connection-secrets.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import type { MongoClientOptions, AuthMechanismProperties } from 'mongodb';

export interface ConnectionSecrets {
password?: string;
sshTunnelPassword?: string;
sshTunnelPassphrase?: string;
awsSessionToken?: string;
tlsCertificateKeyFilePassword?: string;
Expand Down Expand Up @@ -35,6 +36,10 @@ export function mergeSecrets(
uri.password = secrets.password;
}

if (secrets.sshTunnelPassword && connectionOptions.sshTunnel) {
connectionOptions.sshTunnel.password = secrets.sshTunnelPassword;
}

if (secrets.sshTunnelPassphrase && connectionOptions.sshTunnel) {
connectionOptions.sshTunnel.identityKeyPassphrase =
secrets.sshTunnelPassphrase;
Expand Down Expand Up @@ -89,6 +94,11 @@ export function extractSecrets(connectionInfo: Readonly<ConnectionInfo>): {
uri.password = '';
}

if (connectionOptions.sshTunnel?.password) {
secrets.sshTunnelPassword = connectionOptions.sshTunnel.password;
delete connectionOptions.sshTunnel.password;
}

if (connectionOptions.sshTunnel?.identityKeyPassphrase) {
secrets.sshTunnelPassphrase =
connectionOptions.sshTunnel.identityKeyPassphrase;
Expand Down