Skip to content

Commit 5dd3f3e

Browse files
freezy-skmaxhelias
andauthored
Added option preferredAlgorithms (#183)
* Added option preferredAlgorithms * Added option preferredAlgorithms to docs --------- Co-authored-by: Maxime Helias <[email protected]>
1 parent 8e08f9f commit 5dd3f3e

File tree

4 files changed

+11
-0
lines changed

4 files changed

+11
-0
lines changed

docs/3-interacting-with-ftp-and-sftp-servers.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,8 @@ flysystem:
5959
privateKey: 'path/to/or/contents/of/privatekey'
6060
passphrase: 'privatekey_passphrase'
6161
hostFingerprint: 'host_fingerprint'
62+
preferredAlgorithms:
63+
hostkey: ['rsa-sha2-256', 'ssh-rsa']
6264
root: '/path/to/root'
6365
timeout: 10
6466
directoryPerm: 0744

src/Adapter/Builder/SftpAdapterDefinitionBuilder.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,9 @@ protected function configureOptions(OptionsResolver $resolver): void
9191
$resolver->setDefault('connectivityChecker', null);
9292
$resolver->setAllowedTypes('connectivityChecker', ['string', 'null']);
9393

94+
$resolver->setDefault('preferredAlgorithms', []);
95+
$resolver->setAllowedTypes('preferredAlgorithms', 'array');
96+
9497
$this->configureUnixOptions($resolver);
9598
}
9699

tests/Adapter/Builder/SftpAdapterDefinitionBuilderTest.php

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,9 @@ public function provideValidOptions(): \Generator
4040
'passphrase' => null,
4141
'hostFingerprint' => null,
4242
'timeout' => 30,
43+
'preferredAlgorithms' => [
44+
'hostkey' => ['rsa-sha2-256', 'ssh-rsa'],
45+
],
4346
]];
4447
}
4548

@@ -80,6 +83,7 @@ public function testOptionsBehavior(): void
8083
'permPrivate' => 0700,
8184
'permPublic' => 0744,
8285
'connectivityChecker' => null,
86+
'preferredAlgorithms' => [],
8387
'permissions' => [
8488
'file' => [
8589
'public' => 0644,

tests/Adapter/options.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,3 +67,5 @@ fs_sftp:
6767
privateKey: 'path/to/or/contents/of/privatekey'
6868
root: '/path/to/root'
6969
timeout: 10
70+
preferredAlgorithms:
71+
hostkey: ['rsa-sha2-256', 'ssh-rsa']

0 commit comments

Comments
 (0)