From 77f2ab719c50b27b4aeca4d7cbd4b1398337ed78 Mon Sep 17 00:00:00 2001 From: Joel Klinghed Date: Thu, 31 Oct 2024 22:39:09 +0100 Subject: sftp: Let a selection of tests use private key authentication Tests switch between password authentication and private key authentication depending on the hash of the method name. It's a fairly even spread. Update the docker config, it never wanted a pem file, it wanted a ssh-rsa format public key. --- libs/sftp/src/test/docker/docker-compose.yml | 2 +- libs/sftp/src/test/docker/user_public.pem | 9 --------- libs/sftp/src/test/docker/user_public.ssh | 1 + 3 files changed, 2 insertions(+), 10 deletions(-) delete mode 100644 libs/sftp/src/test/docker/user_public.pem create mode 100644 libs/sftp/src/test/docker/user_public.ssh (limited to 'libs/sftp/src/test/docker') diff --git a/libs/sftp/src/test/docker/docker-compose.yml b/libs/sftp/src/test/docker/docker-compose.yml index 973a942..d8321cd 100644 --- a/libs/sftp/src/test/docker/docker-compose.yml +++ b/libs/sftp/src/test/docker/docker-compose.yml @@ -6,7 +6,7 @@ services: volumes: - ./ssh_host_ed25519_key:/etc/ssh/ssh_host_ed25519_key - ./ssh_host_rsa_key:/etc/ssh/ssh_host_rsa_key - - ./user_public.pub:/home/user/.ssh/keys/id_rsa.pub:ro + - ./user_public.ssh:/home/user/.ssh/keys/id_rsa:ro - ../../../build/test-share:/home/user/share ports: - "127.0.0.1:10022:22" diff --git a/libs/sftp/src/test/docker/user_public.pem b/libs/sftp/src/test/docker/user_public.pem deleted file mode 100644 index f0812d9..0000000 --- a/libs/sftp/src/test/docker/user_public.pem +++ /dev/null @@ -1,9 +0,0 @@ ------BEGIN PUBLIC KEY----- -MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA4/t3pxBvR68V27NiEp76 -pKxlQWchdyScphxK0pC6sH9goQNOa8YH9pZjQ4ltrTiG4DkeAPG6THjT9sxq6VM7 -mBZkqfeuOdJk1XCE3i06QeUzT2O7XfMFkPllAedkSDKE+PnuiTZHl8LF7Xhx3gcV -PgSLDs0oqR2NpOccG1gxIV0xQ49BIO/lyHumNN4xQ1WINheCkOQhdryJdVVjpUvm -zAJ4BAs1daNAgY2shAFUuta+vO6vRT/viCyVo0YfkeQharCMGylv0H7sHzUb3SlR -kGDci1l3X85LLbRX0JO4je+5sO7vr4ePRhGVNtGYpTldLBoM+Iu29ejnVzqBFieN -ewIDAQAB ------END PUBLIC KEY----- diff --git a/libs/sftp/src/test/docker/user_public.ssh b/libs/sftp/src/test/docker/user_public.ssh new file mode 100644 index 0000000..ffceffc --- /dev/null +++ b/libs/sftp/src/test/docker/user_public.ssh @@ -0,0 +1 @@ +ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDj+3enEG9HrxXbs2ISnvqkrGVBZyF3JJymHErSkLqwf2ChA05rxgf2lmNDiW2tOIbgOR4A8bpMeNP2zGrpUzuYFmSp96450mTVcITeLTpB5TNPY7td8wWQ+WUB52RIMoT4+e6JNkeXwsXteHHeBxU+BIsOzSipHY2k5xwbWDEhXTFDj0Eg7+XIe6Y03jFDVYg2F4KQ5CF2vIl1VWOlS+bMAngECzV1o0CBjayEAVS61r687q9FP++ILJWjRh+R5CFqsIwbKW/QfuwfNRvdKVGQYNyLWXdfzksttFfQk7iN77mw7u+vh49GEZU20ZilOV0sGgz4i7b16OdXOoEWJ417 -- cgit v1.2.3-70-g09d2