File 0472-ssh-Fix-ssh_sftpd_erlclient_SUITE-for-missing-pubkey.patch of Package erlang
From 1ba8b1fde0ec101d349fb8c736dacebd35f0d4b9 Mon Sep 17 00:00:00 2001
From: Hans Nilsson <hans@erlang.org>
Date: Mon, 9 Mar 2020 16:52:31 +0100
Subject: [PATCH 12/12] ssh: Fix ssh_sftpd_erlclient_SUITE for missing pubkey
algos
---
lib/ssh/test/ssh_sftpd_erlclient_SUITE.erl | 52 +++++++++-------------
.../ssh_sftpd_erlclient_SUITE_data/authorized_keys | 4 ++
lib/ssh/test/ssh_sftpd_erlclient_SUITE_data/id_dsa | 21 +++++----
.../test/ssh_sftpd_erlclient_SUITE_data/id_dsa.pub | 1 +
lib/ssh/test/ssh_sftpd_erlclient_SUITE_data/id_rsa | 38 ++++++++++------
.../test/ssh_sftpd_erlclient_SUITE_data/id_rsa.pub | 1 +
6 files changed, 61 insertions(+), 56 deletions(-)
create mode 100644 lib/ssh/test/ssh_sftpd_erlclient_SUITE_data/authorized_keys
create mode 100644 lib/ssh/test/ssh_sftpd_erlclient_SUITE_data/id_dsa.pub
create mode 100644 lib/ssh/test/ssh_sftpd_erlclient_SUITE_data/id_rsa.pub
diff --git a/lib/ssh/test/ssh_sftpd_erlclient_SUITE.erl b/lib/ssh/test/ssh_sftpd_erlclient_SUITE.erl
index 6e4a22a868..dbf79e3537 100644
--- a/lib/ssh/test/ssh_sftpd_erlclient_SUITE.erl
+++ b/lib/ssh/test/ssh_sftpd_erlclient_SUITE.erl
@@ -58,17 +58,12 @@ init_per_suite(Config) ->
begin
catch ssh:stop(),
DataDir = proplists:get_value(data_dir, Config),
- PrivDir = proplists:get_value(priv_dir, Config),
FileAlt = filename:join(DataDir, "ssh_sftpd_file_alt.erl"),
c:c(FileAlt),
FileName = filename:join(DataDir, "test.txt"),
{ok, FileInfo} = file:read_file_info(FileName),
ok = file:write_file_info(FileName,
FileInfo#file_info{mode = 8#400}),
- ssh_test_lib:setup_rsa(DataDir, PrivDir),
- ssh_test_lib:setup_dsa(DataDir, PrivDir),
- ssh_test_lib:setup_ecdsa("256", DataDir, PrivDir),
- ssh_test_lib:setup_eddsa(ed25519, DataDir, PrivDir),
Config
end).
@@ -91,49 +86,41 @@ end_per_group(_GroupName, Config) ->
init_per_testcase(TestCase, Config) ->
ssh:start(),
- PrivDir = proplists:get_value(priv_dir, Config),
- SystemDir = filename:join(PrivDir, system),
+ DataDir = proplists:get_value(data_dir, Config),
Options =
case atom_to_list(TestCase) of
"file_cb" ++ _ ->
- Spec =
- ssh_sftpd:subsystem_spec([{file_handler,
- ssh_sftpd_file_alt}]),
- [{system_dir, SystemDir},
- {user_dir, PrivDir},
- {subsystems, [Spec]}];
+ Spec = ssh_sftpd:subsystem_spec([{file_handler,
+ ssh_sftpd_file_alt}]),
+ [{subsystems, [Spec]}];
"root_dir" ->
- Privdir = proplists:get_value(priv_dir, Config),
- Root = filename:join(Privdir, root),
+ PrivDir = proplists:get_value(priv_dir, Config),
+ Root = filename:join(PrivDir, root),
file:make_dir(Root),
Spec = ssh_sftpd:subsystem_spec([{root,Root}]),
- [{system_dir, SystemDir},
- {user_dir, PrivDir},
- {subsystems, [Spec]}];
+ [{subsystems, [Spec]}];
"list_dir_limited" ->
- Spec =
- ssh_sftpd:subsystem_spec([{max_files,1}]),
- [{system_dir, SystemDir},
- {user_dir, PrivDir},
- {subsystems, [Spec]}];
+ Spec = ssh_sftpd:subsystem_spec([{max_files,1}]),
+ [{subsystems, [Spec]}];
"ver6_basic" ->
- Spec =
- ssh_sftpd:subsystem_spec([{sftpd_vsn, 6}]),
- [{system_dir, SystemDir},
- {user_dir, PrivDir},
- {subsystems, [Spec]}];
+ Spec = ssh_sftpd:subsystem_spec([{sftpd_vsn, 6}]),
+ [{subsystems, [Spec]}];
_ ->
- [{user_dir, PrivDir},
- {system_dir, SystemDir}]
+ []
end,
- {Sftpd, Host, Port} = ssh_test_lib:daemon(Options),
+ {Sftpd, Host, Port} = ssh_test_lib:daemon([{preferred_algorithms, ssh_transport:supported_algorithms()},
+ {system_dir, DataDir},
+ {user_dir, DataDir},
+ {user_passwords, [{?USER,?PASSWD}]}
+ | Options]),
{ok, ChannelPid, Connection} =
ssh_sftp:start_channel(Host, Port,
[{silently_accept_hosts, true},
- {user_dir, PrivDir},
+ {preferred_algorithms, ssh_transport:supported_algorithms()},
+ {user_dir, DataDir},
{timeout, 30000}]),
TmpConfig = lists:keydelete(sftp, 1, Config),
NewConfig = lists:keydelete(sftpd, 1, TmpConfig),
@@ -191,6 +178,7 @@ quit(Config) when is_list(Config) ->
timer:sleep(5000),
{ok, NewSftp, _Conn} = ssh_sftp:start_channel(Host, Port,
[{silently_accept_hosts, true},
+ {preferred_algorithms, ssh_transport:supported_algorithms()},
{user_dir, UserDir},
{user, ?USER}, {password, ?PASSWD}]),
diff --git a/lib/ssh/test/ssh_sftpd_erlclient_SUITE_data/authorized_keys b/lib/ssh/test/ssh_sftpd_erlclient_SUITE_data/authorized_keys
new file mode 100644
index 0000000000..de8031ff09
--- /dev/null
+++ b/lib/ssh/test/ssh_sftpd_erlclient_SUITE_data/authorized_keys
@@ -0,0 +1,4 @@
+ssh-dss AAAAB3NzaC1kc3MAAACBAKNvLwC0zNq31/V9bdnW3CcpuAzIIhHdq1YIWR86rS3kLVwSiHCi4qzi88+tZ6XUDpdB9IY8xilFZuk8NdCaEJ9jaCIpQbTJfSJoACxhRqZKCFamJXlIxrgI9MADuc3pO3wjBmQlj6Izwpm5m3Gwp4FG6kOJycEtcdCEbFnV13ovAAAAFQD4DVuhRHaz9OmJaGpwrsZlbtTcQQAAAIAhQbL6jEaJUClTwmAgjmHTYF5pADgrwz8dznqbDcveK8rsh1bJXyP2lV7uodiOQPHnyvuxf4WcHN8VihcKYcQIPJi4PXLzfNbibN0+QtLiriHQp8UztSd13LJPasSS3vOlx9VhdIvXhLZXV8tV5LeeQ7DejzQYeL5pbvJZCNwrtwAAAIBkxv0UvuBnhKLDW0HH09dfkocPqUGy7PzOgDumTI48OPML/kdG5gqmkJrsANIEowVzl5gb0VLQFcOhJsSUBbu6GYkCPOQmqxp4qWFfsoSdDxJWGJxkIt30RLxPvoub3yyGTDw3lkpkmctaybVu0H93iPBol0rjNMSKv66e3mhnYA== uabhnil@elxadlj3q32
+ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBAFiU3ECc+pvCdcwrhQoCxrs1Wn1pcf5b938qY0X6FbCXoJ5xjcj5DFrUPRs7nT87ZIM4Osv3Fsum/JbLPtD500= uabhnil@elxadlj3q32
+ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIF6DjNiKQXUx9KMIQvpZhkULBDX5TGPdbUM0Xz1GvyQN uabhnil@elxadlj3q32
+ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC9rjL5w+XPI74lO9KHrDg0DAaGkPaPfPkBODlhIft8+8k3mxFhvjrSCfKqQy8W2U9/3H6Ib3203d2utonw70xxR/wWfQeB7X9FDROfvXkf5hWSyv1NENTF88ccBSFjmNmgIlt9jl3sAN+s4pF9V2kpy0j95y2rGm6AiichRVSxUhLixuQUmgpsPgPKz6HjR8Qf8Fxa5hPChhGa6UZonbacFYcixTHyQi9hj/kSgydalx2PcRENgn58mr8y5MC49L44HPGtjiMWwWpC6VqtdnYgY7r1LzrR+H691Ut1pAv4+vnNUhK0ROGftWUaQ1DG8cNYrhG270HaM/Zbe960XVhH uabhnil@elxadlj3q32
diff --git a/lib/ssh/test/ssh_sftpd_erlclient_SUITE_data/id_dsa b/lib/ssh/test/ssh_sftpd_erlclient_SUITE_data/id_dsa
index d306f8b26e..403904bb16 100644
--- a/lib/ssh/test/ssh_sftpd_erlclient_SUITE_data/id_dsa
+++ b/lib/ssh/test/ssh_sftpd_erlclient_SUITE_data/id_dsa
@@ -1,13 +1,12 @@
-----BEGIN DSA PRIVATE KEY-----
-MIIBvAIBAAKBgQDfi2flSTZZofwT4yQT0NikX/LGNT7UPeB/XEWe/xovEYCElfaQ
-APFixXvEgXwoojmZ5kiQRKzLM39wBP0jPERLbnZXfOOD0PDnw0haMh7dD7XKVMod
-/EigVgHf/qBdM2M8yz1s/rRF7n1UpLSypziKjkzCm7JoSQ2zbWIPdmBIXwIVAMgP
-kpr7Sq3O7sHdb8D601DRjoExAoGAMOQxDfB2Fd8ouz6G96f/UOzRMI/Kdv8kYYKW
-JIGY+pRYrLPyYzUeJznwZreOJgrczAX+luHnKFWJ2Dnk5CyeXk67Wsr7pJ/4MBMD
-OKeIS0S8qoSBN8+Krp79fgA+yS3IfqbkJLtLu4EBaCX4mKQIX4++k44d4U5lc8pt
-+9hlEI8CgYEAznKxx9kyC6bVo7LUYKaGhofRFt0SYFc5PVmT2VUGRs1R6+6DPD+e
-uEO6IhFct7JFSRbP9p0JD4Uk+3zlZF+XX6b2PsZkeV8f/02xlNGUSmEzCSiNg1AX
-Cy/WusYhul0MncWCHMcOZB5rIvU/aP5EJJtn3xrRaz6u0SThF6AnT34CFQC63czE
-ZU8w8Q+H7z0j+a+70x2iAw==
+MIIBuwIBAAKBgQCjby8AtMzat9f1fW3Z1twnKbgMyCIR3atWCFkfOq0t5C1cEohw
+ouKs4vPPrWel1A6XQfSGPMYpRWbpPDXQmhCfY2giKUG0yX0iaAAsYUamSghWpiV5
+SMa4CPTAA7nN6Tt8IwZkJY+iM8KZuZtxsKeBRupDicnBLXHQhGxZ1dd6LwIVAPgN
+W6FEdrP06YloanCuxmVu1NxBAoGAIUGy+oxGiVApU8JgII5h02BeaQA4K8M/Hc56
+mw3L3ivK7IdWyV8j9pVe7qHYjkDx58r7sX+FnBzfFYoXCmHECDyYuD1y83zW4mzd
+PkLS4q4h0KfFM7UnddyyT2rEkt7zpcfVYXSL14S2V1fLVeS3nkOw3o80GHi+aW7y
+WQjcK7cCgYBkxv0UvuBnhKLDW0HH09dfkocPqUGy7PzOgDumTI48OPML/kdG5gqm
+kJrsANIEowVzl5gb0VLQFcOhJsSUBbu6GYkCPOQmqxp4qWFfsoSdDxJWGJxkIt30
+RLxPvoub3yyGTDw3lkpkmctaybVu0H93iPBol0rjNMSKv66e3mhnYAIVANrZ4g1R
+9YivPLIpevmFKRNA38+Y
-----END DSA PRIVATE KEY-----
-
diff --git a/lib/ssh/test/ssh_sftpd_erlclient_SUITE_data/id_dsa.pub b/lib/ssh/test/ssh_sftpd_erlclient_SUITE_data/id_dsa.pub
new file mode 100644
index 0000000000..ca26857c74
--- /dev/null
+++ b/lib/ssh/test/ssh_sftpd_erlclient_SUITE_data/id_dsa.pub
@@ -0,0 +1 @@
+ssh-dss AAAAB3NzaC1kc3MAAACBAKNvLwC0zNq31/V9bdnW3CcpuAzIIhHdq1YIWR86rS3kLVwSiHCi4qzi88+tZ6XUDpdB9IY8xilFZuk8NdCaEJ9jaCIpQbTJfSJoACxhRqZKCFamJXlIxrgI9MADuc3pO3wjBmQlj6Izwpm5m3Gwp4FG6kOJycEtcdCEbFnV13ovAAAAFQD4DVuhRHaz9OmJaGpwrsZlbtTcQQAAAIAhQbL6jEaJUClTwmAgjmHTYF5pADgrwz8dznqbDcveK8rsh1bJXyP2lV7uodiOQPHnyvuxf4WcHN8VihcKYcQIPJi4PXLzfNbibN0+QtLiriHQp8UztSd13LJPasSS3vOlx9VhdIvXhLZXV8tV5LeeQ7DejzQYeL5pbvJZCNwrtwAAAIBkxv0UvuBnhKLDW0HH09dfkocPqUGy7PzOgDumTI48OPML/kdG5gqmkJrsANIEowVzl5gb0VLQFcOhJsSUBbu6GYkCPOQmqxp4qWFfsoSdDxJWGJxkIt30RLxPvoub3yyGTDw3lkpkmctaybVu0H93iPBol0rjNMSKv66e3mhnYA== uabhnil@elxadlj3q32
diff --git a/lib/ssh/test/ssh_sftpd_erlclient_SUITE_data/id_rsa b/lib/ssh/test/ssh_sftpd_erlclient_SUITE_data/id_rsa
index 9d7e0dd5fb..41d1ca459f 100644
--- a/lib/ssh/test/ssh_sftpd_erlclient_SUITE_data/id_rsa
+++ b/lib/ssh/test/ssh_sftpd_erlclient_SUITE_data/id_rsa
@@ -1,15 +1,27 @@
-----BEGIN RSA PRIVATE KEY-----
-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
+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
-----END RSA PRIVATE KEY-----
diff --git a/lib/ssh/test/ssh_sftpd_erlclient_SUITE_data/id_rsa.pub b/lib/ssh/test/ssh_sftpd_erlclient_SUITE_data/id_rsa.pub
new file mode 100644
index 0000000000..1787eb5f56
--- /dev/null
+++ b/lib/ssh/test/ssh_sftpd_erlclient_SUITE_data/id_rsa.pub
@@ -0,0 +1 @@
+ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC9rjL5w+XPI74lO9KHrDg0DAaGkPaPfPkBODlhIft8+8k3mxFhvjrSCfKqQy8W2U9/3H6Ib3203d2utonw70xxR/wWfQeB7X9FDROfvXkf5hWSyv1NENTF88ccBSFjmNmgIlt9jl3sAN+s4pF9V2kpy0j95y2rGm6AiichRVSxUhLixuQUmgpsPgPKz6HjR8Qf8Fxa5hPChhGa6UZonbacFYcixTHyQi9hj/kSgydalx2PcRENgn58mr8y5MC49L44HPGtjiMWwWpC6VqtdnYgY7r1LzrR+H691Ut1pAv4+vnNUhK0ROGftWUaQ1DG8cNYrhG270HaM/Zbe960XVhH uabhnil@elxadlj3q32
--
2.16.4
