From 5bf8baf34902e711a1b914e3a44a13dfef799dc1 Mon Sep 17 00:00:00 2001
From: qo-op <support@qo-op.com>
Date: Sat, 6 Mar 2021 14:50:15 +0100
Subject: [PATCH] Depannage distant =
 ~/.zen/astrXbian/zen/ssh_forward2onelove.sh

---
 zen/port_SSH_one2one.sh    | 20 -------------------
 zen/ssh_forward2onelove.sh | 40 ++++++++++++++++++++++++++++++++++++++
 2 files changed, 40 insertions(+), 20 deletions(-)
 delete mode 100755 zen/port_SSH_one2one.sh
 create mode 100755 zen/ssh_forward2onelove.sh

diff --git a/zen/port_SSH_one2one.sh b/zen/port_SSH_one2one.sh
deleted file mode 100755
index 531ac29..0000000
--- a/zen/port_SSH_one2one.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/bash
-################################################################################
-# Author: Fred (support@qo-op.com)
-# Version: 0.1
-# License: AGPL-3.0 (https://choosealicense.com/licenses/agpl-3.0/)
-################################################################################
-# Activate SUPPORT MODE: open ssh over IPFS
-MY_PATH="`dirname \"$0\"`"              # relative
-MY_PATH="`( cd \"$MY_PATH\" && pwd )`"  # absolutized and normalized
-########################################################################
-YOU=$(ps auxf --sort=+utime | grep -w ipfs | grep -v -E 'color=auto|grep' | tail -n 1 | cut -d " " -f 1) || er+=" ipfs daemon not running"
-IPFSNODEID=$(ipfs id -f='<id>\n') || er+=" ipfs id problem"
-WHOAMI=$(sbotc whoami | jq -r .id) || er+=" sbotc whoami problem"
-[[ "$YOU" == "" || "$IPFSNODEID" == "" || "$WHOAMI" == "" ]] && echo "ERROR : $er " && exit 1
-########################################################################
-# TODO ESTABLISH A PORT FORWARD STRATEGY (depending on Node Flavour)
-
-[[ -f ~/.zen/ipfs/.$IPFSNODEID/G1SSB/_g1.gchange_title ]] && XZUID=$(cat ~/.zen/ipfs/.$IPFSNODEID/G1SSB/_g1.gchange_title)
-
-[[ $XZUID ]] && ipfs p2p listen /x/$XZUID-ssh /ip4/127.0.0.1/tcp/22 # or CLOSE ipfs p2p close /x/$UIDNA-ssh
diff --git a/zen/ssh_forward2onelove.sh b/zen/ssh_forward2onelove.sh
new file mode 100755
index 0000000..23a4591
--- /dev/null
+++ b/zen/ssh_forward2onelove.sh
@@ -0,0 +1,40 @@
+#!/bin/bash
+################################################################################
+# Author: Fred (support@qo-op.com)
+# Version: 0.1
+# License: AGPL-3.0 (https://choosealicense.com/licenses/agpl-3.0/)
+################################################################################
+# Activate SUPPORT MODE: open ssh over IPFS
+MY_PATH="`dirname \"$0\"`"              # relative
+MY_PATH="`( cd \"$MY_PATH\" && pwd )`"  # absolutized and normalized
+########################################################################
+YOU=$(ps auxf --sort=+utime | grep -w ipfs | grep -v -E 'color=auto|grep' | tail -n 1 | cut -d " " -f 1) || er+=" ipfs daemon not running"
+IPFSNODEID=$(ipfs id -f='<id>\n') || er+=" ipfs id problem"
+G1PUB=$(cat ~/.zen/secret.dunikey | grep 'pub:' | cut -d ' ' -f 2) || er+=" G1PUB problem"
+[[ "$YOU" == "" || "$IPFSNODEID" == "" || "$G1PUB" == "" ]] && echo "ERROR : $er " && exit 1
+########################################################################
+## ACTIVATE / DESACTIVATE SSH FORWARD to fred@ONELOVE
+########################################################################
+ARG=$(echo "$1" | awk '{ print tolower($0) }')
+
+if [[ ! $(cat ~/.ssh/authorized_keys | grep "fred@ONELOVE") ]]
+then
+	# ADD fred@ONELOVE to ~/.ssh/authorized_keys
+	echo "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDFLHW8P88C/B7622yXzdAn1ZcTBfE1A4wMqajBwAoHwUVTOUaYfvkiSxbzb5H9dPTAXhQU6ZfuLa70kTo1m2b9TKH0tD6hR3RiKJ0NIjCHYEypcPGpLmHaZWnBKPq3IUU24qFVdUJxnTkDdFUszYMNoV4nqlXY/ZYdNpic8L1jPPyfOLLfPFkuSxagyQj4FGJq77UQE5j+skMJS3ISkazNTLqOCGLFJ5qtBC11BvQaCJ4cQ2Ss7ejPYhpx16NLJfg9VtG4dv9ZebEIl2pf7niiQGSPrDMFWHuQcGAuHt/patr0BcvfvD3Gv+qNsVfAJCNZ2U5NHEMKIhgj1ilNPEw7 fred@ONELOVE" >> ~/.ssh/authorized_keys
+fi
+
+if [[ "$G1PUB" != "Ee1n3hDv9vunfd6m3LW6XeYg7bnt5aaRn9EjqnBe8GNS" ]]
+then
+	if [[ "$ARG" == "stop" ]]
+	then
+		ipfs p2p close -p /x/$G1PUB-ssh
+		echo "ipfs p2p close -p /x/$G1PUB-ssh" > /tmp/ssh.forward
+		~/.zen/astrXbian/zen/jaklis/jaklis.py send -d Ee1n3hDv9vunfd6m3LW6XeYg7bnt5aaRn9EjqnBe8GNS -t "SSH-STOP" -f /tmp/ssh.forward
+	else
+		ipfs p2p listen /x/$G1PUB-ssh /ip4/127.0.0.1/tcp/22
+		## SEND jaklis message to onelove for remote access
+		echo "ipfs p2p forward /x/$G1PUB-ssh /ip4/127.0.0.1/tcp/2222 /p2p/$IPFSNODEID
+		ssh $USER@localhost -p 2222" > /tmp/ssh.forward
+		~/.zen/astrXbian/zen/jaklis/jaklis.py send -d Ee1n3hDv9vunfd6m3LW6XeYg7bnt5aaRn9EjqnBe8GNS -t "SSH-OPEN" -f /tmp/ssh.forward
+	fi
+fi