From 63c7606706cca46e64faff36167b62efff1f5ae1 Mon Sep 17 00:00:00 2001 From: "martin f. krafft" Date: Fri, 17 Apr 2020 03:08:40 +0200 Subject: [PATCH 01/16] maintain persistent ssh auth sock --- .gitignore.d/ssh | 1 + .ssh/rc | 5 +++++ 2 files changed, 6 insertions(+) create mode 100644 .ssh/rc diff --git a/.gitignore.d/ssh b/.gitignore.d/ssh index ab20bac..05142ef 100644 --- a/.gitignore.d/ssh +++ b/.gitignore.d/ssh @@ -29,6 +29,7 @@ !/.ssh/known_hosts.d/tilde-club !/.ssh/known_hosts.d/viinet.de !/.ssh/Makefile +!/.ssh/rc !/.var/ssh/.gitignore !/.xsession.d/20-ssh-ask-passphrase !/.zsh/zshrc/parts.d/50-ssh diff --git a/.ssh/rc b/.ssh/rc new file mode 100644 index 0000000..a70d65c --- /dev/null +++ b/.ssh/rc @@ -0,0 +1,5 @@ +PERSISTENT_AUTH_SOCK=$VARDIR/ssh/persistent-ssh-auth.sock + +if [ ! -S "$PERSISTENT_AUTH_SOCK" ] && [ -S "$SSH_AUTH_SOCK" ]; then + ln -sf "$SSH_AUTH_SOCK" "$PERSISTENT_AUTH_SOCK" +fi -- 2.39.5 From 66373126718846571b5e9d8e092c9945a0f4af60 Mon Sep 17 00:00:00 2001 From: "martin f. krafft" Date: Sun, 26 Apr 2020 08:08:19 +1200 Subject: [PATCH 02/16] remove fishbowl auth key --- .gitignore.d/ssh | 1 - .ssh/authorized_keys.d/ed25519@fishbowl | 1 - .ssh/config.in | 15 +++------------ .ssh/known_hosts.d/madduck.net | 1 - 4 files changed, 3 insertions(+), 15 deletions(-) delete mode 100644 .ssh/authorized_keys.d/ed25519@fishbowl diff --git a/.gitignore.d/ssh b/.gitignore.d/ssh index 05142ef..c034947 100644 --- a/.gitignore.d/ssh +++ b/.gitignore.d/ssh @@ -6,7 +6,6 @@ !/.config/vcsh/hooks-enabled/ssh.post-run !/.gitignore.d/ssh !/.ssh/authorized_keys.d/ed25519@albatross -!/.ssh/authorized_keys.d/ed25519@fishbowl !/.ssh/authorized_keys.d/ed25519@lotus !/.ssh/authorized_keys.d/ed25519@sgs7e !/.ssh/authorized_keys.d/openpgp@smartcard diff --git a/.ssh/authorized_keys.d/ed25519@fishbowl b/.ssh/authorized_keys.d/ed25519@fishbowl deleted file mode 100644 index dc3a7ed..0000000 --- a/.ssh/authorized_keys.d/ed25519@fishbowl +++ /dev/null @@ -1 +0,0 @@ -ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOUyt2rgldAH7ryG3Yi3kTu/6/gPTD57V2S73nC6NTkJ madduck@fishbowl diff --git a/.ssh/config.in b/.ssh/config.in index 18af8a2..550d969 100644 --- a/.ssh/config.in +++ b/.ssh/config.in @@ -143,6 +143,7 @@ Host albatross-via-clegg | ralbatross Host bike.lehel.madduck.net | bike.lehel | bike | clegg-kvm Hostname bike.lehel.madduck.net HostKeyAlias bike.lehel + ProxyJump albatross.lehel.madduck.net Host visitor*.lehel.madduck.net | visitor*.lehel StrictHostKeyChecking no @@ -198,21 +199,11 @@ Host visitor*.mtvic.madduck.net | visitor*.mtvic ### CATALYST Host atom.catalyst.madduck.net | atom.catalyst | atom - Hostname atom.catalyst.madduck.net + Hostname 192.168.19.1 + ProxyJump domine.madduck.net ### ROAD WARRIORS -Host fishbowl.* - CheckHostIP no - HostKeyAlias fishbowl - LocalForward localhost:8386 localhost:8384 - -Host fishbowl | fishbowl.rw.madduck.net - CheckHostIP no - HostKeyAlias fishbowl - ProxyCommand bash -c "TARGETS=$( (TRIES=%h.{mtvic,catalyst,lehel,gauting,rw}.madduck.net; eval fping -aAC1 -t500 $TRIES 2>&1 & eval fping6 -aAC1 -t500 $TRIES 2>&1; wait) | sed -rne 's, : ([[:digit:]]), @\1,p' | sort -t@ -k2n | sed -ne 's, .*,,p' | tr '\n' ','); echo Targets: \$TARGETS using \${TARGETS%%%%,*} … >&2; exec nc -vq0 \${TARGETS%%%%,*} %p" - LocalForward localhost:8386 localhost:8384 - Host lotus.* CheckHostIP no HostKeyAlias lotus diff --git a/.ssh/known_hosts.d/madduck.net b/.ssh/known_hosts.d/madduck.net index 5c42d35..ff7a54f 100644 --- a/.ssh/known_hosts.d/madduck.net +++ b/.ssh/known_hosts.d/madduck.net @@ -20,5 +20,4 @@ gig.madduck.net,130.60.75.241,2001:470:b46d::1 ecdsa-sha2-nistp256 AAAAE2VjZHNhL domine.madduck.net,185.212.47.185 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBIG4ZuK73Qgy+Sr10oWG9zgaN6tbiLKzpzXQjSyLLt3PgHI2uPQrZvdEfqTbkyyuEbQ20A4U10S1FctAtODKraY= # road warriors -fishbowl ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDPFsyNLDNKBl5m9QfJg2dKCwr5fgDhXe7rdKcBeqHyWdZCUztTsuTNWFXEed3h9YnVdUn6AYwijxEsVVKbr2mFDOZ+j7kHN1nxM9T2NvKWksQ43yghMqK9ndTZqpMqObZbyIcO5FTo64wnDfsuuIHZpsYYoVPSMAJH9VaI8xXNQfXhpiJWYKw4DLAWD3Ycz0LjWsTl+91kL26oQd9yl2pkn+7h37Ry1rUNh0iXM6GG7DM263ut3C83gDjZZx+0TeHYstDaf1x5sM/vPRdOp9lofQmtlluE2areuH75yV5zu2RyTXMJs7OA18XbG6kBFrUMNmRW8SkpiWGKDHqayB3D lotus ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBKQqekPYpk6sryPF9TOyhLjO2R7kO0Hfn62mjVDFlHbMjbhHUsfVqvfNkrAhqgX/YaavePC1+RRFX6xNs470jCE= -- 2.39.5 From f5be74d7441557049ad05d5dd7647b3d58133634 Mon Sep 17 00:00:00 2001 From: "martin f. krafft" Date: Sun, 26 Apr 2020 08:08:51 +1200 Subject: [PATCH 03/16] fixup host name for eugene-kvm --- .ssh/config.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.ssh/config.in b/.ssh/config.in index 550d969..8c82456 100644 --- a/.ssh/config.in +++ b/.ssh/config.in @@ -66,10 +66,10 @@ Host lunatic.madduck.net | lunatic ### UNI ZURICH MACHINES -Host gig.madduck.net | gig +Host gig.madduck.net | gig | eugene-kvm Hostname gig.madduck.net -Host eugene.madduck.net | eugene | eugene-kvm +Host eugene.madduck.net | eugene Hostname eugene.madduck.net Host eugene-luks Hostname eugene.madduck.net -- 2.39.5 From 736eb3e97b99e6c0e5a9125c14ab73d55dc1a803 Mon Sep 17 00:00:00 2001 From: "martin f. krafft" Date: Sun, 26 Apr 2020 08:11:35 +1200 Subject: [PATCH 04/16] add files.northdrive.de --- .gitignore.d/ssh | 1 + .ssh/config.in | 4 ++++ .ssh/known_hosts.d/northfiles.de | 1 + 3 files changed, 6 insertions(+) create mode 100644 .ssh/known_hosts.d/northfiles.de diff --git a/.gitignore.d/ssh b/.gitignore.d/ssh index c034947..4ccddbf 100644 --- a/.gitignore.d/ssh +++ b/.gitignore.d/ssh @@ -22,6 +22,7 @@ !/.ssh/known_hosts.d/mjollnir.org !/.ssh/known_hosts.d/mtfk.de !/.ssh/known_hosts.d/mtvic.madduck.net +!/.ssh/known_hosts.d/northfiles.de !/.ssh/known_hosts.d/sgs5m !/.ssh/known_hosts.d/sgs7e !/.ssh/known_hosts.d/skynet.ie diff --git a/.ssh/config.in b/.ssh/config.in index 8c82456..379287f 100644 --- a/.ssh/config.in +++ b/.ssh/config.in @@ -321,6 +321,10 @@ Host lion.mjollnir.org | lion Hostname lion.mjollnir.org User madduck +Host files.northdrive.de | idiotheke + Hostname files.northdrive.de + User madduck + ### DEFAULTS Match host *.madduck.net diff --git a/.ssh/known_hosts.d/northfiles.de b/.ssh/known_hosts.d/northfiles.de new file mode 100644 index 0000000..ad786c6 --- /dev/null +++ b/.ssh/known_hosts.d/northfiles.de @@ -0,0 +1 @@ +clegg.northdrive.de,212.53.142.50 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBE0B6ZJ/t/L+3QZaOONLHxiebW9sCgc+2YyndbJ4WXcmVYRYfOejp65EqJDxr+NxHlVlnSTTn6Qo1ZXSyvgcJUY= -- 2.39.5 From 17a723981052698001d1a7067d9e05271588dcb1 Mon Sep 17 00:00:00 2001 From: "martin f. krafft" Date: Sun, 26 Apr 2020 08:13:13 +1200 Subject: [PATCH 05/16] gauting cleanup --- .ssh/config.in | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/.ssh/config.in b/.ssh/config.in index 379287f..71609e7 100644 --- a/.ssh/config.in +++ b/.ssh/config.in @@ -161,10 +161,6 @@ Host mothere CheckHostIP no HostKeyAlias mother.gauting.madduck.net -Host bell.gauting | bell | bell.gauting.madduck.net - Hostname bell.fritz.box - HostKeyAlias bell.gauting.madduck.net - ### MTVIC Host wall.mtvic.madduck.net | wall.mtvic | wall @@ -212,7 +208,7 @@ Host lotus.* Host lotus | lotus.rw.madduck.net CheckHostIP no HostKeyAlias lotus - ProxyCommand bash -c "TARGETS=$( (TRIES=%h.{mtvic,catalyst,lehel,gauting,rw}.madduck.net; eval fping -aAC1 -t500 $TRIES 2>&1 & eval fping6 -aAC1 -t500 $TRIES 2>&1; wait) | sed -rne 's, : ([[:digit:]]), @\1,p' | sort -t@ -k2n | sed -ne 's, .*,,p' | tr '\n' ','); echo Targets: \$TARGETS using \${TARGETS%%%%,*} … >&2; exec nc -vq0 \${TARGETS%%%%,*} %p" + ProxyCommand bash -c "TARGETS=$( (TRIES=%h.{mtvic,catalyst,lehel,rw}.madduck.net; eval fping -aAC1 -t500 $TRIES 2>&1 & eval fping6 -aAC1 -t500 $TRIES 2>&1; wait) | sed -rne 's, : ([[:digit:]]), @\1,p' | sort -t@ -k2n | sed -ne 's, .*,,p' | tr '\n' ','); echo Targets: \$TARGETS using \${TARGETS%%%%,*} … >&2; exec nc -vq0 \${TARGETS%%%%,*} %p" LocalForward localhost:8385 localhost:8384 Host ini | ini.dyndns.madduck.net -- 2.39.5 From da67ded56a53381f7e0e5597986b7215e8c3d8fa Mon Sep 17 00:00:00 2001 From: "martin f. krafft" Date: Sun, 26 Apr 2020 08:13:57 +1200 Subject: [PATCH 06/16] remove skynet hostkey --- .gitignore.d/ssh | 1 - .ssh/known_hosts.d/skynet.ie | 1 - 2 files changed, 2 deletions(-) delete mode 100644 .ssh/known_hosts.d/skynet.ie diff --git a/.gitignore.d/ssh b/.gitignore.d/ssh index 4ccddbf..072bbfd 100644 --- a/.gitignore.d/ssh +++ b/.gitignore.d/ssh @@ -25,7 +25,6 @@ !/.ssh/known_hosts.d/northfiles.de !/.ssh/known_hosts.d/sgs5m !/.ssh/known_hosts.d/sgs7e -!/.ssh/known_hosts.d/skynet.ie !/.ssh/known_hosts.d/tilde-club !/.ssh/known_hosts.d/viinet.de !/.ssh/Makefile diff --git a/.ssh/known_hosts.d/skynet.ie b/.ssh/known_hosts.d/skynet.ie deleted file mode 100644 index 27247cc..0000000 --- a/.ssh/known_hosts.d/skynet.ie +++ /dev/null @@ -1 +0,0 @@ -skynet.skynet.ie,skynet.ie,193.1.99.74 ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAuk0eQFGzrKQctQY7blrJkyUkJTYmKzZf57SoM4F986qtWSGTRg2+V/hoafwCtDE5/0Khzyi5hNTsRdW0IIKIjiTfuvnAgXvfa+zB5kULK522oSOHSVXEEbL6kNXUv68/AxzbYSJIdHoXtZBPNdgzo0Xg5lHECG//POZAdUz7XdpABSQuR4nCYeIm4iMzYHVYOPyZl7vCIn4VUv0CvHZx8c0GWKu6BkcGeCHQEgrXmcltlB4ZvvV1VW10JsrBlNPUZDFbqsobrJd166fOxZzIAFwDcjwpNzyvtf1iUDbLHkMIKfZHPSGcUeHvXn/4ZpOhlPx1TWstDSklFA+QEwdrEQ== -- 2.39.5 From 39136831f24531367e2196c565d63ff57ffd3245 Mon Sep 17 00:00:00 2001 From: "martin f. krafft" Date: Mon, 27 Apr 2020 23:09:12 +1200 Subject: [PATCH 07/16] move cymbaline to new ip --- .ssh/known_hosts.d/madduck.net | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.ssh/known_hosts.d/madduck.net b/.ssh/known_hosts.d/madduck.net index ff7a54f..fc83b25 100644 --- a/.ssh/known_hosts.d/madduck.net +++ b/.ssh/known_hosts.d/madduck.net @@ -9,7 +9,7 @@ piper.madduck.net,213.138.113.160,2001:41c8:51:7a0:fcff:ff:fe00:4495 ssh-rsa AAA swan.madduck.net,188.174.253.168,2001:a60:902f::188.174.253.168 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDolNsQOnvLUL4QST3yNyFAClV5+dhLwZ/YyX0wc4B+P9L1FgSHdcjbOHMU15geygwao7FjLDLdYq3sFYmJw7mI7yhDB3AmwhZV1cEvQH1Tbd7RBq5IBOcZ9wbd8zU6p7JhOEKE53YE+9vjnT6l9pt/Hi8mubuL5dCKHzC+wy02Y85d2olGFhYERSPFvIAZpStywoRZYyeJAH6pZKGn4KHUQ4MBtq30KgoK0eYkw4zr7M0rk/wxeop08VB8S4EncSi++oazF4Qz5HYlMsBM6RfJP1BsksR6jQFoa2pqHUqOd0+r3FxmUEjqO3Os5VgPGBHqhXa8AjnNryP/1QzCWDzl cirrus.madduck.net,78.46.139.186,2a01:4f8:c17:1589::1 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDBceRAt9Uu2afhbpJoduXaXl9x9t2hI8rq4VLE1SE5WlV7edhKGL5z3Vgq0u6nPxvgVBs9r8gSMPauLgOwInT8uJOi5vX25aiUnfhCDgVaKmrHfE6+WMEuc/fdY8rggMk/Ok8DCcaJj1Y7gIjhe8Su85egg7BvPuSuZI/61tofJg/2/gcl3AFEZnrUvV+y8dd5Fadn+1H7K6/BiuiusAXTLHYbZ1GBXftrsAUxXssfcK+XoAmOo0WONT57+ZLOp1m1WYmA9RuAslIEDvFqKG2nOxavg7wCC7pc5BHiG/aDkXNjO2Uq3RtjO++oi/WlSbOJ/hmMIRZaTJcVLmCzJuo7 seamus.madduck.net,188.174.253.170,2001:a60:902f::188.174.253.170 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBBe7BzeR8u7CS20DP7DSctTnCtDx4h3ds4jAPOmmAqc2s+CpyDjkt9/Aus0ecJ/sF8RzZGILo8IjYUB6r+MU5ns= -cymbaline.madduck.net,188.174.253.171,2001:a60:902f::188.174.253.171 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBK90I+AMSRuH0jKg3LjVDVutXl6GaGdWzThRDMX3jASrnAehFAtpIHowq3PcuLaS+6o8u8/zKYrMBOM9lZb9jxI= +cymbaline.madduck.net,130.60.75.244,2001:470:b47d::130.60.75.244 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBK90I+AMSRuH0jKg3LjVDVutXl6GaGdWzThRDMX3jASrnAehFAtpIHowq3PcuLaS+6o8u8/zKYrMBOM9lZb9jxI= eugene.madduck.net,130.60.75.240,2001:470:b47c::1 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBDHrHvlHG0AsGOPfcbQfO0VWgd9ndZ/LK/lnPKTtYcuNz+maiu9DbVfEATz15AUONvqrLHm21Sjmh2YU8VaX/z8= lunatic.madduck.net,188.174.253.172,2001:a60:902f::188.174.253.172 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBNas0eBvvhCiIr2TAUXZTdfPU9tB19C+/v5P3XSP4K854WvakXXALgDOrseRFgLKR+8Xf5vsK78CqvPyM7FmISQ= diamond.madduck.net,130.60.75.242,2001:470:b47d::130.60.75.242 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBCNA21f4nA839bSTRLBItZiVuY1RulGCAybUdTeQ6s7z0P8LlXPzKnzovIvrOLmvJEvSwQce/qNDXlI6rYJTDYc= -- 2.39.5 From 20e73c623c763198a060514e91d37a64571157e9 Mon Sep 17 00:00:00 2001 From: "martin f. krafft" Date: Tue, 28 Apr 2020 16:17:54 +1200 Subject: [PATCH 08/16] add arnold --- .ssh/config.in | 3 +++ .ssh/known_hosts.d/madduck.net | 1 + 2 files changed, 4 insertions(+) diff --git a/.ssh/config.in b/.ssh/config.in index 71609e7..141fd00 100644 --- a/.ssh/config.in +++ b/.ssh/config.in @@ -55,6 +55,9 @@ Host pulse.madduck.net | pulse Host vera.madduck.net | vera Hostname vera.madduck.net +Host arnold.madduck.net | arnold + Hostname arnold.madduck.net + Host seamus.madduck.net | seamus Hostname seamus.madduck.net diff --git a/.ssh/known_hosts.d/madduck.net b/.ssh/known_hosts.d/madduck.net index fc83b25..34328c0 100644 --- a/.ssh/known_hosts.d/madduck.net +++ b/.ssh/known_hosts.d/madduck.net @@ -18,6 +18,7 @@ pulse.madduck.net,188.174.253.169,2001:a60:902f::188.174.253.169 ecdsa-sha2-nist vera.madduck.net,188.174.253.173,2001:a60:902f::188.174.253.173 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBKWSexThQNjM/MMeztNo8QOp/tohtF5H+tcTGm7tHJPjqjbX2yDGUYxCryhZLKkfH4W+WBJkJo9BuHZiNDSKJ/0= gig.madduck.net,130.60.75.241,2001:470:b46d::1 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBMCMh4OM/HHUhZv04LEgnqTkt68wMI0zGELPz8ApWOzb0zk6OU3XRxm8Z6YdIW+/ZrrokJqiuqovhe8+z0jENVY= domine.madduck.net,185.212.47.185 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBIG4ZuK73Qgy+Sr10oWG9zgaN6tbiLKzpzXQjSyLLt3PgHI2uPQrZvdEfqTbkyyuEbQ20A4U10S1FctAtODKraY= +arnold.madduck.net,188.174.253.171,2001:a60:902f::188.174.253.171 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBGIU1TEgUXp5HcNGaiJhPEdbodAS7lqXJIisUQb9gIZwCKSY/iJ9HXExgUGEHZIqL7+We1kCrAYCUiZkTuMuQXU= # road warriors lotus ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBKQqekPYpk6sryPF9TOyhLjO2R7kO0Hfn62mjVDFlHbMjbhHUsfVqvfNkrAhqgX/YaavePC1+RRFX6xNs470jCE= -- 2.39.5 From 28e3d69d17ced85acbd61b97e6003f15030f9576 Mon Sep 17 00:00:00 2001 From: "martin f. krafft" Date: Thu, 7 May 2020 22:39:03 +1200 Subject: [PATCH 09/16] import sshcd function --- .zsh/zshrc/parts.d/50-ssh | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/.zsh/zshrc/parts.d/50-ssh b/.zsh/zshrc/parts.d/50-ssh index ab151c0..d872af2 100644 --- a/.zsh/zshrc/parts.d/50-ssh +++ b/.zsh/zshrc/parts.d/50-ssh @@ -45,4 +45,23 @@ kssh() { } compdef -e "compset -P ${_SSH_SOCKDIR}/ || PREFIX=${_SSH_SOCKDIR}/; _files -W ${_SSH_SOCKDIR}" kssh +sshcd() { + local args host dir arg + + for arg in "$@"; do + case "$arg" in + (*:*) host=${arg%%:*}; dir="${arg#*:}";; + (*) args="${args:+$args }$arg";; + esac + done + + if [[ -z $dir ]]; then + ssh "$@" + + else + + ssh -t $args $host "cd '$dir' && exec \$SHELL --login" + fi +} + # vim:ft=zsh -- 2.39.5 From 361eacfe215343d432812e29bd6369783679b210 Mon Sep 17 00:00:00 2001 From: "martin f. krafft" Date: Thu, 7 May 2020 22:42:54 +1200 Subject: [PATCH 10/16] escape dir in sshcd --- .zsh/zshrc/parts.d/50-ssh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.zsh/zshrc/parts.d/50-ssh b/.zsh/zshrc/parts.d/50-ssh index d872af2..166fa12 100644 --- a/.zsh/zshrc/parts.d/50-ssh +++ b/.zsh/zshrc/parts.d/50-ssh @@ -60,7 +60,7 @@ sshcd() { else - ssh -t $args $host "cd '$dir' && exec \$SHELL --login" + ssh -t $args $host "cd '${dir:gs/\'/\'\\\'\'}' && exec \$SHELL --login" fi } -- 2.39.5 From 4ef899c332581ca34eada9ab97a735018591aea9 Mon Sep 17 00:00:00 2001 From: "martin f. krafft" Date: Thu, 7 May 2020 22:45:18 +1200 Subject: [PATCH 11/16] rename sshcd to scd, add compdef scp alias --- .zsh/zshrc/parts.d/50-ssh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.zsh/zshrc/parts.d/50-ssh b/.zsh/zshrc/parts.d/50-ssh index 166fa12..c734343 100644 --- a/.zsh/zshrc/parts.d/50-ssh +++ b/.zsh/zshrc/parts.d/50-ssh @@ -45,7 +45,7 @@ kssh() { } compdef -e "compset -P ${_SSH_SOCKDIR}/ || PREFIX=${_SSH_SOCKDIR}/; _files -W ${_SSH_SOCKDIR}" kssh -sshcd() { +scd() { local args host dir arg for arg in "$@"; do @@ -63,5 +63,6 @@ sshcd() { ssh -t $args $host "cd '${dir:gs/\'/\'\\\'\'}' && exec \$SHELL --login" fi } +compdef scd=scp # vim:ft=zsh -- 2.39.5 From 5a8078d8d93a56f3dfb421490cd4326e45ea5450 Mon Sep 17 00:00:00 2001 From: "martin f. krafft" Date: Thu, 7 May 2020 22:45:44 +1200 Subject: [PATCH 12/16] add vpn jumphosts --- .ssh/config.in | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/.ssh/config.in b/.ssh/config.in index 141fd00..3ddafb6 100644 --- a/.ssh/config.in +++ b/.ssh/config.in @@ -144,9 +144,9 @@ Host albatross-via-clegg | ralbatross DynamicForward localhost:9049 Host bike.lehel.madduck.net | bike.lehel | bike | clegg-kvm - Hostname bike.lehel.madduck.net + Hostname bike.lehel.vpn.madduck.net HostKeyAlias bike.lehel - ProxyJump albatross.lehel.madduck.net + ProxyJump domine.madduck.net Host visitor*.lehel.madduck.net | visitor*.lehel StrictHostKeyChecking no @@ -198,7 +198,9 @@ Host visitor*.mtvic.madduck.net | visitor*.mtvic ### CATALYST Host atom.catalyst.madduck.net | atom.catalyst | atom - Hostname 192.168.19.1 + Hostname atom.catalyst.vpn.madduck.net + HostKeyAlias atom.catalyst.madduck.net + CheckHostIP no ProxyJump domine.madduck.net ### ROAD WARRIORS -- 2.39.5 From 56b5273149826dcedb62998357ec756abf74712f Mon Sep 17 00:00:00 2001 From: "martin f. krafft" Date: Fri, 15 May 2020 23:42:23 +1200 Subject: [PATCH 13/16] sshrc needs to handle xauth --- .ssh/rc | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/.ssh/rc b/.ssh/rc index a70d65c..a755dca 100644 --- a/.ssh/rc +++ b/.ssh/rc @@ -3,3 +3,14 @@ PERSISTENT_AUTH_SOCK=$VARDIR/ssh/persistent-ssh-auth.sock if [ ! -S "$PERSISTENT_AUTH_SOCK" ] && [ -S "$SSH_AUTH_SOCK" ]; then ln -sf "$SSH_AUTH_SOCK" "$PERSISTENT_AUTH_SOCK" fi + +if [ -n "${DISPLAY:-}" ]; then + read proto cookie + if [ "${DISPLAY%%:*}" = localhost ]; then + # X11UseLocalhost=yes + echo add unix:$(echo $DISPLAY | cut -c11-) $proto $cookie + else + # X11UseLocalhost=no + echo add $DISPLAY $proto $cookie + fi | xauth -q - +fi -- 2.39.5 From 742c7d4b2f3520d5012ec0cc8e7d43fe9b1f092e Mon Sep 17 00:00:00 2001 From: "martin f. krafft" Date: Wed, 9 Dec 2020 10:00:44 +1300 Subject: [PATCH 14/16] mother via domine vpn --- .ssh/config.in | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.ssh/config.in b/.ssh/config.in index 3ddafb6..119c63f 100644 --- a/.ssh/config.in +++ b/.ssh/config.in @@ -159,10 +159,9 @@ Host mother.gauting | mother | mother.gauting.madduck.net HostKeyAlias mother.gauting.madduck.net Host mothere - Hostname mother.dyndns.madduck.net - Port 22221 - CheckHostIP no HostKeyAlias mother.gauting.madduck.net + Hostname mother.rw.vpn.madduck.net + ProxyJump domine.madduck.net ### MTVIC -- 2.39.5 From fd88b5e062a5c130d9675c0613f736a638b2149a Mon Sep 17 00:00:00 2001 From: "martin f. krafft" Date: Wed, 9 Dec 2020 10:01:01 +1300 Subject: [PATCH 15/16] northdrive hosts --- .ssh/config.in | 10 ++++++++-- .ssh/known_hosts.d/northfiles.de | 3 ++- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/.ssh/config.in b/.ssh/config.in index 119c63f..eaf589f 100644 --- a/.ssh/config.in +++ b/.ssh/config.in @@ -321,8 +321,14 @@ Host lion.mjollnir.org | lion Hostname lion.mjollnir.org User madduck -Host files.northdrive.de | idiotheke - Hostname files.northdrive.de +Host files.northdrive.de | idiotheke | seamus.northdrive.de + Hostname seamus.northdrive.de + Port 37819 + HostKeyAlias seamus.northdrive.de + User madduck + +Host clegg.northdrive.de + Port 37819 User madduck ### DEFAULTS diff --git a/.ssh/known_hosts.d/northfiles.de b/.ssh/known_hosts.d/northfiles.de index ad786c6..9b6533e 100644 --- a/.ssh/known_hosts.d/northfiles.de +++ b/.ssh/known_hosts.d/northfiles.de @@ -1 +1,2 @@ -clegg.northdrive.de,212.53.142.50 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBE0B6ZJ/t/L+3QZaOONLHxiebW9sCgc+2YyndbJ4WXcmVYRYfOejp65EqJDxr+NxHlVlnSTTn6Qo1ZXSyvgcJUY= +[seamus.northdrive.de]:37819,[212.53.142.51]:37819 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBOZOk4M8CBntAck7GSk/2xkWRWSol5wCe5G/sQ4MrRQHkXVBcS3LVTzRlP4sPct2lBG2L/e2LyXhajM2PUrFaXo= +[clegg.northdrive.de]:37819,[212.53.142.50]:37819 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILcwkNbhogouIpWamYkg1Os37lCj1NpU278UcIgADvwr -- 2.39.5 From 25ffeaab8c3d72dffa4fd932aea41f186d9d7ea0 Mon Sep 17 00:00:00 2001 From: "martin f. krafft" Date: Wed, 9 Dec 2020 10:01:43 +1300 Subject: [PATCH 16/16] include bike hostkey --- .ssh/known_hosts.d/lehel.madduck.net | 1 + 1 file changed, 1 insertion(+) diff --git a/.ssh/known_hosts.d/lehel.madduck.net b/.ssh/known_hosts.d/lehel.madduck.net index 771baa5..a41992a 100644 --- a/.ssh/known_hosts.d/lehel.madduck.net +++ b/.ssh/known_hosts.d/lehel.madduck.net @@ -1,3 +1,4 @@ clegg.lehel.madduck.net,clegg.lehel,clegg,192.168.17.1,2001:470:5023::1,clegg.dyndns.madduck.net ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBJcP9obkfcIGs+sS/O4hkIp3qowa16cfnb69wM8Ejal1l0rdFJREZDcS2nvs5jX/l/n5ZKE6mBIONfL5gXnY3NM= albatross.lehel,albatross,192.168.17.32,2001:470:5023::22cf:30ff:fe2a:7c07 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC0sytIkvpfOIxK9ZLVoDYusSMkiwzxhA2eWGqzksHvRdcx9LuEKk21LEKdCRB8lChYoyYXzxrYqYMifaW1dRRc/s+9DCAFLGnaF7WQBdYDIJgs7kXiXDn3v44DqgTK6RiMhBxYqbBCkXkphFqSTJv+4eIc9OAgW0YLYKvz+Yx2hz5OraQy4VbDVkLM2/vhBl8KaUPTQTbOgAHtWCBFw2BsWgYU9rTfuZ5uvZGnN5tu8WcpHqweWdKXe3McrYQ1BNnXtqEEJR5QWJySqGxPi8awpk52Ln4JYBrh2M0sGVIHiT/qKwCLSTYUqP/5T+BXKb98EuSNr7hOgRrj+uRPqeyJ fishbowl.lehel,192.168.17.33,2001:470:5023::224:d7ff:fe04:c82c ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAo1XZRqJLkvUVOUcI87YU1hNdCO9J5ByMqUuMg6HkmL+uNyfBKeGVKTdfimgWpUsO7U3CLgdINC9pmtjRqTmtH/fT/vFeAM7JtAjrD5RS7AvJW8uRYNZ53t45BgIf2b5l7fYhmd3R8EFpbmZwDijiTDyY640nGFvFTI2mXmADqaSB4t9T3MJxIOQ7WdfspuYk7vNgGQaphupelz4TZLf0wHVpu3fdow3o4CYPJu+D/33s5G4qypxk3+CC+e1ra1Z1E8K+OkZGl3EjvxLoaV8oNDUHD/d3OlF8L4FeztnUNi4jNPFeiCn7bxfz39wLcwQN+hGJuU0/1HvKi2kKNcbQEw== +bike.lehel,10.56.17.1 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBPf6AWoWyZna13DpftFwaH3FTtVMRirB4O5y25uj656Mw43ikCd9qaTPZa38SHesFDHonesF08p09dRfsDVL7j8= -- 2.39.5