Skip to content

Commit ecd02bf

Browse files
author
David Galloway
committed
ceph-post-file: migrate to RSA SSH keys
DSA keys are being deprecated: http://www.openssh.com/legacy.html drop.ceph.com will continue to allow the old DSA key but eventually, users submitting logs using ceph-post-file will run into issues when OpenSSH completely drops support for the algorithm. Fixes: http://tracker.ceph.com/issues/14267 Signed-off-by: David Galloway <[email protected]>
1 parent 20186b2 commit ecd02bf

File tree

9 files changed

+43
-28
lines changed

9 files changed

+43
-28
lines changed

‎Makefile.am‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ EXTRA_DIST += \
1818
udev/60-ceph-by-parttypeuuid.rules \
1919
udev/95-ceph-osd.rules \
2020
share/known_hosts_drop.ceph.com \
21-
share/id_dsa_drop.ceph.com \
22-
share/id_dsa_drop.ceph.com.pub
21+
share/id_rsa_drop.ceph.com \
22+
share/id_rsa_drop.ceph.com.pub
2323

2424
NPROC = nproc
2525
if FREEBSD
@@ -30,8 +30,8 @@ endif
3030
install-data-local::
3131
-mkdir -p $(DESTDIR)$(datadir)/ceph
3232
-install -m 600 share/known_hosts_drop.ceph.com $(DESTDIR)$(datadir)/ceph/known_hosts_drop.ceph.com
33-
-install -m 600 share/id_dsa_drop.ceph.com $(DESTDIR)$(datadir)/ceph/id_dsa_drop.ceph.com
34-
-install -m 600 share/id_dsa_drop.ceph.com.pub $(DESTDIR)$(datadir)/ceph/id_dsa_drop.ceph.com.pub
33+
-install -m 600 share/id_rsa_drop.ceph.com $(DESTDIR)$(datadir)/ceph/id_rsa_drop.ceph.com
34+
-install -m 600 share/id_rsa_drop.ceph.com.pub $(DESTDIR)$(datadir)/ceph/id_rsa_drop.ceph.com.pub
3535

3636
all-local::
3737
if WITH_DEBUG

‎ceph.spec.in‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -924,8 +924,8 @@ DISABLE_RESTART_ON_UPDATE="yes"
924924
%{_mandir}/man8/rbd-replay-prep.8*
925925
%dir %{_datadir}/ceph/
926926
%{_datadir}/ceph/known_hosts_drop.ceph.com
927-
%{_datadir}/ceph/id_dsa_drop.ceph.com
928-
%{_datadir}/ceph/id_dsa_drop.ceph.com.pub
927+
%{_datadir}/ceph/id_rsa_drop.ceph.com
928+
%{_datadir}/ceph/id_rsa_drop.ceph.com.pub
929929
%dir %{_sysconfdir}/ceph/
930930
%config %{_sysconfdir}/bash_completion.d/rados
931931
%config %{_sysconfdir}/bash_completion.d/rbd

‎debian/ceph-common.install‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@ usr/share/man/man8/rbd.8
3131
usr/share/man/man8/rbdmap.8
3232
usr/share/man/man8/rbd-replay*.8
3333
usr/share/ceph/known_hosts_drop.ceph.com
34-
usr/share/ceph/id_dsa_drop.ceph.com
35-
usr/share/ceph/id_dsa_drop.ceph.com.pub
34+
usr/share/ceph/id_rsa_drop.ceph.com
35+
usr/share/ceph/id_rsa_drop.ceph.com.pub
3636
etc/ceph/rbdmap
3737
etc/init.d/rbdmap
3838
lib/udev/rules.d/50-rbd.rules

‎share/id_dsa_drop.ceph.com‎

Lines changed: 0 additions & 12 deletions
This file was deleted.

‎share/id_dsa_drop.ceph.com.pub‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎share/id_rsa_drop.ceph.com‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
-----BEGIN RSA PRIVATE KEY-----
2+
MIIEpAIBAAKCAQEA6H/ykb30TtYaK8DbaFH5gOHO1E5zs9M5rRNpx5oSC5K3qj7j
3+
PmWJqFtL+kGxD19IqmYVzAun9auwwObIYtNqr/trD7G9I8W2MYYo/CmJlv/anoBE
4+
R+fQxkcsPQ8TB3RHBFHR2NnJmOAn3dSt5BRdjzQCL3MMCENq7J2zmF1OcATAAjuK
5+
kYvp/dunFqmn6GVDjgUWcd12Oz67dVlykjLDCF6cLqup0YM2dZ/mMAUQkGPJytpZ
6+
4O9Pk9MdXy4LIvJEfQyRWf9fMXWmjEjn7xYFoMbQn+078Fxqv3z2pxB0DU2u94ur
7+
ep4l7NATtuLoF0qrTYqxxmJi2PDhVMkpeaFQWQIDAQABAoIBAGgzT8e51pCurDQH
8+
z03Fz4jPqx7Dul9Rv3uuQ65NguDk9KO8Y6RHZZaqtDaI0o4NKkgUUJiOcMxOEn2h
9+
8RU5o4sTpzv1cMtjhPBVLHE3PI8MRDLdUbzYTF1Q8Ka85s5kcp+g++ewVAXMEJH/
10+
C6A48GWJ7aDOcwoRDQ7W7vLOfqT84U8on97jn1vMA30ZzailQUqvfgOHUldoQlrc
11+
6SnBuPnyIozIlir1+seRiNJJ17Dx7sr3nMr3c2Ugvw5ZDSCJ5PmJxZZwl+I6v2kM
12+
372lOHnp7u0Ii6aOeX69RvWx2CeA2sw1miMfe/b5sjOm4B4PPGwj4knbxHmVs8W4
13+
GTaJWjECgYEA9pAbTDBQQfvsqwnR4W/e6R1azKa0hTL9dSZBxLQjrPaHhRQsrZbE
14+
AudL9cfx5ucmoiX++/wVHUpU9nGhZfdvpISCPuVtTnY26Ug7UsKxf2no5gSyKQi+
15+
xmj0+V9/a1tGD4jdAeRRqhBLR4p1aOWZlCOgaXEq/2w021KBykkzkNcCgYEA8WYL
16+
5F4QnZaqRosAVPhOw7ovSPclQ70aLX56V3QMwuyLXPqIuKJBFhVHxLl97meB+hrY
17+
/4gmLW+hvud7dlW88A5x/sgwLy1dMgY0EJEjhVmsk+kni2ZKNsmXGuwUI1qefYk+
18+
l4WM4k1+5Tp32mw7i5PByQhKVWXh3318ekorkk8CgYEAyzf7R9CKVdhOOKrfUe/i
19+
ykBnlkXQg/iC7wuZKYdP4D9Rc14tdOXOqJX7BZjGyIm8TekDQK2EuZ+KZ5VAccp/
20+
Ohn9P9nZPdIxcBUY0B2oLlwcmXlFXozWsLHRN7h+TP3twOANSIHmzUSgx1ZXbx3O
21+
d0rl7AJabivBZQOb9h5fYgECgYAcS7vlHumPr1NyRWTakOiapL5aLS4fDJF+965b
22+
hezhBF0pnuxbyBkc/42UD7IlOdjQekkpWsou1UD+YZ/lNROah/bwyIJtZUHhVTzR
23+
HFIvlV1XUSMjge/9EBA4RafupPai/G1r0Wm8NR1EvV/DKKCqMb2rVN9xtymMyubG
24+
Zt9InQKBgQDd2TIVDXbPWsnh9EU893uQrLHLDJ5Xu1dcvKX8yvFDihwUrP6ycq9O
25+
zopzAWu8Fdm0vFEyImwkPPhEJ5kSLQW8T3RJVKQpZ1tgz8sZRXoaTOI+u9w28REc
26+
2/ABV6x6DknKI9qiQU4sM5hY5pweFtKDIwJFBqWtgFQR0NBoll7JHA==
27+
-----END RSA PRIVATE KEY-----

‎share/id_rsa_drop.ceph.com.pub‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDof/KRvfRO1horwNtoUfmA4c7UTnOz0zmtE2nHmhILkreqPuM+ZYmoW0v6QbEPX0iqZhXMC6f1q7DA5shi02qv+2sPsb0jxbYxhij8KYmW/9qegERH59DGRyw9DxMHdEcEUdHY2cmY4Cfd1K3kFF2PNAIvcwwIQ2rsnbOYXU5wBMACO4qRi+n926cWqafoZUOOBRZx3XY7Prt1WXKSMsMIXpwuq6nRgzZ1n+YwBRCQY8nK2lng70+T0x1fLgsi8kR9DJFZ/18xdaaMSOfvFgWgxtCf7TvwXGq/fPanEHQNTa73i6t6niXs0BO24ugXSqtNirHGYmLY8OFUySl5oVBZ public_ceph_post_key_2016-08-19

‎src/CMakeLists.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -743,8 +743,8 @@ install(PROGRAMS
743743
RENAME ceph)
744744

745745
install(FILES
746-
${CMAKE_SOURCE_DIR}/share/id_dsa_drop.ceph.com
747-
${CMAKE_SOURCE_DIR}/share/id_dsa_drop.ceph.com.pub
746+
${CMAKE_SOURCE_DIR}/share/id_rsa_drop.ceph.com
747+
${CMAKE_SOURCE_DIR}/share/id_rsa_drop.ceph.com.pub
748748
${CMAKE_SOURCE_DIR}/share/known_hosts_drop.ceph.com
749749
DESTINATION ${CMAKE_INSTALL_DATADIR}/ceph)
750750

‎src/ceph-post-file.in‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
#!/bin/bash -e
22

33
# If these files exist, assume we are a source install.
4-
if [[ -f ../share/known_hosts_drop.ceph.com && -f ../share/id_dsa_drop.ceph.com ]]
4+
if [[ -f ../share/known_hosts_drop.ceph.com && -f ../share/id_rsa_drop.ceph.com ]]
55
then # running from source install
66
known_hosts=../share/known_hosts_drop.ceph.com
7-
ssh_key=../share/id_dsa_drop.ceph.com
7+
ssh_key=../share/id_rsa_drop.ceph.com
88
else # running from a pkg install
99
known_hosts=@datadir@/known_hosts_drop.ceph.com
10-
ssh_key=@datadir@/id_dsa_drop.ceph.com
10+
ssh_key=@datadir@/id_rsa_drop.ceph.com
1111
fi
1212

1313
function usage() {
@@ -39,7 +39,7 @@ Options:
3939
-k|--known_hosts <path> known_hosts file
4040
[Default: /usr/share/ceph/known_hosts_drop.ceph.com]
4141
-i <path> Ssh identity file
42-
[Default: /usr/share/ceph/id_dsa_drop.ceph.com]
42+
[Default: /usr/share/ceph/id_rsa_drop.ceph.com]
4343
-h|--help Show this usage information
4444
"
4545
}
@@ -150,7 +150,7 @@ EOF
150150
done
151151

152152
# no UserKnownHostsFile so that we don't try to record the IP hash key
153-
# GLobalKnownHostsFile so that we are verifying that this is the real drop.ceph.com
153+
# GlobalKnownHostsFile so that we are verifying that this is the real drop.ceph.com
154154

155155
cp "$ssh_key" "$t4"
156156
cp "${ssh_key}.pub" "$t4.pub"

0 commit comments

Comments
 (0)