addimenticato

Makefile

@@ -3,6 +3,7 @@
 
 # paths
 PREFIX = /home/${USER}/.local
+CONFPREFIX = /home/${USER}/.config
 MANPREFIX = $(PREFIX)/share/man
 SHELL = bash
 
@@ -16,8 +17,11 @@ install:
 	cp sshin $(PREFIX)/bin
 	mkdir -p $(DESTDIR)$(MANPREFIX)/man1
 	cp sshin.1 $(DESTDIR)$(MANPREFIX)/man1
+	mkdir -p $(DESTDIR)$(CONFPREFIX)/sshin
+	cp -n hosts.example $(DESTDIR)$(CONFPREFIX)/sshin/hosts
 
 
 uninstall:
 	rm -f $(DESTDIR)$(PREFIX)/bin/sshin
 	rm -f $(DESTDIR)$(MANPREFIX)/man1/sshin.1
+	rm -f $(DESTDIR)$(CONFPREFIX)/sshin/

hosts.example

@@ -0,0 +1,4 @@
+#domain,user,remote,local,yubi_support,usual identity file,yubikey identity file,
+example.me,user,22,12345,1,~/.ssh/id_rsa,~/.ssh/id_ed25519_sk
+octosrv.me,marco,22,12345,0,~/.ssh/id_rsa,
+raber.me,marco,2222,4343,1,~/.ssh/id_rsa_pass,~/.ssh/id_ed25519_sk

sshin

@@ -1,31 +1,28 @@
 #!/bin/bash
 
-usage() {
-	echo "Usage: sshin user hostname/last byte of IP address" 
-	echo
-	echo "This tools automatically chooses the server port based on the port_association file in ~/local/share/sshin/port_association"
-	echo
-	echo "Example: \"sshin foo bar.com \" will run \"ssh foo@bar.com -p 2323\""
-	echo "Example: \"sshin foo 43 \" will run \"ssh foo@192.168.1.43\""
-	return
-}
+command="ssh "
 
-IP_PREFIX="192.168.1."
-[[ $# -le 1 ]] && usage && exit 1
-[[ $1 = "-h" ]] && usage -h && exit 1
-re='^[0-9]+$'
-command="ssh ${1}@"
-shift
-if [[ $1 =~ $re ]]
-then
-	command="${command}192.168.1.$1"
-else
-	[[ $(uname) = "Linux" ]] && ports_file="$HOME/.local/share/sshin/port_association" || ports_file="$HOME/sshin/port_association"
-	port=$(grep $1 $ports_file | awk '{print $2}')
-	command="${command}$1"
-	[[ -n $port ]] && command="${command} -p $port"
-	dport=$(grep $1 $ports_file | awk '{print $NF}')
-	[[ -n $port ]] && command="${command} -D$dport"
-fi
-echo $command
-$command
+MANY_ARGS=$#
+[[ $MANY_ARGS -eq 2 ]] && SSHIN_USER=$1 && shift
+DOMAIN=$1
+
+IFS="," read -r DOMAIN DEFAULT_USER REMOTE_PORT LOCAL_PORT YUBIKEY_SUPPORT USUAL_PUBKEY YUBIKEY_PUBKEY <  <(tail -n +2 $HOME/.config/sshin/hosts | grep $DOMAIN | head -n 1)
+
+[[ $MANY_ARGS -eq 1 ]] && SSHIN_USER=$DEFAULT_USER
+
+command="${command} ${SSHIN_USER}@${DOMAIN}"
+
+lsusb | grep -q "Yubico" && YUBIKEY_PRESENCE=1 || YUBIKEY_PRESENCE=0
+[[ $YUBIKEY_PRESENCE -eq 1 ]] && [[ $YUBIKEY_SUPPORT -eq 1 ]] && command="${command} -i $YUBIKEY_PUBKEY" 
+[[ $USUAL_PUBKEY ]] && command="${command} -i ${USUAL_PUBKEY}"
+[[ $REMOTE_PORT ]] && command="${command} -p ${REMOTE_PORT}"
+[[ $LOCAL_PORT ]] && command="${command} -D${LOCAL_PORT}"
+echo "${command}"
+sleep 1
+#echo "Domain $DOMAIN"
+#echo "User $DEFAULT_USER"
+#echo "Remote $REMOTE_PORT"
+#echo "Local $LOCAL_PORT"
+#echo "Support $YUBIKEY_SUPPORT"
+#echo "Usual $USUAL_PUBKEY"
+${command}