From e9454c1dd5ecd9d7a68f96efc8166232c88f9262 Mon Sep 17 00:00:00 2001 From: Paul Pilone Date: Mon, 12 Feb 2024 15:46:00 -0500 Subject: [PATCH] Merge pull request #3582 from nasa/pp/CUMULUS-3527-sync-granule-sftp-failure [CUMULUS-3527] Adds support for additional kex algorithms to sftp-client --- CHANGELOG.md | 8 ++++++++ packages/sftp-client/src/index.ts | 11 +++++++++++ 2 files changed, 19 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 27673ef3049..ad777642536 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,13 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/). +## Unreleased + +## Fixed + + **CUMULUS-3527** + - Added suppport for additional kex algorithms in the sftp-client. + ## [v16.1.4] 2024-4-23 ### Migration Notes @@ -23,6 +30,7 @@ upgrade instructions](https://nasa.github.io/cumulus/docs/upgrade-notes/upgrade-rds-cluster-tf-postgres-13). ## Changed + - **CUMULUS-3564** - Update webpack configuration to explicitly disable chunking - **CUMULUS-3444** diff --git a/packages/sftp-client/src/index.ts b/packages/sftp-client/src/index.ts index 0eaa26073e4..2ea9a2ff954 100644 --- a/packages/sftp-client/src/index.ts +++ b/packages/sftp-client/src/index.ts @@ -41,6 +41,17 @@ export class SftpClient { this.clientOptions = { host: config.host, port: get(config, 'port', 22), + algorithms: { + kex: { + append: [ + 'diffie-hellman-group-exchange-sha1', + 'diffie-hellman-group14-sha1', + 'diffie-hellman-group1-sha1', + ], + prepend: [], + remove: [], + }, + }, }; if (config.username) this.clientOptions.username = config.username;